[Mlir-commits] [mlir] e16d133 - [mlir] (NFC) Clean up bazel and CMake target names

llvmlistbot at llvm.org llvmlistbot at llvm.org
Mon Jun 13 09:24:24 PDT 2022


Author: Mogball
Date: 2022-06-13T16:24:15Z
New Revision: e16d13322b2617843511aebb29a502166824b07a

URL: https://github.com/llvm/llvm-project/commit/e16d13322b2617843511aebb29a502166824b07a
DIFF: https://github.com/llvm/llvm-project/commit/e16d13322b2617843511aebb29a502166824b07a.diff

LOG: [mlir] (NFC) Clean up bazel and CMake target names

All dialect targets in bazel have been named *Dialect and all dialect
targets in CMake have been named MLIR*Dialect.

Added: 
    

Modified: 
    flang/lib/Lower/CMakeLists.txt
    flang/lib/Optimizer/Dialect/CMakeLists.txt
    flang/lib/Optimizer/Transforms/CMakeLists.txt
    flang/tools/fir-opt/CMakeLists.txt
    flang/tools/tco/CMakeLists.txt
    mlir/examples/standalone/standalone-opt/CMakeLists.txt
    mlir/examples/standalone/standalone-translate/CMakeLists.txt
    mlir/examples/toy/Ch6/CMakeLists.txt
    mlir/examples/toy/Ch7/CMakeLists.txt
    mlir/lib/CAPI/Dialect/CMakeLists.txt
    mlir/lib/Conversion/AMDGPUToROCDL/CMakeLists.txt
    mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
    mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt
    mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt
    mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt
    mlir/lib/Conversion/BufferizationToMemRef/CMakeLists.txt
    mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt
    mlir/lib/Conversion/ComplexToLibm/CMakeLists.txt
    mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt
    mlir/lib/Conversion/ControlFlowToLLVM/CMakeLists.txt
    mlir/lib/Conversion/ControlFlowToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt
    mlir/lib/Conversion/FuncToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/GPUCommon/CMakeLists.txt
    mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
    mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
    mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
    mlir/lib/Conversion/LLVMCommon/CMakeLists.txt
    mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
    mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
    mlir/lib/Conversion/MathToLLVM/CMakeLists.txt
    mlir/lib/Conversion/MathToLibm/CMakeLists.txt
    mlir/lib/Conversion/MathToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/MemRefToLLVM/CMakeLists.txt
    mlir/lib/Conversion/MemRefToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/NVGPUToNVVM/CMakeLists.txt
    mlir/lib/Conversion/OpenACCToLLVM/CMakeLists.txt
    mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt
    mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
    mlir/lib/Conversion/PDLToPDLInterp/CMakeLists.txt
    mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt
    mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
    mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt
    mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt
    mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt
    mlir/lib/Conversion/TensorToLinalg/CMakeLists.txt
    mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/TosaToArith/CMakeLists.txt
    mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt
    mlir/lib/Conversion/TosaToSCF/CMakeLists.txt
    mlir/lib/Conversion/TosaToTensor/CMakeLists.txt
    mlir/lib/Conversion/VectorToGPU/CMakeLists.txt
    mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
    mlir/lib/Conversion/VectorToROCDL/CMakeLists.txt
    mlir/lib/Conversion/VectorToSCF/CMakeLists.txt
    mlir/lib/Conversion/VectorToSPIRV/CMakeLists.txt
    mlir/lib/Dialect/AMDGPU/IR/CMakeLists.txt
    mlir/lib/Dialect/AMX/IR/CMakeLists.txt
    mlir/lib/Dialect/AMX/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
    mlir/lib/Dialect/Affine/IR/CMakeLists.txt
    mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
    mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
    mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
    mlir/lib/Dialect/ArmNeon/CMakeLists.txt
    mlir/lib/Dialect/ArmSVE/IR/CMakeLists.txt
    mlir/lib/Dialect/ArmSVE/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Async/IR/CMakeLists.txt
    mlir/lib/Dialect/Async/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
    mlir/lib/Dialect/Bufferization/TransformOps/CMakeLists.txt
    mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Complex/IR/CMakeLists.txt
    mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt
    mlir/lib/Dialect/DLTI/CMakeLists.txt
    mlir/lib/Dialect/EmitC/IR/CMakeLists.txt
    mlir/lib/Dialect/Func/IR/CMakeLists.txt
    mlir/lib/Dialect/Func/Transforms/CMakeLists.txt
    mlir/lib/Dialect/GPU/CMakeLists.txt
    mlir/lib/Dialect/LLVMIR/CMakeLists.txt
    mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
    mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
    mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
    mlir/lib/Dialect/MLProgram/IR/CMakeLists.txt
    mlir/lib/Dialect/Math/IR/CMakeLists.txt
    mlir/lib/Dialect/Math/Transforms/CMakeLists.txt
    mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
    mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt
    mlir/lib/Dialect/NVGPU/IR/CMakeLists.txt
    mlir/lib/Dialect/OpenACC/CMakeLists.txt
    mlir/lib/Dialect/OpenMP/CMakeLists.txt
    mlir/lib/Dialect/PDL/IR/CMakeLists.txt
    mlir/lib/Dialect/PDLInterp/IR/CMakeLists.txt
    mlir/lib/Dialect/Quant/IR/CMakeLists.txt
    mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Quant/Utils/CMakeLists.txt
    mlir/lib/Dialect/SCF/CMakeLists.txt
    mlir/lib/Dialect/SCF/TransformOps/CMakeLists.txt
    mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
    mlir/lib/Dialect/SCF/Utils/CMakeLists.txt
    mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt
    mlir/lib/Dialect/SPIRV/Linking/ModuleCombiner/CMakeLists.txt
    mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
    mlir/lib/Dialect/SPIRV/Utils/CMakeLists.txt
    mlir/lib/Dialect/Shape/IR/CMakeLists.txt
    mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt
    mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt
    mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt
    mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
    mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt
    mlir/lib/Dialect/Tensor/IR/CMakeLists.txt
    mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt
    mlir/lib/Dialect/Tosa/CMakeLists.txt
    mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Transform/IR/CMakeLists.txt
    mlir/lib/Dialect/Vector/IR/CMakeLists.txt
    mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Vector/Utils/CMakeLists.txt
    mlir/lib/Dialect/X86Vector/IR/CMakeLists.txt
    mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt
    mlir/lib/ExecutionEngine/CMakeLists.txt
    mlir/lib/Rewrite/CMakeLists.txt
    mlir/lib/Target/Cpp/CMakeLists.txt
    mlir/lib/Target/LLVMIR/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/AMX/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/ArmNeon/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/ArmSVE/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/LLVMIR/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/NVVM/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/OpenMP/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/ROCDL/CMakeLists.txt
    mlir/lib/Target/LLVMIR/Dialect/X86Vector/CMakeLists.txt
    mlir/lib/Target/SPIRV/CMakeLists.txt
    mlir/lib/Target/SPIRV/Deserialization/CMakeLists.txt
    mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt
    mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt
    mlir/test/lib/Analysis/CMakeLists.txt
    mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt
    mlir/test/lib/Dialect/DLTI/CMakeLists.txt
    mlir/test/lib/Dialect/Func/CMakeLists.txt
    mlir/test/lib/Dialect/GPU/CMakeLists.txt
    mlir/test/lib/Dialect/Linalg/CMakeLists.txt
    mlir/test/lib/Dialect/Math/CMakeLists.txt
    mlir/test/lib/Dialect/MemRef/CMakeLists.txt
    mlir/test/lib/Dialect/SCF/CMakeLists.txt
    mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
    mlir/test/lib/Dialect/Shape/CMakeLists.txt
    mlir/test/lib/Dialect/Tensor/CMakeLists.txt
    mlir/test/lib/Dialect/Test/CMakeLists.txt
    mlir/test/lib/Dialect/Tosa/CMakeLists.txt
    mlir/test/lib/Dialect/Transform/CMakeLists.txt
    mlir/test/lib/Dialect/Vector/CMakeLists.txt
    mlir/tools/mlir-cpu-runner/CMakeLists.txt
    mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt
    mlir/tools/mlir-translate/CMakeLists.txt
    mlir/tools/mlir-vulkan-runner/CMakeLists.txt
    mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt
    mlir/unittests/Dialect/Quant/CMakeLists.txt
    mlir/unittests/Dialect/SPIRV/CMakeLists.txt
    mlir/unittests/Interfaces/CMakeLists.txt
    mlir/unittests/Pass/CMakeLists.txt
    utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
    utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel

Removed: 
    


################################################################################
diff  --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
index 9309253f178ce..2874084e7e559 100644
--- a/flang/lib/Lower/CMakeLists.txt
+++ b/flang/lib/Lower/CMakeLists.txt
@@ -41,8 +41,8 @@ add_flang_library(FortranLower
   FortranEvaluate
   FortranSemantics
   MLIRAffineToStandard
-  MLIRFunc
-  MLIRLLVMIR
+  MLIRFuncDialect
+  MLIRLLVMDialect
   MLIRSCFToControlFlow
 
   LINK_COMPONENTS

diff  --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt
index def1ef82f683e..c991b43239d41 100644
--- a/flang/lib/Optimizer/Dialect/CMakeLists.txt
+++ b/flang/lib/Optimizer/Dialect/CMakeLists.txt
@@ -12,7 +12,7 @@ add_flang_library(FIRDialect
 
   LINK_LIBS
   FIRSupport
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIROpenMPToLLVM
   MLIRLLVMToLLVMIRTranslation
   MLIRTargetLLVMIRExport

diff  --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
index 2d4ea740a5e68..86547792cd698 100644
--- a/flang/lib/Optimizer/Transforms/CMakeLists.txt
+++ b/flang/lib/Optimizer/Transforms/CMakeLists.txt
@@ -21,9 +21,9 @@ add_flang_library(FIRTransforms
   FIRBuilder
   FIRDialect
   MLIRAffineUtils
-  MLIRFunc
-  MLIRLLVMIR
-  MLIROpenACC
-  MLIROpenMP
+  MLIRFuncDialect
+  MLIRLLVMDialect
+  MLIROpenACCDialect
+  MLIROpenMPDialect
   FIRSupport
 )

diff  --git a/flang/tools/fir-opt/CMakeLists.txt b/flang/tools/fir-opt/CMakeLists.txt
index 30ac475e63dcb..8bed259e049bd 100644
--- a/flang/tools/fir-opt/CMakeLists.txt
+++ b/flang/tools/fir-opt/CMakeLists.txt
@@ -12,7 +12,7 @@ target_link_libraries(fir-opt PRIVATE
   # TODO: these should be transitive dependencies from a target providing
   # "registerFIRPasses()"
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRPass
   MLIRFuncToLLVM
   MLIRTransforms

diff  --git a/flang/tools/tco/CMakeLists.txt b/flang/tools/tco/CMakeLists.txt
index c2526b373753e..2794dcd99cf50 100644
--- a/flang/tools/tco/CMakeLists.txt
+++ b/flang/tools/tco/CMakeLists.txt
@@ -9,7 +9,7 @@ target_link_libraries(tco PRIVATE
   FIRBuilder
   ${dialect_libs}
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRLLVMToLLVMIRTranslation
   MLIRTargetLLVMIRExport
   MLIRPass

diff  --git a/mlir/examples/standalone/standalone-opt/CMakeLists.txt b/mlir/examples/standalone/standalone-opt/CMakeLists.txt
index 8b1747da2e011..ae459aad3d37d 100644
--- a/mlir/examples/standalone/standalone-opt/CMakeLists.txt
+++ b/mlir/examples/standalone/standalone-opt/CMakeLists.txt
@@ -3,7 +3,7 @@ get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
 set(LIBS
         ${dialect_libs}
         ${conversion_libs}
-        MLIRArithmetic
+        MLIRArithmeticDialect
         MLIROptLib
         MLIRStandalone
         )

diff  --git a/mlir/examples/standalone/standalone-translate/CMakeLists.txt b/mlir/examples/standalone/standalone-translate/CMakeLists.txt
index 52464eb7dd62c..ff70c7c46e985 100644
--- a/mlir/examples/standalone/standalone-translate/CMakeLists.txt
+++ b/mlir/examples/standalone/standalone-translate/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(standalone-translate
   MLIRIR
   MLIRParser
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRTranslateLib
   MLIRSupport
   )

diff  --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
index 6f493958fc296..48094f56d6512 100644
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -43,9 +43,9 @@ target_link_libraries(toyc-ch6
     MLIRExecutionEngine
     MLIRIR
     MLIRLLVMCommonConversion
-    MLIRLLVMIR
+    MLIRLLVMDialect
     MLIRLLVMToLLVMIRTranslation
-    MLIRMemRef
+    MLIRMemRefDialect
     MLIRParser
     MLIRPass
     MLIRSideEffectInterfaces

diff  --git a/mlir/examples/toy/Ch7/CMakeLists.txt b/mlir/examples/toy/Ch7/CMakeLists.txt
index 6055038e39a93..8de18d37e3d82 100644
--- a/mlir/examples/toy/Ch7/CMakeLists.txt
+++ b/mlir/examples/toy/Ch7/CMakeLists.txt
@@ -44,7 +44,7 @@ target_link_libraries(toyc-ch7
     MLIRIR
     MLIRLLVMCommonConversion
     MLIRLLVMToLLVMIRTranslation
-    MLIRMemRef
+    MLIRMemRefDialect
     MLIRParser
     MLIRPass
     MLIRSideEffectInterfaces

diff  --git a/mlir/lib/CAPI/Dialect/CMakeLists.txt b/mlir/lib/CAPI/Dialect/CMakeLists.txt
index 37bc121f2c0dd..e5173ffd38abd 100644
--- a/mlir/lib/CAPI/Dialect/CMakeLists.txt
+++ b/mlir/lib/CAPI/Dialect/CMakeLists.txt
@@ -8,7 +8,7 @@ add_mlir_upstream_c_api_library(MLIRCAPIAsync
 
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRAsync
+  MLIRAsyncDialect
   MLIRAsyncTransforms
   MLIRPass
 )
@@ -19,7 +19,7 @@ add_mlir_upstream_c_api_library(MLIRCAPIControlFlow
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRControlFlow
+  MLIRControlFlowDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPIGPU
@@ -42,7 +42,7 @@ add_mlir_upstream_c_api_library(MLIRCAPILLVM
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPILinalg
@@ -55,7 +55,7 @@ add_mlir_upstream_c_api_library(MLIRCAPILinalg
 
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRPass
   MLIRLinalgTransforms
 )
@@ -66,7 +66,7 @@ add_mlir_upstream_c_api_library(MLIRCAPISCF
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRSCF
+  MLIRSCFDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPIShape
@@ -75,7 +75,7 @@ add_mlir_upstream_c_api_library(MLIRCAPIShape
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRShape
+  MLIRShapeDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPISparseTensor
@@ -85,7 +85,7 @@ add_mlir_upstream_c_api_library(MLIRCAPISparseTensor
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRSparseTensor
+  MLIRSparseTensorDialect
   MLIRSparseTensorTransforms
 )
 
@@ -95,7 +95,7 @@ add_mlir_upstream_c_api_library(MLIRCAPIFunc
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRFunc
+  MLIRFuncDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPITensor
@@ -104,7 +104,7 @@ add_mlir_upstream_c_api_library(MLIRCAPITensor
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRTensor
+  MLIRTensorDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPIQuant
@@ -113,7 +113,7 @@ add_mlir_upstream_c_api_library(MLIRCAPIQuant
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRQuant
+  MLIRQuantDialect
 )
 
 add_mlir_upstream_c_api_library(MLIRCAPIPDL
@@ -122,5 +122,5 @@ add_mlir_upstream_c_api_library(MLIRCAPIPDL
   PARTIAL_SOURCES_INTENDED
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRPDL
+  MLIRPDLDialect
 )

diff  --git a/mlir/lib/Conversion/AMDGPUToROCDL/CMakeLists.txt b/mlir/lib/Conversion/AMDGPUToROCDL/CMakeLists.txt
index be8f96136d941..db1d19d635267 100644
--- a/mlir/lib/Conversion/AMDGPUToROCDL/CMakeLists.txt
+++ b/mlir/lib/Conversion/AMDGPUToROCDL/CMakeLists.txt
@@ -12,9 +12,9 @@ add_mlir_conversion_library(MLIRAMDGPUToROCDL
 
   LINK_LIBS PUBLIC
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
-  MLIRROCDLIR
-  MLIRAMDGPU
+  MLIRLLVMDialect
+  MLIRROCDLDialect
+  MLIRAMDGPUDialect
   MLIRPass
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
index 63706332db426..05d1608f6ff03 100644
--- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -11,13 +11,13 @@ add_mlir_conversion_library(MLIRAffineToStandard
   Core
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineUtils
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
-  MLIRMemRef
-  MLIRSCF
+  MLIRMemRefDialect
+  MLIRSCFDialect
   MLIRPass
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
   )

diff  --git a/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt
index 170b63b0243fe..735977461896a 100644
--- a/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt
@@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRArithmeticToLLVM
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   )

diff  --git a/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt
index 1167f18c77795..6e7a609075f64 100644
--- a/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt
@@ -11,8 +11,8 @@ add_mlir_conversion_library(MLIRArithmeticToSPIRV
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRFuncToSPIRV
   MLIRSPIRVConversion
-  MLIRSPIRV
+  MLIRSPIRVDialect
   )

diff  --git a/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt b/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt
index 438c659be4119..ee24f6da32802 100644
--- a/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt
+++ b/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt
@@ -11,10 +11,10 @@ add_mlir_conversion_library(MLIRArmNeon2dToIntr
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRArmNeon
+  MLIRArithmeticDialect
+  MLIRArmNeonDialect
   MLIRPass
   MLIRTransforms
   MLIRIR
-  MLIRVector
+  MLIRVectorDialect
   )

diff  --git a/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt b/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt
index 4d20f43e1a6e3..18c3ffb5ba151 100644
--- a/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt
@@ -11,11 +11,11 @@ add_mlir_conversion_library(MLIRAsyncToLLVM
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRAsync
+  MLIRArithmeticDialect
+  MLIRAsyncDialect
   MLIRFuncToLLVM
   MLIRFuncTransforms
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/BufferizationToMemRef/CMakeLists.txt b/mlir/lib/Conversion/BufferizationToMemRef/CMakeLists.txt
index f228b115f9cec..3fce07be8b138 100644
--- a/mlir/lib/Conversion/BufferizationToMemRef/CMakeLists.txt
+++ b/mlir/lib/Conversion/BufferizationToMemRef/CMakeLists.txt
@@ -8,7 +8,7 @@ add_mlir_conversion_library(MLIRBufferizationToMemRef
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRPass
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt
index 4a9d33031d1a4..b6fae75c15b95 100644
--- a/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt
@@ -11,8 +11,8 @@ add_mlir_conversion_library(MLIRComplexToLLVM
   Core
 
   LINK_LIBS PUBLIC
-  MLIRComplex
+  MLIRComplexDialect
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/ComplexToLibm/CMakeLists.txt b/mlir/lib/Conversion/ComplexToLibm/CMakeLists.txt
index 1941e21ba8384..f0b994dbd114d 100644
--- a/mlir/lib/Conversion/ComplexToLibm/CMakeLists.txt
+++ b/mlir/lib/Conversion/ComplexToLibm/CMakeLists.txt
@@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRComplexToLibm
 
   LINK_LIBS PUBLIC
   MLIRDialectUtils
-  MLIRFunc
-  MLIRComplex
+  MLIRFuncDialect
+  MLIRComplexDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt b/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt
index 08ca46e065160..afe010fc348ab 100644
--- a/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt
@@ -8,9 +8,9 @@ add_mlir_conversion_library(MLIRComplexToStandard
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRComplex
+  MLIRArithmeticDialect
+  MLIRComplexDialect
   MLIRIR
-  MLIRMath
+  MLIRMathDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/ControlFlowToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ControlFlowToLLVM/CMakeLists.txt
index 67d98dc1d3957..dcc78c8367a43 100644
--- a/mlir/lib/Conversion/ControlFlowToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/ControlFlowToLLVM/CMakeLists.txt
@@ -13,9 +13,9 @@ add_mlir_conversion_library(MLIRControlFlowToLLVM
 
   LINK_LIBS PUBLIC
   MLIRAnalysis
-  MLIRControlFlow
+  MLIRControlFlowDialect
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRPass
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Conversion/ControlFlowToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/ControlFlowToSPIRV/CMakeLists.txt
index afe57f88a789e..5be89822c0b0d 100644
--- a/mlir/lib/Conversion/ControlFlowToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/ControlFlowToSPIRV/CMakeLists.txt
@@ -11,9 +11,9 @@ add_mlir_conversion_library(MLIRControlFlowToSPIRV
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRControlFlow
+  MLIRControlFlowDialect
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransformUtils

diff  --git a/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt b/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt
index ce2318f5c2a04..3c36c7afd54eb 100644
--- a/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt
@@ -16,8 +16,8 @@ add_mlir_conversion_library(MLIRFuncToLLVM
   MLIRArithmeticToLLVM
   MLIRControlFlowToLLVM
   MLIRDataLayoutInterfaces
-  MLIRFunc
+  MLIRFuncDialect
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Conversion/FuncToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/FuncToSPIRV/CMakeLists.txt
index 00a78ea4ee624..fca2c670915ad 100644
--- a/mlir/lib/Conversion/FuncToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/FuncToSPIRV/CMakeLists.txt
@@ -10,10 +10,10 @@ add_mlir_conversion_library(MLIRFuncToSPIRV
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransformUtils

diff  --git a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
index 7166d1ad6b3a8..0a856af780ce1 100644
--- a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
@@ -36,7 +36,7 @@ add_mlir_conversion_library(MLIRGPUToGPURuntimeTransforms
   MLIRGPUTransforms
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
   MLIRPass
   MLIRSupport

diff  --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
index 8a5d4a622a74d..b9392f2bc916d 100644
--- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -16,9 +16,9 @@ add_mlir_conversion_library(MLIRGPUToNVVMTransforms
   MLIRGPUOps
   MLIRGPUToGPURuntimeTransforms
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
-  MLIRNVVMIR
+  MLIRNVVMDialect
   MLIRPass
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
index fc34508c5ba2b..546f7a63cacfd 100644
--- a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
@@ -16,9 +16,9 @@ add_mlir_conversion_library(MLIRGPUToROCDLTransforms
   MLIRGPUOps
   MLIRGPUToGPURuntimeTransforms
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
-  MLIRROCDLIR
+  MLIRROCDLDialect
   MLIRPass
   MLIRVectorToROCDL
   )

diff  --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
index 3d08456754b5c..c6547dda4622b 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRGPUToSPIRV
   MLIRIR
   MLIRPass
   MLIRSCFToSPIRV
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
index a5f0f7f31f123..535ae9b7821ac 100644
--- a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
@@ -6,12 +6,12 @@ add_mlir_conversion_library(MLIRGPUToVulkanTransforms
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRFunc
+  MLIRFuncDialect
   MLIRGPUOps
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVSerialization
   MLIRSupport
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt b/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt
index eb0b72027a18f..091cd539f0ae0 100644
--- a/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt
+++ b/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt
@@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRLLVMCommonConversion
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
index 3a5a94f48b6dc..9d87a39f7b5de 100644
--- a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
@@ -15,9 +15,9 @@ add_mlir_conversion_library(MLIRLinalgToLLVM
   LINK_LIBS PUBLIC
   MLIRAffineToStandard
   MLIRIR
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
   MLIRSCFToControlFlow
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
index 27f7febd70065..e4399906f1ce1 100644
--- a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
@@ -11,10 +11,10 @@ add_mlir_conversion_library(MLIRLinalgToSPIRV
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgUtils
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   )

diff  --git a/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt b/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
index f5045f4716e84..0c8816b65d194 100644
--- a/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
@@ -11,11 +11,11 @@ add_mlir_conversion_library(MLIRLinalgToStandard
   Core
 
   LINK_LIBS PUBLIC
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
-  MLIRLinalg
-  MLIRMemRef
+  MLIRLinalgDialect
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/MathToLLVM/CMakeLists.txt b/mlir/lib/Conversion/MathToLLVM/CMakeLists.txt
index fe1c172f5e4bd..a6e6b4f56d37e 100644
--- a/mlir/lib/Conversion/MathToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/MathToLLVM/CMakeLists.txt
@@ -12,8 +12,8 @@ add_mlir_conversion_library(MLIRMathToLLVM
 
   LINK_LIBS PUBLIC
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
-  MLIRMath
+  MLIRLLVMDialect
+  MLIRMathDialect
   MLIRPass
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/MathToLibm/CMakeLists.txt b/mlir/lib/Conversion/MathToLibm/CMakeLists.txt
index ee621a4d6a803..4596a8fafa481 100644
--- a/mlir/lib/Conversion/MathToLibm/CMakeLists.txt
+++ b/mlir/lib/Conversion/MathToLibm/CMakeLists.txt
@@ -11,11 +11,11 @@ add_mlir_conversion_library(MLIRMathToLibm
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialectUtils
-  MLIRFunc
-  MLIRMath
+  MLIRFuncDialect
+  MLIRMathDialect
   MLIRTransformUtils
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorUtils
   )

diff  --git a/mlir/lib/Conversion/MathToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/MathToSPIRV/CMakeLists.txt
index 3e2dab240479d..cbeb7a241b08d 100644
--- a/mlir/lib/Conversion/MathToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/MathToSPIRV/CMakeLists.txt
@@ -11,9 +11,9 @@ add_mlir_conversion_library(MLIRMathToSPIRV
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRMath
+  MLIRMathDialect
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransformUtils

diff  --git a/mlir/lib/Conversion/MemRefToLLVM/CMakeLists.txt b/mlir/lib/Conversion/MemRefToLLVM/CMakeLists.txt
index 4f9508d8c445f..0fa997bcc25df 100644
--- a/mlir/lib/Conversion/MemRefToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/MemRefToLLVM/CMakeLists.txt
@@ -15,7 +15,7 @@ add_mlir_conversion_library(MLIRMemRefToLLVM
   MLIRAnalysis
   MLIRDataLayoutInterfaces
   MLIRLLVMCommonConversion
-  MLIRMemRef
-  MLIRLLVMIR
+  MLIRMemRefDialect
+  MLIRLLVMDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/MemRefToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/MemRefToSPIRV/CMakeLists.txt
index fe4b81903bb35..cc59f63f9c860 100644
--- a/mlir/lib/Conversion/MemRefToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/MemRefToSPIRV/CMakeLists.txt
@@ -11,9 +11,9 @@ add_mlir_conversion_library(MLIRMemRefToSPIRV
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransformUtils

diff  --git a/mlir/lib/Conversion/NVGPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/NVGPUToNVVM/CMakeLists.txt
index 4d9e46907590e..8d764b25c7554 100644
--- a/mlir/lib/Conversion/NVGPUToNVVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/NVGPUToNVVM/CMakeLists.txt
@@ -13,9 +13,9 @@ add_mlir_conversion_library(MLIRNVGPUToNVVM
   LINK_LIBS PUBLIC
   MLIRGPUOps
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
-  MLIRNVVMIR
-  MLIRNVGPU
+  MLIRLLVMDialect
+  MLIRNVVMDialect
+  MLIRNVGPUDialect
   MLIRPass
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/OpenACCToLLVM/CMakeLists.txt b/mlir/lib/Conversion/OpenACCToLLVM/CMakeLists.txt
index b72afe846d1f5..01e2c3fee6374 100644
--- a/mlir/lib/Conversion/OpenACCToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/OpenACCToLLVM/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_conversion_library(MLIROpenACCToLLVM
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
-  MLIROpenACC
+  MLIROpenACCDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt b/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt
index 8772dec77b924..95491130a1847 100644
--- a/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt
+++ b/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt
@@ -8,9 +8,9 @@ add_mlir_conversion_library(MLIROpenACCToSCF
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
-  MLIROpenACC
-  MLIRSCF
+  MLIROpenACCDialect
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
index 998252353b17e..ca22c71898d29 100644
--- a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
@@ -16,8 +16,8 @@ add_mlir_conversion_library(MLIROpenMPToLLVM
   MLIRFuncToLLVM
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
-  MLIROpenMP
+  MLIROpenMPDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/PDLToPDLInterp/CMakeLists.txt b/mlir/lib/Conversion/PDLToPDLInterp/CMakeLists.txt
index 8fb2fec193cc7..fac84b14203bf 100644
--- a/mlir/lib/Conversion/PDLToPDLInterp/CMakeLists.txt
+++ b/mlir/lib/Conversion/PDLToPDLInterp/CMakeLists.txt
@@ -13,7 +13,7 @@ add_mlir_conversion_library(MLIRPDLToPDLInterp
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRInferTypeOpInterface
-  MLIRPDL
-  MLIRPDLInterp
+  MLIRPDLDialect
+  MLIRPDLInterpDialect
   MLIRPass
   )

diff  --git a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt
index 39ace3ae5c557..abb060cfb40e3 100644
--- a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt
@@ -11,8 +11,8 @@ add_mlir_conversion_library(MLIRSCFToControlFlow
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRControlFlow
-  MLIRSCF
+  MLIRArithmeticDialect
+  MLIRControlFlowDialect
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
index e62f3de1cc13e..5f1e7828983ff 100644
--- a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
@@ -9,14 +9,14 @@ add_mlir_conversion_library(MLIRSCFToGPU
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineToStandard
-  MLIRArithmetic
-  MLIRComplex
+  MLIRArithmeticDialect
+  MLIRComplexDialect
   MLIRGPUTransforms
   MLIRIR
-  MLIRLinalg
-  MLIRMemRef
+  MLIRLinalgDialect
+  MLIRMemRefDialect
   MLIRPass
   MLIRSupport
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt b/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt
index cc37f788be779..d65f494c318a4 100644
--- a/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt
@@ -12,9 +12,9 @@ add_mlir_conversion_library(MLIRSCFToOpenMP
 
   LINK_LIBS PUBLIC
   MLIRAnalysis
-  MLIRArithmetic
-  MLIRLLVMIR
-  MLIROpenMP
-  MLIRSCF
+  MLIRArithmeticDialect
+  MLIRLLVMDialect
+  MLIROpenMPDialect
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
index 870f695d75b4c..f37cf3b1a2936 100644
--- a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
@@ -12,11 +12,11 @@ add_mlir_conversion_library(MLIRSCFToSPIRV
   MLIRArithmeticToSPIRV
   MLIRFuncToSPIRV
   MLIRMemRefToSPIRV
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRIR
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt b/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt
index 2f38cd9873105..a89877e303b47 100644
--- a/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt
@@ -16,9 +16,9 @@ add_mlir_conversion_library(MLIRSPIRVToLLVM
   MLIRGPUOps
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRMemRefToLLVM
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVUtils
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt
index eca3b95d9d5bf..5796d550b8228 100644
--- a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt
@@ -17,11 +17,11 @@ add_mlir_conversion_library(MLIRShapeToStandard
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
-  MLIRShape
-  MLIRTensor
+  MLIRShapeDialect
+  MLIRTensorDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/TensorToLinalg/CMakeLists.txt b/mlir/lib/Conversion/TensorToLinalg/CMakeLists.txt
index 8337cdededaef..0236dc6d397c4 100644
--- a/mlir/lib/Conversion/TensorToLinalg/CMakeLists.txt
+++ b/mlir/lib/Conversion/TensorToLinalg/CMakeLists.txt
@@ -12,9 +12,9 @@ add_mlir_conversion_library(MLIRTensorToLinalg
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRPass
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgTransforms
   MLIRSupport
   MLIRTransformUtils
-  MLIRTensor
+  MLIRTensorDialect
   )

diff  --git a/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt
index 4f800ecec17b0..22ac11f3fa24e 100644
--- a/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt
@@ -14,9 +14,9 @@ add_mlir_conversion_library(MLIRTensorToSPIRV
   MLIRFuncToSPIRV
   MLIRIR
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSupport
   MLIRTransformUtils
-  MLIRTensor
+  MLIRTensorDialect
   )

diff  --git a/mlir/lib/Conversion/TosaToArith/CMakeLists.txt b/mlir/lib/Conversion/TosaToArith/CMakeLists.txt
index d5e9b4bc33b1b..0468f99d6155f 100644
--- a/mlir/lib/Conversion/TosaToArith/CMakeLists.txt
+++ b/mlir/lib/Conversion/TosaToArith/CMakeLists.txt
@@ -10,10 +10,10 @@ add_mlir_conversion_library(MLIRTosaToArith
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
   MLIRPass
-  MLIRTosa
+  MLIRTosaDialect
   MLIRTosaTransforms
   MLIRSupport
   )

diff  --git a/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt b/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt
index 50a1c20c72497..6d6d9c845e63d 100644
--- a/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt
+++ b/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt
@@ -12,16 +12,16 @@ add_mlir_conversion_library(MLIRTosaToLinalg
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialectUtils
   MLIRIR
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgUtils
-  MLIRMath
+  MLIRMathDialect
   MLIRPass
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransforms
-  MLIRTosa
+  MLIRTosaDialect
   MLIRTosaTransforms
   MLIRSupport
   )

diff  --git a/mlir/lib/Conversion/TosaToSCF/CMakeLists.txt b/mlir/lib/Conversion/TosaToSCF/CMakeLists.txt
index d52a6a02eaaca..017a2e8c921f2 100644
--- a/mlir/lib/Conversion/TosaToSCF/CMakeLists.txt
+++ b/mlir/lib/Conversion/TosaToSCF/CMakeLists.txt
@@ -11,10 +11,10 @@ add_mlir_conversion_library(MLIRTosaToSCF
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSCF
+  MLIRSCFDialect
   MLIRPass
-  MLIRTensor
-  MLIRTosa
+  MLIRTensorDialect
+  MLIRTosaDialect
   MLIRTosaTransforms
   MLIRSupport
   )

diff  --git a/mlir/lib/Conversion/TosaToTensor/CMakeLists.txt b/mlir/lib/Conversion/TosaToTensor/CMakeLists.txt
index 118635e9ce10d..d143022aa1cf1 100644
--- a/mlir/lib/Conversion/TosaToTensor/CMakeLists.txt
+++ b/mlir/lib/Conversion/TosaToTensor/CMakeLists.txt
@@ -10,10 +10,10 @@ add_mlir_conversion_library(MLIRTosaToTensor
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRTensor
+  MLIRTensorDialect
   MLIRIR
   MLIRPass
-  MLIRTosa
+  MLIRTosaDialect
   MLIRTosaTransforms
   MLIRSupport
   )

diff  --git a/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt b/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt
index 7d12e4781cb64..1f67a9655ea02 100644
--- a/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt
@@ -9,12 +9,12 @@ add_mlir_conversion_library(MLIRVectorToGPU
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRGPUOps
-  MLIRLLVMIR
-  MLIRMemRef
-  MLIRNVGPU
+  MLIRLLVMDialect
+  MLIRMemRefDialect
+  MLIRNVGPUDialect
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorUtils
   )

diff  --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
index 23e5b9b510486..dee915e89c917 100644
--- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
@@ -13,19 +13,19 @@ add_mlir_conversion_library(MLIRVectorToLLVM
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRArmNeon
-  MLIRArmSVE
+  MLIRArithmeticDialect
+  MLIRArmNeonDialect
+  MLIRArmSVEDialect
   MLIRArmSVETransforms
-  MLIRAMX
+  MLIRAMXDialect
   MLIRAMXTransforms
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
-  MLIRMemRef
+  MLIRLLVMDialect
+  MLIRMemRefDialect
   MLIRTargetLLVMIRExport
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorTransforms
-  MLIRX86Vector
+  MLIRX86VectorDialect
   MLIRX86VectorTransforms
   )

diff  --git a/mlir/lib/Conversion/VectorToROCDL/CMakeLists.txt b/mlir/lib/Conversion/VectorToROCDL/CMakeLists.txt
index 4d701ce4d5546..f9be789e64a4c 100644
--- a/mlir/lib/Conversion/VectorToROCDL/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToROCDL/CMakeLists.txt
@@ -13,9 +13,9 @@ add_mlir_conversion_library(MLIRVectorToROCDL
 
   LINK_LIBS PUBLIC
   MLIRFuncToLLVM
-  MLIRROCDLIR
+  MLIRROCDLDialect
   MLIRLLVMCommonConversion
   MLIRMemRefToLLVM
-  MLIRVector
+  MLIRVectorDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt
index 7e9a7445c5884..2d8614cc6f2a1 100644
--- a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt
@@ -8,10 +8,10 @@ add_mlir_conversion_library(MLIRVectorToSCF
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRLLVMIR
-  MLIRMemRef
+  MLIRArithmeticDialect
+  MLIRLLVMDialect
+  MLIRMemRefDialect
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorTransforms
   )

diff  --git a/mlir/lib/Conversion/VectorToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/VectorToSPIRV/CMakeLists.txt
index 76518839531c4..7794ce71b024d 100644
--- a/mlir/lib/Conversion/VectorToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToSPIRV/CMakeLists.txt
@@ -10,8 +10,8 @@ add_mlir_conversion_library(MLIRVectorToSPIRV
   intrinsics_gen
 
   LINK_LIBS PUBLIC
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
-  MLIRVector
+  MLIRVectorDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/AMDGPU/IR/CMakeLists.txt b/mlir/lib/Dialect/AMDGPU/IR/CMakeLists.txt
index 4bc7e714815e1..60834c45babf1 100644
--- a/mlir/lib/Dialect/AMDGPU/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/AMDGPU/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAMDGPU
+add_mlir_dialect_library(MLIRAMDGPUDialect
   AMDGPUDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/AMX/IR/CMakeLists.txt b/mlir/lib/Dialect/AMX/IR/CMakeLists.txt
index 8a3a7f892551e..d109547b2438b 100644
--- a/mlir/lib/Dialect/AMX/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/AMX/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAMX
+add_mlir_dialect_library(MLIRAMXDialect
   AMXDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,6 +9,6 @@ add_mlir_dialect_library(MLIRAMX
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Dialect/AMX/Transforms/CMakeLists.txt b/mlir/lib/Dialect/AMX/Transforms/CMakeLists.txt
index eb863998d94c4..29340d4f45dd1 100644
--- a/mlir/lib/Dialect/AMX/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/AMX/Transforms/CMakeLists.txt
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRAMXTransforms
   MLIRAMXConversionsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAMX
+  MLIRAMXDialect
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   )

diff  --git a/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
index c2b277120236b..77e4602da5f82 100644
--- a/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Analysis/CMakeLists.txt
@@ -12,11 +12,11 @@ add_mlir_dialect_library(MLIRAffineAnalysis
   mlir-headers
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAnalysis
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface
   MLIRPresburger
-  MLIRSCF
+  MLIRSCFDialect
   )

diff  --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
index 8730673b7ac33..5616e80d79fb0 100644
--- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAffine
+add_mlir_dialect_library(MLIRAffineDialect
   AffineMemoryOpInterfaces.cpp
   AffineOps.cpp
   AffineValueMap.cpp
@@ -11,10 +11,10 @@ add_mlir_dialect_library(MLIRAffine
   MLIRAffineOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
   MLIRLoopLikeInterface
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRSideEffectInterfaces
-  MLIRTensor
+  MLIRTensorDialect
   )

diff  --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
index 173abe365ac18..1a2b2dbb17b80 100644
--- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
@@ -22,17 +22,17 @@ add_mlir_dialect_library(MLIRAffineTransforms
   MLIRLoopLikeInterfaceIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
   MLIRAffineUtils
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
   MLIRSCFUtils
   MLIRSideEffectInterfaces
   MLIRTransformUtils
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorUtils
   MLIRVectorToLLVM
   )

diff  --git a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
index 96920e793daf3..3be71bd357982 100644
--- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
@@ -7,9 +7,9 @@ add_mlir_dialect_library(MLIRAffineUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
   MLIRAnalysis
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
index bda294173c128..dc34db3169d6c 100644
--- a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt
@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS ArithmeticCanonicalization.td)
 mlir_tablegen(ArithmeticCanonicalization.inc -gen-rewriters)
 add_public_tablegen_target(MLIRArithmeticCanonicalizationIncGen)
 
-add_mlir_dialect_library(MLIRArithmetic
+add_mlir_dialect_library(MLIRArithmeticDialect
   ArithmeticOps.cpp
   ArithmeticDialect.cpp
 

diff  --git a/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt
index 4d76ee09d2d57..7f5c9ca82cec7 100644
--- a/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt
@@ -10,11 +10,11 @@ add_mlir_dialect_library(MLIRArithmeticTransforms
   MLIRArithmeticTransformsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
index e84cab8a894d5..71fcda4d45b04 100644
--- a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt
@@ -5,7 +5,7 @@ add_mlir_dialect_library(MLIRArithmeticUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arithmetic/Utils
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialect
   MLIRIR
   )

diff  --git a/mlir/lib/Dialect/ArmNeon/CMakeLists.txt b/mlir/lib/Dialect/ArmNeon/CMakeLists.txt
index 12dda1aa5fe50..060b6df1b334a 100644
--- a/mlir/lib/Dialect/ArmNeon/CMakeLists.txt
+++ b/mlir/lib/Dialect/ArmNeon/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRArmNeon
+add_mlir_dialect_library(MLIRArmNeonDialect
   IR/ArmNeonDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/ArmSVE/IR/CMakeLists.txt b/mlir/lib/Dialect/ArmSVE/IR/CMakeLists.txt
index 9177b5889b948..fffc77245d12c 100644
--- a/mlir/lib/Dialect/ArmSVE/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/ArmSVE/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRArmSVE
+add_mlir_dialect_library(MLIRArmSVEDialect
   ArmSVEDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,6 +9,6 @@ add_mlir_dialect_library(MLIRArmSVE
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Dialect/ArmSVE/Transforms/CMakeLists.txt b/mlir/lib/Dialect/ArmSVE/Transforms/CMakeLists.txt
index 7871cb0041818..7031ab4f799c4 100644
--- a/mlir/lib/Dialect/ArmSVE/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/ArmSVE/Transforms/CMakeLists.txt
@@ -5,9 +5,9 @@ add_mlir_dialect_library(MLIRArmSVETransforms
   MLIRArmSVEConversionsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArmSVE
-  MLIRFunc
+  MLIRArmSVEDialect
+  MLIRFuncDialect
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   )

diff  --git a/mlir/lib/Dialect/Async/IR/CMakeLists.txt b/mlir/lib/Dialect/Async/IR/CMakeLists.txt
index a692b86af1368..04e6d9ca49234 100644
--- a/mlir/lib/Dialect/Async/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Async/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAsync
+add_mlir_dialect_library(MLIRAsyncDialect
   Async.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt
index de74c6180d52b..430a647f6504c 100644
--- a/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt
@@ -12,12 +12,12 @@ add_mlir_dialect_library(MLIRAsyncTransforms
   MLIRAsyncPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRAsync
-  MLIRFunc
+  MLIRArithmeticDialect
+  MLIRAsyncDialect
+  MLIRFuncDialect
   MLIRIR
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFToControlFlow
   MLIRTransforms
   MLIRTransformUtils

diff  --git a/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
index 31d608ac04258..2efaaa586ae6a 100644
--- a/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Bufferization/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRBufferization
+add_mlir_dialect_library(MLIRBufferizationDialect
   AllocationOpInterface.cpp
   BufferizableOpInterface.cpp
   BufferizationOps.cpp
@@ -12,10 +12,10 @@ add_mlir_dialect_library(MLIRBufferization
   MLIRBufferizationOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRDialect
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
-  MLIRTensor
-  MLIRMemRef
+  MLIRTensorDialect
+  MLIRMemRefDialect
   )

diff  --git a/mlir/lib/Dialect/Bufferization/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/TransformOps/CMakeLists.txt
index 63d78d9745875..51e5b0a099280 100644
--- a/mlir/lib/Dialect/Bufferization/TransformOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/Bufferization/TransformOps/CMakeLists.txt
@@ -9,10 +9,10 @@ add_mlir_dialect_library(MLIRBufferizationTransformOps
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRParser
-  MLIRPDL
+  MLIRPDLDialect
   MLIRSideEffectInterfaces
   MLIRTransformDialect
   )

diff  --git a/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
index e0218190db806..1b59c548d738d 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
@@ -18,14 +18,14 @@ add_mlir_dialect_library(MLIRBufferizationTransforms
   MLIRBufferizationPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRControlFlowInterfaces
-  MLIRFunc
+  MLIRFuncDialect
   MLIRInferTypeOpInterface
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransforms
 )
 

diff  --git a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt
index da419d9b25994..af76f3abf573d 100644
--- a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRComplex
+add_mlir_dialect_library(MLIRComplexDialect
   ComplexOps.cpp
   ComplexDialect.cpp
 
@@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRComplex
   MLIRComplexOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialect
   MLIRInferTypeOpInterface
   MLIRIR

diff  --git a/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt b/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt
index 2c32274092de0..fad29141c7299 100644
--- a/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRControlFlow
+add_mlir_dialect_library(MLIRControlFlowDialect
   ControlFlowOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -8,7 +8,7 @@ add_mlir_dialect_library(MLIRControlFlow
   MLIRControlFlowOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRControlFlowInterfaces
   MLIRIR
   MLIRSideEffectInterfaces

diff  --git a/mlir/lib/Dialect/DLTI/CMakeLists.txt b/mlir/lib/Dialect/DLTI/CMakeLists.txt
index 6640b5ce15370..f74f5f8013090 100644
--- a/mlir/lib/Dialect/DLTI/CMakeLists.txt
+++ b/mlir/lib/Dialect/DLTI/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRDLTI
+add_mlir_dialect_library(MLIRDLTIDialect
   DLTI.cpp
   Traits.cpp
 

diff  --git a/mlir/lib/Dialect/EmitC/IR/CMakeLists.txt b/mlir/lib/Dialect/EmitC/IR/CMakeLists.txt
index 1eaa8ce68ce58..e2b81a0d8f013 100644
--- a/mlir/lib/Dialect/EmitC/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/EmitC/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIREmitC
+add_mlir_dialect_library(MLIREmitCDialect
   EmitC.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/Func/IR/CMakeLists.txt b/mlir/lib/Dialect/Func/IR/CMakeLists.txt
index 0045a9aebc154..58fafe7d5f77e 100644
--- a/mlir/lib/Dialect/Func/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Func/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRFunc
+add_mlir_dialect_library(MLIRFuncDialect
   FuncOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRFunc
 
   LINK_LIBS PUBLIC
   MLIRCallInterfaces
-  MLIRControlFlow
+  MLIRControlFlowDialect
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface
   MLIRIR

diff  --git a/mlir/lib/Dialect/Func/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Func/Transforms/CMakeLists.txt
index dfc429c7a1d84..acc52e476fa41 100644
--- a/mlir/lib/Dialect/Func/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Func/Transforms/CMakeLists.txt
@@ -10,14 +10,14 @@ add_mlir_dialect_library(MLIRFuncTransforms
   MLIRFuncTransformsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRArithmeticTransforms
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index 50921edb061b6..52cee4af80ecb 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -32,10 +32,10 @@ add_mlir_dialect_library(MLIRGPUOps
   MLIRGPUOpInterfacesIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRDLTI
+  MLIRArithmeticDialect
+  MLIRDLTIDialect
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRSideEffectInterfaces
   MLIRSupport
   )
@@ -66,17 +66,17 @@ add_mlir_dialect_library(MLIRGPUTransforms
 
   LINK_LIBS PUBLIC
   MLIRAffineUtils
-  MLIRArithmetic
-  MLIRAsync
+  MLIRArithmeticDialect
+  MLIRAsyncDialect
   MLIRDataLayoutInterfaces
   MLIRExecutionEngineUtils
   MLIRGPUOps
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRLLVMToLLVMIRTranslation
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSupport
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
index a0efb59d35a38..b8de3f6cfe5e2 100644
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(Transforms)
 
-add_mlir_dialect_library(MLIRLLVMIR
+add_mlir_dialect_library(MLIRLLVMDialect
   IR/FunctionCallUtils.cpp
   IR/LLVMDialect.cpp
   IR/LLVMIntrinsicOps.cpp
@@ -33,7 +33,7 @@ add_mlir_dialect_library(MLIRLLVMIR
   MLIRSupport
   )
 
-add_mlir_dialect_library(MLIRNVVMIR
+add_mlir_dialect_library(MLIRNVVMDialect
   IR/NVVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -50,11 +50,11 @@ add_mlir_dialect_library(MLIRNVVMIR
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSideEffectInterfaces
   )
 
-add_mlir_dialect_library(MLIRROCDLIR
+add_mlir_dialect_library(MLIRROCDLDialect
   IR/ROCDLDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt
index 24405ecab7f95..c68f14fa71dde 100644
--- a/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt
@@ -7,8 +7,8 @@ add_mlir_dialect_library(MLIRLLVMIRTransforms
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRPass
   MLIRTransforms
-  MLIRNVVMIR
+  MLIRNVVMDialect
   )

diff  --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
index 54d3f07c6471e..7c1b655ab6030 100644
--- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
@@ -8,6 +8,6 @@ add_mlir_dialect_library(MLIRLinalgAnalysis
   MLIRAffineAnalysis
   MLIRAnalysis
   MLIRIR
-  MLIRLinalg
-  MLIRMemRef
+  MLIRLinalgDialect
+  MLIRMemRefDialect
   )

diff  --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
index c99e1b564e44e..f5ec9246c5826 100644
--- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLinalg
+add_mlir_dialect_library(MLIRLinalgDialect
   LinalgInterfaces.cpp
   LinalgOps.cpp
   LinalgDialect.cpp
@@ -14,19 +14,19 @@ add_mlir_dialect_library(MLIRLinalg
   MLIRLinalgStructuredOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRAffineDialect
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRDialectUtils
   MLIRInferTypeOpInterface
   MLIRIR
   MLIRParser
   MLIRSideEffectInterfaces
-  MLIRSparseTensor
-  MLIRSCF
-  MLIRMath
-  MLIRMemRef
-  MLIRTensor
+  MLIRSparseTensorDialect
+  MLIRSCFDialect
+  MLIRMathDialect
+  MLIRMemRefDialect
+  MLIRTensorDialect
   MLIRTilingInterface
   MLIRViewLikeInterface
   )

diff  --git a/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt
index 599adc6bfc3a9..819c42f83eb62 100644
--- a/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt
@@ -9,11 +9,11 @@ add_mlir_dialect_library(MLIRLinalgTransformOps
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgTransforms
   MLIRParser
-  MLIRPDL
+  MLIRPDLDialect
   MLIRSideEffectInterfaces
   MLIRTransformDialect
-  MLIRVector
+  MLIRVectorDialect
   )

diff  --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
index 0c536d53f1abe..fc17fba490aa1 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -34,34 +34,34 @@ add_mlir_dialect_library(MLIRLinalgTransforms
   MLIRLinalgPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineUtils
   MLIRAnalysis
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRArithmeticTransforms
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
-  MLIRComplex
-  MLIRFunc
+  MLIRComplexDialect
+  MLIRFuncDialect
   MLIRFuncToLLVM
   MLIRFuncTransforms
   MLIRInferTypeOpInterface
   MLIRIR
-  MLIRMemRef
-  MLIRLinalg
+  MLIRMemRefDialect
+  MLIRLinalgDialect
   MLIRLinalgAnalysis
   MLIRLinalgUtils
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFTransforms
   MLIRSCFUtils
   MLIRPass
-  MLIRSparseTensor
-  MLIRTensor
+  MLIRSparseTensorDialect
+  MLIRTensorDialect
   MLIRTensorTilingInterfaceImpl
   MLIRTensorTransforms
   MLIRTransforms
   MLIRTransformUtils
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorTransforms
   MLIRVectorUtils
   MLIRX86VectorTransforms

diff  --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
index bfdab6c554a97..2af56d6a48103 100644
--- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
@@ -5,13 +5,13 @@ add_mlir_dialect_library(MLIRLinalgUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
   MLIRAffineUtils
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRIR
-  MLIRLinalg
-  MLIRSCF
+  MLIRLinalgDialect
+  MLIRSCFDialect
   MLIRPass
   MLIRTensorUtils
   MLIRTransformUtils

diff  --git a/mlir/lib/Dialect/MLProgram/IR/CMakeLists.txt b/mlir/lib/Dialect/MLProgram/IR/CMakeLists.txt
index 25c2f6ddaa631..994992bd69fb0 100644
--- a/mlir/lib/Dialect/MLProgram/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/MLProgram/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRMLProgram
+add_mlir_dialect_library(MLIRMLProgramDialect
   MLProgramOps.cpp
   MLProgramDialect.cpp
 

diff  --git a/mlir/lib/Dialect/Math/IR/CMakeLists.txt b/mlir/lib/Dialect/Math/IR/CMakeLists.txt
index 45bb9c310cbf3..40e8fa6ec4bc8 100644
--- a/mlir/lib/Dialect/Math/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Math/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRMath
+add_mlir_dialect_library(MLIRMathDialect
   MathOps.cpp
   MathDialect.cpp
 
@@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRMath
   MLIRMathOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialect
   MLIRIR
   )

diff  --git a/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt
index cc3a961cb0b5c..4b7512cf1c39e 100644
--- a/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt
@@ -7,13 +7,13 @@ add_mlir_dialect_library(MLIRMathTransforms
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Math/Transforms
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialectUtils  
   MLIRIR
-  MLIRMath
+  MLIRMathDialect
   MLIRPass
   MLIRTransforms
-  MLIRX86Vector
-  MLIRVector
+  MLIRX86VectorDialect
+  MLIRVectorDialect
   MLIRVectorUtils
   )

diff  --git a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
index 4be8475f4549e..cf969f8298c83 100644
--- a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRMemRef
+add_mlir_dialect_library(MLIRMemRefDialect
   MemRefDialect.cpp
   MemRefOps.cpp
 
@@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRMemRef
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRArithmeticUtils
   MLIRControlFlowInterfaces
   MLIRDialect

diff  --git a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt
index 79789f61a305a..1f8167cc318e5 100644
--- a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt
@@ -13,16 +13,16 @@ add_mlir_dialect_library(MLIRMemRefTransforms
   MLIRMemRefPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineUtils
-  MLIRArithmetic
-  MLIRFunc
+  MLIRArithmeticDialect
+  MLIRFuncDialect
   MLIRInferTypeOpInterface
   MLIRLoopLikeInterface
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
 )
 

diff  --git a/mlir/lib/Dialect/NVGPU/IR/CMakeLists.txt b/mlir/lib/Dialect/NVGPU/IR/CMakeLists.txt
index 64d232d6170f3..c2b678a86ece6 100644
--- a/mlir/lib/Dialect/NVGPU/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/NVGPU/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRNVGPU
+add_mlir_dialect_library(MLIRNVGPUDialect
   NVGPUDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/OpenACC/CMakeLists.txt b/mlir/lib/Dialect/OpenACC/CMakeLists.txt
index cc84ba20569c3..770623c9c72b7 100644
--- a/mlir/lib/Dialect/OpenACC/CMakeLists.txt
+++ b/mlir/lib/Dialect/OpenACC/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIROpenACC
+add_mlir_dialect_library(MLIROpenACCDialect
   IR/OpenACC.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
index 7882b0fa832c1..5eb0ce8a73035 100644
--- a/mlir/lib/Dialect/OpenMP/CMakeLists.txt
+++ b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIROpenMP
+add_mlir_dialect_library(MLIROpenMPDialect
   IR/OpenMPDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -10,5 +10,5 @@ add_mlir_dialect_library(MLIROpenMP
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   )

diff  --git a/mlir/lib/Dialect/PDL/IR/CMakeLists.txt b/mlir/lib/Dialect/PDL/IR/CMakeLists.txt
index 6ffa06ba766c6..a0bec9f51a623 100644
--- a/mlir/lib/Dialect/PDL/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/PDL/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRPDL
+add_mlir_dialect_library(MLIRPDLDialect
   PDL.cpp
   PDLTypes.cpp
 

diff  --git a/mlir/lib/Dialect/PDLInterp/IR/CMakeLists.txt b/mlir/lib/Dialect/PDLInterp/IR/CMakeLists.txt
index 6e0ebc66494f0..3c96be35287a0 100644
--- a/mlir/lib/Dialect/PDLInterp/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/PDLInterp/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRPDLInterp
+add_mlir_dialect_library(MLIRPDLInterpDialect
   PDLInterp.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRPDLInterp
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRPDL
+  MLIRPDLDialect
   MLIRInferTypeOpInterface
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Dialect/Quant/IR/CMakeLists.txt b/mlir/lib/Dialect/Quant/IR/CMakeLists.txt
index 7b871df5bc144..0aa64d1f75f20 100644
--- a/mlir/lib/Dialect/Quant/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Quant/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRQuant
+add_mlir_dialect_library(MLIRQuantDialect
   QuantOps.cpp
   QuantTypes.cpp
   TypeDetail.h

diff  --git a/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt
index 2633fbef9eed9..099ab7537e7ba 100644
--- a/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Quant/Transforms/CMakeLists.txt
@@ -9,10 +9,10 @@ add_mlir_dialect_library(MLIRQuantTransforms
   MLIRQuantPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRFunc
+  MLIRArithmeticDialect
+  MLIRFuncDialect
   MLIRIR
-  MLIRQuant
+  MLIRQuantDialect
   MLIRQuantUtils
   MLIRPass
   MLIRSupport

diff  --git a/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt b/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt
index 4efee44b884fd..0a1d9ea2546fd 100644
--- a/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Quant/Utils/CMakeLists.txt
@@ -8,6 +8,6 @@ add_mlir_dialect_library(MLIRQuantUtils
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRQuant
+  MLIRQuantDialect
   MLIRSupport
   )

diff  --git a/mlir/lib/Dialect/SCF/CMakeLists.txt b/mlir/lib/Dialect/SCF/CMakeLists.txt
index 2301a32567fc0..72c4f84e3c6bc 100644
--- a/mlir/lib/Dialect/SCF/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRSCF
+add_mlir_dialect_library(MLIRSCFDialect
   SCF.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -8,9 +8,9 @@ add_mlir_dialect_library(MLIRSCF
   MLIRSCFOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRBufferization
-  MLIRControlFlow
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
+  MLIRControlFlowDialect
   MLIRIR
   MLIRLoopLikeInterface
   MLIRSideEffectInterfaces

diff  --git a/mlir/lib/Dialect/SCF/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/SCF/TransformOps/CMakeLists.txt
index 611a78f7bff7e..a45ecfab9f32f 100644
--- a/mlir/lib/Dialect/SCF/TransformOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/TransformOps/CMakeLists.txt
@@ -8,13 +8,13 @@ add_mlir_dialect_library(MLIRSCFTransformOps
   MLIRSCFTransformOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
-  MLIRFunc
+  MLIRAffineDialect
+  MLIRFuncDialect
   MLIRIR
-  MLIRPDL
-  MLIRSCF
+  MLIRPDLDialect
+  MLIRSCFDialect
   MLIRSCFTransforms
   MLIRSCFUtils
   MLIRTransformDialect
-  MLIRVector
+  MLIRVectorDialect
 )

diff  --git a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
index 507f735851120..8f5322dc7b9da 100644
--- a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
@@ -18,19 +18,19 @@ add_mlir_dialect_library(MLIRSCFTransforms
   MLIRSCFPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRDialectUtils
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFUtils
   MLIRSupport
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransforms
   MLIRTransformUtils
 )

diff  --git a/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt b/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt
index 6ad4606dd48fc..3fe1483930daf 100644
--- a/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt
@@ -6,14 +6,14 @@ add_mlir_dialect_library(MLIRSCFUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SCF
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
   MLIRAnalysis
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialectUtils
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt
index 196cbe15843fc..9274d89bf5c89 100644
--- a/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt
@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS SPIRVCanonicalization.td)
 mlir_tablegen(SPIRVCanonicalization.inc -gen-rewriters)
 add_public_tablegen_target(MLIRSPIRVCanonicalizationIncGen)
 
-add_mlir_dialect_library(MLIRSPIRV
+add_mlir_dialect_library(MLIRSPIRVDialect
   SPIRVAttributes.cpp
   SPIRVCanonicalization.cpp
   SPIRVGLSLCanonicalization.cpp

diff  --git a/mlir/lib/Dialect/SPIRV/Linking/ModuleCombiner/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Linking/ModuleCombiner/CMakeLists.txt
index 69af5a69ce8ad..3239aa8407a10 100644
--- a/mlir/lib/Dialect/SPIRV/Linking/ModuleCombiner/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Linking/ModuleCombiner/CMakeLists.txt
@@ -6,6 +6,6 @@ add_mlir_dialect_library(MLIRSPIRVModuleCombiner
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSupport
   )

diff  --git a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
index 685cbe416d0aa..aa83f4ca2fe20 100644
--- a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
@@ -15,8 +15,8 @@ add_mlir_dialect_library(MLIRSPIRVConversion
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
   LINK_LIBS PUBLIC
-  MLIRFunc
-  MLIRSPIRV
+  MLIRFuncDialect
+  MLIRSPIRVDialect
   MLIRTransformUtils
 )
 

diff  --git a/mlir/lib/Dialect/SPIRV/Utils/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Utils/CMakeLists.txt
index fa0f9322b8388..9da83e02735d2 100644
--- a/mlir/lib/Dialect/SPIRV/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Utils/CMakeLists.txt
@@ -5,6 +5,6 @@ add_mlir_dialect_library(MLIRSPIRVUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
   LINK_LIBS PUBLIC
-  MLIRSPIRV
+  MLIRSPIRVDialect
 )
 

diff  --git a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
index c18160e70f340..6db6815f11e74 100644
--- a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS ShapeCanonicalization.td)
 mlir_tablegen(ShapeCanonicalization.inc -gen-rewriters)
 add_public_tablegen_target(MLIRShapeCanonicalizationIncGen)
 
-add_mlir_dialect_library(MLIRShape
+add_mlir_dialect_library(MLIRShapeDialect
   Shape.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -12,14 +12,14 @@ add_mlir_dialect_library(MLIRShape
   MLIRShapeOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRCallInterfaces
   MLIRCastInterfaces
   MLIRControlFlowInterfaces
   MLIRDialect
-  MLIRFunc
+  MLIRFuncDialect
   MLIRInferTypeOpInterface
   MLIRIR
   MLIRSideEffectInterfaces
-  MLIRTensor
+  MLIRTensorDialect
   )

diff  --git a/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt
index c3d20e1b175c2..ad8df5598835d 100644
--- a/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt
@@ -13,13 +13,13 @@ add_mlir_dialect_library(MLIRShapeOpsTransforms
 
 target_link_libraries(MLIRShapeOpsTransforms
   PUBLIC
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRShape
+  MLIRShapeDialect
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt
index 25b58a51357ae..5172031909b46 100644
--- a/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRSparseTensor
+add_mlir_dialect_library(MLIRSparseTensorDialect
   SparseTensorDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff  --git a/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt
index d8158a04ec205..08e7592cbc0fb 100644
--- a/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt
+++ b/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt
@@ -19,7 +19,7 @@ add_mlir_dialect_library(MLIRSparseTensorPipelines
   MLIRPass
   MLIRReconcileUnrealizedCasts
   MLIRSCFToControlFlow
-  MLIRSparseTensor
+  MLIRSparseTensorDialect
   MLIRSparseTensorTransforms
   MLIRTensorTransforms
   MLIRVectorToLLVM

diff  --git a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
index 7e7ed55416360..6d2fe169a05c7 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
@@ -11,22 +11,22 @@ add_mlir_dialect_library(MLIRSparseTensorTransforms
   MLIRSparseTensorPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRBufferization
-  MLIRComplex
-  MLIRFunc
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
+  MLIRComplexDialect
+  MLIRFuncDialect
   MLIRIR
-  MLIRLLVMIR
-  MLIRLinalg
+  MLIRLLVMDialect
+  MLIRLinalgDialect
   MLIRLinalgTransforms
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFTransforms
   MLIRSCFUtils
-  MLIRSparseTensor
+  MLIRSparseTensorDialect
   MLIRSparseTensorUtils
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
 )

diff  --git a/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt
index ad436bf1e0224..0e2d8efeec059 100644
--- a/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRSparseTensorUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SparseTensor
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRComplex
+  MLIRArithmeticDialect
+  MLIRComplexDialect
   MLIRIR
-  MLIRLinalg
+  MLIRLinalgDialect
 )

diff  --git a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt
index 22d41dc5e7693..81f0ccb24f2bd 100644
--- a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt
@@ -5,7 +5,7 @@ set(LLVM_OPTIONAL_SOURCES
   TensorTilingInterfaceImpl.cpp
 )
 
-add_mlir_dialect_library(MLIRTensor
+add_mlir_dialect_library(MLIRTensorDialect
   TensorDialect.cpp
   TensorOps.cpp
 
@@ -19,10 +19,10 @@ add_mlir_dialect_library(MLIRTensor
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRArithmeticUtils
   MLIRCastInterfaces
-  MLIRComplex
+  MLIRComplexDialect
   MLIRDialectUtils
   MLIRIR
   MLIRInferTypeOpInterface
@@ -38,11 +38,11 @@ add_mlir_dialect_library(MLIRTensorInferTypeOpInterfaceImpl
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Tensor
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRIR
   MLIRInferTypeOpInterface
   MLIRSupport
-  MLIRTensor
+  MLIRTensorDialect
   )
 
 add_mlir_dialect_library(MLIRTensorTilingInterfaceImpl
@@ -52,11 +52,11 @@ add_mlir_dialect_library(MLIRTensorTilingInterfaceImpl
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Tensor
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRIR
-  MLIRLinalg
-  MLIRSCF
+  MLIRLinalgDialect
+  MLIRSCFDialect
   MLIRSupport
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTilingInterface
   )

diff  --git a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt
index 2a677195679f0..f4983c4d5c886 100644
--- a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt
@@ -10,13 +10,13 @@ add_mlir_dialect_library(MLIRTensorTransforms
   MLIRTensorTransformsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
-  MLIRTensor
+  MLIRSCFDialect
+  MLIRTensorDialect
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt
index 19a00b5bc6eb9..a8c0197a27c18 100644
--- a/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt
@@ -5,8 +5,8 @@ add_mlir_dialect_library(MLIRTensorUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Tensor
 
   LINK_LIBS PUBLIC
-  MLIRAffine
-  MLIRArithmetic
+  MLIRAffineDialect
+  MLIRArithmeticDialect
   MLIRIR
-  MLIRTensor
+  MLIRTensorDialect
 )

diff  --git a/mlir/lib/Dialect/Tosa/CMakeLists.txt b/mlir/lib/Dialect/Tosa/CMakeLists.txt
index e30fa98a4d82f..520f6425cbe67 100644
--- a/mlir/lib/Dialect/Tosa/CMakeLists.txt
+++ b/mlir/lib/Dialect/Tosa/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRTosa
+add_mlir_dialect_library(MLIRTosaDialect
   Utils/ConversionUtils.cpp
   Utils/QuantUtils.cpp
   IR/TosaOps.cpp
@@ -16,10 +16,10 @@ add_mlir_dialect_library(MLIRTosa
   MLIRDialect
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
-  MLIRQuant
+  MLIRQuantDialect
   MLIRQuantUtils
   MLIRSideEffectInterfaces
-  MLIRTensor
+  MLIRTensorDialect
   MLIRViewLikeInterface
   )
 

diff  --git a/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt
index 79979eee9077d..ae552693d7310 100644
--- a/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Tosa/Transforms/CMakeLists.txt
@@ -15,8 +15,8 @@ add_mlir_dialect_library(MLIRTosaTransforms
   MLIRTosaPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRFunc
+  MLIRFuncDialect
   MLIRPass
-  MLIRTosa
+  MLIRTosaDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/Transform/IR/CMakeLists.txt b/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
index dd22d0d10c017..3041d20a87c4c 100644
--- a/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_dialect_library(MLIRTransformDialect
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRPDL
-  MLIRPDLInterp
+  MLIRPDLDialect
+  MLIRPDLInterpDialect
   MLIRRewrite
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Dialect/Vector/IR/CMakeLists.txt b/mlir/lib/Dialect/Vector/IR/CMakeLists.txt
index 17380bd049db5..79899eb89472d 100644
--- a/mlir/lib/Dialect/Vector/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRVector
+add_mlir_dialect_library(MLIRVectorDialect
   VectorOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,13 +9,13 @@ add_mlir_dialect_library(MLIRVector
   MLIRVectorOpsEnumsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRControlFlowInterfaces
   MLIRDataLayoutInterfaces
   MLIRDialectUtils
   MLIRIR
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRSideEffectInterfaces
-  MLIRTensor
+  MLIRTensorDialect
   MLIRVectorInterfaces
   )

diff  --git a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
index bb7822b86344f..931e676a2c162 100644
--- a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
@@ -18,19 +18,19 @@ add_mlir_dialect_library(MLIRVectorTransforms
   MLIRVectorTransformsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
   MLIRAffineUtils
-  MLIRArithmetic
-  MLIRBufferization
+  MLIRArithmeticDialect
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRDialectUtils
   MLIRIR
-  MLIRLinalg
-  MLIRMemRef
-  MLIRSCF
+  MLIRLinalgDialect
+  MLIRMemRefDialect
+  MLIRSCFDialect
   MLIRTransforms
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorInterfaces
   MLIRVectorUtils
   )

diff  --git a/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt b/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt
index c1954407f4b63..2ead2a651d395 100644
--- a/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt
@@ -5,14 +5,14 @@ add_mlir_dialect_library(MLIRVectorUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Vector/Utils
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAffineAnalysis
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRDialectUtils
-  MLIRFunc
+  MLIRFuncDialect
   MLIRIR
-  MLIRMemRef
-  MLIRTensor
-  MLIRVector
+  MLIRMemRefDialect
+  MLIRTensorDialect
+  MLIRVectorDialect
   MLIRVectorInterfaces
   )

diff  --git a/mlir/lib/Dialect/X86Vector/IR/CMakeLists.txt b/mlir/lib/Dialect/X86Vector/IR/CMakeLists.txt
index 012c468d34a15..d24617f037b13 100644
--- a/mlir/lib/Dialect/X86Vector/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/X86Vector/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRX86Vector
+add_mlir_dialect_library(MLIRX86VectorDialect
   X86VectorDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,6 +9,6 @@ add_mlir_dialect_library(MLIRX86Vector
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt
index 8781d1f5f1242..7824ecfa0d0da 100644
--- a/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt
@@ -6,10 +6,10 @@ add_mlir_dialect_library(MLIRX86VectorTransforms
   MLIRX86VectorConversionsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRX86Vector
+  MLIRArithmeticDialect
+  MLIRX86VectorDialect
   MLIRIR
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
-  MLIRVector
+  MLIRLLVMDialect
+  MLIRVectorDialect
   )

diff  --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt
index ae384551429dc..22ac4f846215b 100644
--- a/mlir/lib/ExecutionEngine/CMakeLists.txt
+++ b/mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -87,7 +87,7 @@ add_mlir_library(MLIRExecutionEngine
 
   LINK_LIBS PUBLIC
   MLIRExecutionEngineUtils
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRLLVMToLLVMIRTranslation
   MLIRTargetLLVMIRExport
   )
@@ -109,7 +109,7 @@ add_mlir_library(MLIRJitRunner
   LINK_LIBS PUBLIC
   ${dialect_libs}
   MLIRExecutionEngine
-  MLIRFunc
+  MLIRFuncDialect
   MLIRFuncToLLVM
   MLIRIR
   MLIRParser

diff  --git a/mlir/lib/Rewrite/CMakeLists.txt b/mlir/lib/Rewrite/CMakeLists.txt
index 76bf64944d50c..e0395be6cd6f5 100644
--- a/mlir/lib/Rewrite/CMakeLists.txt
+++ b/mlir/lib/Rewrite/CMakeLists.txt
@@ -11,8 +11,8 @@ add_mlir_library(MLIRRewrite
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRPDL
-  MLIRPDLInterp
+  MLIRPDLDialect
+  MLIRPDLInterpDialect
   MLIRPDLToPDLInterp
   MLIRSideEffectInterfaces
   )

diff  --git a/mlir/lib/Target/Cpp/CMakeLists.txt b/mlir/lib/Target/Cpp/CMakeLists.txt
index f1c4c4228b7e5..babe403c131c9 100644
--- a/mlir/lib/Target/Cpp/CMakeLists.txt
+++ b/mlir/lib/Target/Cpp/CMakeLists.txt
@@ -6,13 +6,13 @@ add_mlir_translation_library(MLIRTargetCpp
   ${EMITC_MAIN_INCLUDE_DIR}/emitc/Target/Cpp
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
-  MLIRControlFlow
-  MLIREmitC
-  MLIRFunc
+  MLIRArithmeticDialect
+  MLIRControlFlowDialect
+  MLIREmitCDialect
+  MLIRFuncDialect
   MLIRIR
-  MLIRMath
-  MLIRSCF
+  MLIRMathDialect
+  MLIRSCFDialect
   MLIRSupport
   MLIRTranslateLib
   )

diff  --git a/mlir/lib/Target/LLVMIR/CMakeLists.txt b/mlir/lib/Target/LLVMIR/CMakeLists.txt
index 22daebc08f267..3ee83820b1e2e 100644
--- a/mlir/lib/Target/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/CMakeLists.txt
@@ -27,8 +27,8 @@ add_mlir_translation_library(MLIRTargetLLVMIRExport
   TransformUtils
 
   LINK_LIBS PUBLIC
-  MLIRDLTI
-  MLIRLLVMIR
+  MLIRDLTIDialect
+  MLIRLLVMDialect
   MLIRLLVMIRTransforms
   MLIRTranslateLib
   )
@@ -60,7 +60,7 @@ add_mlir_translation_library(MLIRTargetLLVMIRImport
   IRReader
 
   LINK_LIBS PUBLIC
-  MLIRDLTI
-  MLIRLLVMIR
+  MLIRDLTIDialect
+  MLIRLLVMDialect
   MLIRTranslateLib
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/AMX/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/AMX/CMakeLists.txt
index f7f7b583fd656..733b4c2e31b80 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/AMX/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/AMX/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_translation_library(MLIRAMXToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRAMX
-  MLIRLLVMIR
+  MLIRAMXDialect
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/ArmNeon/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/ArmNeon/CMakeLists.txt
index 887ba8d9e22b5..516fa179aa56e 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/ArmNeon/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/ArmNeon/CMakeLists.txt
@@ -8,9 +8,9 @@ add_mlir_translation_library(MLIRArmNeonToLLVMIRTranslation
   Core
 
   LINK_LIBS PUBLIC
-  MLIRArmNeon
+  MLIRArmNeonDialect
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/ArmSVE/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/ArmSVE/CMakeLists.txt
index 21a2d1671c85e..66180f9e001d5 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/ArmSVE/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/ArmSVE/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_translation_library(MLIRArmSVEToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRArmSVE
-  MLIRLLVMIR
+  MLIRArmSVEDialect
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/CMakeLists.txt
index 68b89936714cb..0caeb903f8ab5 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_translation_library(MLIRLLVMToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/NVVM/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/NVVM/CMakeLists.txt
index 4518904a110b7..a836c1aa5cffe 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/NVVM/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/NVVM/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_translation_library(MLIRNVVMToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
-  MLIRNVVMIR
+  MLIRLLVMDialect
+  MLIRNVVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt
index c61aece81d79f..84997d7648aeb 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt
@@ -6,8 +6,8 @@ add_mlir_translation_library(MLIROpenACCToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
-  MLIROpenACC
+  MLIRLLVMDialect
+  MLIROpenACCDialect
   MLIROpenACCToLLVM
   MLIRSupport
   MLIRTargetLLVMIRExport

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/CMakeLists.txt
index 4a06df33e99b5..41227f80cdfc8 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/CMakeLists.txt
@@ -6,8 +6,8 @@ add_mlir_translation_library(MLIROpenMPToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
-  MLIROpenMP
+  MLIRLLVMDialect
+  MLIROpenMPDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/ROCDL/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/ROCDL/CMakeLists.txt
index 5b6323d5e4864..9e69bcd4e9465 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/ROCDL/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/ROCDL/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_translation_library(MLIRROCDLToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLLVMIR
-  MLIRROCDLIR
+  MLIRLLVMDialect
+  MLIRROCDLDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/LLVMIR/Dialect/X86Vector/CMakeLists.txt b/mlir/lib/Target/LLVMIR/Dialect/X86Vector/CMakeLists.txt
index 0331633cde05b..3910982c0cdc6 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/X86Vector/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/Dialect/X86Vector/CMakeLists.txt
@@ -9,8 +9,8 @@ add_mlir_translation_library(MLIRX86VectorToLLVMIRTranslation
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRX86Vector
-  MLIRLLVMIR
+  MLIRX86VectorDialect
+  MLIRLLVMDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

diff  --git a/mlir/lib/Target/SPIRV/CMakeLists.txt b/mlir/lib/Target/SPIRV/CMakeLists.txt
index acfa68c9047bc..97bb64a74c41c 100644
--- a/mlir/lib/Target/SPIRV/CMakeLists.txt
+++ b/mlir/lib/Target/SPIRV/CMakeLists.txt
@@ -11,7 +11,7 @@ add_mlir_translation_library(MLIRSPIRVBinaryUtils
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSupport
   )
 
@@ -20,7 +20,7 @@ add_mlir_translation_library(MLIRSPIRVTranslateRegistration
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVSerialization
   MLIRSPIRVDeserialization
   MLIRSupport

diff  --git a/mlir/lib/Target/SPIRV/Deserialization/CMakeLists.txt b/mlir/lib/Target/SPIRV/Deserialization/CMakeLists.txt
index eec147230058d..6b35a126af169 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/CMakeLists.txt
+++ b/mlir/lib/Target/SPIRV/Deserialization/CMakeLists.txt
@@ -8,7 +8,7 @@ add_mlir_translation_library(MLIRSPIRVDeserialization
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVBinaryUtils
   MLIRSupport
   MLIRTranslateLib

diff  --git a/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt
index 5dc5cd23a66b9..71580d8fcb978 100644
--- a/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt
@@ -8,7 +8,7 @@ add_mlir_translation_library(MLIRSPIRVSerialization
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVBinaryUtils
   MLIRSupport
   MLIRTranslateLib

diff  --git a/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt b/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt
index 9226beefe3303..f378a28af2db9 100644
--- a/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt
+++ b/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt
@@ -5,6 +5,6 @@ add_mlir_library(MLIRPDLLCodeGen
   LINK_LIBS PUBLIC
   MLIRParser
   MLIRPDLLAST
-  MLIRPDL
+  MLIRPDLDialect
   MLIRSupport
   )

diff  --git a/mlir/test/lib/Analysis/CMakeLists.txt b/mlir/test/lib/Analysis/CMakeLists.txt
index f3f5f81f3ef77..02ca3a1481993 100644
--- a/mlir/test/lib/Analysis/CMakeLists.txt
+++ b/mlir/test/lib/Analysis/CMakeLists.txt
@@ -14,9 +14,9 @@ add_mlir_library(MLIRTestAnalysis
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAnalysis
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRPass
   MLIRTestDialect
   )

diff  --git a/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt b/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt
index bda478a6a951a..45ba62d839d36 100644
--- a/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt
+++ b/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_library(MLIRTestFuncToLLVM
   LINK_LIBS PUBLIC
   MLIRFuncToLLVM
   MLIRLLVMCommonConversion
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRLLVMIRTransforms
   MLIRPass
   MLIRTestDialect

diff  --git a/mlir/test/lib/Dialect/DLTI/CMakeLists.txt b/mlir/test/lib/Dialect/DLTI/CMakeLists.txt
index cc81817b67d6e..fddc3e342e0ac 100644
--- a/mlir/test/lib/Dialect/DLTI/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/DLTI/CMakeLists.txt
@@ -5,7 +5,7 @@ add_mlir_library(MLIRDLTITestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRDLTI
+  MLIRDLTIDialect
   MLIRPass
   MLIRTestDialect
   )

diff  --git a/mlir/test/lib/Dialect/Func/CMakeLists.txt b/mlir/test/lib/Dialect/Func/CMakeLists.txt
index 4320ffaea0108..6adf893e44f05 100644
--- a/mlir/test/lib/Dialect/Func/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Func/CMakeLists.txt
@@ -5,7 +5,7 @@ add_mlir_library(MLIRFuncTestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRPass
   MLIRFuncTransforms
   MLIRTestDialect

diff  --git a/mlir/test/lib/Dialect/GPU/CMakeLists.txt b/mlir/test/lib/Dialect/GPU/CMakeLists.txt
index 65f4780ea82e3..74188936f5e5e 100644
--- a/mlir/test/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/GPU/CMakeLists.txt
@@ -8,16 +8,16 @@ add_mlir_library(MLIRGPUTestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRAffine
-  MLIRFunc
+  MLIRAffineDialect
+  MLIRFuncDialect
   MLIRGPUOps
   MLIRGPUToGPURuntimeTransforms
   MLIRLLVMToLLVMIRTranslation
-  MLIRNVVMIR
+  MLIRNVVMDialect
   MLIRNVVMToLLVMIRTranslation
   MLIRPass
-  MLIRROCDLIR
+  MLIRROCDLDialect
   MLIRROCDLToLLVMIRTranslation
-  MLIRSCF
+  MLIRSCFDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/test/lib/Dialect/Linalg/CMakeLists.txt b/mlir/test/lib/Dialect/Linalg/CMakeLists.txt
index 18e452962381d..b85b88ad8a71f 100644
--- a/mlir/test/lib/Dialect/Linalg/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Linalg/CMakeLists.txt
@@ -10,24 +10,24 @@ add_mlir_library(MLIRLinalgTestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRAffine
-  MLIRArithmetic
+  MLIRAffineDialect
+  MLIRArithmeticDialect
   MLIRArithmeticTransforms
-  MLIRBufferization
+  MLIRBufferizationDialect
   MLIRBufferizationTransforms
   MLIRGPUTransforms
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgTransforms
   MLIRLLVMToLLVMIRTranslation
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRParser
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFTransforms
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTensorTransforms
   MLIRTransformUtils
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorToSCF
   MLIRVectorTransforms
   )

diff  --git a/mlir/test/lib/Dialect/Math/CMakeLists.txt b/mlir/test/lib/Dialect/Math/CMakeLists.txt
index ff62dc4fd053c..195d392d6ad34 100644
--- a/mlir/test/lib/Dialect/Math/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Math/CMakeLists.txt
@@ -10,6 +10,6 @@ add_mlir_library(MLIRMathTestPasses
   MLIRMathTransforms
   MLIRPass
   MLIRTransformUtils
-  MLIRVector
-  MLIRX86Vector
+  MLIRVectorDialect
+  MLIRX86VectorDialect
   )

diff  --git a/mlir/test/lib/Dialect/MemRef/CMakeLists.txt b/mlir/test/lib/Dialect/MemRef/CMakeLists.txt
index 12e09b40cbf51..df3fdacd09358 100644
--- a/mlir/test/lib/Dialect/MemRef/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/MemRef/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_library(MLIRMemRefTestPasses
 
   LINK_LIBS PUBLIC
   MLIRPass
-  MLIRMemRef
+  MLIRMemRefDialect
   MLIRMemRefTransforms
   MLIRTestDialect
   )

diff  --git a/mlir/test/lib/Dialect/SCF/CMakeLists.txt b/mlir/test/lib/Dialect/SCF/CMakeLists.txt
index 8cd43cd2ee492..d720d591c82c9 100644
--- a/mlir/test/lib/Dialect/SCF/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/SCF/CMakeLists.txt
@@ -8,7 +8,7 @@ add_mlir_library(MLIRSCFTestPasses
 
   LINK_LIBS PUBLIC
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRSCFTransforms
   MLIRSCFUtils
   MLIRTransformUtils

diff  --git a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
index 1b3305d3ca726..3c29465ccf133 100644
--- a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
@@ -14,7 +14,7 @@ add_mlir_library(MLIRSPIRVTestPasses
   MLIRGPUOps
   MLIRIR
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVConversion
   MLIRSPIRVModuleCombiner
   MLIRSupport

diff  --git a/mlir/test/lib/Dialect/Shape/CMakeLists.txt b/mlir/test/lib/Dialect/Shape/CMakeLists.txt
index 6c041ab9c3713..2d142d3949c0a 100644
--- a/mlir/test/lib/Dialect/Shape/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Shape/CMakeLists.txt
@@ -11,6 +11,6 @@ add_mlir_library(MLIRShapeTestPasses
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRPass
-  MLIRShape
+  MLIRShapeDialect
   MLIRSupport
   )

diff  --git a/mlir/test/lib/Dialect/Tensor/CMakeLists.txt b/mlir/test/lib/Dialect/Tensor/CMakeLists.txt
index fbe7485257bbc..89c996da7b2a9 100644
--- a/mlir/test/lib/Dialect/Tensor/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Tensor/CMakeLists.txt
@@ -5,10 +5,10 @@ add_mlir_library(MLIRTensorTestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRPass
-  MLIRSCF
-  MLIRTensor
+  MLIRSCFDialect
+  MLIRTensorDialect
   MLIRTensorTransforms
   MLIRTransforms
   )

diff  --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt
index de495bf8fe3db..2df8718e5f6a7 100644
--- a/mlir/test/lib/Dialect/Test/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Test/CMakeLists.txt
@@ -58,18 +58,18 @@ add_mlir_library(MLIRTestDialect
   MLIRDataLayoutInterfaces
   MLIRDerivedAttributeOpInterface
   MLIRDialect
-  MLIRDLTI
-  MLIRFunc
+  MLIRDLTIDialect
+  MLIRFuncDialect
   MLIRFuncTransforms
   MLIRIR
   MLIRInferIntRangeInterface
   MLIRInferTypeOpInterface
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgTransforms
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRPass
   MLIRReduce
-  MLIRTensor
+  MLIRTensorDialect
   MLIRTransformUtils
   MLIRTransforms
 )

diff  --git a/mlir/test/lib/Dialect/Tosa/CMakeLists.txt b/mlir/test/lib/Dialect/Tosa/CMakeLists.txt
index 91437dd5bc74b..e5dd35d6dbcb7 100644
--- a/mlir/test/lib/Dialect/Tosa/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Tosa/CMakeLists.txt
@@ -10,8 +10,8 @@ add_mlir_dialect_library(MLIRTosaTestPasses
   MLIRTosaPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRFunc
+  MLIRFuncDialect
   MLIRPass
-  MLIRTosa
+  MLIRTosaDialect
   MLIRTransformUtils
   )

diff  --git a/mlir/test/lib/Dialect/Transform/CMakeLists.txt b/mlir/test/lib/Dialect/Transform/CMakeLists.txt
index 2318f82795160..6d74721c87182 100644
--- a/mlir/test/lib/Dialect/Transform/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Transform/CMakeLists.txt
@@ -15,6 +15,6 @@ add_mlir_library(MLIRTestTransformDialect
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRPass
-  MLIRPDL
+  MLIRPDLDialect
   MLIRTransformDialect
 )

diff  --git a/mlir/test/lib/Dialect/Vector/CMakeLists.txt b/mlir/test/lib/Dialect/Vector/CMakeLists.txt
index ba2e0e3b791ba..415aca5626da5 100644
--- a/mlir/test/lib/Dialect/Vector/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Vector/CMakeLists.txt
@@ -5,18 +5,18 @@ add_mlir_library(MLIRVectorTestPasses
   EXCLUDE_FROM_LIBMLIR
 
   LINK_LIBS PUBLIC
-  MLIRAffine
+  MLIRAffineDialect
   MLIRAnalysis
-  MLIRFunc
+  MLIRFuncDialect
   MLIRGPUOps
-  MLIRLinalg
+  MLIRLinalgDialect
   MLIRLinalgTransforms
-  MLIRLLVMIR
-  MLIRMemRef
+  MLIRLLVMDialect
+  MLIRMemRefDialect
   MLIRPass
-  MLIRSCF
+  MLIRSCFDialect
   MLIRTransformUtils
-  MLIRVector
+  MLIRVectorDialect
   MLIRVectorToSCF
-  MLIRX86Vector
+  MLIRX86VectorDialect
   )

diff  --git a/mlir/tools/mlir-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
index 8ca83a289150d..f658d295d85eb 100644
--- a/mlir/tools/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(mlir-cpu-runner PRIVATE
   MLIRExecutionEngine
   MLIRIR
   MLIRJitRunner
-  MLIRLLVMIR
+  MLIRLLVMDialect
   MLIRLLVMToLLVMIRTranslation
   MLIRToLLVMIRTranslationRegistration
   MLIRParser

diff  --git a/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt
index 7029de6edc4b4..cfbc5463e6d3a 100644
--- a/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt
@@ -16,17 +16,17 @@ if (MLIR_ENABLE_SPIRV_CPU_RUNNER)
   target_link_libraries(mlir-spirv-cpu-runner PRIVATE
     ${conversion_libs}
     MLIRAnalysis
-    MLIRArithmetic
+    MLIRArithmeticDialect
     MLIRExecutionEngine
-    MLIRFunc
+    MLIRFuncDialect
     MLIRGPUOps
     MLIRIR
     MLIRJitRunner
-    MLIRLLVMIR
+    MLIRLLVMDialect
     MLIRLLVMToLLVMIRTranslation
-    MLIRMemRef
+    MLIRMemRefDialect
     MLIRParser
-    MLIRSPIRV
+    MLIRSPIRVDialect
     MLIRTargetLLVMIRExport
     MLIRTransforms
     MLIRTranslateLib

diff  --git a/mlir/tools/mlir-translate/CMakeLists.txt b/mlir/tools/mlir-translate/CMakeLists.txt
index b1145f265c499..e105cf8996fde 100644
--- a/mlir/tools/mlir-translate/CMakeLists.txt
+++ b/mlir/tools/mlir-translate/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(mlir-translate
   MLIRIR
   MLIRParser
   MLIRPass
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRTranslateLib
   MLIRSupport
   )

diff  --git a/mlir/tools/mlir-vulkan-runner/CMakeLists.txt b/mlir/tools/mlir-vulkan-runner/CMakeLists.txt
index 7d331e76ba788..be4883ba0b4f5 100644
--- a/mlir/tools/mlir-vulkan-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-vulkan-runner/CMakeLists.txt
@@ -56,19 +56,19 @@ if (MLIR_ENABLE_VULKAN_RUNNER)
   set(LIBS
     ${conversion_libs}
     MLIRAnalysis
-    MLIRArithmetic
+    MLIRArithmeticDialect
     MLIRExecutionEngine
-    MLIRFunc
+    MLIRFuncDialect
     MLIRGPUOps
     MLIRIR
     MLIRJitRunner
-    MLIRLLVMIR
+    MLIRLLVMDialect
     MLIRLLVMCommonConversion
     MLIRLLVMToLLVMIRTranslation
-    MLIRMemRef
+    MLIRMemRefDialect
     MLIRMemRefToLLVM
     MLIRParser
-    MLIRSPIRV
+    MLIRSPIRVDialect
     MLIRSPIRVTransforms
     MLIRSupport
     MLIRTargetLLVMIRExport

diff  --git a/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt b/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt
index 6c753f165b205..dc58ae92b81e9 100644
--- a/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt
+++ b/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt
@@ -3,6 +3,6 @@ add_mlir_unittest(MLIRPDLToPDLInterpTests
 )
 target_link_libraries(MLIRPDLToPDLInterpTests
   PRIVATE
-  MLIRArithmetic
+  MLIRArithmeticDialect
   MLIRPDLToPDLInterp
 )

diff  --git a/mlir/unittests/Dialect/Quant/CMakeLists.txt b/mlir/unittests/Dialect/Quant/CMakeLists.txt
index 756b31e8cb8db..8b4e76cdd1ff2 100644
--- a/mlir/unittests/Dialect/Quant/CMakeLists.txt
+++ b/mlir/unittests/Dialect/Quant/CMakeLists.txt
@@ -3,6 +3,6 @@ add_mlir_unittest(MLIRQuantTests
 )
 target_link_libraries(MLIRQuantTests
   PRIVATE
-  MLIRQuant
+  MLIRQuantDialect
   MLIRQuantUtils
   )

diff  --git a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
index 530896a22ea6c..19100b9110177 100644
--- a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
@@ -5,7 +5,7 @@ add_mlir_unittest(MLIRSPIRVImportExportTests
 target_link_libraries(MLIRSPIRVImportExportTests
   PRIVATE
   MLIRIR
-  MLIRSPIRV
+  MLIRSPIRVDialect
   MLIRSPIRVDeserialization
   MLIRSPIRVSerialization
 )

diff  --git a/mlir/unittests/Interfaces/CMakeLists.txt b/mlir/unittests/Interfaces/CMakeLists.txt
index c4201b135e917..d603cf7d2088f 100644
--- a/mlir/unittests/Interfaces/CMakeLists.txt
+++ b/mlir/unittests/Interfaces/CMakeLists.txt
@@ -9,8 +9,8 @@ target_link_libraries(MLIRInterfacesTests
   PRIVATE
   MLIRControlFlowInterfaces
   MLIRDataLayoutInterfaces
-  MLIRDLTI
-  MLIRFunc
+  MLIRDLTIDialect
+  MLIRFuncDialect
   MLIRInferIntRangeInterface
   MLIRInferTypeOpInterface
   MLIRParser

diff  --git a/mlir/unittests/Pass/CMakeLists.txt b/mlir/unittests/Pass/CMakeLists.txt
index cb10611b2ad63..65f0774123865 100644
--- a/mlir/unittests/Pass/CMakeLists.txt
+++ b/mlir/unittests/Pass/CMakeLists.txt
@@ -5,5 +5,5 @@ add_mlir_unittest(MLIRPassTests
 )
 target_link_libraries(MLIRPassTests
   PRIVATE
-  MLIRFunc
+  MLIRFuncDialect
   MLIRPass)

diff  --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index 4f22564696ae5..5fde5e771e538 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -441,7 +441,7 @@ mlir_c_api_cc_library(
     ],
     includes = ["include"],
     deps = [
-        ":Async",
+        ":AsyncDialect",
         ":AsyncTransforms",
         ":Pass",
     ],
@@ -528,7 +528,7 @@ mlir_c_api_cc_library(
     includes = ["include"],
     deps = [
         ":Pass",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":SparseTensorTransforms",
         ":Support",
     ],
@@ -1200,7 +1200,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "AMDGPU",
+    name = "AMDGPUDialect",
     srcs = ["lib/Dialect/AMDGPU/IR/AMDGPUDialect.cpp"],
     hdrs = ["include/mlir/Dialect/AMDGPU/AMDGPUDialect.h"],
     includes = ["include"],
@@ -1295,7 +1295,7 @@ cc_library(
     deps = [
         ":ArithmeticDialect",
         ":ControlFlowDialect",
-        ":EmitC",
+        ":EmitCDialect",
         ":FuncDialect",
         ":IR",
         ":MathDialect",
@@ -1443,7 +1443,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "ArmNeon",
+    name = "ArmNeonDialect",
     srcs = ["lib/Dialect/ArmNeon/IR/ArmNeonDialect.cpp"],
     hdrs = ["include/mlir/Dialect/ArmNeon/ArmNeonDialect.h"],
     includes = ["include"],
@@ -1451,7 +1451,7 @@ cc_library(
         ":ArmNeonIncGen",
         ":IR",
         ":SideEffectInterfaces",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Core",
         "//llvm:Support",
     ],
@@ -1482,7 +1482,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":ArmNeon",
+        ":ArmNeonDialect",
         ":ConversionPassIncGen",
         ":FuncDialect",
         ":IR",
@@ -1492,7 +1492,7 @@ cc_library(
         ":SCFDialect",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
     ],
 )
 
@@ -1556,7 +1556,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "ArmSVE",
+    name = "ArmSVEDialect",
     srcs = ["lib/Dialect/ArmSVE/IR/ArmSVEDialect.cpp"],
     hdrs = ["include/mlir/Dialect/ArmSVE/ArmSVEDialect.h"],
     includes = ["include"],
@@ -1576,7 +1576,7 @@ cc_library(
     hdrs = ["include/mlir/Dialect/ArmSVE/Transforms.h"],
     includes = ["include"],
     deps = [
-        ":ArmSVE",
+        ":ArmSVEDialect",
         ":FuncDialect",
         ":IR",
         ":LLVMCommonConversion",
@@ -1652,7 +1652,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "AMX",
+    name = "AMXDialect",
     srcs = ["lib/Dialect/AMX/IR/AMXDialect.cpp"],
     hdrs = ["include/mlir/Dialect/AMX/AMXDialect.h"],
     includes = ["include"],
@@ -1672,7 +1672,7 @@ cc_library(
     hdrs = ["include/mlir/Dialect/AMX/Transforms.h"],
     includes = ["include"],
     deps = [
-        ":AMX",
+        ":AMXDialect",
         ":FuncDialect",
         ":IR",
         ":LLVMCommonConversion",
@@ -1748,7 +1748,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "X86Vector",
+    name = "X86VectorDialect",
     srcs = ["lib/Dialect/X86Vector/IR/X86VectorDialect.cpp"],
     hdrs = ["include/mlir/Dialect/X86Vector/X86VectorDialect.h"],
     includes = ["include"],
@@ -1774,8 +1774,8 @@ cc_library(
         ":IR",
         ":LLVMCommonConversion",
         ":LLVMDialect",
-        ":VectorOps",
-        ":X86Vector",
+        ":VectorDialect",
+        ":X86VectorDialect",
         "//llvm:Core",
         "//llvm:Support",
     ],
@@ -1868,8 +1868,8 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":BufferizationDialect",
         ":BufferizationTransforms",
@@ -1926,7 +1926,7 @@ cc_library(
     hdrs = glob(["include/mlir/Dialect/SCF/TransformOps/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":FuncDialect",
         ":IR",
         ":PDLDialect",
@@ -1936,7 +1936,7 @@ cc_library(
         ":SCFUtils",
         ":SideEffectInterfaces",
         ":TransformDialect",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -2046,7 +2046,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "SparseTensor",
+    name = "SparseTensorDialect",
     srcs = ["lib/Dialect/SparseTensor/IR/SparseTensorDialect.cpp"],
     hdrs = ["include/mlir/Dialect/SparseTensor/IR/SparseTensor.h"],
     includes = ["include"],
@@ -2070,7 +2070,7 @@ cc_library(
         ":IR",
         ":LinalgDialect",
         ":MathDialect",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         "//llvm:Support",
     ],
 )
@@ -2087,7 +2087,7 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":BufferizationDialect",
         ":ComplexDialect",
@@ -2097,16 +2097,17 @@ cc_library(
         ":LLVMDialect",
         ":LinalgDialect",
         ":LinalgTransforms",
+        ":LinalgUtils",
         ":MemRefDialect",
         ":Pass",
         ":SCFDialect",
         ":SCFTransforms",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":SparseTensorPassIncGen",
         ":SparseTensorUtils",
         ":TensorDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":mlir_c_runner_utils",
         "//llvm:Support",
     ],
@@ -2125,7 +2126,7 @@ cc_library(
         ":FuncTransforms",
         ":LinalgTransforms",
         ":Pass",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":SparseTensorTransforms",
         ":TensorTransforms",
         ":VectorToLLVM",
@@ -2183,7 +2184,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "NVGPU",
+    name = "NVGPUDialect",
     srcs = ["lib/Dialect/NVGPU/IR/NVGPUDialect.cpp"],
     hdrs = ["include/mlir/Dialect/NVGPU/NVGPUDialect.h"],
     includes = ["include"],
@@ -2284,13 +2285,11 @@ cc_library(
 )
 
 cc_library(
-    name = "Affine",
-    srcs = glob(
-        [
-            "lib/Dialect/Affine/IR/*.cpp",
-            "lib/Dialect/Affine/IR/*.h",
-        ],
-    ) + ["include/mlir/Transforms/InliningUtils.h"],
+    name = "AffineDialect",
+    srcs = glob([
+        "lib/Dialect/Affine/IR/*.cpp",
+        "lib/Dialect/Affine/IR/*.h",
+    ]),
     hdrs = glob([
         "include/mlir/Dialect/Affine/IR/*.h",
     ]),
@@ -2310,7 +2309,7 @@ cc_library(
 )
 
 cc_library(
-    name = "EmitC",
+    name = "EmitCDialect",
     srcs = glob([
         "lib/Dialect/EmitC/IR/*.cpp",
     ]),
@@ -2328,7 +2327,7 @@ cc_library(
 )
 
 cc_library(
-    name = "Async",
+    name = "AsyncDialect",
     srcs = glob([
         "lib/Dialect/Async/IR/*.cpp",
     ]),
@@ -2360,7 +2359,7 @@ cc_library(
     deps = [
         ":Analysis",
         ":ArithmeticDialect",
-        ":Async",
+        ":AsyncDialect",
         ":AsyncPassIncGen",
         ":ControlFlowDialect",
         ":FuncDialect",
@@ -2386,7 +2385,7 @@ cc_library(
     hdrs = glob(["include/mlir/Dialect/Affine/Analysis/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":Analysis",
         ":ArithmeticDialect",
         ":FuncDialect",
@@ -2412,8 +2411,8 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":Analysis",
         ":FuncDialect",
         ":IR",
@@ -2451,8 +2450,8 @@ cc_library(
     hdrs = ["include/mlir/Dialect/Affine/Passes.h"],
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":AffinePassIncGen",
         ":AffineUtils",
         ":Analysis",
@@ -2466,7 +2465,7 @@ cc_library(
         ":SCFUtils",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorUtils",
         "//llvm:Support",
     ],
@@ -2572,7 +2571,7 @@ cc_library(
     includes = ["include"],
     deps = [
         ":ArithmeticDialect",
-        ":Async",
+        ":AsyncDialect",
         ":ConversionPassIncGen",
         ":FuncDialect",
         ":FuncToLLVM",
@@ -2596,7 +2595,7 @@ cc_library(
     hdrs = glob(["include/mlir/Conversion/AffineToStandard/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":AffineUtils",
         ":ArithmeticDialect",
         ":ConversionPassIncGen",
@@ -2607,7 +2606,7 @@ cc_library(
         ":SCFDialect",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
     ],
 )
 
@@ -2684,8 +2683,8 @@ cc_library(
     ),
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":Analysis",
         ":ArithmeticDialect",
         ":DialectUtils",
@@ -2818,7 +2817,7 @@ gentbl_cc_library(
 )
 
 cc_library(
-    name = "Shape",
+    name = "ShapeDialect",
     srcs = glob(["lib/Dialect/Shape/IR/*.cpp"]),
     hdrs = ["include/mlir/Dialect/Shape/IR/Shape.h"],
     includes = ["include"],
@@ -2868,7 +2867,7 @@ cc_library(
         ":MemRefDialect",
         ":Pass",
         ":SCFDialect",
-        ":Shape",
+        ":ShapeDialect",
         ":ShapeToStandardGen",
         ":Support",
         ":TensorDialect",
@@ -2911,7 +2910,7 @@ cc_library(
         ":IR",
         ":MemRefDialect",
         ":Pass",
-        ":Shape",
+        ":ShapeDialect",
         ":ShapeTransformsPassIncGen",
         ":Transforms",
     ],
@@ -3066,7 +3065,7 @@ cc_library(
 )
 
 cc_library(
-    name = "VectorOps",
+    name = "VectorDialect",
     srcs = glob(
         [
             "lib/Dialect/Vector/IR/*.cpp",
@@ -3124,7 +3123,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":ArithmeticUtils",
         ":BufferizationDialect",
@@ -3139,8 +3138,8 @@ cc_library(
         ":Support",
         ":TensorDialect",
         ":Transforms",
+        ":VectorDialect",
         ":VectorInterfaces",
-        ":VectorOps",
         ":VectorPassIncGen",
         ":VectorUtils",
         "//llvm:Support",
@@ -3159,15 +3158,15 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":FuncDialect",
         ":IR",
         ":MemRefDialect",
         ":Support",
         ":TensorDialect",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -3558,7 +3557,7 @@ cc_library(
     includes = ["include"],
     deps = [
         ":ArithmeticDialect",
-        ":Async",
+        ":AsyncDialect",
         ":ControlFlowDialect",
         ":DLTIDialect",
         ":AffineUtils",
@@ -3690,7 +3689,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":AMDGPU",
+        ":AMDGPUDialect",
         ":ConversionPassIncGen",
         ":IR",
         ":LLVMCommonConversion",
@@ -3716,7 +3715,7 @@ cc_library(
         ":GPUDialect",
         ":IR",
         ":LLVMCommonConversion",
-        ":NVGPU",
+        ":NVGPUDialect",
         ":NVVMDialect",
         ":Pass",
         ":Transforms",
@@ -3744,7 +3743,7 @@ cc_library(
         ":Pass",
         ":ROCDLDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
     ],
 )
 
@@ -3765,7 +3764,7 @@ cc_library(
         ":SPIRVConversion",
         ":SPIRVDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -3813,7 +3812,7 @@ cc_library(
         ":Pass",
         ":ROCDLDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorToLLVM",
         ":VectorToROCDL",
         ":VectorToSCF",
@@ -3854,7 +3853,7 @@ cc_library(
     includes = ["include"],
     deps = [
         ":ArithmeticToLLVM",
-        ":Async",
+        ":AsyncDialect",
         ":AsyncToLLVM",
         ":ControlFlowToLLVM",
         ":ConversionPassIncGen",
@@ -4673,7 +4672,7 @@ cc_library(
         ":Support",
         ":TensorDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -4702,7 +4701,7 @@ cc_library(
         ":Support",
         ":TensorDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -4736,7 +4735,7 @@ cc_library(
         ":Support",
         ":TensorDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -4912,7 +4911,7 @@ cc_library(
     hdrs = ["include/mlir/Dialect/Tensor/IR/TensorInferTypeOpInterfaceImpl.h"],
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticUtils",
         ":IR",
         ":InferTypeOpInterface",
@@ -4927,7 +4926,7 @@ cc_library(
     hdrs = ["include/mlir/Dialect/Tensor/IR/TensorTilingInterfaceImpl.h"],
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticUtils",
         ":IR",
         ":LinalgDialect",
@@ -4944,7 +4943,7 @@ cc_library(
     hdrs = ["include/mlir/Dialect/Tensor/Utils/Utils.h"],
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":TensorDialect",
         "//llvm:Support",
@@ -5289,7 +5288,7 @@ cc_library(
     hdrs = glob(["include/mlir/Conversion/SCFToGPU/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":AffineToStandard",
         ":ArithmeticDialect",
         ":ComplexDialect",
@@ -5319,7 +5318,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticToSPIRV",
         ":ConversionPassIncGen",
         ":FuncDialect",
@@ -5861,8 +5860,8 @@ cc_library(
     hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/AMX/*.h"]),
     includes = ["include"],
     deps = [
-        ":AMX",
         ":AMXConversionIncGen",
+        ":AMXDialect",
         ":IR",
         ":ToLLVMIRTranslation",
         "//llvm:Core",
@@ -5878,8 +5877,8 @@ cc_library(
     deps = [
         ":IR",
         ":ToLLVMIRTranslation",
-        ":X86Vector",
         ":X86VectorConversionIncGen",
+        ":X86VectorDialect",
         "//llvm:Core",
         "//llvm:Support",
     ],
@@ -5891,8 +5890,8 @@ cc_library(
     hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/ArmNeon/*.h"]),
     includes = ["include"],
     deps = [
-        ":ArmNeon",
         ":ArmNeonConversionIncGen",
+        ":ArmNeonDialect",
         ":ArmNeonIncGen",
         ":IR",
         ":ToLLVMIRTranslation",
@@ -5907,8 +5906,8 @@ cc_library(
     hdrs = glob(["include/mlir/Target/LLVMIR/Dialect/ArmSVE/*.h"]),
     includes = ["include"],
     deps = [
-        ":ArmSVE",
         ":ArmSVEConversionIncGen",
+        ":ArmSVEDialect",
         ":IR",
         ":ToLLVMIRTranslation",
         "//llvm:Core",
@@ -6152,11 +6151,11 @@ cc_library(
         "include/mlir/InitAllPasses.h",
     ],
     deps = [
-        ":AMDGPU",
+        ":AMDGPUDialect",
         ":AMDGPUToROCDL",
-        ":AMX",
+        ":AMXDialect",
         ":AMXTransforms",
-        ":Affine",
+        ":AffineDialect",
         ":AffinePassIncGen",
         ":AffineToStandard",
         ":AffineTransforms",
@@ -6164,10 +6163,10 @@ cc_library(
         ":ArithmeticToLLVM",
         ":ArithmeticToSPIRV",
         ":ArithmeticTransforms",
-        ":ArmNeon",
-        ":ArmSVE",
+        ":ArmNeonDialect",
+        ":ArmSVEDialect",
         ":ArmSVETransforms",
-        ":Async",
+        ":AsyncDialect",
         ":AsyncPassIncGen",
         ":AsyncToLLVM",
         ":AsyncTransforms",
@@ -6180,7 +6179,7 @@ cc_library(
         ":ControlFlowDialect",
         ":ConversionPasses",
         ":DLTIDialect",
-        ":EmitC",
+        ":EmitCDialect",
         ":FuncDialect",
         ":FuncToLLVM",
         ":FuncToSPIRV",
@@ -6215,7 +6214,7 @@ cc_library(
         ":MemRefToLLVM",
         ":MemRefToSPIRV",
         ":MemRefTransforms",
-        ":NVGPU",
+        ":NVGPUDialect",
         ":NVGPUToNVVM",
         ":NVVMDialect",
         ":OpenACCDialect",
@@ -6239,11 +6238,11 @@ cc_library(
         ":SPIRVPassIncGen",
         ":SPIRVToLLVM",
         ":SPIRVTransforms",
-        ":Shape",
+        ":ShapeDialect",
         ":ShapeToStandard",
         ":ShapeTransforms",
         ":ShapeTransformsPassIncGen",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":SparseTensorPipelines",
         ":SparseTensorTransforms",
         ":TensorDialect",
@@ -6256,13 +6255,13 @@ cc_library(
         ":TransformDialectTransforms",
         ":Transforms",
         ":TransformsPassIncGen",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorToLLVM",
         ":VectorToROCDL",
         ":VectorToSCF",
         ":VectorToSPIRV",
         ":VectorTransforms",
-        ":X86Vector",
+        ":X86VectorDialect",
         ":X86VectorTransforms",
     ],
 )
@@ -7270,7 +7269,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ConversionPassIncGen",
         ":FuncDialect",
         ":IR",
@@ -7303,6 +7302,7 @@ cc_library(
         ":IR",
         ":LinalgDialect",
         ":LinalgTransforms",
+        ":LinalgUtils",
         ":Pass",
         ":SPIRVConversion",
         ":SPIRVDialect",
@@ -7316,7 +7316,7 @@ cc_library(
     hdrs = glob(["include/mlir/Dialect/Linalg/IR/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":ArithmeticDialect",
         ":ArithmeticUtils",
         ":BufferizationDialect",
@@ -7336,7 +7336,7 @@ cc_library(
         ":Parser",
         ":SCFDialect",
         ":SideEffectInterfaces",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":Support",
         ":TensorDialect",
         ":TilingInterface",
@@ -7399,29 +7399,69 @@ gentbl_cc_library(
     deps = [":PassBaseTdFiles"],
 )
 
+cc_library(
+    name = "LinalgAnalysis",
+    srcs = glob([
+        "lib/Dialect/Linalg/Analysis/*.cpp",
+        "lib/Dialect/Linalg/Analysis/*.h",
+    ]),
+    hdrs = glob([
+        "include/mlir/Dialect/Linalg/Analysis/*.h",
+    ]),
+    includes = ["include"],
+    deps = [
+        ":BufferizationDialect",
+        ":FuncDialect",
+        ":IR",
+        ":LinalgDialect",
+        "//llvm:Support",
+    ],
+)
+
+cc_library(
+    name = "LinalgUtils",
+    srcs = glob([
+        "lib/Dialect/Linalg/Utils/*.cpp",
+        "lib/Dialect/Linalg/Utils/*.h",
+    ]),
+    hdrs = glob([
+        "include/mlir/Dialect/Linalg/Utils/*.h",
+    ]),
+    deps = [
+        ":AffineAnalysis",
+        ":AffineDialect",
+        ":AffineUtils",
+        ":Analysis",
+        ":ArithmeticDialect",
+        ":ArithmeticUtils",
+        ":DialectUtils",
+        ":IR",
+        ":LinalgAnalysis",
+        ":LinalgDialect",
+        ":MemRefDialect",
+        ":Pass",
+        ":SCFDialect",
+        ":TensorDialect",
+        ":TensorUtils",
+        "//llvm:Support",
+    ],
+)
+
 cc_library(
     name = "LinalgTransforms",
     srcs = glob([
         "lib/Dialect/Linalg/Transforms/*.cpp",
         "lib/Dialect/Linalg/Transforms/*.h",
-    ]) + [
-        "lib/Dialect/Linalg/Analysis/DependenceAnalysis.cpp",
-        "lib/Dialect/Linalg/Utils/Utils.cpp",
-    ],
+    ]),
     hdrs = [
-        "include/mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h",
         "include/mlir/Dialect/Linalg/Passes.h",
-        "include/mlir/Dialect/Linalg/Transforms/BufferizableOpInterfaceImpl.h",
-        "include/mlir/Dialect/Linalg/Transforms/CodegenStrategy.h",
-        "include/mlir/Dialect/Linalg/Transforms/HoistPadding.h",
-        "include/mlir/Dialect/Linalg/Transforms/Hoisting.h",
-        "include/mlir/Dialect/Linalg/Transforms/Transforms.h",
-        "include/mlir/Dialect/Linalg/Utils/Utils.h",
-    ],
+    ] + glob([
+        "include/mlir/Dialect/Linalg/Transforms/*.h",
+    ]),
     includes = ["include"],
     deps = [
-        ":Affine",
         ":AffineAnalysis",
+        ":AffineDialect",
         ":AffineUtils",
         ":Analysis",
         ":ArithmeticDialect",
@@ -7435,16 +7475,18 @@ cc_library(
         ":FuncDialect",
         ":FuncTransforms",
         ":IR",
+        ":LinalgAnalysis",
         ":LinalgDialect",
         ":LinalgPassIncGen",
         ":LinalgStructuredOpsIncGen",
+        ":LinalgUtils",
         ":MathDialect",
         ":MemRefDialect",
         ":Pass",
         ":SCFDialect",
         ":SCFTransforms",
         ":SCFUtils",
-        ":SparseTensor",
+        ":SparseTensorDialect",
         ":Support",
         ":TensorDialect",
         ":TensorTilingInterfaceImpl",
@@ -7452,7 +7494,7 @@ cc_library(
         ":TensorUtils",
         ":TransformUtils",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorToSCF",
         ":VectorTransforms",
         ":VectorUtils",
@@ -7544,12 +7586,12 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":AMX",
+        ":AMXDialect",
         ":AMXTransforms",
         ":ArithmeticDialect",
         ":ArithmeticUtils",
-        ":ArmNeon",
-        ":ArmSVE",
+        ":ArmNeonDialect",
+        ":ArmSVEDialect",
         ":ArmSVETransforms",
         ":ConversionPassIncGen",
         ":DialectUtils",
@@ -7562,9 +7604,9 @@ cc_library(
         ":Support",
         ":ToLLVMIRTranslation",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorTransforms",
-        ":X86Vector",
+        ":X86VectorDialect",
         ":X86VectorTransforms",
         "//llvm:Core",
         "//llvm:Support",
@@ -7582,7 +7624,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":Analysis",
         ":ArithmeticDialect",
         ":ConversionPassIncGen",
@@ -7593,13 +7635,13 @@ cc_library(
         ":IR",
         ":LLVMDialect",
         ":MemRefDialect",
-        ":NVGPU",
+        ":NVGPUDialect",
         ":NVVMDialect",
         ":Pass",
         ":SCFDialect",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorUtils",
         "//llvm:Core",
         "//llvm:Support",
@@ -7617,7 +7659,7 @@ cc_library(
     ]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":AffineUtils",
         ":ArithmeticDialect",
         ":ConversionPassIncGen",
@@ -7630,7 +7672,7 @@ cc_library(
         ":SCFDialect",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorTransforms",
         "//llvm:Core",
         "//llvm:Support",
@@ -8390,7 +8432,6 @@ cc_library(
     ),
     hdrs = [
         "include/mlir/Dialect/Math/IR/Math.h",
-        "include/mlir/Transforms/InliningUtils.h",
     ],
     includes = ["include"],
     deps = [
@@ -8422,9 +8463,9 @@ cc_library(
         ":MathDialect",
         ":SCFDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorUtils",
-        ":X86Vector",
+        ":X86VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -8450,7 +8491,7 @@ cc_library(
         ":Pass",
         ":Support",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         ":VectorUtils",
         "//llvm:Core",
         "//llvm:Support",
@@ -8574,7 +8615,7 @@ cc_library(
     hdrs = glob(["include/mlir/Dialect/MemRef/Transforms/*.h"]),
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":AffineUtils",
         ":ArithmeticDialect",
         ":ArithmeticTransforms",
@@ -8587,7 +8628,7 @@ cc_library(
         ":Pass",
         ":TensorDialect",
         ":Transforms",
-        ":VectorOps",
+        ":VectorDialect",
         "//llvm:Support",
     ],
 )
@@ -8868,7 +8909,7 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
-        ":Affine",
+        ":AffineDialect",
         ":AllocationOpInterface",
         ":ArithmeticDialect",
         ":BufferizableOpInterfaceIncGen",

diff  --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
index 2aa5e2fec0a72..742e7b610453a 100644
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -23,8 +23,8 @@ cc_library(
     deps = [
         ":TestDialect",
         "//llvm:Support",
-        "//mlir:Affine",
         "//mlir:AffineAnalysis",
+        "//mlir:AffineDialect",
         "//mlir:Analysis",
         "//mlir:IR",
         "//mlir:MemRefDialect",
@@ -340,8 +340,8 @@ cc_library(
     deps = [
         ":TestDialect",
         "//llvm:Support",
-        "//mlir:Affine",
         "//mlir:AffineAnalysis",
+        "//mlir:AffineDialect",
         "//mlir:Analysis",
         "//mlir:ArithmeticDialect",
         "//mlir:FuncDialect",
@@ -377,8 +377,8 @@ cc_library(
     ]),
     deps = [
         "//llvm:Support",
-        "//mlir:Affine",
         "//mlir:AffineAnalysis",
+        "//mlir:AffineDialect",
         "//mlir:AffineTransforms",
         "//mlir:AffineUtils",
         "//mlir:Analysis",
@@ -389,7 +389,7 @@ cc_library(
         "//mlir:SCFDialect",
         "//mlir:Support",
         "//mlir:Transforms",
-        "//mlir:VectorOps",
+        "//mlir:VectorDialect",
         "//mlir:VectorUtils",
     ],
 )
@@ -416,7 +416,7 @@ cc_library(
     deps = [
         "//llvm:NVPTXCodeGen",
         "//llvm:Support",
-        "//mlir:Affine",
+        "//mlir:AffineDialect",
         "//mlir:ArithmeticDialect",
         "//mlir:FuncDialect",
         "//mlir:GPUDialect",
@@ -440,7 +440,7 @@ cc_library(
     includes = ["lib/Dialect/Test"],
     deps = [
         "//llvm:Support",
-        "//mlir:Affine",
+        "//mlir:AffineDialect",
         "//mlir:ArithmeticDialect",
         "//mlir:ArithmeticTransforms",
         "//mlir:BufferizationDialect",
@@ -449,8 +449,10 @@ cc_library(
         "//mlir:FuncTransforms",
         "//mlir:GPUDialect",
         "//mlir:IR",
+        "//mlir:LinalgAnalysis",
         "//mlir:LinalgDialect",
         "//mlir:LinalgTransforms",
+        "//mlir:LinalgUtils",
         "//mlir:MemRefDialect",
         "//mlir:Parser",
         "//mlir:Pass",
@@ -460,7 +462,7 @@ cc_library(
         "//mlir:TensorTransforms",
         "//mlir:TransformUtils",
         "//mlir:Transforms",
-        "//mlir:VectorOps",
+        "//mlir:VectorDialect",
         "//mlir:VectorToSCF",
         "//mlir:VectorTransforms",
     ],
@@ -478,8 +480,8 @@ cc_library(
         "//mlir:Pass",
         "//mlir:SCFDialect",
         "//mlir:TransformUtils",
-        "//mlir:VectorOps",
-        "//mlir:X86Vector",
+        "//mlir:VectorDialect",
+        "//mlir:X86VectorDialect",
     ],
 )
 
@@ -490,7 +492,7 @@ cc_library(
     includes = ["lib/Dialect/Test"],
     deps = [
         ":TestDialect",
-        "//mlir:Affine",
+        "//mlir:AffineDialect",
         "//mlir:MemRefDialect",
         "//mlir:MemRefTransforms",
         "//mlir:Pass",
@@ -528,7 +530,7 @@ cc_library(
         "//mlir:IR",
         "//mlir:InferTypeOpInterface",
         "//mlir:Pass",
-        "//mlir:Shape",
+        "//mlir:ShapeDialect",
     ],
 )
 
@@ -556,7 +558,7 @@ cc_library(
     includes = ["lib/Dialect/Test"],
     deps = [
         ":TestDialect",
-        "//mlir:Affine",
+        "//mlir:AffineDialect",
         "//mlir:FuncDialect",
         "//mlir:FuncTransforms",
         "//mlir:IR",
@@ -586,7 +588,7 @@ cc_library(
     defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"],
     includes = ["lib/Dialect/Test"],
     deps = [
-        "//mlir:Affine",
+        "//mlir:AffineDialect",
         "//mlir:Analysis",
         "//mlir:FuncDialect",
         "//mlir:GPUDialect",
@@ -598,10 +600,10 @@ cc_library(
         "//mlir:SCFDialect",
         "//mlir:Support",
         "//mlir:TransformUtils",
-        "//mlir:VectorOps",
+        "//mlir:VectorDialect",
         "//mlir:VectorToSCF",
         "//mlir:VectorTransforms",
-        "//mlir:X86Vector",
+        "//mlir:X86VectorDialect",
     ],
 )
 


        


More information about the Mlir-commits mailing list