Bump to llvm commit 8b76aea8d8b1b71f6220bc2845abc749f18a19b7 (#2366)

* bump to llvm commit 8b76aea8d8b1b71f6220bc2845abc749f18a19b7 Signed-off-by: Ferdinand Lemaire <[email protected]> * Update calls to affine::normalizeMemRefType function. Signed-off-by: Tiago Trevisan Jost <[email protected]> * clang-format ZHighToZLow.cpp Signed-off-by: Tiago Trevisan Jost <[email protected]> * Removes llvm.sext in KrnlMemcpyOpLowering that was failing in the IR verifier. Signed-off-by: Tiago Trevisan Jost <[email protected]> --------- Signed-off-by: Ferdinand Lemaire <[email protected]> Signed-off-by: Tiago Trevisan Jost <[email protected]> Co-authored-by: Tiago Trevisan Jost <[email protected]> Co-authored-by: Philip Lassen <[email protected]> Co-authored-by: maxbartel <[email protected]> Co-authored-by: Alexandre Eichenberger <[email protected]>
onnx · Jul 20, 2023 · ab4fa45 · ab4fa45
1 parent 7b92fbc
commit ab4fa45
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/docs/BuildOnLinuxOSX.md b/docs/BuildOnLinuxOSX.md
@@ -15,7 +15,7 @@ Firstly, install MLIR (as a part of LLVM-Project):
 ``` bash
 git clone -n https://github.com/llvm/llvm-project.git
 # Check out a specific branch that is known to work with ONNX-MLIR.
-cd llvm-project && git checkout ec89cb9a81529fd41fb37b8e62203a2e9f23bd54 && cd ..
+cd llvm-project && git checkout 8b76aea8d8b1b71f6220bc2845abc749f18a19b7 && cd ..
 ```
 
 [same-as-file]: <> (utils/build-mlir.sh)

diff --git a/docs/BuildOnWindows.md b/docs/BuildOnWindows.md
@@ -52,7 +52,7 @@ Install MLIR (as a part of LLVM-Project):
 ```shell
 git clone -n https://github.com/llvm/llvm-project.git
 # Check out a specific branch that is known to work with ONNX-MLIR.
-cd llvm-project && git checkout ec89cb9a81529fd41fb37b8e62203a2e9f23bd54 && cd ..
+cd llvm-project && git checkout 8b76aea8d8b1b71f6220bc2845abc749f18a19b7 && cd ..
 ```
 
 [same-as-file]: <> (utils/build-mlir.cmd)

diff --git a/src/Accelerators/NNPA/Conversion/ZHighToZLow/ZHighToZLow.cpp b/src/Accelerators/NNPA/Conversion/ZHighToZLow/ZHighToZLow.cpp
@@ -177,8 +177,8 @@ Value insertAllocOrEmitZeroConstant(ArrayRef<IndexExpr> dims,
         RankedTensorType::get(shape, rewriter.getF32Type(),
             ZTensorEncodingAttr::get(op->getContext(), layout));
     ZMemRefType zMemRefType = convertZTensorToMemRefType(tensorType);
-    MemRefType resType = affine::normalizeMemRefType(
-        zMemRefType.value.cast<MemRefType>(), /*numSymbolicOperands=*/0);
+    MemRefType resType =
+        affine::normalizeMemRefType(zMemRefType.value.cast<MemRefType>());
 
     // Create a ZHighStickifiedConstantOp.
     ZHighStickifiedConstantOp stickifiedConstant =
@@ -660,8 +660,8 @@ struct ZHighToZLowStickifiedConstantOpLowering : public ConversionPattern {
     // Normalize MemRefType to get a static shape.
     assert(zMemRefType.value.cast<MemRefType>().getNumDynamicDims() == 0 &&
            "MemRefType has dynamic dimensions");
-    MemRefType normalizedType = affine::normalizeMemRefType(
-        zMemRefType.value.cast<MemRefType>(), /*numSymbolicOperands=*/0);
+    MemRefType normalizedType =
+        affine::normalizeMemRefType(zMemRefType.value.cast<MemRefType>());
     ArrayRef<int64_t> normalizedShape = normalizedType.getShape();
 
     // Get dense resource attribute.

diff --git a/src/Conversion/KrnlToLLVM/KrnlMemcpy.cpp b/src/Conversion/KrnlToLLVM/KrnlMemcpy.cpp
@@ -88,7 +88,6 @@ class KrnlMemcpyOpLowering : public ConversionPattern {
 
     // Size.
     Value sizeInBytes = create.llvm.mul(elemsToCopy, eltSizeInBytes);
-    sizeInBytes = create.llvm.sext(i64Ty, sizeInBytes);
 
     // Is volatile (set to false).
     Value isVolatile = create.llvm.constant(i1Ty, (int64_t)0);

diff --git a/src/Dialect/ONNX/ONNXOps/Additional/ShapeTransform.cpp b/src/Dialect/ONNX/ONNXOps/Additional/ShapeTransform.cpp
@@ -47,8 +47,7 @@ LogicalResult ONNXShapeTransformOpShapeHelper::computeShape() {
   // TODO: support dynamic shape.
   MemRefType affineMemRefType =
       MemRefType::get(inputDims, elementType, AffineMapAttr::get(indexMap));
-  MemRefType flatMemRefType =
-      affine::normalizeMemRefType(affineMemRefType, /*numSymbols=*/0);
+  MemRefType flatMemRefType = affine::normalizeMemRefType(affineMemRefType);
   assert((flatMemRefType.getRank() == outputRank) && "Normalization failed");
 
   DimsExpr outputIEs(outputRank);

diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
diff --git a/utils/clone-mlir.sh b/utils/clone-mlir.sh
@@ -1,3 +1,3 @@
 git clone -n https://github.com/llvm/llvm-project.git
 # Check out a specific branch that is known to work with ONNX-MLIR.
-cd llvm-project && git checkout ec89cb9a81529fd41fb37b8e62203a2e9f23bd54 && cd ..
+cd llvm-project && git checkout 8b76aea8d8b1b71f6220bc2845abc749f18a19b7 && cd ..