Integrate LLVM at llvm/llvm-project@246b57cb2086

openxla · Nov 8, 2024 · 0468b28 · 0468b28
1 parent 4d85f95
commit 0468b28
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 35 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -17,9 +17,9 @@ workspace(name = "stablehlo")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "95c2d798148f12565dd4c9ddc753d196e47f230f"
+LLVM_COMMIT = "246b57cb2086b22ad8b41051c77e86ef478053a1"
 
-LLVM_SHA256 = "f11e5bbf17d50ff31addc9e1737d64e64a144fce928166de5878c72a1efcf9b4"
+LLVM_SHA256 = "2d46c080deb2cb6dbb9420a334be231040487bbfe87b5ed0b90bb69cac423500"
 
 http_archive(
     name = "llvm-raw",

diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
@@ -1 +1 @@
-95c2d798148f12565dd4c9ddc753d196e47f230f
+246b57cb2086b22ad8b41051c77e86ef478053a1
diff --git a/stablehlo/reference/Tensor.cpp b/stablehlo/reference/Tensor.cpp
@@ -155,42 +155,22 @@ Element Tensor::get(const Index &index) const {
   // integer variants.
   if (isSupportedIntegerType(elementType)) {
     IntegerType intTy = cast<IntegerType>(elementType);
-
-    if (elementType.isSignlessInteger(2) || elementType.isSignlessInteger(4) ||
-        elementType.isSignlessInteger(8)) {
-      auto elementData = reinterpret_cast<const int8_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isSignlessInteger(16)) {
-      auto elementData = reinterpret_cast<const int16_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isSignlessInteger(32)) {
-      auto elementData = reinterpret_cast<const int32_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isSignlessInteger(64)) {
-      auto elementData = reinterpret_cast<const int64_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isUnsignedInteger(2) ||
-               elementType.isUnsignedInteger(4) ||
-               elementType.isUnsignedInteger(8)) {
+    const unsigned int bitwidth = intTy.getWidth();
+    if (bitwidth == 2 || bitwidth == 4 || bitwidth == 8) {
       auto elementData = reinterpret_cast<const uint8_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isUnsignedInteger(16)) {
+      // Set implicitTrunc to ignore garbage bits on 2-bit and 4-bit types.
+      const bool implicitTrunc = bitwidth == 2 || bitwidth == 4;
+      return Element(elementType, APInt(bitwidth, *elementData,
+                                        /*isSigned=*/false, implicitTrunc));
+    } else if (bitwidth == 16) {
       auto elementData = reinterpret_cast<const uint16_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isUnsignedInteger(32)) {
+      return Element(elementType, APInt(bitwidth, *elementData));
+    } else if (bitwidth == 32) {
       auto elementData = reinterpret_cast<const uint32_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
-    } else if (elementType.isUnsignedInteger(64)) {
+      return Element(elementType, APInt(bitwidth, *elementData));
+    } else if (bitwidth == 64) {
       auto elementData = reinterpret_cast<const uint64_t *>(elementPtr);
-      return Element(elementType, APInt(intTy.getWidth(), *elementData,
-                                        intTy.isSignedInteger()));
+      return Element(elementType, APInt(bitwidth, *elementData));
     }
   }