Single line syntax + introduce wrapConsectutiveOp header to fuseDequant.

nod-ai · Dec 15, 2023 · 3d9e3f3 · 3d9e3f3
1 parent 81bfe26
commit 3d9e3f3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/compiler/src/iree/compiler/GlobalOptimization/FuseDequantizationMatmul.cpp b/compiler/src/iree/compiler/GlobalOptimization/FuseDequantizationMatmul.cpp
@@ -8,6 +8,7 @@
 #include "iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.h"
 #include "iree/compiler/GlobalOptimization/PassDetail.h"
 #include "iree/compiler/GlobalOptimization/Passes.h"
+#include "iree/compiler/GlobalOptimization/Utils.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/IR/LinalgInterfaces.h"

diff --git a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvNchwToNhwc.cpp b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvNchwToNhwc.cpp
@@ -18,9 +18,7 @@
 
 #define DEBUG_TYPE "iree-flow-convert-conv-nchw-to-nhwc"
 
-namespace mlir {
-namespace iree_compiler {
-namespace IREE {
+namespace mlir::iree_compiler::Preprocessing {
 
 using TransposeIndices = SmallVector<int64_t, 4>;
 
@@ -559,6 +557,4 @@ createConvertConvNchwToNhwcPass() {
   return std::make_unique<ConvertConvNchwToNhwcPass>();
 }
 
-}  // namespace IREE
-}  // namespace iree_compiler
-}  // namespace mlir
+}  // namespace mlir::iree_compiler::Preprocessing
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp
@@ -23,9 +23,7 @@
 
 #define DEBUG_TYPE "iree-preprocessing-convert-conv-to-channels-last"
 
-namespace mlir {
-namespace iree_compiler {
-namespace IREE {
+namespace mlir::iree_compiler::Preprocessing {
 
 static const StringLiteral fullTileTransposeMarker = "__fully_transpose_tile__";
 
@@ -885,6 +883,4 @@ std::unique_ptr<Pass> createConvertConvToChannelsLastPass() {
   return std::make_unique<ConvertConvToChannelsLastPass>();
 }
 
-}  // namespace IREE
-}  // namespace iree_compiler
-}  // namespace mlir
+}  // namespace mlir::iree_compiler::Preprocessing
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/GeneralizeConvolutions.cpp b/compiler/src/iree/compiler/Preprocessing/Common/GeneralizeConvolutions.cpp
@@ -20,9 +20,7 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
-namespace mlir {
-namespace iree_compiler {
-namespace IREE {
+namespace mlir::iree_compiler::Preprocessing {
 
 namespace {
 
@@ -63,6 +61,4 @@ std::unique_ptr<Pass> createGeneralizeConvolutionsPass() {
   return std::make_unique<GeneralizeConvolutionsPass>();
 }
 
-}  // namespace IREE
-}  // namespace iree_compiler
-}  // namespace mlir
+}  // namespace mlir::iree_compiler::Preprocessing
diff --git a/compiler/src/iree/compiler/Preprocessing/Common/Passes.td b/compiler/src/iree/compiler/Preprocessing/Common/Passes.td
@@ -19,7 +19,7 @@ def ConvertConvNchwToNhwc :
     InterfacePass<"iree-flow-convert-conv-nchw-to-nhwc", "mlir::FunctionOpInterface"> {
   let summary = "Convert linalg NCHW Convolutions to NHWC";
   let constructor =
-      "mlir::iree_compiler::IREE::createConvertConvNchwToNhwcPass()";
+      "mlir::iree_compiler::Preprocessing::createConvertConvNchwToNhwcPass()";
 }
 
 def MakeSingleDispatchForFunction :
@@ -31,14 +31,14 @@ def MakeSingleDispatchForFunction :
 def GeneralizeConvolutions :
     Pass<"iree-preprocessing-generalize-convolutions", ""> {
   let summary = "Generalize all convolution ops";
-  let constructor = "mlir::iree_compiler::IREE::createGeneralizeConvolutionsPass()";
+  let constructor = "mlir::iree_compiler::Preprocessing::createGeneralizeConvolutionsPass()";
 }
 
 def ConvertConvToChannelsLast :
     Pass<"iree-preprocessing-convert-conv-to-channels-last", ""> {
   let summary = "Convert linalg convolutions to channels last.";
   let constructor =
-      "mlir::iree_compiler::IREE::createConvertConvToChannelsLastPass()";
+      "mlir::iree_compiler::Preprocessing::createConvertConvToChannelsLastPass()";
   let options = [
     Option<"tileSize", "tile-size", "int",
            /*default=*/"0",