48 files changed, 93 insertions, 88 deletions
diff --git a/mlir/include/mlir/CMakeLists.txt b/mlir/include/mlir/CMakeLists.txt
index af16f856328..d7d8175bce5 100644
--- a/mlir/include/mlir/CMakeLists.txt
+++ b/mlir/include/mlir/CMakeLists.txt
@@ -1,7 +1,6 @@
+add_subdirectory(Dialect)
 add_subdirectory(EDSC)
-add_subdirectory(FxpMathOps)
 add_subdirectory(GPU)
 add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
-add_subdirectory(Quantization)
 add_subdirectory(StandardOps)
diff --git a/mlir/include/mlir/Dialect/CMakeLists.txt b/mlir/include/mlir/Dialect/CMakeLists.txt
new file mode 100644
index 00000000000..f07993a5aa9
--- /dev/null
+++ b/mlir/include/mlir/Dialect/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(FxpMathOps)
+add_subdirectory(QuantOps)
diff --git a/mlir/include/mlir/FxpMathOps/CMakeLists.txt b/mlir/include/mlir/Dialect/FxpMathOps/CMakeLists.txt
index eaf72d214f8..eaf72d214f8 100644
--- a/mlir/include/mlir/FxpMathOps/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/FxpMathOps/CMakeLists.txt
diff --git a/mlir/include/mlir/FxpMathOps/FxpMathOps.h b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.h
index c8854c26ce5..88a42344c3b 100644
--- a/mlir/include/mlir/FxpMathOps/FxpMathOps.h
+++ b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.h
@@ -1,4 +1,4 @@
-//===- FxpMathOps/FxpMathOps.h - Fixed point ops ----------------*- C++ -*-===//
+//===- FxpMathOps.h - Fixed point ops ---------------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@@ -15,11 +15,12 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_FXPMATH_QUANTOPS_H_
-#define MLIR_FXPMATH_QUANTOPS_H_
+#ifndef MLIR_DIALECT_FXPMATHOPS_FXPMATHOPS_H_
+#define MLIR_DIALECT_FXPMATHOPS_FXPMATHOPS_H_
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
+#include "mlir/IR/StandardTypes.h"
 
 namespace mlir {
 namespace fxpmath {
@@ -31,9 +32,9 @@ public:
 };
 
 #define GET_OP_CLASSES
-#include "mlir/FxpMathOps/FxpMathOps.h.inc"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.h.inc"
 
 } // namespace fxpmath
 } // namespace mlir
 
-#endif // MLIR_FXPMATH_QUANTOPS_H_
+#endif // MLIR_DIALECT_FXPMATHOPS_FXPMATHOPS_H_
diff --git a/mlir/include/mlir/FxpMathOps/FxpMathOps.td b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
index fc4062c8a77..9757cdde474 100644
--- a/mlir/include/mlir/FxpMathOps/FxpMathOps.td
+++ b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
@@ -20,15 +20,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifdef FXPMATH_OPS
+#ifdef DIALECT_FXPMATHOPS_FXPMATH_OPS_
 #else
-
+#define DIALECT_FXPMATHOPS_FXPMATH_OPS_
 #ifdef OP_BASE
 #else
 include "mlir/IR/OpBase.td"
 #endif // OP_BASE
 
-include "mlir/Quantization/QuantPredicates.td"
+include "mlir/Dialect/QuantOps/QuantPredicates.td"
 
 def fxpmath_Dialect : Dialect {
   let name = "fxpmath";
@@ -287,4 +287,4 @@ def fxpmath_RealMatMulBiasOp :
   }];
 }
 
-#endif  // FXPMATH_OPS
+#endif  // DIALECT_FXPMATHOPS_FXPMATH_OPS_
diff --git a/mlir/include/mlir/FxpMathOps/Passes.h b/mlir/include/mlir/Dialect/FxpMathOps/Passes.h
index b988f1378b5..74c634a6889 100644
--- a/mlir/include/mlir/FxpMathOps/Passes.h
+++ b/mlir/include/mlir/Dialect/FxpMathOps/Passes.h
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_FXPMATH_PASSES_H
-#define MLIR_FXPMATH_PASSES_H
+#ifndef MLIR_DIALECT_FXPMATHOPS_PASSES_H
+#define MLIR_DIALECT_FXPMATHOPS_PASSES_H
 
 namespace mlir {
 class FunctionPassBase;
@@ -40,4 +40,4 @@ FunctionPassBase *createLowerUniformCastsPass();
 } // namespace fxpmath
 } // namespace mlir
 
-#endif // MLIR_FXPMATH_PASSES_H
+#endif // MLIR_DIALECT_FXPMATHOPS_PASSES_H
diff --git a/mlir/include/mlir/Quantization/CMakeLists.txt b/mlir/include/mlir/Dialect/QuantOps/CMakeLists.txt
index 88264881943..3e3b9462b88 100644
--- a/mlir/include/mlir/Quantization/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/QuantOps/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(LLVM_TARGET_DEFINITIONS QuantOps.td)
 mlir_tablegen(QuantOps.h.inc -gen-op-decls)
 mlir_tablegen(QuantOps.cpp.inc -gen-op-defs)
-add_public_tablegen_target(MLIRQuantizationOpsIncGen)
+add_public_tablegen_target(MLIRQuantOpsIncGen)
diff --git a/mlir/include/mlir/Quantization/FakeQuantSupport.h b/mlir/include/mlir/Dialect/QuantOps/FakeQuantSupport.h
index c6ec299e9af..8afe2a69ae8 100644
--- a/mlir/include/mlir/Quantization/FakeQuantSupport.h
+++ b/mlir/include/mlir/Dialect/QuantOps/FakeQuantSupport.h
@@ -43,10 +43,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_QUANTIZATION_FAKEQUANTSUPPORT_H_
-#define MLIR_QUANTIZATION_FAKEQUANTSUPPORT_H_
+#ifndef MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
+#define MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
 
-#include "mlir/Quantization/QuantTypes.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 
 namespace mlir {
 namespace quant {
@@ -64,4 +64,4 @@ UniformQuantizedType fakeQuantAttrsToType(Location loc, unsigned numBits,
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_FAKEQUANTSUPPORT_H_
+#endif // MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
diff --git a/mlir/include/mlir/Quantization/Passes.h b/mlir/include/mlir/Dialect/QuantOps/Passes.h
index 03bd986940d..6b647a87f4a 100644
--- a/mlir/include/mlir/Quantization/Passes.h
+++ b/mlir/include/mlir/Dialect/QuantOps/Passes.h
@@ -22,8 +22,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_QUANTIZATION_PASSES_H
-#define MLIR_QUANTIZATION_PASSES_H
+#ifndef MLIR_DIALECT_QUANTOPS_PASSES_H
+#define MLIR_DIALECT_QUANTOPS_PASSES_H
 
 namespace mlir {
 class FunctionPassBase;
@@ -44,4 +44,4 @@ FunctionPassBase *createConvertConstPass();
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_PASSES_H
+#endif // MLIR_DIALECT_QUANTOPS_PASSES_H
diff --git a/mlir/include/mlir/Quantization/QuantOps.h b/mlir/include/mlir/Dialect/QuantOps/QuantOps.h
index 24b504a5663..8753cd2ed48 100644
--- a/mlir/include/mlir/Quantization/QuantOps.h
+++ b/mlir/include/mlir/Dialect/QuantOps/QuantOps.h
@@ -1,4 +1,4 @@
-//===- Quantization/QuantOps.h - Quantization Ops and Types -----*- C++ -*-===//
+//===- QuantOps.h - Quantization Ops and Types ------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_QUANTIZATION_QUANTOPS_H_
-#define MLIR_QUANTIZATION_QUANTOPS_H_
+#ifndef MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
+#define MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
@@ -42,9 +42,9 @@ public:
 };
 
 #define GET_OP_CLASSES
-#include "mlir/Quantization/QuantOps.h.inc"
+#include "mlir/Dialect/QuantOps/QuantOps.h.inc"
 
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_QUANTOPS_H_
+#endif // MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
diff --git a/mlir/include/mlir/Quantization/QuantOps.td b/mlir/include/mlir/Dialect/QuantOps/QuantOps.td
index 00415fa386b..5671828c4db 100644
--- a/mlir/include/mlir/Quantization/QuantOps.td
+++ b/mlir/include/mlir/Dialect/QuantOps/QuantOps.td
@@ -19,13 +19,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifdef QUANTIZATION_OPS
+#ifdef DIALECT_QUANTOPS_QUANT_OPS_
 #else
-
+#define DIALECT_QUANTOPS_QUANT_OPS_
 #ifdef OP_BASE
 #else
 include "mlir/IR/OpBase.td"
-include "mlir/Quantization/QuantPredicates.td"
+include "mlir/Dialect/QuantOps/QuantPredicates.td"
 #endif // OP_BASE
 
 def quant_Dialect : Dialect {
@@ -222,4 +222,4 @@ def quant_CoupledRefOp : quant_Op<"coupled_ref", [SameValueType]> {
   let results = (outs quant_RealValueType);
 }
 
-#endif // QUANT_OPS
+#endif // DIALECT_QUANTOPS_QUANT_OPS_
diff --git a/mlir/include/mlir/Quantization/QuantPredicates.td b/mlir/include/mlir/Dialect/QuantOps/QuantPredicates.td
index af0135173b4..028e0dfbb75 100644
--- a/mlir/include/mlir/Quantization/QuantPredicates.td
+++ b/mlir/include/mlir/Dialect/QuantOps/QuantPredicates.td
@@ -19,7 +19,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifdef QUANTIZATION_PREDICATES_
+#ifdef DIALECT_QUANTOPS_QUANT_PREDICATES_
 #else
 
 //===----------------------------------------------------------------------===//
@@ -69,4 +69,4 @@ def quant_UniformQuantizedType :
 def quant_UniformQuantizedValueType :
     quant_TypedPrimitiveOrContainer<quant_UniformQuantizedType>;
 
-#endif // QUANTIZATION_PREDICATES_
+#endif // DIALECT_QUANTOPS_QUANT_PREDICATES_
diff --git a/mlir/include/mlir/Quantization/QuantTypes.h b/mlir/include/mlir/Dialect/QuantOps/QuantTypes.h
index 2804c92d4ca..af20c6338fb 100644
--- a/mlir/include/mlir/Quantization/QuantTypes.h
+++ b/mlir/include/mlir/Dialect/QuantOps/QuantTypes.h
@@ -1,4 +1,4 @@
-//===- Quantization/QuantOps.h - Quantization Ops and Types -----*- C++ -*-===//
+//===- QuantTypes.h - Quantization Ops and Types ----------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_QUANTIZATION_QUANT_TYPES_H_
-#define MLIR_QUANTIZATION_QUANT_TYPES_H_
+#ifndef MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
+#define MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
@@ -396,4 +396,4 @@ public:
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_QUANT_TYPES_H_
+#endif // MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
diff --git a/mlir/include/mlir/Quantization/QuantizeUtils.h b/mlir/include/mlir/Dialect/QuantOps/QuantizeUtils.h
index 0e4d04ab9f1..de87ca1e67c 100644
--- a/mlir/include/mlir/Quantization/QuantizeUtils.h
+++ b/mlir/include/mlir/Dialect/QuantOps/QuantizeUtils.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_QUANTIZATION_QUANTIZEUTILS_H_
-#define MLIR_QUANTIZATION_QUANTIZEUTILS_H_
+#ifndef MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
+#define MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
 
 namespace mlir {
 class Attribute;
@@ -67,4 +67,4 @@ Attribute quantizeAttrUniform(Attribute realValue,
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_QUANTIZEUTILS_H_
+#endif // MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
diff --git a/mlir/include/mlir/Quantization/UniformSupport.h b/mlir/include/mlir/Dialect/QuantOps/UniformSupport.h
index af4d5dc8d6b..c8d818d4871 100644
--- a/mlir/include/mlir/Quantization/UniformSupport.h
+++ b/mlir/include/mlir/Dialect/QuantOps/UniformSupport.h
@@ -15,12 +15,12 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_QUANTIZATION_UNIFORMSUPPORT_H_
-#define MLIR_QUANTIZATION_UNIFORMSUPPORT_H_
+#ifndef MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
+#define MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
 
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Quantization/QuantTypes.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/APSInt.h"
@@ -116,4 +116,4 @@ private:
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_QUANTIZATION_UNIFORMSUPPORT_H_
+#endif // MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
diff --git a/mlir/lib/CMakeLists.txt b/mlir/lib/CMakeLists.txt
index 6f17598835f..659cba90710 100644
--- a/mlir/lib/CMakeLists.txt
+++ b/mlir/lib/CMakeLists.txt
@@ -3,14 +3,12 @@ add_subdirectory(Analysis)
 add_subdirectory(Dialect)
 add_subdirectory(EDSC)
 add_subdirectory(ExecutionEngine)
-add_subdirectory(FxpMathOps)
 add_subdirectory(GPU)
 add_subdirectory(IR)
 add_subdirectory(LLVMIR)
 add_subdirectory(Linalg)
 add_subdirectory(Parser)
 add_subdirectory(Pass)
-add_subdirectory(Quantization)
 add_subdirectory(StandardOps)
 add_subdirectory(Support)
 add_subdirectory(TableGen)
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 78b6b82bb94..ef3ce435fdf 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -1,3 +1,6 @@
+add_subdirectory(FxpMathOps)
+add_subdirectory(QuantOps)
+
 add_llvm_library(MLIRDialect
   Traits.cpp
 
diff --git a/mlir/lib/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
index 43ac6a9753f..9eddc5545f5 100644
--- a/mlir/lib/FxpMathOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -4,11 +4,11 @@ add_llvm_library(MLIRFxpMathOps
   Transforms/LowerUniformRealMath.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/FxpMathOps
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
   )
 add_dependencies(MLIRFxpMathOps
                  MLIRFxpMathOpsIncGen
-                 MLIRQuantization
+                 MLIRQuantOps
                  MLIRIR
                  MLIRPass
                  MLIRSupport
diff --git a/mlir/lib/FxpMathOps/IR/DialectRegistration.cpp b/mlir/lib/Dialect/FxpMathOps/IR/DialectRegistration.cpp
index 24e666860b4..aa6782e1464 100644
--- a/mlir/lib/FxpMathOps/IR/DialectRegistration.cpp
+++ b/mlir/lib/Dialect/FxpMathOps/IR/DialectRegistration.cpp
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/FxpMathOps/FxpMathOps.h"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.h"
 
 using namespace mlir;
 using namespace mlir::fxpmath;
diff --git a/mlir/lib/FxpMathOps/IR/FxpMathOps.cpp b/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp
index 723d0c84725..18c07b07117 100644
--- a/mlir/lib/FxpMathOps/IR/FxpMathOps.cpp
+++ b/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp
@@ -15,10 +15,10 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/FxpMathOps/FxpMathOps.h"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Quantization/QuantTypes.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/MathExtras.h"
@@ -27,12 +27,12 @@ using namespace mlir;
 using namespace mlir::fxpmath;
 
 #define GET_OP_CLASSES
-#include "mlir/FxpMathOps/FxpMathOps.cpp.inc"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.cpp.inc"
 
 FxpMathOpsDialect::FxpMathOpsDialect(MLIRContext *context)
     : Dialect(/*name=*/"fxpmath", context) {
   addOperations<
 #define GET_OP_LIST
-#include "mlir/FxpMathOps/FxpMathOps.cpp.inc"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.cpp.inc"
       >();
 }
diff --git a/mlir/lib/FxpMathOps/Transforms/LowerUniformRealMath.cpp b/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp
index 8bfcfa5aac8..32d8de3c25d 100644
--- a/mlir/lib/FxpMathOps/Transforms/LowerUniformRealMath.cpp
+++ b/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp
@@ -17,8 +17,8 @@
 
 #include "UniformKernelUtils.h"
 
-#include "mlir/FxpMathOps/FxpMathOps.h"
-#include "mlir/FxpMathOps/Passes.h"
+#include "mlir/Dialect/FxpMathOps/FxpMathOps.h"
+#include "mlir/Dialect/FxpMathOps/Passes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
diff --git a/mlir/lib/FxpMathOps/Transforms/UniformKernelUtils.h b/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h
index f96ee9e2cea..325b0ca93ca 100644
--- a/mlir/lib/FxpMathOps/Transforms/UniformKernelUtils.h
+++ b/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h
@@ -18,10 +18,10 @@
 #ifndef MLIR_FXPMATH_UNIFORM_KERNEL_UTILS_H_
 #define MLIR_FXPMATH_UNIFORM_KERNEL_UTILS_H_
 
+#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/Quantization/QuantOps.h"
-#include "mlir/Quantization/QuantTypes.h"
-#include "mlir/Quantization/UniformSupport.h"
 
 #include <cmath>
 
diff --git a/mlir/lib/Quantization/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
index a8a865debbd..74b3f3c4525 100644
--- a/mlir/lib/Quantization/CMakeLists.txt
+++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRQuantization
+add_llvm_library(MLIRQuantOps
   IR/DialectRegistration.cpp
   IR/QuantOps.cpp
   IR/QuantTypes.cpp
@@ -11,11 +11,11 @@ add_llvm_library(MLIRQuantization
   Utils/FakeQuantSupport.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Quantization
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
   )
-add_dependencies(MLIRQuantization
-                 MLIRQuantizationOpsIncGen
+add_dependencies(MLIRQuantOps
                  MLIRIR
                  MLIRPass
+                 MLIRQuantOpsIncGen
                  MLIRSupport
                  MLIRStandardOps)
diff --git a/mlir/lib/Quantization/IR/DialectRegistration.cpp b/mlir/lib/Dialect/QuantOps/IR/DialectRegistration.cpp
index 6beb193aecd..b071248f4bb 100644
--- a/mlir/lib/Quantization/IR/DialectRegistration.cpp
+++ b/mlir/lib/Dialect/QuantOps/IR/DialectRegistration.cpp
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/QuantOps.h"
+#include "mlir/Dialect/QuantOps/QuantOps.h"
 
 using namespace mlir;
 using namespace mlir::quant;
diff --git a/mlir/lib/Quantization/IR/QuantOps.cpp b/mlir/lib/Dialect/QuantOps/IR/QuantOps.cpp
index ab6d97f3a6f..fb5b2e1b0f7 100644
--- a/mlir/lib/Quantization/IR/QuantOps.cpp
+++ b/mlir/lib/Dialect/QuantOps/IR/QuantOps.cpp
@@ -15,13 +15,14 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/QuantOps.h"
+#include "mlir/Dialect/QuantOps/QuantOps.h"
 #include "TypeDetail.h"
+
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Quantization/QuantTypes.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/MathExtras.h"
@@ -31,7 +32,7 @@ using namespace mlir::quant;
 using namespace mlir::quant::detail;
 
 #define GET_OP_CLASSES
-#include "mlir/Quantization/QuantOps.cpp.inc"
+#include "mlir/Dialect/QuantOps/QuantOps.cpp.inc"
 
 namespace {
 
@@ -74,6 +75,6 @@ QuantizationDialect::QuantizationDialect(MLIRContext *context)
            UniformQuantizedPerAxisType>();
   addOperations<
 #define GET_OP_LIST
-#include "mlir/Quantization/QuantOps.cpp.inc"
+#include "mlir/Dialect/QuantOps/QuantOps.cpp.inc"
       >();
 }
diff --git a/mlir/lib/Quantization/IR/QuantTypes.cpp b/mlir/lib/Dialect/QuantOps/IR/QuantTypes.cpp
index d3d4c604ace..6ca3b92d064 100644
--- a/mlir/lib/Quantization/IR/QuantTypes.cpp
+++ b/mlir/lib/Dialect/QuantOps/IR/QuantTypes.cpp
@@ -15,8 +15,9 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/QuantTypes.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 #include "TypeDetail.h"
+
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/StandardTypes.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/mlir/lib/Quantization/IR/TypeDetail.h b/mlir/lib/Dialect/QuantOps/IR/TypeDetail.h
index 66aa4223982..4949b128481 100644
--- a/mlir/lib/Quantization/IR/TypeDetail.h
+++ b/mlir/lib/Dialect/QuantOps/IR/TypeDetail.h
@@ -1,4 +1,4 @@
-//===- Quantization/IR/TypeDetail.h - Type detail ---------------*- C++ -*-===//
+//===- TypeDetail.h - QuantOps Type detail ----------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
diff --git a/mlir/lib/Quantization/IR/TypeParser.cpp b/mlir/lib/Dialect/QuantOps/IR/TypeParser.cpp
index 62f9c9881f6..1172f82bffa 100644
--- a/mlir/lib/Quantization/IR/TypeParser.cpp
+++ b/mlir/lib/Dialect/QuantOps/IR/TypeParser.cpp
@@ -1,4 +1,4 @@
-//===- Quantization/IR/TypeParser.h - Quantization Type Parser --*- C++ -*-===//
+//===- TypeParser.h - Quantization Type Parser ------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@@ -15,11 +15,11 @@
 // limitations under the License.
 // =============================================================================
 
+#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Quantization/QuantOps.h"
-#include "mlir/Quantization/QuantTypes.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Format.h"
diff --git a/mlir/lib/Quantization/Transforms/ConvertConst.cpp b/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp
index ad41f8f5d75..228e16d752e 100644
--- a/mlir/lib/Quantization/Transforms/ConvertConst.cpp
+++ b/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp
@@ -15,15 +15,15 @@
 // limitations under the License.
 // =============================================================================
 
+#include "mlir/Dialect/QuantOps/Passes.h"
+#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/Quantization/Passes.h"
-#include "mlir/Quantization/QuantOps.h"
-#include "mlir/Quantization/QuantizeUtils.h"
-#include "mlir/Quantization/UniformSupport.h"
 #include "mlir/StandardOps/Ops.h"
 
 using namespace mlir;
diff --git a/mlir/lib/Quantization/Transforms/ConvertSimQuant.cpp b/mlir/lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp
index c62adc8c58c..ea8095b791c 100644
--- a/mlir/lib/Quantization/Transforms/ConvertSimQuant.cpp
+++ b/mlir/lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp
@@ -15,14 +15,14 @@
 // limitations under the License.
 // =============================================================================
 
+#include "mlir/Dialect/QuantOps/FakeQuantSupport.h"
+#include "mlir/Dialect/QuantOps/Passes.h"
+#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/Quantization/FakeQuantSupport.h"
-#include "mlir/Quantization/Passes.h"
-#include "mlir/Quantization/QuantOps.h"
-#include "mlir/Quantization/UniformSupport.h"
 
 using namespace mlir;
 using namespace mlir::quant;
diff --git a/mlir/lib/Quantization/Utils/FakeQuantSupport.cpp b/mlir/lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp
index 26e88b90d07..5562e45bb4a 100644
--- a/mlir/lib/Quantization/Utils/FakeQuantSupport.cpp
+++ b/mlir/lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/FakeQuantSupport.h"
-#include "mlir/Quantization/QuantTypes.h"
+#include "mlir/Dialect/QuantOps/FakeQuantSupport.h"
+#include "mlir/Dialect/QuantOps/QuantTypes.h"
 
 using namespace mlir;
 using namespace mlir::quant;
diff --git a/mlir/lib/Quantization/Utils/QuantizeUtils.cpp b/mlir/lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp
index fe9d1ce27ba..3685a65f2d8 100644
--- a/mlir/lib/Quantization/Utils/QuantizeUtils.cpp
+++ b/mlir/lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp
@@ -15,10 +15,10 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/QuantizeUtils.h"
+#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Quantization/UniformSupport.h"
 
 namespace mlir {
 namespace quant {
diff --git a/mlir/lib/Quantization/Utils/UniformSupport.cpp b/mlir/lib/Dialect/QuantOps/Utils/UniformSupport.cpp
index d9549bb0747..d791075f5db 100644
--- a/mlir/lib/Quantization/Utils/UniformSupport.cpp
+++ b/mlir/lib/Dialect/QuantOps/Utils/UniformSupport.cpp
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Quantization/UniformSupport.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/StandardTypes.h"
 
 using namespace mlir;
diff --git a/mlir/test/FxpMathOps/lower-uniform-casts.mlir b/mlir/test/Dialect/FxpMathOps/lower-uniform-casts.mlir
index 14d98a0babb..14d98a0babb 100644
--- a/mlir/test/FxpMathOps/lower-uniform-casts.mlir
+++ b/mlir/test/Dialect/FxpMathOps/lower-uniform-casts.mlir
diff --git a/mlir/test/FxpMathOps/lower-uniform-real-math-addew.mlir b/mlir/test/Dialect/FxpMathOps/lower-uniform-real-math-addew.mlir
index 5f73979bfa1..5f73979bfa1 100644
--- a/mlir/test/FxpMathOps/lower-uniform-real-math-addew.mlir
+++ b/mlir/test/Dialect/FxpMathOps/lower-uniform-real-math-addew.mlir
diff --git a/mlir/test/FxpMathOps/lower-uniform-real-math-mulew.mlir b/mlir/test/Dialect/FxpMathOps/lower-uniform-real-math-mulew.mlir
index edfdc8b6ab7..edfdc8b6ab7 100644
--- a/mlir/test/FxpMathOps/lower-uniform-real-math-mulew.mlir
+++ b/mlir/test/Dialect/FxpMathOps/lower-uniform-real-math-mulew.mlir
diff --git a/mlir/test/Quantization/canonicalize.mlir b/mlir/test/Dialect/QuantOps/canonicalize.mlir
index 5b3d20ceaf1..5b3d20ceaf1 100644
--- a/mlir/test/Quantization/canonicalize.mlir
+++ b/mlir/test/Dialect/QuantOps/canonicalize.mlir
diff --git a/mlir/test/Quantization/convert-const.mlir b/mlir/test/Dialect/QuantOps/convert-const.mlir
index 742a06ebf45..742a06ebf45 100644
--- a/mlir/test/Quantization/convert-const.mlir
+++ b/mlir/test/Dialect/QuantOps/convert-const.mlir
diff --git a/mlir/test/Quantization/convert-fakequant-invalid.mlir b/mlir/test/Dialect/QuantOps/convert-fakequant-invalid.mlir
index b108033a04c..b108033a04c 100644
--- a/mlir/test/Quantization/convert-fakequant-invalid.mlir
+++ b/mlir/test/Dialect/QuantOps/convert-fakequant-invalid.mlir
diff --git a/mlir/test/Quantization/convert-fakequant.mlir b/mlir/test/Dialect/QuantOps/convert-fakequant.mlir
index bfafb9a2c05..bfafb9a2c05 100644
--- a/mlir/test/Quantization/convert-fakequant.mlir
+++ b/mlir/test/Dialect/QuantOps/convert-fakequant.mlir
diff --git a/mlir/test/Quantization/parse-any-invalid.mlir b/mlir/test/Dialect/QuantOps/parse-any-invalid.mlir
index caff5ec61ec..caff5ec61ec 100644
--- a/mlir/test/Quantization/parse-any-invalid.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-any-invalid.mlir
diff --git a/mlir/test/Quantization/parse-any.mlir b/mlir/test/Dialect/QuantOps/parse-any.mlir
index 90976e8d437..90976e8d437 100644
--- a/mlir/test/Quantization/parse-any.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-any.mlir
diff --git a/mlir/test/Quantization/parse-ops-invalid.mlir b/mlir/test/Dialect/QuantOps/parse-ops-invalid.mlir
index d7c15c8ea41..d7c15c8ea41 100644
--- a/mlir/test/Quantization/parse-ops-invalid.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-ops-invalid.mlir
diff --git a/mlir/test/Quantization/parse-ops.mlir b/mlir/test/Dialect/QuantOps/parse-ops.mlir
index 87534faabfa..87534faabfa 100644
--- a/mlir/test/Quantization/parse-ops.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-ops.mlir
diff --git a/mlir/test/Quantization/parse-uniform-invalid.mlir b/mlir/test/Dialect/QuantOps/parse-uniform-invalid.mlir
index d046fc9b7a1..d046fc9b7a1 100644
--- a/mlir/test/Quantization/parse-uniform-invalid.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-uniform-invalid.mlir
diff --git a/mlir/test/Quantization/parse-uniform.mlir b/mlir/test/Dialect/QuantOps/parse-uniform.mlir
index 82d2ae65649..82d2ae65649 100644
--- a/mlir/test/Quantization/parse-uniform.mlir
+++ b/mlir/test/Dialect/QuantOps/parse-uniform.mlir
diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
index 6c92f265343..0bc5d4ff18b 100644
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -26,7 +26,7 @@ set(LIBS
   MLIRNVVMIR
   MLIRParser
   MLIRPass
-  MLIRQuantization
+  MLIRQuantOps
   MLIRStandardOps
   MLIRTransforms
   MLIRSupport
diff --git a/mlir/unittests/Quantization/QuantizationUtilsTest.cpp b/mlir/unittests/Dialect/QuantOps/QuantizationUtilsTest.cpp
index 1578c4d6976..fd2efb20513 100644
--- a/mlir/unittests/Quantization/QuantizationUtilsTest.cpp
+++ b/mlir/unittests/Dialect/QuantOps/QuantizationUtilsTest.cpp
@@ -15,10 +15,10 @@
 // limitations under the License.
 // =============================================================================
 
+#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
+#include "mlir/Dialect/QuantOps/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Quantization/QuantizeUtils.h"
-#include "mlir/Quantization/UniformSupport.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"