Skip to content

Commit 6668da9

Browse files
author
ZhangYan
committed
Merge remote-tracking branch 'origin/main' into zhangyan/enhance_allocator
2 parents 9494fdc + 686c34c commit 6668da9

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

lib/gc/Transforms/IterativeTilingAndFusion.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ getClosestExtractSliceOfOperand(OpOperand &operand) {
4646
if (auto loop =
4747
dyn_cast<LoopLikeOpInterface>(iterArg.getOwner()->getParentOp()))
4848
return getClosestExtractSliceOfOperand(*loop.getTiedLoopInit(iterArg));
49+
// If operand is not using loop init.
50+
return failure();
4951
}
5052

5153
Operation *defineOp = operand.get().getDefiningOp();

lib/gc/Transforms/MemRefToCPURuntime.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "gc/Dialect/CPURuntime/IR/CPURuntimeDialect.h"
1313
#include "gc/Dialect/CPURuntime/IR/CPURuntimeOps.h"
1414
#include "gc/Transforms/Passes.h"
15-
#include "mlir/Conversion/LLVMCommon/Pattern.h"
1615
#include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h"
1716
#include "mlir/Dialect/Func/IR/FuncOps.h"
1817
#include "mlir/IR/PatternMatch.h"

lib/gc/Transforms/Pipeline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void populateCPUPipeline(mlir::OpPassManager &pm) {
184184
populateBufferizationPasses(pm);
185185
// REMOVE this pass after the TensorPasses are added. Currently we add this
186186
// pass to make the pipeline work properly
187-
pm.addNestedPass<func::FuncOp>(createConvertLinalgToParallelLoopsPass());
187+
pm.addNestedPass<func::FuncOp>(createConvertLinalgToLoopsPass());
188188
populateMicroKernelPasses(pm);
189189
populateCPURuntimePasses(pm);
190190
// back-end, llvm dialect

0 commit comments

Comments
 (0)