Skip to content

Commit 49aacf8

Browse files
authored
Carrying reverts: - llvm/llvm-project@c6964b1 (breaks i1 tensor handling, see #23463) (looked into by @rkayaith) - llvm/llvm-project@34eb59d (depends on llvm/llvm-project@c6964b1) - llvm/llvm-project@75eecd2 (removes LLVMSupport from Python bindings CMake, breaks iree-dialects build, see #23476) (looked into by @RattataKing) Dropped reverts: llvm/llvm-project@a1d7cda Other points of interest: llvm/llvm-project@1de1a76 disallows implicit `const SmallVector` -> `MutableArrayRef`. [Affects PCF](https://github.com/iree-org/iree/blob/a852a42734d182a7049433822c72607a06dca8fd/compiler/src/iree/compiler/Codegen/Dialect/PCF/Transforms/FuseConsumers.cpp#L630) when we pass `params.slices`(coming from coming from `const ConsumerFusionParams &params`) into `fuseIntoWriteSlices`; fix by dropping extraneous const qualifier --------- Signed-off-by: Eric Feng <Eric.Feng@amd.com>
1 parent 5df5fa2 commit 49aacf8

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

compiler/src/iree/compiler/Codegen/Dialect/PCF/Transforms/FuseConsumers.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ addResults(RewriterBase &rewriter, PCF::GenericOp genericOp,
510510
template <typename OpTy>
511511
static void fuseTilableConsumerImpl(RewriterBase &rewriter, OpTy producerOp,
512512
TilingInterface target,
513-
const ConsumerFusionParams &params) {
513+
ConsumerFusionParams &params) {
514514
assert(!params.results.empty() && "unexpected empty number of results");
515515

516516
Location loc = target.getLoc();
@@ -893,14 +893,12 @@ LogicalResult matchTilableConsumer(RewriterBase &rewriter,
893893
}
894894

895895
void fuseTilableConsumer(RewriterBase &rewriter, PCF::GenericOp producerOp,
896-
TilingInterface target,
897-
const ConsumerFusionParams &params) {
896+
TilingInterface target, ConsumerFusionParams &params) {
898897
return fuseTilableConsumerImpl(rewriter, producerOp, target, params);
899898
}
900899

901900
void fuseTilableConsumer(RewriterBase &rewriter, PCF::LoopOp producerOp,
902-
TilingInterface target,
903-
const ConsumerFusionParams &params) {
901+
TilingInterface target, ConsumerFusionParams &params) {
904902
return fuseTilableConsumerImpl(rewriter, producerOp, target, params);
905903
}
906904

compiler/src/iree/compiler/Codegen/Dialect/PCF/Transforms/Transforms.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,9 @@ LogicalResult matchTilableConsumer(RewriterBase &rewriter, PCF::LoopOp loopOp,
9090
ConsumerFusionParams &params);
9191

9292
void fuseTilableConsumer(RewriterBase &rewriter, PCF::GenericOp genericOp,
93-
TilingInterface target,
94-
const ConsumerFusionParams &params);
93+
TilingInterface target, ConsumerFusionParams &params);
9594
void fuseTilableConsumer(RewriterBase &rewriter, PCF::LoopOp loopOp,
96-
TilingInterface target,
97-
const ConsumerFusionParams &params);
95+
TilingInterface target, ConsumerFusionParams &params);
9896

9997
// Pattern set for dropping unused results from scoped ops. Due to memory
10098
// effects this requires cascading operation erasure and is unsuitable for

third_party/llvm-project

Submodule llvm-project updated 1673 files

0 commit comments

Comments
 (0)