Skip to content

Commit 6ed8495

Browse files
rolfmorelrolfmorel
authored
Bump llvm - get updated Python bindings for linalg.elementwise (#1045)
Fixes: 1. `config.strictMode = GreedyRewriteStrictness::ExistingOps;` to `config.setStrictness(GreedyRewriteStrictness::ExistingOps);` * per llvm/llvm-project#137122 2. `vectorOp.getSource();` to `vectorOp.getBase();` * per deprecation messages introduced by llvm/llvm-project#137859 3. `ToMemrefOp` -> `ToBufferOp` * per llvm/llvm-project#137180
1 parent 24b2ed9 commit 6ed8495

9 files changed

+29
-29
lines changed

‎build_tools/llvm_version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a99e055030f0da61651e808cbb208bb39594cdc0
1+
faf5d747f174cc9d714839f0d3bce1a783eac2ac

‎lib/TPP/Runner/MLIRBench.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ LogicalResult MLIRBench::printResult(Operation *kernelCall) {
388388

389389
if (isa<TensorType>(result.getType())) {
390390
result =
391-
builder.create<bufferization::ToMemrefOp>(unkLoc, memrefType, result);
391+
builder.create<bufferization::ToBufferOp>(unkLoc, memrefType, result);
392392
}
393393

394394
auto outBuf = builder.create<memref::AllocOp>(unkLoc, memrefType);

‎lib/TPP/Transforms/BrgemmLinalgTiling.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ struct BrgemmLinalgTiling
202202
RewritePatternSet patterns(&getContext());
203203
populateBrgemmLinalgTilingPatterns(patterns, options);
204204
GreedyRewriteConfig config;
205-
config.strictMode = GreedyRewriteStrictness::ExistingOps;
205+
config.setStrictness(GreedyRewriteStrictness::ExistingOps);
206206

207207
(void)applyPatternsGreedily(getOperation(), std::move(patterns), config);
208208
}

‎lib/TPP/Transforms/HoistVectorTransfers.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ struct HoistVectorTransfers
250250
RewritePatternSet patterns(&getContext());
251251
populateHoistVectorTransferPatterns(patterns);
252252
GreedyRewriteConfig config;
253-
config.strictMode = GreedyRewriteStrictness::ExistingOps;
253+
config.setStrictness(GreedyRewriteStrictness::ExistingOps);
254254
(void)applyPatternsGreedily(getOperation(), std::move(patterns), config);
255255
}
256256
};

‎lib/TPP/Transforms/SplitReductionDim.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct SplitReductionDim
103103
RewritePatternSet patterns(ctx);
104104
patterns.add<SplitContractionReduction>(ctx, options);
105105
GreedyRewriteConfig config;
106-
config.strictMode = GreedyRewriteStrictness::ExistingOps;
106+
config.setStrictness(GreedyRewriteStrictness::ExistingOps);
107107
(void)applyPatternsGreedily(getOperation(), std::move(patterns), config);
108108
}
109109
};

‎lib/TPP/Transforms/VectorContractToAMX.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ struct VectorContractToAMXPattern
392392
int64_t M = accType.getDimSize(0);
393393
int64_t N = accType.getDimSize(1);
394394

395-
auto accSubview = accDefiningOp.getSource();
395+
auto accSubview = accDefiningOp.getBase();
396396
Location loc = op.getLoc();
397397
scf::ForOp insertAt =
398398
getOutermostLoopWithIterargAccumulator(ctx.innerForOp, acc);
@@ -472,14 +472,14 @@ struct VectorContractToAMXPattern
472472
// Update index of LHS matrix subview for batch dimension if corresponding
473473
// loop is needed.
474474
if (iv)
475-
mapping.map(lhsDefiningOp.getSource().getDefiningOp()->getOperand(1),
475+
mapping.map(lhsDefiningOp.getBase().getDefiningOp()->getOperand(1),
476476
iv);
477477
// Update index of LHS matrix subview for K dimension.
478478
mapping.map(
479-
lhsDefiningOp.getSource().getDefiningOp()->getOperand(iv ? 3 : 1),
479+
lhsDefiningOp.getBase().getDefiningOp()->getOperand(iv ? 3 : 1),
480480
innerIv);
481481
auto lhsClone = innerBuilder.clone(
482-
*lhsDefiningOp.getSource().getDefiningOp(), mapping);
482+
*lhsDefiningOp.getBase().getDefiningOp(), mapping);
483483
// Load matrix A tile
484484
SmallVector<Value, 4> aLoadTiles =
485485
createTileLoads(innerBuilder, loc, amxInputTilesOf16x32xBf16Ty,
@@ -489,14 +489,14 @@ struct VectorContractToAMXPattern
489489
// Update index of LHS matrix subview for batch dimension if corresponding
490490
// loop is needed.
491491
if (iv)
492-
rhsMapping.map(rhsDefiningOp.getSource().getDefiningOp()->getOperand(1),
492+
rhsMapping.map(rhsDefiningOp.getBase().getDefiningOp()->getOperand(1),
493493
iv);
494494
// Update index of LHS matrix subview for K dimension.
495495
rhsMapping.map(
496-
rhsDefiningOp.getSource().getDefiningOp()->getOperand(iv ? 2 : 1),
496+
rhsDefiningOp.getBase().getDefiningOp()->getOperand(iv ? 2 : 1),
497497
innerIv);
498498
auto rhsClone = innerBuilder.clone(
499-
*rhsDefiningOp.getSource().getDefiningOp(), rhsMapping);
499+
*rhsDefiningOp.getBase().getDefiningOp(), rhsMapping);
500500
// Load matrix B tile, vnni factor and N tile size will be collapsed as
501501
// effective tilse size.
502502
SmallVector<Value, 4> bLoadTiles =

‎lib/TPP/Transforms/VectorContractToBF16DotProduct.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ struct BF16DotProductOp : OpRewritePattern<vector::ContractionOp> {
402402
Value ivNewKForOp, ValueRange iterArgsNewKForOp) {
403403
IRMapping mapping;
404404
mapping.map(
405-
vectorReadOpLhs.getSource().getDefiningOp()->getOperand(1),
405+
vectorReadOpLhs.getBase().getDefiningOp()->getOperand(1),
406406
ivNewReductionForOp);
407407
mapping.map(
408-
vectorReadOpLhs.getSource().getDefiningOp()->getOperand(3),
408+
vectorReadOpLhs.getBase().getDefiningOp()->getOperand(3),
409409
ivNewKForOp);
410410
auto lhsClone = rewriterNewKForOp.clone(
411-
*vectorReadOpLhs.getSource().getDefiningOp(), mapping);
411+
*vectorReadOpLhs.getBase().getDefiningOp(), mapping);
412412

413413
// Memory access for A Matrix into <32xbf16>
414414
llvm::SmallVector<Value, 8> vectorA;
@@ -440,13 +440,13 @@ struct BF16DotProductOp : OpRewritePattern<vector::ContractionOp> {
440440

441441
IRMapping rhsMapping;
442442
rhsMapping.map(
443-
vectorReadOpRhs.getSource().getDefiningOp()->getOperand(1),
444-
ivNewReductionForOp);
443+
vectorReadOpRhs.getBase().getDefiningOp()->getOperand(1),
444+
ivNewReductionForOp);
445445
rhsMapping.map(
446-
vectorReadOpRhs.getSource().getDefiningOp()->getOperand(2),
446+
vectorReadOpRhs.getBase().getDefiningOp()->getOperand(2),
447447
ivNewKForOp);
448448
auto rhsClone = rewriterNewKForOp.clone(
449-
*vectorReadOpRhs.getSource().getDefiningOp(), rhsMapping);
449+
*vectorReadOpRhs.getBase().getDefiningOp(), rhsMapping);
450450

451451
// Memory access for B Matrix into <32xbf16>
452452
llvm::SmallVector<Value, 8> vectorB;
@@ -516,7 +516,7 @@ struct BF16DotProduct : public impl::BF16DotProductBase<BF16DotProduct> {
516516
RewritePatternSet patterns(&getContext());
517517
populateBF16DotProductPatterns(patterns);
518518
GreedyRewriteConfig config;
519-
config.strictMode = GreedyRewriteStrictness::ExistingOps;
519+
config.setStrictness(GreedyRewriteStrictness::ExistingOps);
520520
(void)applyPatternsGreedily(getOperation(), std::move(patterns), config);
521521
}
522522
};

‎lib/TPP/Transforms/VectorContractToFMA.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ struct VectorContractToFMAPattern
245245
if (K != 1)
246246
return failure();
247247

248-
auto accSubview = accDefiningOp.getSource();
248+
auto accSubview = accDefiningOp.getBase();
249249
Location loc = op.getLoc();
250250

251251
// Create M different <1xN> subviews.
@@ -295,13 +295,13 @@ struct VectorContractToFMAPattern
295295
ValueRange innerIterArgs) {
296296
IRMapping mapping;
297297
mapping.map(
298-
lhsDefiningOp.getSource().getDefiningOp()->getOperand(1),
298+
lhsDefiningOp.getBase().getDefiningOp()->getOperand(1),
299299
iv);
300300
mapping.map(
301-
lhsDefiningOp.getSource().getDefiningOp()->getOperand(3),
301+
lhsDefiningOp.getBase().getDefiningOp()->getOperand(3),
302302
innerIv);
303303
auto lhsClone = innerBuilder.clone(
304-
*lhsDefiningOp.getSource().getDefiningOp(), mapping);
304+
*lhsDefiningOp.getBase().getDefiningOp(), mapping);
305305

306306
// Load and broadcast individual elements
307307
SmallVector<Value, 4> broadcasts;
@@ -319,13 +319,13 @@ struct VectorContractToFMAPattern
319319

320320
IRMapping rhsMapping;
321321
rhsMapping.map(
322-
rhsDefiningOp.getSource().getDefiningOp()->getOperand(1),
322+
rhsDefiningOp.getBase().getDefiningOp()->getOperand(1),
323323
iv);
324324
rhsMapping.map(
325-
rhsDefiningOp.getSource().getDefiningOp()->getOperand(2),
325+
rhsDefiningOp.getBase().getDefiningOp()->getOperand(2),
326326
innerIv);
327327
auto rhsClone = innerBuilder.clone(
328-
*rhsDefiningOp.getSource().getDefiningOp(), rhsMapping);
328+
*rhsDefiningOp.getBase().getDefiningOp(), rhsMapping);
329329
auto rowVec = innerBuilder.create<vector::LoadOp>(
330330
loc, VectorType::get({N}, elementType),
331331
rhsClone->getResult(0), ValueRange{c0, c0, c0});

‎lib/TPP/Transforms/VectorContractToOuterproduct.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ struct VectorContractToOuterproductPattern
230230
nestedBuilder.getContext());
231231
}
232232

233-
Value lhsTensor = lhsDefiningOp.getSource();
234-
Value rhsTensor = rhsDefiningOp.getSource();
233+
Value lhsTensor = lhsDefiningOp.getBase();
234+
Value rhsTensor = rhsDefiningOp.getBase();
235235
// Read vector slices using TransferReadOp
236236
auto lhsSlice = nestedBuilder.create<vector::TransferReadOp>(
237237
nestedLoc, VectorType::get({M}, lhsType.getElementType()),

0 commit comments

Comments
 (0)