Integrate LLVM at llvm/llvm-project@32de3b9ef9e7 (#2867)

Author: abhigunj

WORKSPACE.bazel

@@ -17,9 +17,9 @@ workspace(name = "stablehlo")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "3a6b818132e3133c7d33f8f577e62503f12869b4"
+LLVM_COMMIT = "32de3b9ef9e7e8debc14416e968456ca13b48bea"
 
-LLVM_SHA256 = "a0b3de698393e0f49d0aca3f869cc03bf0c59eba0c65f608e565278943c31958"
+LLVM_SHA256 = "e048b05e1fb9366e224ea3c06f8473714114039bfad00e81db4ecb6409f23efa"
 
 http_archive(
     name = "llvm-raw",

build_tools/llvm_version.txt

@@ -1 +1 @@
-3a6b818132e3133c7d33f8f577e62503f12869b4
+32de3b9ef9e7e8debc14416e968456ca13b48bea

stablehlo/dialect/Base.td

@@ -72,45 +72,45 @@ def IsValidQuantizedDimension : CPred<"mlir::hlo::isValidQuantizedDimension($_se
 
 // TODO(b/230381284): Upstream width-specific uniform quantized element types.
 class StableHLO_UniformQuantizedSignedInt<int width>
-  : Type<And<[CPred<"isa<mlir::quant::UniformQuantizedType>($_self)">,
-           CPred<"cast<mlir::quant::UniformQuantizedType>($_self)" #
+  : Type<And<[CPred<"::llvm::isa<::mlir::quant::UniformQuantizedType>($_self)">,
+           CPred<"::llvm::cast<::mlir::quant::UniformQuantizedType>($_self)" #
                  ".getStorageTypeIntegralWidth() == " # width>,
-           CPred<"cast<mlir::IntegerType>(" #
-                   "cast<mlir::quant::UniformQuantizedType>($_self).getStorageType()" #
+           CPred<"::llvm::cast<::mlir::IntegerType>(" #
+                   "::llvm::cast<::mlir::quant::UniformQuantizedType>($_self).getStorageType()" #
                  ").isSignless()">, IsValidStablehloQuantizedElementType]>,
     "QI" # width # " type"> {
   string name = "UniformQuantizedSignedInt";
   int bitwidth = width;
 }
 
 class StableHLO_UniformQuantizedPerAxisSignedInt<int width>
-  : Type<And<[CPred<"isa<mlir::quant::UniformQuantizedPerAxisType>($_self)">,
-           CPred<"cast<mlir::quant::UniformQuantizedPerAxisType>($_self)" #
+  : Type<And<[CPred<"::llvm::isa<::mlir::quant::UniformQuantizedPerAxisType>($_self)">,
+           CPred<"::llvm::cast<::mlir::quant::UniformQuantizedPerAxisType>($_self)" #
                  ".getStorageTypeIntegralWidth() == " # width>,
-           CPred<"cast<mlir::IntegerType>(" #
-                   "cast<mlir::quant::UniformQuantizedPerAxisType>($_self).getStorageType()" #
+           CPred<"::llvm::cast<::mlir::IntegerType>(" #
+                   "::llvm::cast<::mlir::quant::UniformQuantizedPerAxisType>($_self).getStorageType()" #
                  ").isSignless()">, IsValidStablehloQuantizedElementType]>,
     "QI" # width # " type"> {
   string name = "UniformQuantizedPerAxisSignedInt";
   int bitwidth = width;
 }
 
 class StableHLO_UniformQuantizedUnsignedInt<int width>
-  : Type<And<[CPred<"isa<mlir::quant::UniformQuantizedType>($_self)">,
-           CPred<"cast<mlir::quant::UniformQuantizedType>($_self)" #
+  : Type<And<[CPred<"::llvm::isa<::mlir::quant::UniformQuantizedType>($_self)">,
+           CPred<"::llvm::cast<::mlir::quant::UniformQuantizedType>($_self)" #
                  ".getStorageTypeIntegralWidth() == " # width>,
-           CPred<"!cast<mlir::quant::UniformQuantizedType>($_self)" #
+           CPred<"!::llvm::cast<::mlir::quant::UniformQuantizedType>($_self)" #
                  ".isSigned()">, IsValidStablehloQuantizedElementType]>,
     "QUI" # width # " type"> {
   string name = "UniformQuantizedUnsignedInt";
   int bitwidth = width;
 }
 
 class StableHLO_UniformQuantizedPerAxisUnsignedInt<int width>
-  : Type<And<[CPred<"isa<mlir::quant::UniformQuantizedPerAxisType>($_self)">,
-           CPred<"cast<mlir::quant::UniformQuantizedPerAxisType>($_self)" #
+  : Type<And<[CPred<"::llvm::isa<::mlir::quant::UniformQuantizedPerAxisType>($_self)">,
+           CPred<"::llvm::cast<::mlir::quant::UniformQuantizedPerAxisType>($_self)" #
                  ".getStorageTypeIntegralWidth() == " # width>,
-           CPred<"!cast<mlir::quant::UniformQuantizedPerAxisType>($_self)" #
+           CPred<"!::llvm::cast<::mlir::quant::UniformQuantizedPerAxisType>($_self)" #
                  ".isSigned()">, IsValidStablehloQuantizedElementType]>,
     "QUI" # width # " type"> {
   string name = "UniformQuantizedPerAxisUnsignedInt";
@@ -152,7 +152,7 @@ def HLO_PerAxisQuantizedInt :
     AnyTypeOf<[HLO_PerAxisQuantizedSignedInt, HLO_PerAxisQuantizedUnsignedInt], "per-axis integer quantized">;
 
 // Token type.
-def HLO_Token : Type<CPred<"isa<TokenType>($_self)">, "token">;
+def HLO_Token : Type<CPred<"::llvm::isa<::mlir::stablehlo::TokenType>($_self)">, "token">;
 
 // Any integer tensor types
 def HLO_IntTensor : RankedTensorOf<[HLO_Int]>;

stablehlo/dialect/StablehloAttrs.td

@@ -172,7 +172,7 @@ def StableHLO_TypeExtensions : AttrDef<StableHLO_Dialect, "TypeExtensions", [
 // A layout attribute (1D tensor of index type)
 def StableHLO_LayoutAttr : Attr<
   And<[IndexElementsAttr.predicate,
-       CPred<[{cast<::mlir::DenseIntElementsAttr>($_self).getType().getRank()
+       CPred<[{::llvm::cast<::mlir::DenseIntElementsAttr>($_self).getType().getRank()
                == 1}]>]>,
   "A 1D tensor of index type (layout)"> {
   let storageType = IndexElementsAttr.storageType;