Skip to content

Commit 0fed6e7

Browse files
Add channel last pass in global opt
just using it in preprocessing breaks with qunatized convs Signed-off-by: Nirvedh <nirvedh@gmail.com>
1 parent 401e33d commit 0fed6e7

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

compiler/src/iree/compiler/GlobalOptimization/Passes.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

66
#include "iree/compiler/GlobalOptimization/Passes.h"
7+
#include "iree/compiler/Preprocessing/Passes.h"
8+
#include "iree/compiler/Preprocessing/Common/Passes.h"
79
#include "iree/compiler/Dialect/Flow/IR/FlowDialect.h"
810
#include "iree/compiler/Dialect/Flow/Transforms/Passes.h"
911
#include "iree/compiler/Dialect/Util/Transforms/Passes.h"
@@ -102,7 +104,9 @@ void buildGlobalOptimizationPassPipeline(
102104
.addPass(IREE::Flow::createCanonicalizerPass)
103105
.addPass(createRemoveZeroExtentTensorsPass)
104106
.addPass(createDetachElementwiseFromNamedOpsPass)
105-
.addPass(mlir::createLinalgNamedOpConversionPass);
107+
.addPass(mlir::createLinalgNamedOpConversionPass)
108+
.addPass(Preprocessing::createConvertConvToChannelsLastPass)
109+
.addPass(GlobalOptimization::createConvert1X1FilterConv2DToMatmulPass);
106110
mainPassManager.addPass(createEraseUnusedLinalgOperandsPass());
107111

108112
// Expand tensor shapes into SSA values and optimize the whole program.

compiler/src/iree/compiler/Preprocessing/Passes.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ buildTransposeConvolutionPassPipeline(OpPassManager &passManager,
102102
FunctionLikeNest(passManager)
103103
.addPass(GlobalOptimization::createDetachElementwiseFromNamedOpsPass)
104104
.addPass(mlir::createLinalgNamedOpConversionPass)
105-
.addPass(GlobalOptimization::createConvert1X1FilterConv2DToMatmulPass)
106-
.addPass(createConvertConvToChannelsLastPass);
105+
.addPass(createConvertConvToChannelsLastPass)
106+
.addPass(GlobalOptimization::createConvert1X1FilterConv2DToMatmulPass);
107107
passManager.addPass(DispatchCreation::createFoldUnitExtentDimsPass());
108108
passManager.addPass(createCanonicalizerPass());
109109
passManager.addPass(createCSEPass());

0 commit comments

Comments
 (0)