Integrate LLVM at llvm/llvm-project@33363521ca24

Updates LLVM usage to match [33363521ca24](llvm/llvm-project@33363521ca24) PiperOrigin-RevId: 689288723
openxla · Oct 24, 2024 · 3fa2fa0 · 3fa2fa0
1 parent a6eeef2
commit 3fa2fa0
Show file tree

Hide file tree

Showing 10 changed files with 354 additions and 187 deletions.
diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch
@@ -1,43 +1 @@
 Auto generated patch. Do not edit or delete it, even if empty.
-diff -ruN --strip-trailing-cr a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
---- a/llvm/lib/Target/X86/X86ISelLowering.cpp
-+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
-@@ -50049,8 +50049,9 @@
-   SDValue X, Y, Z;
-   if (sd_match(N, m_And(m_Value(X),
-                         m_OneUse(m_Or(m_Value(Y), m_Not(m_Value(Z))))))) {
--    // Don't fold if Y is a constant to prevent infinite loops.
--    if (!isa<ConstantSDNode>(Y))
-+    // Don't fold if Y or Z are constants to prevent infinite loops.
-+    if (!DAG.isConstantIntBuildVectorOrConstantInt(Y) &&
-+        !DAG.isConstantIntBuildVectorOrConstantInt(Z))
-       return DAG.getNode(
-           ISD::AND, DL, VT, X,
-           DAG.getNOT(
-diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/X86/pr108731.ll b/llvm/test/CodeGen/X86/pr108731.ll
---- a/llvm/test/CodeGen/X86/pr108731.ll
-+++ b/llvm/test/CodeGen/X86/pr108731.ll
-@@ -192,3 +192,23 @@
-   ret void
- }
-
-+define void @PR113240(i64 %a) {
-+; CHECK-LABEL: PR113240:
-+; CHECK:       # %bb.0: # %entry
-+; CHECK-NEXT:    movq %rdi, %rax
-+; CHECK-NEXT:    notq %rax
-+; CHECK-NEXT:    movabsq $8796093022206, %rcx # imm = 0x7FFFFFFFFFE
-+; CHECK-NEXT:    notq %rcx
-+; CHECK-NEXT:    orq %rax, %rcx
-+; CHECK-NEXT:    andq %rdi, %rcx
-+; CHECK-NEXT:    movq %rcx, 0
-+; CHECK-NEXT:    retq
-+entry:
-+  %and = and i64 %a, 8796093022206
-+  %bf.value = and i64 8796093022206, 0
-+  %not = xor i64 %and, -1
-+  %and4 = and i64 %a, %not
-+  store i64 %and4, ptr null, align 8
-+  ret void
-+}
-+
diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "6c4267fb1779bc5550bb413f33250f9365acfbc6"
-    LLVM_SHA256 = "7010ee8fe86246fabcaedbed21fa9ac2bd2542e0d2ad6172a4481e0294fdf354"
+    LLVM_COMMIT = "33363521ca24f912cc25530f6cecbca53acce8a3"
+    LLVM_SHA256 = "3fd9cbd992ed880e348d81715f39138538fd6c8e9164b981551a97181a3b7b24"
 
     tf_http_archive(
         name = name,

diff --git a/third_party/shardy/temporary.patch b/third_party/shardy/temporary.patch
diff --git a/third_party/shardy/workspace.bzl b/third_party/shardy/workspace.bzl
@@ -3,8 +3,8 @@
 load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
-    SHARDY_COMMIT = "cd99ddc074b23157ae82b9ddfee448656bca67ee"
-    SHARDY_SHA256 = "36914bd8dd27dd86e48698f8b39fdf9346489fc9d5d9a3ba2b124a71a52060e5"
+    SHARDY_COMMIT = "2ddd85e06a72365f30b061610e593c9bb33037c9"
+    SHARDY_SHA256 = "5b3a5753019d37e4a11237939d9f471087dd6eb4b7d53fa5b39c974f7f5033be"
 
     tf_http_archive(
         name = "shardy",

diff --git a/third_party/stablehlo/temporary.patch b/third_party/stablehlo/temporary.patch
@@ -1,3 +1,49 @@
+diff --ruN a/stablehlo/stablehlo/conversions/linalg/transforms/TypeConversion.cpp b/stablehlo/stablehlo/conversions/linalg/transforms/TypeConversion.cpp
+--- stablehlo/stablehlo/conversions/linalg/transforms/TypeConversion.cpp
++++ stablehlo/stablehlo/conversions/linalg/transforms/TypeConversion.cpp
+@@ -47,36 +47,36 @@
+   return shapedType;
+ }
+
+-std::optional<Value> materializeCastFromIllegal(OpBuilder &builder, Type type,
++Value materializeCastFromIllegal(OpBuilder &builder, Type type,
+                                                 ValueRange inputs,
+                                                 Location loc) {
+   Type fromType = getElementTypeOrSelf(inputs[0].getType());
+   Type toType = getElementTypeOrSelf(type);
+   if ((!fromType.isSignedInteger() && !fromType.isUnsignedInteger()) ||
+       !toType.isSignlessInteger())
+-    return std::nullopt;
++    return Value();
+   // Use unrealized conversion casts to do signful->signless conversions.
+   return builder.create<UnrealizedConversionCastOp>(loc, type, inputs[0])
+       ->getResult(0);
+ }
+
+-std::optional<Value> materializeCastToIllegal(OpBuilder &builder, Type type,
++Value materializeCastToIllegal(OpBuilder &builder, Type type,
+                                               ValueRange inputs, Location loc) {
+   Type fromType = getElementTypeOrSelf(inputs[0].getType());
+   Type toType = getElementTypeOrSelf(type);
+   if (!fromType.isSignlessInteger() ||
+       (!toType.isSignedInteger() && !toType.isUnsignedInteger()))
+-    return std::nullopt;
++    return Value();
+   // Use unrealized conversion casts to do signless->signful conversions.
+   return builder.create<UnrealizedConversionCastOp>(loc, type, inputs[0])
+       ->getResult(0);
+ }
+
+-std::optional<Value> scalarToTensor(OpBuilder &builder, Type type,
++Value scalarToTensor(OpBuilder &builder, Type type,
+                                     ValueRange inputs, Location loc) {
+   assert(inputs.size() == 1);
+   if (mlir::isa<ShapedType>(inputs.front().getType())) {
+-    return std::nullopt;
++    return Value();
+   }
+   Value result =
+       builder
 diff --ruN a/stablehlo/stablehlo/tests/vhlo/vhlo_to_version_downgrade_patch.mlir b/stablehlo/stablehlo/tests/vhlo/vhlo_to_version_downgrade_patch.mlir
 --- stablehlo/stablehlo/tests/vhlo/vhlo_to_version_downgrade_patch.mlir
 +++ stablehlo/stablehlo/tests/vhlo/vhlo_to_version_downgrade_patch.mlir

diff --git a/third_party/triton/llvm_integration/cl689288723.patch b/third_party/triton/llvm_integration/cl689288723.patch
@@ -0,0 +1,47 @@
+
+--- a/lib/Conversion/TritonToTritonGPU/TritonGPUConversion.cpp	2024-08-05 02:40:13.000000000 -0700
++++ b/lib/Conversion/TritonToTritonGPU/TritonGPUConversion.cpp	2024-10-24 02:13:18.000000000 -0700
+@@ -56,7 +56,7 @@
+   // This will create newArg, and map(origArg, newArg)
+   addArgumentMaterialization([&](OpBuilder &builder,
+                                  RankedTensorType tensorType, ValueRange inputs,
+-                                 Location loc) -> std::optional<Value> {
++                                 Location loc) -> Value {
+     // Allows partial TTIR to TTGIR conversion by materializing a conversion for
+     // remaining arguments that have been converted to a new type.
+     // We use this to rewrite triton_gpu.sparse_dot in a separate pass after
+@@ -65,14 +65,14 @@
+                                                         inputs);
+     llvm_unreachable("Argument rematerialization should not happen in Triton "
+                      "-> TritonGPU conversion");
+-    return std::nullopt;
++    return Value();
+   });
+
+   // If the origValue still has live user(s), use this to
+   // convert origValue to newValue
+   addSourceMaterialization([&](OpBuilder &builder, RankedTensorType tensorType,
+                                ValueRange inputs,
+-                               Location loc) -> std::optional<Value> {
++                               Location loc) -> Value {
+     // Allows partial TTIR to TTGIR conversion by materializing a conversion for
+     // remaining uses of values that have been converted to a new type.
+     // We use this to rewrite triton_gpu.sparse_dot in a separate pass after
+@@ -81,7 +81,7 @@
+                                                         inputs);
+     llvm_unreachable("Source rematerialization should not happen in Triton -> "
+                      "TritonGPU Conversion");
+-    return std::nullopt;
++    return Value();
+   });
+
+   // This will be called when (desiredType != newOperandType)
+@@ -91,7 +91,7 @@
+                                ValueRange inputs, Location loc) {
+     auto cast =
+         builder.create<triton::gpu::ConvertLayoutOp>(loc, tensorType, inputs);
+-    return std::optional<Value>(cast.getResult());
++    return Value(cast.getResult());
+   });
+ }
+
diff --git a/third_party/triton/llvm_integration/series.bzl b/third_party/triton/llvm_integration/series.bzl
@@ -12,5 +12,6 @@ llvm_patch_list = [
     "//third_party/triton:llvm_integration/cl683501567.patch",
     "//third_party/triton:llvm_integration/cl686059966.patch",
     "//third_party/triton:llvm_integration/cl686893691.patch",
+    "//third_party/triton:llvm_integration/cl689288723.patch",
     # Add new patches just above this line
 ]
diff --git a/third_party/tsl/third_party/llvm/generated.patch b/third_party/tsl/third_party/llvm/generated.patch
@@ -1,43 +1 @@
 Auto generated patch. Do not edit or delete it, even if empty.
-diff -ruN --strip-trailing-cr a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
---- a/llvm/lib/Target/X86/X86ISelLowering.cpp
-+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
-@@ -50049,8 +50049,9 @@
-   SDValue X, Y, Z;
-   if (sd_match(N, m_And(m_Value(X),
-                         m_OneUse(m_Or(m_Value(Y), m_Not(m_Value(Z))))))) {
--    // Don't fold if Y is a constant to prevent infinite loops.
--    if (!isa<ConstantSDNode>(Y))
-+    // Don't fold if Y or Z are constants to prevent infinite loops.
-+    if (!DAG.isConstantIntBuildVectorOrConstantInt(Y) &&
-+        !DAG.isConstantIntBuildVectorOrConstantInt(Z))
-       return DAG.getNode(
-           ISD::AND, DL, VT, X,
-           DAG.getNOT(
-diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/X86/pr108731.ll b/llvm/test/CodeGen/X86/pr108731.ll
---- a/llvm/test/CodeGen/X86/pr108731.ll
-+++ b/llvm/test/CodeGen/X86/pr108731.ll
-@@ -192,3 +192,23 @@
-   ret void
- }
-
-+define void @PR113240(i64 %a) {
-+; CHECK-LABEL: PR113240:
-+; CHECK:       # %bb.0: # %entry
-+; CHECK-NEXT:    movq %rdi, %rax
-+; CHECK-NEXT:    notq %rax
-+; CHECK-NEXT:    movabsq $8796093022206, %rcx # imm = 0x7FFFFFFFFFE
-+; CHECK-NEXT:    notq %rcx
-+; CHECK-NEXT:    orq %rax, %rcx
-+; CHECK-NEXT:    andq %rdi, %rcx
-+; CHECK-NEXT:    movq %rcx, 0
-+; CHECK-NEXT:    retq
-+entry:
-+  %and = and i64 %a, 8796093022206
-+  %bf.value = and i64 8796093022206, 0
-+  %not = xor i64 %and, -1
-+  %and4 = and i64 %a, %not
-+  store i64 %and4, ptr null, align 8
-+  ret void
-+}
-+
diff --git a/third_party/tsl/third_party/llvm/workspace.bzl b/third_party/tsl/third_party/llvm/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "6c4267fb1779bc5550bb413f33250f9365acfbc6"
-    LLVM_SHA256 = "7010ee8fe86246fabcaedbed21fa9ac2bd2542e0d2ad6172a4481e0294fdf354"
+    LLVM_COMMIT = "33363521ca24f912cc25530f6cecbca53acce8a3"
+    LLVM_SHA256 = "3fd9cbd992ed880e348d81715f39138538fd6c8e9164b981551a97181a3b7b24"
 
     tf_http_archive(
         name = name,

diff --git a/xla/mlir_hlo/mhlo/utils/type_conversion.cc b/xla/mlir_hlo/mhlo/utils/type_conversion.cc
@@ -49,36 +49,36 @@ Type convertShapedType(ShapedType shapedType) {
   return shapedType;
 }
 
-std::optional<Value> materializeCastFromIllegal(OpBuilder& builder, Type type,
+Value materializeCastFromIllegal(OpBuilder& builder, Type type,
                                                 ValueRange inputs,
                                                 Location loc) {
   Type fromType = getElementTypeOrSelf(inputs[0].getType());
   Type toType = getElementTypeOrSelf(type);
   if ((!fromType.isSignedInteger() && !fromType.isUnsignedInteger()) ||
       !toType.isSignlessInteger())
-    return std::nullopt;
+    return Value();
   // Use unrealized conversion casts to do signful->signless conversions.
   return builder.create<UnrealizedConversionCastOp>(loc, type, inputs[0])
       ->getResult(0);
 }
 
-std::optional<Value> materializeCastToIllegal(OpBuilder& builder, Type type,
+Value materializeCastToIllegal(OpBuilder& builder, Type type,
                                               ValueRange inputs, Location loc) {
   Type fromType = getElementTypeOrSelf(inputs[0].getType());
   Type toType = getElementTypeOrSelf(type);
   if (!fromType.isSignlessInteger() ||
       (!toType.isSignedInteger() && !toType.isUnsignedInteger()))
-    return std::nullopt;
+    return Value();
   // Use unrealized conversion casts to do signless->signful conversions.
   return builder.create<UnrealizedConversionCastOp>(loc, type, inputs[0])
       ->getResult(0);
 }
 
-std::optional<Value> scalarToTensor(OpBuilder& builder, Type type,
+Value scalarToTensor(OpBuilder& builder, Type type,
                                     ValueRange inputs, Location loc) {
   assert(inputs.size() == 1);
   if (mlir::isa<ShapedType>(inputs.front().getType())) {
-    return std::nullopt;
+    return Value();
   }
   Value result =
       builder