42 files changed, 93 insertions, 93 deletions
diff --git a/mlir/include/mlir/CMakeLists.txt b/mlir/include/mlir/CMakeLists.txt
index fc690a05910..043db03641f 100644
--- a/mlir/include/mlir/CMakeLists.txt
+++ b/mlir/include/mlir/CMakeLists.txt
@@ -1,5 +1,3 @@
 add_subdirectory(AffineOps)
 add_subdirectory(Dialect)
 add_subdirectory(EDSC)
-add_subdirectory(Linalg)
-add_subdirectory(VectorOps)
diff --git a/mlir/include/mlir/Dialect/CMakeLists.txt b/mlir/include/mlir/Dialect/CMakeLists.txt
index 128c04d867a..ce53bfc9a57 100644
--- a/mlir/include/mlir/Dialect/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/CMakeLists.txt
@@ -1,7 +1,9 @@
 add_subdirectory(FxpMathOps)
 add_subdirectory(GPU)
+add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
 add_subdirectory(LoopOps)
 add_subdirectory(QuantOps)
 add_subdirectory(SPIRV)
 add_subdirectory(StandardOps)
+add_subdirectory(VectorOps)
diff --git a/mlir/include/mlir/Linalg/Analysis/DependenceAnalysis.h b/mlir/include/mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h
index de5a28d2e46..2367363b9b4 100644
--- a/mlir/include/mlir/Linalg/Analysis/DependenceAnalysis.h
+++ b/mlir/include/mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
-#define MLIR_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
+#ifndef MLIR_DIALECT_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
+#define MLIR_DIALECT_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
 
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/OpDefinition.h"
@@ -134,4 +134,4 @@ private:
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
+#endif // MLIR_DIALECT_LINALG_ANALYSIS_DEPENDENCEANALYSIS_H_
diff --git a/mlir/include/mlir/Linalg/CMakeLists.txt b/mlir/include/mlir/Dialect/Linalg/CMakeLists.txt
index f33061b2d87..f33061b2d87 100644
--- a/mlir/include/mlir/Linalg/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/Linalg/CMakeLists.txt
diff --git a/mlir/include/mlir/Linalg/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
index b0c72669643..b0c72669643 100644
--- a/mlir/include/mlir/Linalg/IR/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
diff --git a/mlir/include/mlir/Linalg/IR/LinalgBase.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td
index 5ca798ed431..5ca798ed431 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgBase.td
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td
diff --git a/mlir/include/mlir/Linalg/IR/LinalgLibraryOps.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgLibraryOps.td
index d807b9f3d72..29977c1c637 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgLibraryOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgLibraryOps.td
@@ -25,7 +25,7 @@
 #define LINALG_LIBRARY_OPS
 
 include "mlir/AffineOps/AffineOpsBase.td"
-include "mlir/Linalg/IR/LinalgBase.td"
+include "mlir/Dialect/Linalg/IR/LinalgBase.td"
 
 class LinalgParametricNativeOpTrait<string prop, string parameters> :
   NativeOpTrait<"linalg::" # prop # parameters>
diff --git a/mlir/include/mlir/Linalg/IR/LinalgOps.h b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.h
index 761fed8b765..e6db78dcf1b 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgOps.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_LINALGOPS_H_
-#define MLIR_LINALG_LINALGOPS_H_
+#ifndef MLIR_DIALECT_LINALG_LINALGOPS_H_
+#define MLIR_DIALECT_LINALG_LINALGOPS_H_
 
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Builders.h"
@@ -26,8 +26,8 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Linalg/IR/LinalgTraits.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTraits.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
 #include "mlir/Support/LLVM.h"
 
 namespace mlir {
@@ -216,14 +216,14 @@ public:
 };
 
 #define GET_OP_CLASSES
-#include "mlir/Linalg/IR/LinalgOps.h.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h.inc"
 
 #define GET_OP_CLASSES
-#include "mlir/Linalg/IR/LinalgLibraryOps.h.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgLibraryOps.h.inc"
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &os, SubViewOp::Range &range);
 
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_LINALGOPS_H_
+#endif // MLIR_DIALECT_LINALG_LINALGOPS_H_
diff --git a/mlir/include/mlir/Linalg/IR/LinalgOps.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
index 2e455c669d2..475f400572e 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
@@ -19,7 +19,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-include "mlir/Linalg/IR/LinalgBase.td"
+include "mlir/Dialect/Linalg/IR/LinalgBase.td"
 
 #ifdef LINALG_OPS
 #else
diff --git a/mlir/include/mlir/Linalg/IR/LinalgTraits.h b/mlir/include/mlir/Dialect/Linalg/IR/LinalgTraits.h
index 34f7043b97e..593021db2f8 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgTraits.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgTraits.h
@@ -15,11 +15,11 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_LINALGTRAITS_H_
-#define MLIR_LINALG_LINALGTRAITS_H_
+#ifndef MLIR_DIALECT_LINALG_LINALGTRAITS_H_
+#define MLIR_DIALECT_LINALG_LINALGTRAITS_H_
 
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
 #include "mlir/Support/LLVM.h"
 
 namespace mlir {
@@ -190,4 +190,4 @@ public:
 } // namespace OpTrait
 } // namespace mlir
 
-#endif // MLIR_LINALG_LINALGTRAITS_H_
+#endif // MLIR_DIALECT_LINALG_LINALGTRAITS_H_
diff --git a/mlir/include/mlir/Linalg/IR/LinalgTypes.h b/mlir/include/mlir/Dialect/Linalg/IR/LinalgTypes.h
index b1ce221ace1..86b77f17868 100644
--- a/mlir/include/mlir/Linalg/IR/LinalgTypes.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgTypes.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_LINALGTYPES_H_
-#define MLIR_LINALG_LINALGTYPES_H_
+#ifndef MLIR_DIALECT_LINALG_LINALGTYPES_H_
+#define MLIR_DIALECT_LINALG_LINALGTYPES_H_
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Types.h"
@@ -118,4 +118,4 @@ public:
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_LINALGTYPES_H_
+#endif // MLIR_DIALECT_LINALG_LINALGTYPES_H_
diff --git a/mlir/include/mlir/Linalg/Passes.h b/mlir/include/mlir/Dialect/Linalg/Passes.h
index 57dd09cfc63..e17439f6eea 100644
--- a/mlir/include/mlir/Linalg/Passes.h
+++ b/mlir/include/mlir/Dialect/Linalg/Passes.h
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_LINALG_PASSES_H_
-#define MLIR_LINALG_PASSES_H_
+#ifndef MLIR_DIALECT_LINALG_PASSES_H_
+#define MLIR_DIALECT_LINALG_PASSES_H_
 
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -43,4 +43,4 @@ std::unique_ptr<ModulePassBase> createLowerLinalgToLLVMPass();
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_PASSES_H_
+#endif // MLIR_DIALECT_LINALG_PASSES_H_
diff --git a/mlir/include/mlir/Linalg/Utils/Intrinsics.h b/mlir/include/mlir/Dialect/Linalg/Utils/Intrinsics.h
index eabec69883e..014fa728405 100644
--- a/mlir/include/mlir/Linalg/Utils/Intrinsics.h
+++ b/mlir/include/mlir/Dialect/Linalg/Utils/Intrinsics.h
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_INTRINSICS_H_
-#define MLIR_LINALG_INTRINSICS_H_
+#ifndef MLIR_DIALECT_LINALG_INTRINSICS_H_
+#define MLIR_DIALECT_LINALG_INTRINSICS_H_
 
 #include "mlir/EDSC/Intrinsics.h"
 
@@ -48,4 +48,4 @@ using view = mlir::edsc::intrinsics::ValueBuilder<ViewOp>;
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_INTRINSICS_H_
+#endif // MLIR_DIALECT_LINALG_INTRINSICS_H_
diff --git a/mlir/include/mlir/Linalg/Utils/Utils.h b/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
index 68d71a8d37c..ff46f6a10ce 100644
--- a/mlir/include/mlir/Linalg/Utils/Utils.h
+++ b/mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
@@ -15,13 +15,13 @@
 // limitations under the License.
 // =============================================================================
 
-#ifndef MLIR_LINALG_UTILS_H_
-#define MLIR_LINALG_UTILS_H_
+#ifndef MLIR_DIALECT_LINALG_UTILS_H_
+#define MLIR_DIALECT_LINALG_UTILS_H_
 
 #include "mlir/Dialect/LoopOps/LoopOps.h"
 #include "mlir/EDSC/Helpers.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
 #include "mlir/Support/LLVM.h"
 
 namespace mlir {
@@ -153,4 +153,4 @@ llvm::SmallVector<Value *, 4> getAssumedNonViewOperands(LinalgOp linalgOp);
 } // namespace linalg
 } // namespace mlir
 
-#endif // MLIR_LINALG_UTILS_H_
+#endif // MLIR_DIALECT_LINALG_UTILS_H_
diff --git a/mlir/include/mlir/VectorOps/CMakeLists.txt b/mlir/include/mlir/Dialect/VectorOps/CMakeLists.txt
index 6cc7e44e387..6cc7e44e387 100644
--- a/mlir/include/mlir/VectorOps/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/VectorOps/CMakeLists.txt
diff --git a/mlir/include/mlir/VectorOps/VectorOps.h b/mlir/include/mlir/Dialect/VectorOps/VectorOps.h
index 47cd8a1ee4d..11b1efd3eaf 100644
--- a/mlir/include/mlir/VectorOps/VectorOps.h
+++ b/mlir/include/mlir/Dialect/VectorOps/VectorOps.h
@@ -20,8 +20,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_VECTOROPS_VECTOROPS_H
-#define MLIR_VECTOROPS_VECTOROPS_H
+#ifndef MLIR_DIALECT_VECTOROPS_VECTOROPS_H
+#define MLIR_DIALECT_VECTOROPS_VECTOROPS_H
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Dialect.h"
@@ -204,9 +204,9 @@ public:
 };
 
 #define GET_OP_CLASSES
-#include "mlir/VectorOps/VectorOps.h.inc"
+#include "mlir/Dialect/VectorOps/VectorOps.h.inc"
 
 } // end namespace vector
 } // end namespace mlir
 
-#endif // MLIR_VECTOROPS_VECTOROPS_H
+#endif // MLIR_DIALECT_VECTOROPS_VECTOROPS_H
diff --git a/mlir/include/mlir/VectorOps/VectorOps.td b/mlir/include/mlir/Dialect/VectorOps/VectorOps.td
index e6f543ff26e..e6f543ff26e 100644
--- a/mlir/include/mlir/VectorOps/VectorOps.td
+++ b/mlir/include/mlir/Dialect/VectorOps/VectorOps.td
diff --git a/mlir/include/mlir/EDSC/Builders.h b/mlir/include/mlir/EDSC/Builders.h
index c4728743f31..29e2e9e1ea7 100644
--- a/mlir/include/mlir/EDSC/Builders.h
+++ b/mlir/include/mlir/EDSC/Builders.h
@@ -25,9 +25,9 @@
 
 #include "mlir/AffineOps/AffineOps.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/Transforms/FoldUtils.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 namespace mlir {
 
diff --git a/mlir/lib/Analysis/LoopAnalysis.cpp b/mlir/lib/Analysis/LoopAnalysis.cpp
index 79620f95373..1e1095743c9 100644
--- a/mlir/lib/Analysis/LoopAnalysis.cpp
+++ b/mlir/lib/Analysis/LoopAnalysis.cpp
@@ -27,12 +27,12 @@
 #include "mlir/Analysis/NestedMatcher.h"
 #include "mlir/Analysis/VectorAnalysis.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/MathExtras.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallString.h"
diff --git a/mlir/lib/Analysis/VectorAnalysis.cpp b/mlir/lib/Analysis/VectorAnalysis.cpp
index 2e85b168a37..f34515f73a0 100644
--- a/mlir/lib/Analysis/VectorAnalysis.cpp
+++ b/mlir/lib/Analysis/VectorAnalysis.cpp
@@ -20,12 +20,12 @@
 #include "mlir/Analysis/AffineAnalysis.h"
 #include "mlir/Analysis/LoopAnalysis.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/STLExtras.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SetVector.h"
diff --git a/mlir/lib/CMakeLists.txt b/mlir/lib/CMakeLists.txt
index a0a1bdad2f3..bcb2d21d2da 100644
--- a/mlir/lib/CMakeLists.txt
+++ b/mlir/lib/CMakeLists.txt
@@ -5,7 +5,6 @@ add_subdirectory(Dialect)
 add_subdirectory(EDSC)
 add_subdirectory(ExecutionEngine)
 add_subdirectory(IR)
-add_subdirectory(Linalg)
 add_subdirectory(Parser)
 add_subdirectory(Pass)
 add_subdirectory(Quantizer)
@@ -14,4 +13,3 @@ add_subdirectory(TableGen)
 add_subdirectory(Target)
 add_subdirectory(Transforms)
 add_subdirectory(Translation)
-add_subdirectory(VectorOps)
diff --git a/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp b/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp
index 238bd920341..174e3d6910c 100644
--- a/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp
+++ b/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp
@@ -19,6 +19,7 @@
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h"
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/MLIRContext.h"
@@ -31,7 +32,6 @@
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/Passes.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Module.h"
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 7c6a4fafc4d..294041df4a5 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -1,11 +1,13 @@
 add_subdirectory(FxpMathOps)
 add_subdirectory(GPU)
+add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
 add_subdirectory(LoopOps)
 add_subdirectory(QuantOps)
 add_subdirectory(SDBM)
 add_subdirectory(SPIRV)
 add_subdirectory(StandardOps)
+add_subdirectory(VectorOps)
 
 add_llvm_library(MLIRDialect
   Traits.cpp
diff --git a/mlir/lib/Linalg/Analysis/DependenceAnalysis.cpp b/mlir/lib/Dialect/Linalg/Analysis/DependenceAnalysis.cpp
index a9ed86ee9ca..3fab843d56d 100644
--- a/mlir/lib/Linalg/Analysis/DependenceAnalysis.cpp
+++ b/mlir/lib/Dialect/Linalg/Analysis/DependenceAnalysis.cpp
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Linalg/Analysis/DependenceAnalysis.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
diff --git a/mlir/lib/Linalg/CMakeLists.txt b/mlir/lib/Dialect/Linalg/CMakeLists.txt
index b37bdaac440..8eea5dc7137 100644
--- a/mlir/lib/Linalg/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/CMakeLists.txt
@@ -10,7 +10,7 @@ add_llvm_library(MLIRLinalg
   Utils/Utils.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Linalg
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
   DEPENDS
   intrinsics_gen
   )
diff --git a/mlir/lib/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
index 4b7ffe6ae39..3da7805b0e4 100644
--- a/mlir/lib/Linalg/IR/LinalgOps.cpp
+++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
@@ -19,7 +19,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/LoopOps/LoopOps.h"
 #include "mlir/EDSC/Helpers.h"
 #include "mlir/IR/AffineExpr.h"
@@ -30,8 +30,8 @@
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Support/STLExtras.h"
 #include "mlir/Transforms/FoldUtils.h"
@@ -830,10 +830,10 @@ namespace mlir {
 namespace linalg {
 
 #define GET_OP_CLASSES
-#include "mlir/Linalg/IR/LinalgOps.cpp.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.cpp.inc"
 
 #define GET_OP_CLASSES
-#include "mlir/Linalg/IR/LinalgLibraryOps.cpp.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgLibraryOps.cpp.inc"
 
 } // namespace linalg
 } // namespace mlir
diff --git a/mlir/lib/Linalg/IR/LinalgTypes.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgTypes.cpp
index 736ee6c1ae2..6fdd9adb1dd 100644
--- a/mlir/lib/Linalg/IR/LinalgTypes.cpp
+++ b/mlir/lib/Dialect/Linalg/IR/LinalgTypes.cpp
@@ -19,10 +19,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Parser.h"
 #include "mlir/Support/LLVM.h"
 
@@ -37,11 +37,11 @@ mlir::linalg::LinalgDialect::LinalgDialect(MLIRContext *context)
   addTypes<BufferType, RangeType, ViewType>();
   addOperations<
 #define GET_OP_LIST
-#include "mlir/Linalg/IR/LinalgOps.cpp.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.cpp.inc"
       >();
   addOperations<
 #define GET_OP_LIST
-#include "mlir/Linalg/IR/LinalgLibraryOps.cpp.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgLibraryOps.cpp.inc"
       >();
 }
 
diff --git a/mlir/lib/Linalg/LinalgRegistration.cpp b/mlir/lib/Dialect/Linalg/LinalgRegistration.cpp
index cf5bd8f112e..df21ffa88ac 100644
--- a/mlir/lib/Linalg/LinalgRegistration.cpp
+++ b/mlir/lib/Dialect/Linalg/LinalgRegistration.cpp
@@ -15,8 +15,8 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
 
 using namespace mlir;
 using namespace mlir::linalg;
diff --git a/mlir/lib/Linalg/Transforms/Fusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp
index a2a63d5bedf..9f44b1cffa6 100644
--- a/mlir/lib/Linalg/Transforms/Fusion.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp
@@ -23,12 +23,12 @@
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/OpImplementation.h"
-#include "mlir/Linalg/Analysis/DependenceAnalysis.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Passes.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
-#include "mlir/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Passes.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Support/STLExtras.h"
diff --git a/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp b/mlir/lib/Dialect/Linalg/Transforms/LowerToLLVMDialect.cpp
index b79ee4ad40f..54fe9a71b80 100644
--- a/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/LowerToLLVMDialect.cpp
@@ -29,10 +29,10 @@
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Passes.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Passes.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Support/LogicalResult.h"
diff --git a/mlir/lib/Linalg/Transforms/LowerToLoops.cpp b/mlir/lib/Dialect/Linalg/Transforms/LowerToLoops.cpp
index 1fd50666f00..1c5bb6e70c8 100644
--- a/mlir/lib/Linalg/Transforms/LowerToLoops.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/LowerToLoops.cpp
@@ -23,11 +23,11 @@
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/OpImplementation.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Passes.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
-#include "mlir/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Passes.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Support/STLExtras.h"
@@ -367,7 +367,7 @@ populateLinalgToLoopRewritePatterns(OwningRewritePatternList &patterns,
                                     MLIRContext *ctx) {
   ConversionList<
 #define GET_OP_LIST
-#include "mlir/Linalg/IR/LinalgLibraryOps.cpp.inc"
+#include "mlir/Dialect/Linalg/IR/LinalgLibraryOps.cpp.inc"
       >::build(patterns, ctx);
 }
 
diff --git a/mlir/lib/Linalg/Transforms/Tiling.cpp b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp
index 051278e12f4..d2495bdfeac 100644
--- a/mlir/lib/Linalg/Transforms/Tiling.cpp
+++ b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp
@@ -25,11 +25,11 @@
 #include "mlir/IR/AffineExprVisitor.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/OpImplementation.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Passes.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
-#include "mlir/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Passes.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Support/STLExtras.h"
diff --git a/mlir/lib/Linalg/Utils/Utils.cpp b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp
index 9472b80f58e..7fefe5ccd48 100644
--- a/mlir/lib/Linalg/Utils/Utils.cpp
+++ b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp
@@ -19,17 +19,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Linalg/Utils/Utils.h"
+#include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Dialect/LoopOps/LoopOps.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
 #include "mlir/EDSC/Helpers.h"
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/OpImplementation.h"
-#include "mlir/Linalg/IR/LinalgOps.h"
-#include "mlir/Linalg/IR/LinalgTypes.h"
-#include "mlir/Linalg/Passes.h"
-#include "mlir/Linalg/Utils/Intrinsics.h"
+#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
+#include "mlir/Dialect/Linalg/Passes.h"
+#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/STLExtras.h"
 #include "mlir/Transforms/FoldUtils.h"
diff --git a/mlir/lib/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index 0e76501f569..590eeed6f41 100644
--- a/mlir/lib/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -3,7 +3,7 @@ add_llvm_library(MLIRVectorOps
   VectorOps.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/VectorOps
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
   )
 
 add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
diff --git a/mlir/lib/VectorOps/DialectRegistration.cpp b/mlir/lib/Dialect/VectorOps/DialectRegistration.cpp
index aedba315351..0caa1cf629e 100644
--- a/mlir/lib/VectorOps/DialectRegistration.cpp
+++ b/mlir/lib/Dialect/VectorOps/DialectRegistration.cpp
@@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================
 
-#include "mlir/VectorOps/VectorOps.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 using namespace mlir;
 
 // Static initialization for VectorOps dialect registration.
diff --git a/mlir/lib/VectorOps/VectorOps.cpp b/mlir/lib/Dialect/VectorOps/VectorOps.cpp
index 0bd552ed6a9..64255762dec 100644
--- a/mlir/lib/VectorOps/VectorOps.cpp
+++ b/mlir/lib/Dialect/VectorOps/VectorOps.cpp
@@ -20,7 +20,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/VectorOps/VectorOps.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Builders.h"
@@ -41,7 +41,7 @@ mlir::vector::VectorOpsDialect::VectorOpsDialect(MLIRContext *context)
                 VectorTypeCastOp>();
   addOperations<
 #define GET_OP_LIST
-#include "mlir/VectorOps/VectorOps.cpp.inc"
+#include "mlir/Dialect/VectorOps/VectorOps.cpp.inc"
       >();
 }
 
@@ -550,6 +550,6 @@ LogicalResult VectorTypeCastOp::verify() {
 namespace mlir {
 
 #define GET_OP_CLASSES
-#include "mlir/VectorOps/VectorOps.cpp.inc"
+#include "mlir/Dialect/VectorOps/VectorOps.cpp.inc"
 
 } // namespace mlir
diff --git a/mlir/lib/EDSC/Intrinsics.cpp b/mlir/lib/EDSC/Intrinsics.cpp
index 421cadc31d4..f80726866fc 100644
--- a/mlir/lib/EDSC/Intrinsics.cpp
+++ b/mlir/lib/EDSC/Intrinsics.cpp
@@ -16,9 +16,9 @@
 // =============================================================================
 
 #include "mlir/EDSC/Intrinsics.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/EDSC/Builders.h"
 #include "mlir/IR/AffineExpr.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 using namespace mlir;
 using namespace mlir::edsc;
diff --git a/mlir/lib/Transforms/LowerVectorTransfers.cpp b/mlir/lib/Transforms/LowerVectorTransfers.cpp
index ab98340f0af..86ab2484e2a 100644
--- a/mlir/lib/Transforms/LowerVectorTransfers.cpp
+++ b/mlir/lib/Transforms/LowerVectorTransfers.cpp
@@ -26,6 +26,7 @@
 #include "mlir/Analysis/Utils.h"
 #include "mlir/Analysis/VectorAnalysis.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/EDSC/Builders.h"
 #include "mlir/EDSC/Helpers.h"
 #include "mlir/IR/AffineExpr.h"
@@ -40,7 +41,6 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Transforms/Passes.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 /// Implements lowering of VectorTransferReadOp and VectorTransferWriteOp to a
 /// proper abstraction for the hardware.
diff --git a/mlir/lib/Transforms/MaterializeVectors.cpp b/mlir/lib/Transforms/MaterializeVectors.cpp
index eaa4d002969..0c6a3567ef3 100644
--- a/mlir/lib/Transforms/MaterializeVectors.cpp
+++ b/mlir/lib/Transforms/MaterializeVectors.cpp
@@ -29,6 +29,7 @@
 #include "mlir/Analysis/Utils.h"
 #include "mlir/Analysis/VectorAnalysis.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Attributes.h"
@@ -40,7 +41,6 @@
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Transforms/Passes.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
diff --git a/mlir/lib/Transforms/Vectorize.cpp b/mlir/lib/Transforms/Vectorize.cpp
index 6b3c4449667..08ee944dc45 100644
--- a/mlir/lib/Transforms/Vectorize.cpp
+++ b/mlir/lib/Transforms/Vectorize.cpp
@@ -27,6 +27,7 @@
 #include "mlir/Analysis/Utils.h"
 #include "mlir/Analysis/VectorAnalysis.h"
 #include "mlir/Dialect/StandardOps/Ops.h"
+#include "mlir/Dialect/VectorOps/VectorOps.h"
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Location.h"
@@ -35,7 +36,6 @@
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Transforms/Passes.h"
-#include "mlir/VectorOps/VectorOps.h"
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
index 2e102395e83..93170e4f0c6 100644
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -9,7 +9,7 @@ llvm_canonicalize_cmake_booleans(
 
 # Passed to lit.site.cfg.py.in to set up the path where to find the libraries
 # for linalg integration tests.
-set(MLIR_LINALG_INTEGRATION_TEST_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+set(MLIR_DIALECT_LINALG_INTEGRATION_TEST_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 # Passed to lit.site.cfg.py.in to set up the path where to find the libraries
 # for the mlir cuda runner tests.
diff --git a/mlir/test/lit.site.cfg.py.in b/mlir/test/lit.site.cfg.py.in
index 830b65fdd3b..6008680eb66 100644
--- a/mlir/test/lit.site.cfg.py.in
+++ b/mlir/test/lit.site.cfg.py.in
@@ -30,7 +30,7 @@ config.host_arch = "@HOST_ARCH@"
 config.mlir_src_root = "@MLIR_SOURCE_DIR@"
 config.mlir_obj_root = "@MLIR_BINARY_DIR@"
 config.mlir_tools_dir = "@MLIR_TOOLS_DIR@"
-config.linalg_test_lib_dir = "@MLIR_LINALG_INTEGRATION_TEST_LIB_DIR@"
+config.linalg_test_lib_dir = "@MLIR_DIALECT_LINALG_INTEGRATION_TEST_LIB_DIR@"
 config.build_examples = @LLVM_BUILD_EXAMPLES@
 config.run_cuda_tests = @MLIR_CUDA_CONVERSIONS_ENABLED@
 config.cuda_wrapper_library_dir = "@MLIR_CUDA_WRAPPER_LIBRARY_DIR@"