Bump polygeist to 6ba6b7b

Author: hanchenye

tools/polymer/.github/workflows/buildAndTest.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "wsmoses/Polygeist"
-          ref: "e5b8b83312c7a5f6fd94ea1a2cda87e54c4451fd"
+          ref: "6ba6b7b8ac07c9d60994eb46b46682a9f76ea34e"
           path: "polygeist"
           submodules: "true"
 

tools/polymer/include/polymer/Support/ScopStmt.h

@@ -16,7 +16,9 @@ class Operation;
 class FlatAffineValueConstraints;
 class AffineValueMap;
 class FuncOp;
+namespace func {
 class CallOp;
+} // namespace func
 class Value;
 } // namespace mlir
 
@@ -44,7 +46,7 @@ class ScopStmt {
   /// Get the callee of this scop stmt.
   mlir::FuncOp getCallee() const;
   /// Get the caller of this scop stmt.
-  mlir::CallOp getCaller() const;
+  mlir::func::CallOp getCaller() const;
   /// Get the access AffineValueMap of an op in the callee and the memref in the
   /// caller scope that this op is using.
   void getAccessMapAndMemRef(mlir::Operation *op, mlir::AffineValueMap *vMap,

tools/polymer/include/polymer/Target/OpenScop.h

@@ -17,7 +17,7 @@
 #include "llvm/ADT/StringMap.h"
 
 namespace mlir {
-class OwningModuleRef;
+template <typename OpTy> class OwningOpRef;
 class MLIRContext;
 class ModuleOp;
 class FuncOp;
@@ -42,8 +42,9 @@ createFuncOpFromOpenScop(std::unique_ptr<OslScop> scop, mlir::ModuleOp module,
                          PlutoProg *prog = nullptr,
                          const char *dumpClastAfterPluto = nullptr);
 
-mlir::OwningModuleRef translateOpenScopToModule(std::unique_ptr<OslScop> scop,
-                                                mlir::MLIRContext *context);
+mlir::OwningOpRef<mlir::ModuleOp>
+translateOpenScopToModule(std::unique_ptr<OslScop> scop,
+                          mlir::MLIRContext *context);
 
 mlir::LogicalResult translateModuleToOpenScop(
     mlir::ModuleOp module,

tools/polymer/include/polymer/Transforms/Passes.h

@@ -4,9 +4,13 @@
 
 #include "mlir/Pass/Pass.h"
 
+namespace mlir {
+class Pass;
+} // namespace mlir
+
 namespace polymer {
 
-std::unique_ptr<mlir::OperationPass<mlir::FuncOp>> createAnnotateScopPass();
+std::unique_ptr<mlir::Pass> createAnnotateScopPass();
 
 /// Generate the code for registering passes.
 #define GEN_PASS_REGISTRATION

tools/polymer/include/polymer/Transforms/Passes.td

@@ -4,7 +4,7 @@
 include "mlir/Pass/PassBase.td"
 include "mlir/Rewrite/PassUtil.td"
 
-def AnnotateScop : FunctionPass<"annotate-scop"> {
+def AnnotateScop : Pass<"annotate-scop", "mlir::FuncOp"> {
   let summary = "Annotate scop.ignore to unselected functions.";
   let constructor = "polymer::createAnnotateScopPass()";
 

tools/polymer/lib/Support/CMakeLists.txt

@@ -14,7 +14,7 @@ add_mlir_library(PolymerSupport
 
   LINK_LIBS PUBLIC
   MLIRAnalysis
-  MLIRLoopAnalysis
+  MLIRAffineAnalysis
 
   # libosl
   # libcloog

tools/polymer/lib/Support/OslScop.cc

@@ -10,11 +10,11 @@
 
 #include "osl/osl.h"
 
-#include "mlir/Analysis/AffineAnalysis.h"
-#include "mlir/Analysis/AffineStructures.h"
+#include "mlir/Dialect/Affine/Analysis/AffineAnalysis.h"
+#include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Affine/IR/AffineValueMap.h"
-#include "mlir/Dialect/StandardOps/IR/Ops.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
@@ -451,7 +451,7 @@ void OslScop::addBodyExtension(int stmtId, const ScopStmt &stmt) {
   for (unsigned i = 0; i < numIVs; i++)
     ss << "i" << i << " ";
 
-  mlir::CallOp caller = stmt.getCaller();
+  mlir::func::CallOp caller = stmt.getCaller();
   mlir::FuncOp callee = stmt.getCallee();
   ss << "\n" << callee.getName() << "(";
 

tools/polymer/lib/Support/OslScopStmtOpSet.cc

@@ -6,9 +6,9 @@
 
 #include "polymer/Support/OslScopStmtOpSet.h"
 
-#include "mlir/Analysis/AffineAnalysis.h"
-#include "mlir/Analysis/AffineStructures.h"
-#include "mlir/Analysis/Utils.h"
+#include "mlir/Dialect/Affine/Analysis/AffineAnalysis.h"
+#include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
+#include "mlir/Dialect/Affine/Analysis/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/LogicalResult.h"

tools/polymer/lib/Support/ScopStmt.cc

@@ -6,13 +6,13 @@
 
 #include "polymer/Support/ScopStmt.h"
 
-#include "mlir/Analysis/AffineAnalysis.h"
-#include "mlir/Analysis/AffineStructures.h"
-#include "mlir/Analysis/Utils.h"
+#include "mlir/Dialect/Affine/Analysis/AffineAnalysis.h"
+#include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
+#include "mlir/Dialect/Affine/Analysis/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Affine/IR/AffineValueMap.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
-#include "mlir/Dialect/StandardOps/IR/Ops.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
@@ -34,7 +34,8 @@ class ScopStmtImpl {
 public:
   using EnclosingOpList = SmallVector<Operation *, 8>;
 
-  ScopStmtImpl(llvm::StringRef name, mlir::CallOp caller, mlir::FuncOp callee)
+  ScopStmtImpl(llvm::StringRef name, mlir::func::CallOp caller,
+               mlir::FuncOp callee)
       : name(name), caller(caller), callee(callee) {}
 
   static std::unique_ptr<ScopStmtImpl> get(mlir::Operation *callerOp,
@@ -50,7 +51,7 @@ class ScopStmtImpl {
   /// symbol in the OpenScop representation.
   llvm::StringRef name;
   /// The caller to the scop.stmt func.
-  mlir::CallOp caller;
+  mlir::func::CallOp caller;
   /// The scop.stmt callee.
   mlir::FuncOp callee;
   /// The domain of the caller.
@@ -64,9 +65,9 @@ class ScopStmtImpl {
 /// Create ScopStmtImpl from only the caller/callee pair.
 std::unique_ptr<ScopStmtImpl> ScopStmtImpl::get(mlir::Operation *callerOp,
                                                 mlir::Operation *calleeOp) {
-  // We assume that the callerOp is of type mlir::CallOp, and the calleeOp is a
-  // mlir::FuncOp. If not, these two cast lines will raise error.
-  mlir::CallOp caller = cast<mlir::CallOp>(callerOp);
+  // We assume that the callerOp is of type mlir::func::CallOp, and the calleeOp
+  // is a mlir::FuncOp. If not, these two cast lines will raise error.
+  mlir::func::CallOp caller = cast<mlir::func::CallOp>(callerOp);
   mlir::FuncOp callee = cast<mlir::FuncOp>(calleeOp);
   llvm::StringRef name = caller.getCallee();
 
@@ -185,7 +186,7 @@ void ScopStmt::getEnclosingOps(llvm::SmallVectorImpl<mlir::Operation *> &ops,
 }
 
 mlir::FuncOp ScopStmt::getCallee() const { return impl->callee; }
-mlir::CallOp ScopStmt::getCaller() const { return impl->caller; }
+mlir::func::CallOp ScopStmt::getCaller() const { return impl->caller; }
 
 static mlir::Value findBlockArg(mlir::Value v) {
   mlir::Value r = v;

tools/polymer/lib/Target/OpenScop/ConvertFromOpenScop.cc

@@ -21,26 +21,24 @@ extern "C" {
 #include "polymer/Support/Utils.h"
 #include "polymer/Target/OpenScop.h"
 
-#include "mlir/Analysis/AffineAnalysis.h"
-#include "mlir/Analysis/AffineStructures.h"
-#include "mlir/Analysis/LoopAnalysis.h"
-#include "mlir/Analysis/Utils.h"
+#include "mlir/Dialect/Affine/Analysis/AffineAnalysis.h"
+#include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
+#include "mlir/Dialect/Affine/Analysis/LoopAnalysis.h"
+#include "mlir/Dialect/Affine/Analysis/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Affine/IR/AffineValueMap.h"
+#include "mlir/Dialect/Affine/LoopUtils.h"
 #include "mlir/Dialect/Affine/Utils.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/Builders.h"
-#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dominance.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/MLIRContext.h"
-#include "mlir/Transforms/LoopUtils.h"
-#include "mlir/Transforms/Utils.h"
 #include "mlir/Translation.h"
 
 #include "llvm/Support/Error.h"
@@ -598,7 +596,7 @@ void Importer::initializeFuncOpInterface() {
   // Initialize the symbol table for these entryBlock arguments
   auto &entryBlock = *func.addEntryBlock();
   b.setInsertionPointToStart(&entryBlock);
-  b.create<mlir::ReturnOp>(UnknownLoc::get(context));
+  b.create<mlir::func::ReturnOp>(UnknownLoc::get(context));
 
   b.setInsertionPointToStart(&entryBlock);
   for (unsigned i = 0; i < entryBlock.getNumArguments(); i++) {
@@ -609,7 +607,7 @@ void Importer::initializeFuncOpInterface() {
     if (scop->isParameterSymbol(argSymbol) &&
         arg.getType() != b.getIndexType()) {
       mlir::Operation *op = b.create<mlir::arith::IndexCastOp>(
-          sourceFuncOp.getLoc(), arg, b.getIndexType());
+          sourceFuncOp.getLoc(), b.getIndexType(), arg);
       symbolTable[argSymbol] = op->getResult(0);
     } else {
       symbolTable[argSymbol] = arg;
@@ -820,7 +818,7 @@ void Importer::createCalleeAndCallerArgs(
       // TODO: refactorize these two lines into a single API.
       Value memref = symTable->getValue(args[i]);
       if (!memref) {
-        memref = entryBlock.addArgument(memType);
+        memref = entryBlock.addArgument(memType, b.getUnknownLoc());
         symTable->setValue(args[i], memref, OslSymbolTable::Memref);
       }
       callerArgs.push_back(memref);
@@ -990,7 +988,7 @@ LogicalResult Importer::processStmt(clast_user_stmt *userStmt) {
 
     assert(callee.getName() == calleeName && "Callee names should match.");
     // Note that caller is in the original function.
-    mlir::CallOp origCaller = it->second.getCaller();
+    mlir::func::CallOp origCaller = it->second.getCaller();
     loc = origCaller.getLoc();
     unsigned currInductionVar = 0;
 
@@ -1008,7 +1006,7 @@ LogicalResult Importer::processStmt(clast_user_stmt *userStmt) {
           OpBuilder::InsertionGuard guard(b);
           b.setInsertionPointAfterValue(val);
           mlir::Operation *castOp = b.create<mlir::arith::IndexCastOp>(
-              b.getUnknownLoc(), val, arg.getType());
+              b.getUnknownLoc(), arg.getType(), val);
           callerArgs.push_back(castOp->getResult(0));
         } else {
           callerArgs.push_back(val);
@@ -1065,7 +1063,7 @@ LogicalResult Importer::processStmt(clast_user_stmt *userStmt) {
   }
 
   // Finally create the CallOp.
-  b.create<mlir::CallOp>(loc, callee, callerArgs);
+  b.create<mlir::func::CallOp>(loc, callee, callerArgs);
 
   return success();
 }
@@ -1317,11 +1315,12 @@ LogicalResult Importer::processStmt(clast_for *forStmt) {
   vMap.map(args, func.getArguments());
   b.setInsertionPointToStart(newEntry);
   b.clone(*forOp.getOperation(), vMap);
-  b.create<mlir::ReturnOp>(func.getLoc(), llvm::None);
+  b.create<mlir::func::ReturnOp>(func.getLoc(), llvm::None);
 
   // Create function call.
   b.setInsertionPointAfter(forOp);
-  b.create<mlir::CallOp>(forOp.getLoc(), func, ValueRange(args.getArrayRef()));
+  b.create<mlir::func::CallOp>(forOp.getLoc(), func,
+                               ValueRange(args.getArrayRef()));
 
   // Clean up
   forOp.erase();
@@ -1539,11 +1538,11 @@ mlir::Operation *polymer::createFuncOpFromOpenScop(
   return deserializer.getFunc();
 }
 
-OwningModuleRef
+OwningOpRef<ModuleOp>
 polymer::translateOpenScopToModule(std::unique_ptr<OslScop> scop,
                                    MLIRContext *context) {
   context->loadDialect<AffineDialect>();
-  OwningModuleRef module(ModuleOp::create(
+  OwningOpRef<ModuleOp> module(ModuleOp::create(
       FileLineColLoc::get(context, "", /*line=*/0, /*column=*/0)));
 
   OslSymbolTable symTable;
@@ -1554,8 +1553,8 @@ polymer::translateOpenScopToModule(std::unique_ptr<OslScop> scop,
   return module;
 }
 
-static OwningModuleRef translateOpenScopToModule(llvm::SourceMgr &sourceMgr,
-                                                 MLIRContext *context) {
+static OwningOpRef<ModuleOp>
+translateOpenScopToModule(llvm::SourceMgr &sourceMgr, MLIRContext *context) {
   llvm::SMDiagnostic err;
   std::unique_ptr<OslScop> scop =
       readOpenScop(*sourceMgr.getMemoryBuffer(sourceMgr.getMainFileID()));