Integrate LLVM at llvm/llvm-project@93ffe1792fd9

Updates LLVM usage to match
[93ffe1792fd9](llvm/llvm-project@93ffe1792fd9)

PiperOrigin-RevId: 644334496

third_party/llvm/workspace.bzl

@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "e83adfe59632d2e2f8ff26db33087ba7fb754485"
-    LLVM_SHA256 = "5730ac18a80109d6189a34e212f61f2b0832b91b8cc175c3ebd0aa063db85f59"
+    LLVM_COMMIT = "93ffe1792fd9a985b96fee1105b399b5196a15bc"
+    LLVM_SHA256 = "f92f48acaf9a6543097dc50acb761584ca3da3f2a137d7ad32aa92650b9ea932"
 
     tf_http_archive(
         name = name,

third_party/stablehlo/temporary.patch

@@ -2442,7 +2442,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/ChloRecomposeOps.cpp b/
 +    // Do a single traversal to recompose CustomCallOp to CHLO ops.
 +    GreedyRewriteConfig config;
 +    config.useTopDownTraversal = true;
-+    config.enableRegionSimplification = true;
++    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
 +    config.maxIterations = 1;
 +    config.maxNumRewrites = GreedyRewriteConfig::kNoLimit;
 +    config.strictMode = GreedyRewriteStrictness::ExistingOps;
@@ -2754,7 +2754,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloCanonicalizeDy
 +  void runOnOperation() override {
 +    GreedyRewriteConfig config;
 +    config.useTopDownTraversal = true;
-+    config.enableRegionSimplification = true;
++    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
 +    config.maxIterations = 2;
 +    config.maxNumRewrites = GreedyRewriteConfig::kNoLimit;
 +    config.strictMode = GreedyRewriteStrictness::AnyOp;
@@ -2930,7 +2930,7 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.c
 +    // upstream, and that might be the reason.
 +    GreedyRewriteConfig config;
 +    config.useTopDownTraversal = true;
-+    config.enableRegionSimplification = true;
++    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
 +    config.maxIterations = 3;
 +    config.maxNumRewrites = GreedyRewriteConfig::kNoLimit;
 +    config.strictMode = GreedyRewriteStrictness::AnyOp;
@@ -2955,4 +2955,41 @@ diff --ruN a/stablehlo/stablehlo/experimental/transforms/StablehloRefineShapes.c
 +}  // namespace experimental
 +}  // namespace stablehlo
 +}  // namespace mlir
+diff --ruN a/stablehlo/stablehlo/tests/TestUtils.cpp b/stablehlo/stablehlo/tests/TestUtils.cpp
+--- stablehlo/stablehlo/tests/TestUtils.cpp
++++ stablehlo/stablehlo/tests/TestUtils.cpp
+@@ -176,7 +176,8 @@
+     GreedyRewriteConfig config;
+     config.maxIterations = 1;
+     config.useTopDownTraversal = true;
+-    config.enableRegionSimplification = false;
++    config.enableRegionSimplification =
++        mlir::GreedySimplifyRegionLevel::Disabled;
+     (void)applyPatternsAndFoldGreedily(getOperation(), std::move(patterns));
+   }
+
+diff --ruN a/stablehlo/stablehlo/transforms/StablehloCanonicalizeDynamism.cpp b/stablehlo/stablehlo/transforms/StablehloCanonicalizeDynamism.cpp
+--- stablehlo/stablehlo/transforms/StablehloCanonicalizeDynamism.cpp
++++ stablehlo/stablehlo/transforms/StablehloCanonicalizeDynamism.cpp
+@@ -300,7 +300,7 @@
+
+   LogicalResult initialize(MLIRContext* context) override {
+     config.useTopDownTraversal = true;
+-    config.enableRegionSimplification = true;
++    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
+     config.maxIterations = 2;
+     config.maxNumRewrites = GreedyRewriteConfig::kNoLimit;
+     config.strictMode = GreedyRewriteStrictness::AnyOp;
+diff --ruN a/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp b/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
+--- stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
++++ stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp
+@@ -728,7 +728,7 @@
+     // There have been recent refactors to applyPatternsAndFoldGreedily
+     // upstream, and that might be the reason.
+     config.useTopDownTraversal = true;
+-    config.enableRegionSimplification = true;
++    config.enableRegionSimplification = GreedySimplifyRegionLevel::Aggressive;
+     config.maxIterations = 2;
+     config.maxNumRewrites = GreedyRewriteConfig::kNoLimit;
+     config.strictMode = GreedyRewriteStrictness::AnyOp;
 

third_party/triton/llvm_integration/cl643947742.patch

@@ -0,0 +1,13 @@
+==== triton/test/Triton/reproducer.mlir#3 - triton/test/Triton/reproducer.mlir ====
+# action=edit type=text
+--- triton/test/Triton/reproducer.mlir	2024-05-14 06:33:36.000000000 -0700
++++ triton/test/Triton/reproducer.mlir	2024-06-17 08:37:24.000000000 -0700
+@@ -9,7 +9,7 @@
+ {-#
+   external_resources: {
+     mlir_reproducer: {
+-      pipeline: "builtin.module(any(convert-scf-to-cf,convert-index-to-llvm{index-bitwidth=0},convert-triton-gpu-to-llvm{compute-capability=90},convert-nv-gpu-to-llvm,convert-arith-to-llvm{index-bitwidth=0},canonicalize{  max-iterations=10 max-num-rewrites=-1 region-simplify=true test-convergence=false top-down=true},cse,symbol-dce,enable-line-info))",
++      pipeline: "builtin.module(any(convert-scf-to-cf,convert-index-to-llvm{index-bitwidth=0},convert-triton-gpu-to-llvm{compute-capability=90},convert-nv-gpu-to-llvm,convert-arith-to-llvm{index-bitwidth=0},canonicalize{  max-iterations=10 max-num-rewrites=-1 region-simplify=aggressive test-convergence=false top-down=true},cse,symbol-dce,enable-line-info))",
+       disable_threading: false,
+       verify_each: false
+     }

third_party/triton/llvm_integration/series.bzl

@@ -6,4 +6,5 @@ These should be upstreamed to openai/triton as part of the next triton integrati
 
 llvm_patch_list = [
     "//third_party/triton/llvm_integration:cl642434908.patch",
+    "//third_party/triton/llvm_integration:cl643947742.patch",
 ]