commit 9a135c273658e2ef4ce9271ec9554ccfd79dca79
author Thomas <thomasraoux@google.com> Mon Mar 06 13:37:14 2023 -0800
committer GitHub <noreply@github.com> Mon Mar 06 13:37:14 2023 -0800
tree 3ad8ef8d1682ffeefeac0a7801a4f8917561325b
parent d5a9b1b86f244bbe3257d542d699eae344ad1c00

[CUDA] Remove workaround running passes in old pass manager (#12516)

Remove workaround that was added during transition to the new pass
manager.
Use parsePassPipeline to call those passes instead.

benchmarks: cuda

Fixes #12515

compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/CUDATarget.cpp

diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/CUDATarget.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/CUDATarget.cpp
index 04d5632..624ffff 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/CUDATarget.cpp
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/CUDA/CUDATarget.cpp
@@ -56,11 +56,6 @@
     "iree-hal-cuda-llvm-target-arch", llvm::cl::desc("LLVM target chip."),
     llvm::cl::init("sm_35"));
 
-namespace llvm {
-class FunctionPass;
-FunctionPass *createNVVMIntrRangePass(unsigned int SmVersion);
-FunctionPass *createNVVMReflectPass(unsigned int SmVersion);
-}  // namespace llvm
 namespace mlir {
 namespace iree_compiler {
 namespace IREE {
@@ -149,13 +144,6 @@
 /// Performs optimizations on |module| (including LTO-style whole-program ones).
 static void optimizeModule(llvm::Module &module,
                            llvm::TargetMachine &targetMachine) {
-  // Workaround run those passed ahead as they are temporarily disabled in NVPTX
-  // target.
-  llvm::legacy::PassManager legacyPM;
-  legacyPM.add(llvm::createNVVMIntrRangePass(35));
-  legacyPM.add(llvm::createNVVMReflectPass(35));
-  legacyPM.run(module);
-
   llvm::LoopAnalysisManager lam;
   llvm::FunctionAnalysisManager fam;
   llvm::CGSCCAnalysisManager cgam;
@@ -172,6 +160,15 @@
   si.registerCallbacks(pic, &fam);
 
   llvm::PassBuilder pb(&targetMachine, pto, std::nullopt, &pic);
+  llvm::ModulePassManager mpm;
+  StringRef nnvmReflectPassName = "nvvm-reflect";
+  StringRef nnvmIntrRangePassName = "nvvm-intr-range";
+  if (pb.parsePassPipeline(mpm, nnvmReflectPassName)) {
+    llvm::errs() << "Could not parse -" << nnvmReflectPassName << "\n";
+  }
+  if (pb.parsePassPipeline(mpm, nnvmIntrRangePassName)) {
+    llvm::errs() << "Could not parse -" << nnvmIntrRangePassName << "\n";
+  }
   pb.registerModuleAnalyses(mam);
   pb.registerCGSCCAnalyses(cgam);
   pb.registerFunctionAnalyses(fam);
@@ -180,7 +177,6 @@
 
   llvm::OptimizationLevel ol = llvm::OptimizationLevel::O2;
 
-  llvm::ModulePassManager mpm;
   mpm.addPass(llvm::VerifierPass());
   mpm.addPass(pb.buildPerModuleDefaultPipeline(ol));
   mpm.addPass(llvm::VerifierPass());