Skip to content

Commit 2182fa1

Browse files
chelinichelini
committed
Bump llvm
- FuncOp namespace - include path for moveLoopInvariantCode
1 parent 526ec90 commit 2182fa1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+320
-311
lines changed

‎include/polygeist/Ops.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- BFVOps.h - BFV dialect ops -----------------*- C++ -*-===//
1+
//===- Polygeistps.h - Polygeist dialect ops --------------------*- C++ -*-===//
22
//
33
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,11 +9,17 @@
99
#ifndef POLYGEISTOPS_H
1010
#define POLYGEISTOPS_H
1111

12+
#include "mlir/Dialect/Affine/IR/AffineOps.h"
13+
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
14+
#include "mlir/Dialect/SCF/SCF.h"
1215
#include "mlir/IR/BuiltinTypes.h"
1316
#include "mlir/IR/Dialect.h"
17+
#include "mlir/IR/Matchers.h"
1418
#include "mlir/IR/OpDefinition.h"
19+
#include "mlir/IR/PatternMatch.h"
1520
#include "mlir/Interfaces/SideEffectInterfaces.h"
1621
#include "mlir/Interfaces/ViewLikeInterface.h"
22+
#include "llvm/Support/CommandLine.h"
1723

1824
#define GET_OP_CLASSES
1925
#include "polygeist/PolygeistOps.h.inc"
@@ -141,4 +147,4 @@ class BarrierElim final
141147
}
142148
};
143149

144-
#endif // BFV_BFVOPS_H
150+
#endif // POLYGEISTOPS_H

‎include/polygeist/PolygeistOps.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- BFVOps.td - BFV dialect ops -----------*- tablegen -*-===//
1+
//===- Polygeist.td - Polygeist dialect ops ----------------*- tablegen -*-===//
22
//
33
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

‎lib/polygeist/Passes/BarrierRemovalContinuation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static LogicalResult applyCFGConversion(FunctionOpInterface function) {
8181
target.addLegalDialect<func::FuncDialect>();
8282
target.addLegalDialect<memref::MemRefDialect>();
8383
target.addIllegalOp<scf::ForOp, scf::IfOp, scf::WhileOp>();
84-
target.addLegalOp<scf::ExecuteRegionOp, FuncOp, ModuleOp>();
84+
target.addLegalOp<scf::ExecuteRegionOp, func::FuncOp, ModuleOp>();
8585
target.addDynamicallyLegalOp<scf::ParallelOp>(
8686
[](scf::ParallelOp op) { return hasImmediateBarriers(op); });
8787

@@ -362,7 +362,7 @@ findNesrestPostDominatingInsertionPoint(
362362
std::pair<Block *, Block::iterator>
363363
findInsertionPointAfterLoopOperands(scf::ParallelOp op) {
364364
// Find the earliest insertion point where loop bounds are fully defined.
365-
PostDominanceInfo postDominanceInfo(op->getParentOfType<FuncOp>());
365+
PostDominanceInfo postDominanceInfo(op->getParentOfType<func::FuncOp>());
366366
SmallVector<Value> operands;
367367
llvm::append_range(operands, op.getLowerBound());
368368
llvm::append_range(operands, op.getUpperBound());

‎lib/polygeist/Passes/ConvertPolygeistToLLVM.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ struct SubIndexOpLowering : public ConvertOpToLLVMPattern<SubIndexOp> {
4747
auto loc = subViewOp.getLoc();
4848

4949
if (!subViewOp.source().getType().isa<MemRefType>()) {
50-
llvm::errs() << " func: " << subViewOp->getParentOfType<FuncOp>() << "\n";
50+
llvm::errs() << " func: " << subViewOp->getParentOfType<func::FuncOp>()
51+
<< "\n";
5152
llvm::errs() << " sub: " << subViewOp << " - " << subViewOp.source()
5253
<< "\n";
5354
}

‎lib/polygeist/Passes/Mem2Reg.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,9 +1088,10 @@ bool Mem2Reg::forwardStoreToLoad(
10881088

10891089
SmallPtrSet<Operation *, 4> AliasingStoreOperations;
10901090

1091-
LLVM_DEBUG(llvm::dbgs() << "Begin forwarding store of " << AI << " to load\n"
1092-
<< *AI.getDefiningOp()->getParentOfType<FuncOp>()
1093-
<< "\n");
1091+
LLVM_DEBUG(
1092+
llvm::dbgs() << "Begin forwarding store of " << AI << " to load\n"
1093+
<< *AI.getDefiningOp()->getParentOfType<func::FuncOp>()
1094+
<< "\n");
10941095
bool captured = AI.getDefiningOp<memref::GetGlobalOp>();
10951096
while (list.size()) {
10961097
auto pair = list.front();
@@ -1741,7 +1742,7 @@ bool Mem2Reg::forwardStoreToLoad(
17411742
mlir::Value pval =
17421743
valueAtEndOfBlock.find(pred)->second->materialize(true);
17431744
if (!pval || pval.getType() != elType) {
1744-
AI.getDefiningOp()->getParentOfType<FuncOp>().dump();
1745+
AI.getDefiningOp()->getParentOfType<func::FuncOp>().dump();
17451746
pred->dump();
17461747
llvm::errs() << "pval: " << *valueAtEndOfBlock.find(pred)->second
17471748
<< " AI: " << AI << "\n";

‎lib/polygeist/Passes/ParallelLICM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "mlir/IR/IntegerSet.h"
1313
#include "mlir/IR/Matchers.h"
1414
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
15+
#include "mlir/Transforms/LoopInvariantCodeMotionUtils.h"
1516
#include "polygeist/Passes/Passes.h"
16-
#include <mlir/Dialect/Arithmetic/IR/Arithmetic.h>
1717

1818
#define DEBUG_TYPE "parallel-licm"
1919

‎llvm-project

Submodule llvm-project updated 6364 files

‎test/polygeist-opt/affinecfg.mlir

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: polygeist-opt --affine-cfg --split-input-file %s | FileCheck %s
22
module {
3-
func @_Z7runTestiPPc(%arg0: index, %arg2: memref<?xi32>) {
3+
func.func @_Z7runTestiPPc(%arg0: index, %arg2: memref<?xi32>) {
44
%c0_i32 = arith.constant 0 : i32
55
%c1 = arith.constant 1 : index
66
%1 = arith.addi %arg0, %c1 : index
@@ -17,7 +17,7 @@ module {
1717
}
1818

1919

20-
// CHECK: func @_Z7runTestiPPc(%arg0: index, %arg1: memref<?xi32>) {
20+
// CHECK: func.func @_Z7runTestiPPc(%arg0: index, %arg1: memref<?xi32>) {
2121
// CHECK-NEXT: %c0_i32 = arith.constant 0 : i32
2222
// CHECK-NEXT: affine.for %arg2 = 0 to 2 {
2323
// CHECK-NEXT: affine.for %arg3 = 0 to 2 {
@@ -29,7 +29,7 @@ module {
2929

3030
// -----
3131
module {
32-
func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
32+
func.func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
3333
%c0 = arith.constant 0 : index
3434
%true = arith.constant true
3535
%c1_i32 = arith.constant 1 : i32
@@ -48,7 +48,7 @@ func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
4848
}
4949

5050
// CHECK: #set = affine_set<(d0) : (d0 + 40 >= 0)>
51-
// CHECK: func @kernel_nussinov(%arg0: i32, %arg1: memref<i32>) {
51+
// CHECK: func.func @kernel_nussinov(%arg0: i32, %arg1: memref<i32>) {
5252
// CHECK-NEXT: affine.for %arg2 = 0 to 60 {
5353
// CHECK-NEXT: affine.if #set(%arg2) {
5454
// CHECK-NEXT: affine.store %arg0, %arg1[] : memref<i32>
@@ -61,9 +61,9 @@ func @kernel_nussinov(%arg0: i32, %arg2: memref<i32>) {
6161
// -----
6262

6363
module {
64-
func private @run()
64+
func.func private @run()
6565

66-
func @minif(%arg4: i32, %arg5 : i32, %arg10 : index) {
66+
func.func @minif(%arg4: i32, %arg5 : i32, %arg10 : index) {
6767
%c0_i32 = arith.constant 0 : i32
6868

6969
affine.for %i = 0 to 10 {
@@ -76,7 +76,7 @@ module {
7676
%83 = arith.select %81, %arg5, %79 : i32
7777
%92 = arith.cmpi slt, %c0_i32, %83 : i32
7878
scf.if %92 {
79-
call @run() : () -> ()
79+
func.call @run() : () -> ()
8080
scf.yield
8181
}
8282
}
@@ -85,7 +85,7 @@ module {
8585
}
8686

8787
// CHECK: #set = affine_set<()[s0] : (s0 - 1 >= 0)>
88-
// CHECK: func @minif(%arg0: i32, %arg1: i32, %arg2: index) {
88+
// CHECK: func.func @minif(%arg0: i32, %arg1: i32, %arg2: index) {
8989
// CHECK-NEXT: %0 = arith.index_cast %arg2 : index to i32
9090
// CHECK-NEXT: %1 = arith.muli %0, %arg1 : i32
9191
// CHECK-NEXT: %2 = arith.divui %1, %arg1 : i32
@@ -96,7 +96,7 @@ module {
9696
// CHECK-NEXT: %7 = arith.index_cast %6 : i32 to index
9797
// CHECK-NEXT: affine.for %arg3 = 0 to 10 {
9898
// CHECK-NEXT: affine.if #set()[%7] {
99-
// CHECK-NEXT: call @run() : () -> ()
99+
// CHECK-NEXT: func.call @run() : () -> ()
100100
// CHECK-NEXT: }
101101
// CHECK-NEXT: }
102102
// CHECK-NEXT: return
@@ -106,7 +106,7 @@ module {
106106

107107
module {
108108
llvm.func @atoi(!llvm.ptr<i8>) -> i32
109-
func @_Z7runTestiPPc(%arg0: i32, %39: memref<?xi32>, %arg1: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
109+
func.func @_Z7runTestiPPc(%arg0: i32, %39: memref<?xi32>, %arg1: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
110110
%c2_i32 = arith.constant 2 : i32
111111
%c16_i32 = arith.constant 16 : i32
112112
%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
123123
}
124124
}
125125

126-
// CHECK: func @_Z7runTestiPPc(%arg0: i32, %arg1: memref<?xi32>, %arg2: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
126+
// CHECK: func.func @_Z7runTestiPPc(%arg0: i32, %arg1: memref<?xi32>, %arg2: !llvm.ptr<i8>) attributes {llvm.linkage = #llvm.linkage<external>} {
127127
// CHECK-NEXT: %c2_i32 = arith.constant 2 : i32
128128
// CHECK-NEXT: %c16_i32 = arith.constant 16 : i32
129129
// CHECK-NEXT: %0 = llvm.call @atoi(%arg2) : (!llvm.ptr<i8>) -> i32

‎test/polygeist-opt/affraise.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: polygeist-opt --raise-scf-to-affine -allow-unregistered-dialect --split-input-file %s | FileCheck %s
22

33
module {
4-
func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
4+
func.func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
55
%c0 = arith.constant 0 : index
66
%c1 = arith.constant 1 : index
77
scf.if %arg3 {
@@ -13,7 +13,7 @@ module {
1313
}
1414
return
1515
}
16-
func @aff(%c : i1, %arg0: i32) {
16+
func.func @aff(%c : i1, %arg0: i32) {
1717
%c0 = arith.constant 0 : index
1818
%c1 = arith.constant 1 : index
1919
scf.if %c {
@@ -27,7 +27,7 @@ module {
2727
}
2828
}
2929

30-
// CHECK: func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
30+
// CHECK: func.func @withinif(%arg0: memref<?xf64>, %arg1: i32, %arg2: memref<?xf64>, %arg3: i1) {
3131
// CHECK-DAG: %0 = arith.index_cast %arg1 : i32 to index
3232
// CHECK-NEXT: scf.if %arg3 {
3333
// CHECK-NEXT: affine.for %arg4 = 1 to %0 {
@@ -38,7 +38,7 @@ module {
3838
// CHECK-NEXT: return
3939
// CHECK-NEXT: }
4040

41-
// CHECK-NEXT: func @aff(%arg0: i1, %arg1: i32) {
41+
// CHECK-NEXT: func.func @aff(%arg0: i1, %arg1: i32) {
4242
// CHECK-NEXT: %0 = arith.index_cast %arg1 : i32 to index
4343
// CHECK-NEXT: scf.if %arg0 {
4444
// CHECK-NEXT: affine.parallel (%arg2) = (0) to (symbol(%0)) {

‎test/polygeist-opt/affraise2.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: polygeist-opt --raise-scf-to-affine --split-input-file %s | FileCheck %s
22

33
module {
4-
func @main(%12 : i1, %14 : i32, %18 : memref<?xf32>, %19 : memref<?xf32> ) {
4+
func.func @main(%12 : i1, %14 : i32, %18 : memref<?xf32>, %19 : memref<?xf32> ) {
55
%c0 = arith.constant 0 : index
66
%c4 = arith.constant 4 : index
77
%c1 = arith.constant 1 : index
@@ -18,7 +18,7 @@ module {
1818
}
1919
}
2020

21-
// CHECK: func @main(%arg0: i1, %arg1: i32, %arg2: memref<?xf32>, %arg3: memref<?xf32>) {
21+
// CHECK: func.func @main(%arg0: i1, %arg1: i32, %arg2: memref<?xf32>, %arg3: memref<?xf32>) {
2222
// CHECK-NEXT: %c4 = arith.constant 4 : index
2323
// CHECK-NEXT: %0 = arith.index_cast %arg1 : i32 to index
2424
// CHECK-NEXT: %1 = arith.muli %0, %c4 : index

0 commit comments

Comments
 (0)