Revert "[AMD] Disable block merging to avoid block argument explosion (…

…triton-lang#4176)" This reverts commit cf2ad02 and enables aggresive strategy to enable block merging.
joviliast · Sep 6, 2024 · 24bfa51 · 24bfa51
1 parent e14ee2d
commit 24bfa51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/test/Conversion/amd/amd-convert-builtin-func.mlir b/test/Conversion/amd/amd-convert-builtin-func.mlir
diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/BuiltinFuncToLLVM.cpp
@@ -206,11 +206,8 @@ struct ConvertBuiltinFuncToLLVM
     MLIRContext *context = &getContext();
     ModuleOp mod = getOperation();
 
-    // Disable block merging because of:
-    // https://github.com/llvm/llvm-project/issues/63230
-    // TODO(giuseros): enable block merging once the above ticket is completed
     GreedyRewriteConfig config;
-    config.enableRegionSimplification = GreedySimplifyRegionLevel::Normal;
+    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
 
     RewritePatternSet patterns(context);
     patterns.add<CallOpConversion>(context);