[clang] Fix handling of Cilkscale tool variants, specifically cilksca…

…le and cilkscale-instructions, to ensure instrumentation is inserted appropriately when using LLD with LTO.
neboat · Dec 7, 2024 · 09c0b71 · 09c0b71
1 parent 80676cb
commit 09c0b71
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
@@ -1078,7 +1078,7 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
             });
         break;
       case LangOptions::CilktoolKind::Cilktool_Cilkscale_Benchmark:
-          PB.registerTapirLoopEndEPCallback(
+          PB.registerTapirLateEPCallback(
             [&PB](ModulePassManager &MPM, OptimizationLevel Level) {
               MPM.addPass(CSISetupPass(getCSIOptionsForCilkscaleBenchmark()));
               MPM.addPass(ComprehensiveStaticInstrumentationPass(

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -301,6 +301,10 @@ static void renderTapirLoweringOptions(const ArgList &Args,
     } else if (Args.hasArg(options::OPT_fcilkplus))
       CmdArgs.push_back("--plugin-opt=tapir-target=cilkplus");
   }
+
+  if (const Arg *A = Args.getLastArg(options::OPT_fcilktool_EQ))
+    CmdArgs.push_back(Args.MakeArgString(
+        Twine("--plugin-opt=cilktool=") + A->getValue()));
 }
 
 void tools::addPathIfExists(const Driver &D, const Twine &Path,

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -576,6 +576,10 @@ static void renderTapirLoweringOptions(const ArgList &Args,
     } else if (Args.hasArg(options::OPT_fcilkplus))
       CmdArgs.push_back("--tapir-target=cilkplus");
   }
+
+  if (const Arg *A = Args.getLastArg(options::OPT_fcilktool_EQ))
+    CmdArgs.push_back(
+        Args.MakeArgString(Twine("--plugin-opt=cilktool=") + A->getValue()));
 }
 
 static void AppendPlatformPrefix(SmallString<128> &Path, const llvm::Triple &T);

diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -1777,7 +1777,7 @@ PassBuilder::buildPerModuleDefaultPipeline(OptimizationLevel Level,
     MPM.addPass(buildTapirLoweringPipeline(
         Level, LTOPreLink ? ThinOrFullLTOPhase::FullLTOPreLink
                           : ThinOrFullLTOPhase::None));
-  else
+  else if (!LTOPreLink)
     invokeTapirLoopEndEPCallbacks(MPM, Level);
 
   return MPM;
@@ -2359,7 +2359,7 @@ ModulePassManager PassBuilder::buildO0DefaultPipeline(OptimizationLevel Level,
     MPM.addPass(buildTapirLoweringPipeline(
         Level, LTOPreLink ? ThinOrFullLTOPhase::FullLTOPreLink
                           : ThinOrFullLTOPhase::None));
-  else
+  else if (!LTOPreLink)
     invokeTapirLoopEndEPCallbacks(MPM, Level);
 
   invokeOptimizerLastEPCallbacks(MPM, Level);