Bump llvm

- FuncOp namespace
- include path for moveLoopInvariantCode

Author: chelini

include/polygeist/Ops.h

@@ -1,4 +1,4 @@
-//===- BFVOps.h - BFV dialect ops -----------------*- C++ -*-===//
+//===- Polygeistps.h - Polygeist dialect ops --------------------*- C++ -*-===//
 //
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,11 +9,17 @@
 #ifndef POLYGEISTOPS_H
 #define POLYGEISTOPS_H
 
+#include "mlir/Dialect/Affine/IR/AffineOps.h"
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
+#include "mlir/IR/Matchers.h"
 #include "mlir/IR/OpDefinition.h"
+#include "mlir/IR/PatternMatch.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
+#include "llvm/Support/CommandLine.h"
 
 #define GET_OP_CLASSES
 #include "polygeist/PolygeistOps.h.inc"
@@ -141,4 +147,4 @@ class BarrierElim final
   }
 };
 
-#endif // BFV_BFVOPS_H
+#endif // POLYGEISTOPS_H

include/polygeist/PolygeistOps.td

@@ -1,4 +1,4 @@
-//===- BFVOps.td - BFV dialect ops -----------*- tablegen -*-===//
+//===- Polygeist.td - Polygeist dialect ops ----------------*- tablegen -*-===//
 //
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

lib/polygeist/Passes/BarrierRemovalContinuation.cpp

@@ -81,7 +81,7 @@ static LogicalResult applyCFGConversion(FunctionOpInterface function) {
   target.addLegalDialect<func::FuncDialect>();
   target.addLegalDialect<memref::MemRefDialect>();
   target.addIllegalOp<scf::ForOp, scf::IfOp, scf::WhileOp>();
-  target.addLegalOp<scf::ExecuteRegionOp, FuncOp, ModuleOp>();
+  target.addLegalOp<scf::ExecuteRegionOp, func::FuncOp, ModuleOp>();
   target.addDynamicallyLegalOp<scf::ParallelOp>(
       [](scf::ParallelOp op) { return hasImmediateBarriers(op); });
 
@@ -362,7 +362,7 @@ findNesrestPostDominatingInsertionPoint(
 std::pair<Block *, Block::iterator>
 findInsertionPointAfterLoopOperands(scf::ParallelOp op) {
   // Find the earliest insertion point where loop bounds are fully defined.
-  PostDominanceInfo postDominanceInfo(op->getParentOfType<FuncOp>());
+  PostDominanceInfo postDominanceInfo(op->getParentOfType<func::FuncOp>());
   SmallVector<Value> operands;
   llvm::append_range(operands, op.getLowerBound());
   llvm::append_range(operands, op.getUpperBound());

lib/polygeist/Passes/ConvertPolygeistToLLVM.cpp

@@ -47,7 +47,8 @@ struct SubIndexOpLowering : public ConvertOpToLLVMPattern<SubIndexOp> {
     auto loc = subViewOp.getLoc();
 
     if (!subViewOp.source().getType().isa<MemRefType>()) {
-      llvm::errs() << " func: " << subViewOp->getParentOfType<FuncOp>() << "\n";
+      llvm::errs() << " func: " << subViewOp->getParentOfType<func::FuncOp>()
+                   << "\n";
       llvm::errs() << " sub: " << subViewOp << " - " << subViewOp.source()
                    << "\n";
     }

lib/polygeist/Passes/Mem2Reg.cpp

@@ -1088,9 +1088,10 @@ bool Mem2Reg::forwardStoreToLoad(
 
   SmallPtrSet<Operation *, 4> AliasingStoreOperations;
 
-  LLVM_DEBUG(llvm::dbgs() << "Begin forwarding store of " << AI << " to load\n"
-                          << *AI.getDefiningOp()->getParentOfType<FuncOp>()
-                          << "\n");
+  LLVM_DEBUG(
+      llvm::dbgs() << "Begin forwarding store of " << AI << " to load\n"
+                   << *AI.getDefiningOp()->getParentOfType<func::FuncOp>()
+                   << "\n");
   bool captured = AI.getDefiningOp<memref::GetGlobalOp>();
   while (list.size()) {
     auto pair = list.front();
@@ -1741,7 +1742,7 @@ bool Mem2Reg::forwardStoreToLoad(
       mlir::Value pval =
           valueAtEndOfBlock.find(pred)->second->materialize(true);
       if (!pval || pval.getType() != elType) {
-        AI.getDefiningOp()->getParentOfType<FuncOp>().dump();
+        AI.getDefiningOp()->getParentOfType<func::FuncOp>().dump();
         pred->dump();
         llvm::errs() << "pval: " << *valueAtEndOfBlock.find(pred)->second
                      << " AI: " << AI << "\n";

lib/polygeist/Passes/ParallelLICM.cpp

@@ -12,8 +12,8 @@
 #include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
+#include "mlir/Transforms/LoopInvariantCodeMotionUtils.h"
 #include "polygeist/Passes/Passes.h"
-#include <mlir/Dialect/Arithmetic/IR/Arithmetic.h>
 
 #define DEBUG_TYPE "parallel-licm"
 

llvm-project

@@ -1,6 +1,6 @@
 // RUN: polygeist-opt --affine-cfg --split-input-file %s | FileCheck %s
 module {
-  func @_Z7runTestiPPc(%arg0: index, %arg2: memref<?xi32>) {
+  func.func @_Z7runTestiPPc(%arg0: index, %arg2: memref<?xi32>) {
     %c0_i32 = arith.constant 0 : i32
     %c1 = arith.constant 1 : index
     %1 = arith.addi %arg0, %c1 : index
@@ -17,7 +17,7 @@ module {
 }
 
 
-// CHECK:   func @_Z7runTestiPPc(%arg0: index, %arg1: memref<?xi32>) {
+// CHECK:   func.func @_Z7runTestiPPc(%arg0: index, %arg1: memref<?xi32>) {
 // CHECK-NEXT:     %c0_i32 = arith.constant 0 : i32
 // CHECK-NEXT:     affine.for %arg2 = 0 to 2 {
 // CHECK-NEXT:       affine.for %arg3 = 0 to 2 {
@@ -29,7 +29,7 @@ module {
 
 // -----
 module {
-func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
+func.func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
   %c0 = arith.constant 0 : index
   %true = arith.constant true
   %c1_i32 = arith.constant 1 : i32
@@ -48,7 +48,7 @@ func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
 }
 
 // CHECK: #set = affine_set<(d0) : (d0 + 40 >= 0)>
-// CHECK:   func @kernel_nussinov(%arg0: i32, %arg1: memref<i32>) {
+// CHECK:   func.func @kernel_nussinov(%arg0: i32, %arg1: memref<i32>) {
 // CHECK-NEXT:     affine.for %arg2 = 0 to 60 {
 // CHECK-NEXT:       affine.if #set(%arg2) {
 // CHECK-NEXT:         affine.store %arg0, %arg1[] : memref<i32>
@@ -61,9 +61,9 @@ func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
 // -----
 
 module {
-  func private @run()
+  func.func private @run()
 
-  func @minif(%arg4: i32, %arg5 : i32, %arg10 : index) { 
+  func.func @minif(%arg4: i32, %arg5 : i32, %arg10 : index) { 
     %c0_i32 = arith.constant 0 : i32
 
     affine.for %i = 0 to 10 {
@@ -76,7 +76,7 @@ module {
       %83 = arith.select %81, %arg5, %79 : i32
       %92 = arith.cmpi slt, %c0_i32, %83 : i32
       scf.if %92 {
-        call @run() : () -> ()
+        func.call @run() : () -> ()
         scf.yield
       }
     }
@@ -85,7 +85,7 @@ module {
 }
 
 // CHECK: #set = affine_set<()[s0] : (s0 - 1 >= 0)>
-// CHECK:   func @minif(%arg0: i32, %arg1: i32, %arg2: index) {
+// CHECK:   func.func @minif(%arg0: i32, %arg1: i32, %arg2: index) {
 // CHECK-NEXT:     %0 = arith.index_cast %arg2 : index to i32
 // CHECK-NEXT:     %1 = arith.muli %0, %arg1 : i32
 // CHECK-NEXT:     %2 = arith.divui %1, %arg1 : i32
@@ -96,7 +96,7 @@ module {
 // CHECK-NEXT:     %7 = arith.index_cast %6 : i32 to index
 // CHECK-NEXT:     affine.for %arg3 = 0 to 10 {
 // CHECK-NEXT:       affine.if #set()[%7] {
-// CHECK-NEXT:         call @run() : () -> ()
+// CHECK-NEXT:         func.call @run() : () -> ()
 // CHECK-NEXT:       }
 // CHECK-NEXT:     }
 // CHECK-NEXT:     return
@@ -106,7 +106,7 @@ module {
 
 module {
   llvm.func @atoi(!llvm.ptr<i8>) -> i32
-func @_Z7runTestiPPc(%arg0: i32, %39: memref<?xi32>, %arg1: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
+func.func @_Z7runTestiPPc(%arg0: i32, %39: memref<?xi32>, %arg1: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
   %c2_i32 = arith.constant 2 : i32
   %c16_i32 = arith.constant 16 : i32
     %58 = llvm.call @atoi(%arg1) : (!llvm.ptr<i8>) -> i32
@@ -123,7 +123,7 @@ func @_Z7runTestiPPc(%arg0: i32, %39: memref<?xi32>, %arg1: !llvm.ptr<i8>) attri
 }
 }
 
-// CHECK:   func @_Z7runTestiPPc(%arg0: i32, %arg1: memref<?xi32>, %arg2: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
+// CHECK:   func.func @_Z7runTestiPPc(%arg0: i32, %arg1: memref<?xi32>, %arg2: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
 // CHECK-NEXT:     %c2_i32 = arith.constant 2 : i32
 // CHECK-NEXT:     %c16_i32 = arith.constant 16 : i32
 // CHECK-NEXT:     %0 = llvm.call @atoi(%arg2) : (!llvm.ptr<i8>) -> i32

test/polygeist-opt/affinecfg.mlir

@@ -1,7 +1,7 @@
 // RUN: polygeist-opt --raise-scf-to-affine -allow-unregistered-dialect --split-input-file %s | FileCheck %s
 
 module {
-  func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
+  func.func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
     %c0 = arith.constant 0 : index
     %c1 = arith.constant 1 : index
     scf.if %arg3 {
@@ -13,7 +13,7 @@ module {
     }
     return
   }
-  func @aff(%c : i1, %arg0: i32) {
+  func.func @aff(%c : i1, %arg0: i32) {
     %c0 = arith.constant 0 : index
     %c1 = arith.constant 1 : index
     scf.if %c {
@@ -27,7 +27,7 @@ module {
   }
 }
 
-// CHECK:   func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
+// CHECK:   func.func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
 // CHECK-DAG:     %0 = arith.index_cast %arg1 : i32 to index
 // CHECK-NEXT:     scf.if %arg3 {
 // CHECK-NEXT:       affine.for %arg4 = 1 to %0 {
@@ -38,7 +38,7 @@ module {
 // CHECK-NEXT:     return
 // CHECK-NEXT:   }
 
-// CHECK-NEXT:   func @aff(%arg0: i1, %arg1: i32) {
+// CHECK-NEXT:   func.func @aff(%arg0: i1, %arg1: i32) {
 // CHECK-NEXT:     %0 = arith.index_cast %arg1 : i32 to index
 // CHECK-NEXT:     scf.if %arg0 {
 // CHECK-NEXT:       affine.parallel (%arg2) = (0) to (symbol(%0)) {

test/polygeist-opt/affraise.mlir

@@ -1,7 +1,7 @@
 // RUN: polygeist-opt --raise-scf-to-affine --split-input-file %s | FileCheck %s
 
 module {
-  func @main(%12 : i1, %14 : i32, %18 : memref<?xf32>, %19 : memref<?xf32> ) {
+  func.func @main(%12 : i1, %14 : i32, %18 : memref<?xf32>, %19 : memref<?xf32> ) {
     %c0 = arith.constant 0 : index
     %c4 = arith.constant 4 : index
     %c1 = arith.constant 1 : index
@@ -18,7 +18,7 @@ module {
   }
 }
 
-// CHECK:   func @main(%arg0: i1, %arg1: i32, %arg2: memref<?xf32>, %arg3: memref<?xf32>) {
+// CHECK:   func.func @main(%arg0: i1, %arg1: i32, %arg2: memref<?xf32>, %arg3: memref<?xf32>) {
 // CHECK-NEXT:     %c4 = arith.constant 4 : index
 // CHECK-NEXT:     %0 = arith.index_cast %arg1 : i32 to index
 // CHECK-NEXT:     %1 = arith.muli %0, %c4 : index