[mlir][NFC] Split MlirQuant into proper IR/Utils/Transforms libraries

River707 · River707 · commit 14124c302536 · 2022-02-03T10:54:52.000-08:00
This matches the structure of other dialects, and also removes
unnecessary dependencies from the core dialect lib.
diff --git a/mlir/lib/Dialect/Quant/CMakeLists.txt b/mlir/lib/Dialect/Quant/CMakeLists.txt
@@ -1,26 +1,3 @@
-add_mlir_dialect_library(MLIRQuant
-  IR/QuantOps.cpp
-  IR/QuantTypes.cpp
-  IR/TypeDetail.h
-  IR/TypeParser.cpp
-  Transforms/ConvertConst.cpp
-  Transforms/ConvertSimQuant.cpp
-  Utils/QuantizeUtils.cpp
-  Utils/UniformSupport.cpp
-  Utils/FakeQuantSupport.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
-
-  DEPENDS
-  MLIRQuantOpsIncGen
-  MLIRQuantPassIncGen
-
-  LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRIR
-  MLIRPass
-  MLIRSideEffectInterfaces
-  MLIRSupport
-  MLIRTransformUtils
-  )
+add_subdirectory(IR)
+add_subdirectory(Transforms)
+add_subdirectory(Utils)
diff --git a/mlir/lib/Dialect/Quant/IR/CMakeLists.txt b/mlir/lib/Dialect/Quant/IR/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_mlir_dialect_library(MLIRQuant
+  QuantOps.cpp
+  QuantTypes.cpp
+  TypeDetail.h
+  TypeParser.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps/IR
+
+  DEPENDS
+  MLIRQuantOpsIncGen
+
+  LINK_LIBS PUBLIC
+  MLIRIR
+  MLIRSideEffectInterfaces
+  MLIRSupport
+  )
diff --git a/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_mlir_dialect_library(MLIRQuantTransforms
+  ConvertConst.cpp
+  ConvertSimQuant.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps/Transforms
+
+  DEPENDS
+  MLIRQuantPassIncGen
+
+  LINK_LIBS PUBLIC
+  MLIRArithmetic
+  MLIRIR
+  MLIRQuant
+  MLIRQuantUtils
+  MLIRPass
+  MLIRSupport
+  MLIRTransformUtils
+  )
diff --git a/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt b/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_mlir_dialect_library(MLIRQuantUtils
+  QuantizeUtils.cpp
+  UniformSupport.cpp
+  FakeQuantSupport.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps/Utils
+
+  LINK_LIBS PUBLIC
+  MLIRIR
+  MLIRQuant
+  MLIRSupport
+  )
diff --git a/mlir/lib/Dialect/Tosa/CMakeLists.txt b/mlir/lib/Dialect/Tosa/CMakeLists.txt
@@ -17,6 +17,7 @@ add_mlir_dialect_library(MLIRTosa
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRQuant
+  MLIRQuantUtils
   MLIRSideEffectInterfaces
   MLIRTensor
   MLIRViewLikeInterface
diff --git a/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt
@@ -16,4 +16,5 @@ add_mlir_dialect_library(MLIRTosaTransforms
   MLIRPass
   MLIRTosa
   MLIRStandard
+  MLIRTransformUtils
   )
diff --git a/mlir/test/lib/Dialect/Tosa/CMakeLists.txt b/mlir/test/lib/Dialect/Tosa/CMakeLists.txt
@@ -12,4 +12,5 @@ add_mlir_dialect_library(MLIRTosaTestPasses
   LINK_LIBS PUBLIC
   MLIRPass
   MLIRTosa
+  MLIRTransformUtils
   )
diff --git a/mlir/unittests/Dialect/Quant/CMakeLists.txt b/mlir/unittests/Dialect/Quant/CMakeLists.txt
@@ -3,4 +3,6 @@ add_mlir_unittest(MLIRQuantTests
 )
 target_link_libraries(MLIRQuantTests
   PRIVATE
-  MLIRQuant)
+  MLIRQuant
+  MLIRQuantUtils
+  )

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ add_mlir_dialect_library(MLIRTosaTransforms`
`16`	`16`	`MLIRPass`
`17`	`17`	`MLIRTosa`
`18`	`18`	`MLIRStandard`
	`19`	`+ MLIRTransformUtils`
`19`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ add_mlir_dialect_library(MLIRTosaTestPasses`
`12`	`12`	`LINK_LIBS PUBLIC`
`13`	`13`	`MLIRPass`
`14`	`14`	`MLIRTosa`
	`15`	`+ MLIRTransformUtils`
`15`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,6 @@ add_mlir_unittest(MLIRQuantTests`
`3`	`3`	`)`
`4`	`4`	`target_link_libraries(MLIRQuantTests`
`5`	`5`	`PRIVATE`
`6`		`- MLIRQuant)`
	`6`	`+ MLIRQuant`
	`7`	`+ MLIRQuantUtils`
	`8`	`+ )`