Skip to content

Commit f659a0b

Browse files
Integrate LLVM at f427890a1dcd7759240568f189df8fbbcf23669c (#4152)
Update LLVM to llvm/llvm-project@f427890 1. Remove argument materialization in accordance with https://discourse.llvm.org/t/rfc-merging-1-1-and-1-n-dialect-conversions/82513. 2. Make changes to `GreedyRewriteConfig` methods in accordance with llvm/llvm-project@0c61b24. 3. Update tests affected by llvm/llvm-project@f010725. --------- Signed-off-by: Vivek Khandelwal <vivekkhandelwal1424@gmail.com>
1 parent f9bd4c2 commit f659a0b

File tree

13 files changed

+40
-40
lines changed

13 files changed

+40
-40
lines changed

externals/llvm-project

Submodule llvm-project updated 4541 files

lib/Conversion/TorchToLinalg/Pooling.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,8 @@ Value PoolSizeCalculator<NumOfDims>::getPoolSize(
916916
// change, these variables used "height" and "width" (or "h" and "w")
917917
// in these intermediate variables instead of "Dim".
918918
Value IndexODim =
919-
b.createOrFold<linalg::IndexOp>(location,
920-
/*value=*/DimSizeFromSumPoolType[i]);
919+
b.create<linalg::IndexOp>(location,
920+
/*value=*/DimSizeFromSumPoolType[i]);
921921
Value ODim = castIndexToInt64(b, location, IndexODim);
922922
Value DDim = b.createOrFold<arith::ConstantOp>(
923923
location, b.getI64IntegerAttr(strideInts[i]));

lib/Dialect/TMTensor/Transforms/Bufferize.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ struct TMTensorBufferizePass
154154
typeConverter.addConversion([](UnrankedTensorType type) -> Type {
155155
return UnrankedMemRefType::get(type.getElementType(), 0);
156156
});
157-
typeConverter.addArgumentMaterialization(materializeToTensor);
158157
typeConverter.addSourceMaterialization(materializeToTensor);
159158
typeConverter.addTargetMaterialization([](OpBuilder &builder,
160159
BaseMemRefType type,

lib/Dialect/Torch/Transforms/AdjustCallingConventions.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ static LogicalResult adjustCallingConventions(func::FuncOp func,
231231
return success();
232232
});
233233

234-
typeConverter.addArgumentMaterialization(materializeAsCopyTensorToType);
235234
typeConverter.addSourceMaterialization(materializeAsCopyTensorToType);
236235
typeConverter.addTargetMaterialization(materializeAsCopyTensorToType);
237236
patterns.add<AdjustCallingConventionForFunc>(typeConverter, context);

lib/Dialect/Torch/Transforms/DecomposeComplexOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12115,8 +12115,8 @@ class DecomposeComplexOpsPass
1211512115
addPatternIfTargetOpIsIllegal<DecomposeAten_AssertScalarOp>(patterns);
1211612116

1211712117
GreedyRewriteConfig config;
12118-
config.useTopDownTraversal = true;
12119-
config.maxIterations = GreedyRewriteConfig::kNoLimit;
12118+
config.setUseTopDownTraversal(true);
12119+
config.setMaxIterations(GreedyRewriteConfig::kNoLimit);
1212012120

1212112121
if (failed(applyPatternsGreedily(getOperation(), std::move(patterns),
1212212122
config))) {

lib/Dialect/Torch/Transforms/RecomposeComplexOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,8 @@ class RecomposeComplexOpsPass
820820
patterns.add<RecomposeMeshgridIndexingListUnpack>(context);
821821

822822
GreedyRewriteConfig config;
823-
config.useTopDownTraversal = true;
824-
config.maxIterations = GreedyRewriteConfig::kNoLimit;
823+
config.setUseTopDownTraversal(true);
824+
config.setMaxIterations(GreedyRewriteConfig::kNoLimit);
825825

826826
if (failed(applyPatternsGreedily(getOperation(), std::move(patterns),
827827
config))) {

lib/Dialect/Torch/Transforms/RestructureNonConstantAxes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ class RestructureNonConstantAxesPass
261261
// TODO: Debug visitation order to make this more efficient.
262262
// A single linear scan should suffice.
263263
GreedyRewriteConfig config;
264-
config.useTopDownTraversal = true;
265-
config.maxIterations = GreedyRewriteConfig::kNoLimit;
264+
config.setUseTopDownTraversal(true);
265+
config.setMaxIterations(GreedyRewriteConfig::kNoLimit);
266266
if (failed(applyPatternsGreedily(getOperation(), std::move(patterns),
267267
config))) {
268268
return signalPassFailure();

lib/Dialect/Torch/Transforms/ScalarizeShapes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ class ScalarizeShapesPass : public ScalarizeShapesBase<ScalarizeShapesPass> {
16011601
// When propagating, we need to go back and clean up aten.Tensor ops that
16021602
// have been futher propagated. It is also necessary to add newly created
16031603
// ops for custom folding after scalarizing a where.self op.
1604-
config.strictMode = GreedyRewriteStrictness::ExistingAndNewOps;
1604+
config.setStrictness(GreedyRewriteStrictness::ExistingAndNewOps);
16051605
if (failed(applyOpPatternsGreedily(shapeCalculationOps.getArrayRef(),
16061606
std::move(patterns), config))) {
16071607
return signalPassFailure();

lib/Dialect/Torch/Transforms/SimplifyDtypeCalculations.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ class SimplifyDtypeCalculationsPass
211211
// TODO: Debug visitation order to make this more efficient.
212212
// A single linear scan should suffice.
213213
GreedyRewriteConfig config;
214-
config.useTopDownTraversal = true;
215-
config.maxIterations = GreedyRewriteConfig::kNoLimit;
214+
config.setUseTopDownTraversal(true);
215+
config.setMaxIterations(GreedyRewriteConfig::kNoLimit);
216216
if (failed(applyPatternsGreedily(getOperation(), std::move(patterns),
217217
config))) {
218218
return signalPassFailure();

lib/Dialect/Torch/Transforms/SimplifyShapeCalculations.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ class SimplifyShapeCalculationsPass
207207
// TODO: Debug visitation order to make this more efficient.
208208
// A single linear scan should suffice.
209209
GreedyRewriteConfig config;
210-
config.useTopDownTraversal = true;
211-
config.maxIterations = GreedyRewriteConfig::kNoLimit;
210+
config.setUseTopDownTraversal(true);
211+
config.setMaxIterations(GreedyRewriteConfig::kNoLimit);
212212
if (failed(applyPatternsGreedily(getOperation(), std::move(patterns),
213213
config))) {
214214
return signalPassFailure();

0 commit comments

Comments
 (0)