Update llvm-project to 310d32c

llvm · May 11, 2020 · 83db558 · 83db558
1 parent 53c17db
commit 83db558
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ export LDFLAGS=-fuse-ld=$(which ld.lld-$LLVM_VERSION)
 export LLVM_SRC_DIR=/path/to/llvm-project
 
 # Check out last known good commit.
-(cd $LLVM_SRC_DIR && git checkout 3af85fa8f06220b43f03f26de216a67be4568fe7)
+(cd $LLVM_SRC_DIR && git checkout 310d32cb80a611e6384a921e85607fea05841f26)
 
 ./tools/install_mlir.sh
 ./tools/cmake_configure.sh

diff --git a/lib/E2E/E2E.cpp b/lib/E2E/E2E.cpp
@@ -44,7 +44,6 @@
 
 #include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
-#include "mlir/Dialect/LoopOps/LoopOps.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Pass/Pass.h"

diff --git a/lib/E2E/LowerToHybridTensorMemRef.cpp b/lib/E2E/LowerToHybridTensorMemRef.cpp
@@ -11,7 +11,7 @@
 
 #include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
-#include "mlir/Dialect/LoopOps/LoopOps.h"
+#include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Pass/Pass.h"
@@ -86,7 +86,7 @@ class LowerBroadcastToToLoopsPattern
       // Loop invariant: At the start of iteration `i`, the rewriter insertion
       // point is inside `i` nested loops.
       for (int i = 0, e = resultType.getRank(); i < e; i++) {
-        auto loop = rewriter.create<loop::ForOp>(
+        auto loop = rewriter.create<scf::ForOp>(
             op.getLoc(), c0, outputExtents[i], c1, ValueRange({}));
         Block *body = loop.getBody();
         inductionVariables.push_back(body->getArgument(0));
@@ -139,7 +139,7 @@ class LowerBroadcastToToLoops
     ConversionTarget target(*context);
     target.addLegalDialect<shape::ShapeDialect>();
     target.addLegalDialect<StandardOpsDialect>();
-    target.addLegalDialect<loop::LoopOpsDialect>();
+    target.addLegalDialect<scf::SCFDialect>();
     target.addLegalDialect<tcp::TCPDialect>();
 
     OwningRewritePatternList patterns;