Merge pull request #378 from Xilinx/jrickert.bump_integration_1

LLVM Bump Integration

Author: jorickert

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 52e1d522a65b0d30cf1d49851d2ed6d196e65e10 && cd ..
+cd llvm-project && git checkout 776b07b472a12db1a451fb4bfc737e05c0ee0b1c && cd ..
 ```
 
 [same-as-file]: <> (utils/build-mlir.sh)

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 52e1d522a65b0d30cf1d49851d2ed6d196e65e10 && cd ..
+cd llvm-project && git checkout 776b07b472a12db1a451fb4bfc737e05c0ee0b1c && cd ..
 ```
 
 [same-as-file]: <> (utils/build-mlir.cmd)

src/Accelerators/NNPA/Conversion/ONNXToZHigh/ONNXToZHigh.cpp

@@ -1680,7 +1680,7 @@ void ONNXToZHighLoweringPass::runOnOperation() {
   onnx_mlir::getONNXToZHighMultipleOpPatterns(combinedPatterns);
 
   // It's ok to fail.
-  (void)applyPatternsAndFoldGreedily(module, std::move(combinedPatterns));
+  (void)applyPatternsGreedily(module, std::move(combinedPatterns));
 
   // Run the unknown dimension analysis to help check equality of unknown
   // dimensions at compile time.

src/Accelerators/NNPA/Conversion/ONNXToZHigh/ZHighToONNX.cpp

@@ -62,7 +62,7 @@ void ZHighToONNXLoweringPass::runOnOperation() {
   zhigh::ZHighStickOp::getCanonicalizationPatterns(patterns, &getContext());
   zhigh::ZHighUnstickOp::getCanonicalizationPatterns(patterns, &getContext());
 
-  (void)applyPatternsAndFoldGreedily(function, std::move(patterns));
+  (void)applyPatternsGreedily(function, std::move(patterns));
 }
 
 std::unique_ptr<Pass> createZHighToONNXPass() {

src/Accelerators/NNPA/Transform/FoldStdAlloc.cpp

@@ -211,8 +211,7 @@ class FoldStdAllocPass
     RewritePatternSet patterns(&getContext());
     patterns.insert<FoldStdAlloc>(&getContext());
 
-    static_cast<void>(
-        applyPatternsAndFoldGreedily(function, std::move(patterns)));
+    static_cast<void>(applyPatternsGreedily(function, std::move(patterns)));
   }
 };
 

src/Accelerators/NNPA/Transform/ZHigh/ZHighConstPropagation.cpp

@@ -503,7 +503,7 @@ struct ZHighConstPropagationPass
     patterns.insert<ConstantStickPattern>(patterns.getContext());
     patterns.insert<ConstantStickForGRUPattern>(patterns.getContext());
     patterns.insert<ConstantStickForLSTMPattern>(patterns.getContext());
-    (void)applyPatternsAndFoldGreedily(moduleOp, std::move(patterns));
+    (void)applyPatternsGreedily(moduleOp, std::move(patterns));
   }
 };
 } // anonymous namespace

src/Accelerators/NNPA/Transform/ZHigh/ZHighDecomposeStickUnstick.cpp

@@ -71,7 +71,7 @@ struct ZHighDecomposeStickUnstickPass
     ZHighDLF16ToF32Op::getCanonicalizationPatterns(patterns, &getContext());
     ZHighF32ToDLF16Op::getCanonicalizationPatterns(patterns, &getContext());
     ONNXLayoutTransformOp::getCanonicalizationPatterns(patterns, &getContext());
-    (void)applyPatternsAndFoldGreedily(function, std::move(patterns));
+    (void)applyPatternsGreedily(function, std::move(patterns));
   }
 };
 

src/Accelerators/NNPA/Transform/ZHigh/ZHighLayoutPropagation.cpp

@@ -367,7 +367,7 @@ struct ZHighLayoutPropagationPass
     // rules in this pass.
     ZHighStickOp::getCanonicalizationPatterns(patterns, &getContext());
     ZHighUnstickOp::getCanonicalizationPatterns(patterns, &getContext());
-    (void)applyPatternsAndFoldGreedily(function, std::move(patterns));
+    (void)applyPatternsGreedily(function, std::move(patterns));
   }
 };
 } // anonymous namespace

src/Accelerators/NNPA/Transform/ZHigh/ZHighRecomposeToStickUnstick.cpp

@@ -71,7 +71,7 @@ struct ZHighRecomposeToStickUnstickPass
     ZHighDLF16ToF32Op::getCanonicalizationPatterns(patterns, &getContext());
     ZHighF32ToDLF16Op::getCanonicalizationPatterns(patterns, &getContext());
     ONNXLayoutTransformOp::getCanonicalizationPatterns(patterns, &getContext());
-    (void)applyPatternsAndFoldGreedily(function, std::move(patterns));
+    (void)applyPatternsGreedily(function, std::move(patterns));
   }
 };
 

src/Accelerators/NNPA/Transform/ZLow/ZLowRewrite.cpp

@@ -696,7 +696,7 @@ class ZLowRewritePass
     patterns.insert<UnstickLoadStoreStickRemovalPattern>(
         &getContext(), removableStickOps);
 
-    if (failed(applyPatternsAndFoldGreedily(function, std::move(patterns))))
+    if (failed(applyPatternsGreedily(function, std::move(patterns))))
       return signalPassFailure();
 
     // Remove ZLowStickOp that were marked "removable".