Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -6,6 +6,11 @@
 set(MLIR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(MLIR_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
+# Make sure that our source directory is on the current cmake module path so that
+# we can include cmake files from this directory.
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+include(AddMLIR)
+
 function(mlir_tablegen ofn)
   tablegen(MLIR ${ARGV} "-I${MLIR_MAIN_SRC_DIR}" "-I${MLIR_INCLUDE_DIR}")
   set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
Index: mlir/cmake/modules/AddMLIR.cmake
===================================================================
--- /dev/null
+++ mlir/cmake/modules/AddMLIR.cmake
@@ -0,0 +1,65 @@
+macro(add_mlir_library name)
+  cmake_parse_arguments(ARG
+    "SHARED;STATIC;BUILDTREE_ONLY;MODULE;INSTALL_WITH_TOOLCHAIN"
+    ""
+    ""
+    ${ARGN})
+
+  # LIBTYPE=STATIC as the default within MLIR even with BUILD_SHARED_LIBS=ON
+  set(LIBTYPE STATIC)
+
+  if(ARG_MODULE)
+    set(LIBTYPE MODULE)
+  elseif( ARG_SHARED )
+    set(LIBTYPE SHARED)
+  elseif( ARG_STATIC )
+    set(LIBTYPE STATIC)
+  endif()
+  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS})
+
+  # Libraries that are meant to only be exposed via the build tree only are
+  # never installed and are only exported as a target in the special build tree
+  # config file.
+  if (NOT ARG_BUILDTREE_ONLY AND NOT ARG_MODULE)
+    set_property( GLOBAL APPEND PROPERTY LLVM_LIBS ${name} )
+    set(in_llvm_libs YES)
+  endif()
+
+  if (ARG_MODULE AND NOT TARGET ${name})
+    # Add empty "phony" target
+    add_custom_target(${name})
+  elseif( EXCLUDE_FROM_ALL )
+    set_target_properties( ${name} PROPERTIES EXCLUDE_FROM_ALL ON)
+  elseif(ARG_BUILDTREE_ONLY)
+    set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS_BUILDTREE_ONLY ${name})
+  else()
+    if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
+
+      set(export_to_llvmexports)
+      if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
+          (in_llvm_libs AND "llvm-libraries" IN_LIST LLVM_DISTRIBUTION_COMPONENTS) OR
+          NOT LLVM_DISTRIBUTION_COMPONENTS)
+        set(export_to_llvmexports EXPORT LLVMExports)
+        set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True)
+      endif()
+
+      install(TARGETS ${name}
+              ${export_to_llvmexports}
+              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              RUNTIME DESTINATION bin COMPONENT ${name})
+
+      if (NOT LLVM_ENABLE_IDE)
+        add_llvm_install_targets(install-${name}
+                                 DEPENDS ${name}
+                                 COMPONENT ${name})
+      endif()
+    endif()
+    set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
+  endif()
+  if (ARG_MODULE)
+    set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
+  else()
+    set_target_properties(${name} PROPERTIES FOLDER "Libraries")
+  endif()
+endmacro(add_mlir_library)
Index: mlir/examples/toy/Ch6/CMakeLists.txt
===================================================================
--- mlir/examples/toy/Ch6/CMakeLists.txt
+++ mlir/examples/toy/Ch6/CMakeLists.txt
@@ -43,6 +43,13 @@
     MLIRStandardToLLVM
     MLIRTargetLLVMIR
     MLIRTransforms
+    LLVMMC
+    LLVMScalarOpts
+    LLVMInstCombine
+    LLVMAggressiveInstCombine
+    LLVMAnalysis
+    LLVMVectorize
+    LLVMTarget
     )
 
 whole_archive_link(toyc-ch6
Index: mlir/examples/toy/Ch7/CMakeLists.txt
===================================================================
--- mlir/examples/toy/Ch7/CMakeLists.txt
+++ mlir/examples/toy/Ch7/CMakeLists.txt
@@ -43,6 +43,13 @@
     MLIRStandardToLLVM
     MLIRTargetLLVMIR
     MLIRTransforms
+    LLVMMC
+    LLVMScalarOpts
+    LLVMInstCombine
+    LLVMAggressiveInstCombine
+    LLVMAnalysis
+    LLVMVectorize
+    LLVMTarget
     )
 
 whole_archive_link(toyc-ch7
Index: mlir/lib/Analysis/CMakeLists.txt
===================================================================
--- mlir/lib/Analysis/CMakeLists.txt
+++ mlir/lib/Analysis/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRAnalysis STATIC
+add_mlir_library(MLIRAnalysis STATIC
   AffineAnalysis.cpp
   AffineStructures.cpp
   CallGraph.cpp
Index: mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRAffineToStandard
+add_mlir_library(MLIRAffineToStandard
   AffineToStandard.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -1,7 +1,7 @@
 if(MLIR_CUDA_CONVERSIONS_ENABLED)
   llvm_map_components_to_libnames(nvptx "NVPTX")
 
-  add_llvm_library(MLIRGPUtoCUDATransforms
+  add_mlir_library(MLIRGPUtoCUDATransforms
     ConvertKernelFuncToCubin.cpp
     ConvertLaunchFuncToCudaCalls.cpp
   )
Index: mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
+++ mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -2,7 +2,7 @@
 mlir_tablegen(GPUToNVVM.cpp.inc -gen-rewriters)
 add_public_tablegen_target(MLIRGPUToNVVMIncGen)
 
-add_llvm_library(MLIRGPUtoNVVMTransforms
+add_mlir_library(MLIRGPUtoNVVMTransforms
   LowerGpuOpsToNVVMOps.cpp
   )
 
Index: mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
+++ mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRGPUtoROCDLTransforms
+add_mlir_library(MLIRGPUtoROCDLTransforms
   LowerGpuOpsToROCDLOps.cpp
   )
 target_link_libraries(MLIRGPUtoROCDLTransforms
Index: mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRGPUtoSPIRVTransforms
+add_mlir_library(MLIRGPUtoSPIRVTransforms
   ConvertGPUToSPIRV.cpp
   ConvertGPUToSPIRVPass.cpp
   )
Index: mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
+++ mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRLinalgToLLVM
+add_mlir_library(MLIRLinalgToLLVM
   LinalgToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
+++ mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRLoopToStandard
+add_mlir_library(MLIRLoopToStandard
   ConvertLoopToStandard.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
+++ mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
@@ -10,7 +10,7 @@
   LLVMSupport
 )
 
-add_llvm_library(MLIRLoopsToGPU
+add_mlir_library(MLIRLoopsToGPU
   LoopsToGPU.cpp
   LoopsToGPUPass.cpp
 
Index: mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
+++ mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRStandardToLLVM
+add_mlir_library(MLIRStandardToLLVM
   ConvertStandardToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
+++ mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -2,7 +2,7 @@
 mlir_tablegen(StandardToSPIRV.cpp.inc -gen-rewriters)
 add_public_tablegen_target(MLIRStandardToSPIRVIncGen)
 
-add_llvm_library(MLIRStandardToSPIRVTransforms
+add_mlir_library(MLIRStandardToSPIRVTransforms
   ConvertStandardToSPIRV.cpp
   ConvertStandardToSPIRVPass.cpp
   LegalizeStandardForSPIRV.cpp
Index: mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
+++ mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRVectorToLLVM
+add_mlir_library(MLIRVectorToLLVM
   ConvertVectorToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
+++ mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRVectorToLoops
+add_mlir_library(MLIRVectorToLoops
   ConvertVectorToLoops.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Dialect/AffineOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/AffineOps/CMakeLists.txt
+++ mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRAffineOps
+add_mlir_library(MLIRAffineOps
   AffineOps.cpp
   DialectRegistration.cpp
 
Index: mlir/lib/Dialect/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/CMakeLists.txt
+++ mlir/lib/Dialect/CMakeLists.txt
@@ -10,7 +10,7 @@
 add_subdirectory(StandardOps)
 add_subdirectory(VectorOps)
 
-add_llvm_library(MLIRDialect
+add_mlir_library(MLIRDialect
   Traits.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
+++ mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRFxpMathOps
+add_mlir_library(MLIRFxpMathOps
   IR/FxpMathOps.cpp
   IR/DialectRegistration.cpp
   Transforms/LowerUniformRealMath.cpp
Index: mlir/lib/Dialect/GPU/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/GPU/CMakeLists.txt
+++ mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRGPU
+add_mlir_library(MLIRGPU
   IR/GPUDialect.cpp
   IR/DialectRegistration.cpp
   Transforms/KernelOutlining.cpp
Index: mlir/lib/Dialect/LLVMIR/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRLLVMIR
+add_mlir_library(MLIRLLVMIR
   IR/LLVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -7,7 +7,7 @@
 add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
 target_link_libraries(MLIRLLVMIR LLVMAsmParser LLVMCore LLVMSupport MLIRIR)
 
-add_llvm_library(MLIRNVVMIR
+add_mlir_library(MLIRNVVMIR
   IR/NVVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -16,7 +16,7 @@
 add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
 target_link_libraries(MLIRNVVMIR LLVMAsmParser LLVMCore LLVMSupport MLIRIR)
 
-add_llvm_library(MLIRROCDLIR
+add_mlir_library(MLIRROCDLIR
   IR/ROCDLDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Dialect/Linalg/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/Linalg/CMakeLists.txt
+++ mlir/lib/Dialect/Linalg/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRLinalg
+add_mlir_library(MLIRLinalg
   LinalgRegistration.cpp
   Analysis/DependenceAnalysis.cpp
   EDSC/Builders.cpp
Index: mlir/lib/Dialect/LoopOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/LoopOps/CMakeLists.txt
+++ mlir/lib/Dialect/LoopOps/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB globbed *.c *.cpp)
-add_llvm_library(MLIRLoopOps
+add_mlir_library(MLIRLoopOps
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Dialect/QuantOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/QuantOps/CMakeLists.txt
+++ mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRQuantOps
+add_mlir_library(MLIRQuantOps
   IR/DialectRegistration.cpp
   IR/QuantOps.cpp
   IR/QuantTypes.cpp
Index: mlir/lib/Dialect/SDBM/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SDBM/CMakeLists.txt
+++ mlir/lib/Dialect/SDBM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRSDBM
+add_mlir_library(MLIRSDBM
   SDBM.cpp
   SDBMExpr.cpp
   SDBMDialect.cpp
Index: mlir/lib/Dialect/SPIRV/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/CMakeLists.txt
@@ -2,7 +2,7 @@
 mlir_tablegen(SPIRVCanonicalization.inc -gen-rewriters)
 add_public_tablegen_target(MLIRSPIRVCanonicalizationIncGen)
 
-add_llvm_library(MLIRSPIRV
+add_mlir_library(MLIRSPIRV
   DialectRegistration.cpp
   LayoutUtils.cpp
   SPIRVDialect.cpp
Index: mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRSPIRVSerialization
+add_mlir_library(MLIRSPIRVSerialization
   Deserializer.cpp
   Serializer.cpp
   SPIRVBinaryUtils.cpp
Index: mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRSPIRVTransforms
+add_mlir_library(MLIRSPIRVTransforms
   DecorateSPIRVCompositeTypeLayoutPass.cpp
   LowerABIAttributesPass.cpp
 
Index: mlir/lib/Dialect/StandardOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB globbed *.c *.cpp)
-add_llvm_library(MLIRStandardOps
+add_mlir_library(MLIRStandardOps
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Dialect/VectorOps/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRVectorOps
+add_mlir_library(MLIRVectorOps
   DialectRegistration.cpp
   VectorOps.cpp
   VectorTransforms.cpp
Index: mlir/lib/EDSC/CMakeLists.txt
===================================================================
--- mlir/lib/EDSC/CMakeLists.txt
+++ mlir/lib/EDSC/CMakeLists.txt
@@ -5,7 +5,7 @@
   Intrinsics.cpp
   )
 
-add_llvm_library(MLIREDSC
+add_mlir_library(MLIREDSC
   Builders.cpp
   Helpers.cpp
   Intrinsics.cpp
@@ -22,7 +22,7 @@
     MLIRVectorOps
     )
 
-add_llvm_library(MLIREDSCInterface
+add_mlir_library(MLIREDSCInterface
   CoreAPIs.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/ExecutionEngine/CMakeLists.txt
===================================================================
--- mlir/lib/ExecutionEngine/CMakeLists.txt
+++ mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -1,5 +1,5 @@
 llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO")
-add_llvm_library(MLIRExecutionEngine
+add_mlir_library(MLIRExecutionEngine
   ExecutionEngine.cpp
   OptUtils.cpp
 
Index: mlir/lib/IR/CMakeLists.txt
===================================================================
--- mlir/lib/IR/CMakeLists.txt
+++ mlir/lib/IR/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB globbed *.c *.cpp)
-add_llvm_library(MLIRIR
+add_mlir_library(MLIRIR
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Parser/CMakeLists.txt
===================================================================
--- mlir/lib/Parser/CMakeLists.txt
+++ mlir/lib/Parser/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRParser
+add_mlir_library(MLIRParser
   Lexer.cpp
   Parser.cpp
   Token.cpp
Index: mlir/lib/Pass/CMakeLists.txt
===================================================================
--- mlir/lib/Pass/CMakeLists.txt
+++ mlir/lib/Pass/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB globbed *.c *.cpp)
-add_llvm_library(MLIRPass
+add_mlir_library(MLIRPass
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Quantizer/CMakeLists.txt
===================================================================
--- mlir/lib/Quantizer/CMakeLists.txt
+++ mlir/lib/Quantizer/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Support.
-add_llvm_library(MLIRQuantizerSupport
+add_mlir_library(MLIRQuantizerSupport
   Support/Configuration.cpp
   Support/ConstraintAnalysisGraph.cpp
   Support/Metadata.cpp
@@ -17,7 +17,7 @@
                  MLIRStandardOps)
 
 # Configurations.
-add_llvm_library(MLIRQuantizerFxpMathConfig
+add_mlir_library(MLIRQuantizerFxpMathConfig
   Configurations/FxpMathConfig.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -27,7 +27,7 @@
                  MLIRQuantizerSupport)
 
 # Transforms.
-add_llvm_library(MLIRQuantizerTransforms
+add_mlir_library(MLIRQuantizerTransforms
   Transforms/AddDefaultStatsTestPass.cpp
   Transforms/InferQuantizedTypesPass.cpp
   Transforms/RemoveInstrumentationPass.cpp
Index: mlir/lib/Support/CMakeLists.txt
===================================================================
--- mlir/lib/Support/CMakeLists.txt
+++ mlir/lib/Support/CMakeLists.txt
@@ -7,7 +7,7 @@
   TranslateClParser.cpp
 )
 
-add_llvm_library(MLIRSupport
+add_mlir_library(MLIRSupport
   FileUtilities.cpp
   StorageUniquer.cpp
   ToolUtilities.cpp
@@ -17,7 +17,7 @@
   )
 target_link_libraries(MLIRSupport LLVMSupport ${LLVM_PTHREAD_LIB})
 
-add_llvm_library(MLIROptMain
+add_mlir_library(MLIROptMain
   MlirOptMain.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -29,7 +29,7 @@
   MLIRSupport
   )
 
-add_llvm_library(MLIRTranslateClParser
+add_mlir_library(MLIRTranslateClParser
   TranslateClParser.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -37,7 +37,7 @@
   )
 target_link_libraries(MLIRTranslateClParser LLVMSupport)
 
-add_llvm_library(MLIRJitRunner
+add_mlir_library(MLIRJitRunner
   JitRunner.cpp
 )
 target_link_libraries(MLIRJitRunner PRIVATE
Index: mlir/lib/TableGen/CMakeLists.txt
===================================================================
--- mlir/lib/TableGen/CMakeLists.txt
+++ mlir/lib/TableGen/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(LLVMMLIRTableGen
+add_mlir_library(LLVMMLIRTableGen
   Argument.cpp
   Attribute.cpp
   Constraint.cpp
Index: mlir/lib/Target/CMakeLists.txt
===================================================================
--- mlir/lib/Target/CMakeLists.txt
+++ mlir/lib/Target/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTargetLLVMIRModuleTranslation
+add_mlir_library(MLIRTargetLLVMIRModuleTranslation
   LLVMIR/ModuleTranslation.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -9,7 +9,7 @@
 target_link_libraries(MLIRTargetLLVMIRModuleTranslation
   MLIRLLVMIR LLVMCore LLVMIRReader LLVMSupport LLVMTransformUtils
   MLIRTranslation)
-add_llvm_library(MLIRTargetLLVMIR
+add_mlir_library(MLIRTargetLLVMIR
   LLVMIR/ConvertFromLLVMIR.cpp
   LLVMIR/ConvertToLLVMIR.cpp
 
@@ -17,7 +17,7 @@
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
   )
 target_link_libraries(MLIRTargetLLVMIR MLIRTargetLLVMIRModuleTranslation)
-add_llvm_library(MLIRTargetNVVMIR
+add_mlir_library(MLIRTargetNVVMIR
   LLVMIR/ConvertToNVVMIR.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -32,7 +32,7 @@
   MLIRNVVMIR
   MLIRTargetLLVMIRModuleTranslation
   )
-add_llvm_library(MLIRTargetROCDLIR
+add_mlir_library(MLIRTargetROCDLIR
   LLVMIR/ConvertToROCDLIR.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/lib/Transforms/CMakeLists.txt
===================================================================
--- mlir/lib/Transforms/CMakeLists.txt
+++ mlir/lib/Transforms/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(Utils)
 
-add_llvm_library(MLIRTransforms
+add_mlir_library(MLIRTransforms
   AffineDataCopyGeneration.cpp
   AffineLoopInvariantCodeMotion.cpp
   Canonicalizer.cpp
Index: mlir/lib/Transforms/Utils/CMakeLists.txt
===================================================================
--- mlir/lib/Transforms/Utils/CMakeLists.txt
+++ mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTransformUtils
+add_mlir_library(MLIRTransformUtils
   FoldUtils.cpp
   GreedyPatternRewriteDriver.cpp
   InliningUtils.cpp
Index: mlir/lib/Translation/CMakeLists.txt
===================================================================
--- mlir/lib/Translation/CMakeLists.txt
+++ mlir/lib/Translation/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTranslation
+add_mlir_library(MLIRTranslation
   Translation.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/test/Dialect/SPIRV/CMakeLists.txt
===================================================================
--- mlir/test/Dialect/SPIRV/CMakeLists.txt
+++ mlir/test/Dialect/SPIRV/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRSPIRVTestPasses
+add_mlir_library(MLIRSPIRVTestPasses
   TestAvailability.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/test/lib/IR/CMakeLists.txt
===================================================================
--- mlir/test/lib/IR/CMakeLists.txt
+++ mlir/test/lib/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTestIR
+add_mlir_library(MLIRTestIR
   TestFunc.cpp
   TestMatchers.cpp
   TestSymbolUses.cpp
Index: mlir/test/lib/Pass/CMakeLists.txt
===================================================================
--- mlir/test/lib/Pass/CMakeLists.txt
+++ mlir/test/lib/Pass/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTestPass
+add_mlir_library(MLIRTestPass
   TestPassManager.cpp
 
   ADDITIONAL_HEADER_DIRS
Index: mlir/test/lib/TestDialect/CMakeLists.txt
===================================================================
--- mlir/test/lib/TestDialect/CMakeLists.txt
+++ mlir/test/lib/TestDialect/CMakeLists.txt
@@ -11,7 +11,7 @@
 mlir_tablegen(TestPatterns.inc -gen-rewriters)
 add_public_tablegen_target(MLIRTestOpsIncGen)
 
-add_llvm_library(MLIRTestDialect
+add_mlir_library(MLIRTestDialect
   TestDialect.cpp
   TestPatterns.cpp
 )
Index: mlir/test/lib/Transforms/CMakeLists.txt
===================================================================
--- mlir/test/lib/Transforms/CMakeLists.txt
+++ mlir/test/lib/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRTestTransforms
+add_mlir_library(MLIRTestTransforms
   TestCallGraph.cpp
   TestConstantFold.cpp
   TestLoopFusion.cpp
Index: mlir/test/mlir-cpu-runner/CMakeLists.txt
===================================================================
--- mlir/test/mlir-cpu-runner/CMakeLists.txt
+++ mlir/test/mlir-cpu-runner/CMakeLists.txt
@@ -4,12 +4,12 @@
   mlir_runner_utils.cpp
   )
 
-add_llvm_library(cblas SHARED cblas.cpp)
+add_mlir_library(cblas SHARED cblas.cpp)
 target_compile_definitions(cblas PRIVATE cblas_EXPORTS)
 
-add_llvm_library(cblas_interface SHARED cblas_interface.cpp)
+add_mlir_library(cblas_interface SHARED cblas_interface.cpp)
 target_link_libraries(cblas_interface PRIVATE cblas)
 target_compile_definitions(cblas_interface PRIVATE cblas_interface_EXPORTS)
 
-add_llvm_library(mlir_runner_utils SHARED mlir_runner_utils.cpp)
+add_mlir_library(mlir_runner_utils SHARED mlir_runner_utils.cpp)
 target_compile_definitions(mlir_runner_utils PRIVATE mlir_runner_utils_EXPORTS)
Index: mlir/tools/mlir-cpu-runner/CMakeLists.txt
===================================================================
--- mlir/tools/mlir-cpu-runner/CMakeLists.txt
+++ mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -20,4 +20,11 @@
   MLIRSupport
   LLVMCore
   LLVMSupport
+  LLVMMC
+  LLVMScalarOpts
+  LLVMInstCombine
+  LLVMAggressiveInstCombine
+  LLVMAnalysis
+  LLVMVectorize
+  LLVMTarget
 )
Index: mlir/tools/mlir-cuda-runner/CMakeLists.txt
===================================================================
--- mlir/tools/mlir-cuda-runner/CMakeLists.txt
+++ mlir/tools/mlir-cuda-runner/CMakeLists.txt
@@ -23,7 +23,7 @@
   # We need the libcuda.so library.
   find_library(CUDA_RUNTIME_LIBRARY cuda)
 
-  add_llvm_library(cuda-runtime-wrappers SHARED
+  add_mlir_library(cuda-runtime-wrappers SHARED
     cuda-runtime-wrappers.cpp
   )
   target_include_directories(cuda-runtime-wrappers
Index: mlir/tools/mlir-opt/CMakeLists.txt
===================================================================
--- mlir/tools/mlir-opt/CMakeLists.txt
+++ mlir/tools/mlir-opt/CMakeLists.txt
@@ -10,7 +10,7 @@
   MLIRTransforms
   MLIRSupport
 )
-add_llvm_library(MLIRMlirOptLib
+add_mlir_library(MLIRMlirOptLib
   mlir-opt.cpp
 )
 target_link_libraries(MLIRMlirOptLib ${LIB_LIBS})