[flang-commits] [flang] d4e889f - Remove `Ops` suffix from dialect library names

Stella Laurenzo via flang-commits flang-commits at lists.llvm.org
Wed Sep 30 18:02:14 PDT 2020 

Author: Geoffrey Martin-Noble
Date: 2020-09-30T18:00:44-07:00
New Revision: d4e889f1f5723105dbab12b749503d2462eb1755

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

LOG: Remove `Ops` suffix from dialect library names

Dialects include more than just ops, so this suffix is outdated. Follows
discussion in
https://llvm.discourse.group/t/rfc-canonical-file-paths-to-dialects/621

Reviewed By: stellaraccident

Differential Revision: https://reviews.llvm.org/D88530

Added: 
    

Modified: 
    flang/lib/Lower/CMakeLists.txt
    mlir/docs/Tutorials/CreatingADialect.md
    mlir/lib/Analysis/CMakeLists.txt
    mlir/lib/CAPI/Standard/CMakeLists.txt
    mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
    mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
    mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
    mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
    mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
    mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
    mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
    mlir/lib/Dialect/Affine/EDSC/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/GPU/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
    mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
    mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
    mlir/lib/Dialect/Quant/CMakeLists.txt
    mlir/lib/Dialect/SCF/CMakeLists.txt
    mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Shape/IR/CMakeLists.txt
    mlir/lib/Dialect/StandardOps/CMakeLists.txt
    mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt
    mlir/lib/Dialect/Vector/CMakeLists.txt
    mlir/lib/ExecutionEngine/CMakeLists.txt
    mlir/lib/Transforms/CMakeLists.txt
    mlir/lib/Transforms/Utils/CMakeLists.txt
    mlir/test/EDSC/CMakeLists.txt
    mlir/test/lib/Dialect/Test/CMakeLists.txt
    mlir/test/lib/Transforms/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
index e104a8fd0d89..07b87ef22ce9 100644
--- a/flang/lib/Lower/CMakeLists.txt
+++ b/flang/lib/Lower/CMakeLists.txt
@@ -30,7 +30,7 @@ add_flang_library(FortranLower
   MLIRAffineToStandard
   MLIRLLVMIR
   MLIRSCFToStandard
-  MLIRStandardOps
+  MLIRStandard
 
   LINK_COMPONENTS
   Support

diff  --git a/mlir/docs/Tutorials/CreatingADialect.md b/mlir/docs/Tutorials/CreatingADialect.md
index 9f9eb7a8317b..17d2ec97eb68 100644
--- a/mlir/docs/Tutorials/CreatingADialect.md
+++ b/mlir/docs/Tutorials/CreatingADialect.md
@@ -26,7 +26,7 @@ typically described in TableGen file using the [DDR
 format](DeclarativeRewrites.md).
 
 Note that dialect names should not generally be suffixed with “Ops”,
-although some files pertaining to the operations of a dialect (e.g.
+although some files pertaining only to the operations of a dialect (e.g.
 FooOps.cpp) might be.
 
 ## CMake best practices
@@ -38,10 +38,8 @@ tablegen in a file FooOps.td.  This file forms the core of a dialect and
 is declared using add_mlir_dialect().
 
 ```cmake
-
 add_mlir_dialect(FooOps foo)
 add_mlir_doc(FooOps -gen-dialect-doc FooDialect Dialects/)
-
 ```
 
 This generates the correct rules to run mlir-tblgen, along with a
@@ -49,6 +47,7 @@ This generates the correct rules to run mlir-tblgen, along with a
 
 Dialect transformations are typically declared in a file FooTransforms.td.
 Targets for TableGen are described in typical llvm fashion.
+
 ```cmake
 set(LLVM_TARGET_DEFINITIONS FooTransforms.td)
 mlir_tablegen(FooTransforms.h.inc -gen-rewriters)
@@ -67,20 +66,18 @@ other dialect libraries.  Typically this dependence is declared using
 target_link_libraries() and the PUBLIC keyword.  For instance:
 
 ```cmake
-
-add_mlir_dialect_library(FooOps
-	DEPENDS
-	MLIRFooOpsIncGen
-	MLIRFooTransformsIncGen
-
-	LINK_COMPONENTS
-	Core
-
-	LINK_LIBS PUBLIC
-	BarOps
-	<some-other-library>
-   )
-
+add_mlir_dialect_library(MLIRFoo
+  DEPENDS
+  MLIRFooOpsIncGen
+  MLIRFooTransformsIncGen
+
+  LINK_COMPONENTS
+  Core
+
+  LINK_LIBS PUBLIC
+  MLIRBar
+  <some-other-library>
+  )
 ```
 
 add_mlir_dialect_library() is a thin wrapper around add_llvm_library()
@@ -90,9 +87,7 @@ access to all dialects.  This list is also linked into libMLIR.so.
 The list can be retrieved from the MLIR_DIALECT_LIBS global property:
 
 ```cmake
-
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
 ```
 
 Note that although the Bar dialect also uses TableGen to declare its
@@ -139,18 +134,16 @@ dialects (e.g. MLIRStandard).  Typically this dependence is specified
 using target_link_libraries() and the PUBLIC keyword.  For instance:
 
 ```cmake
-
 add_mlir_conversion_library(MLIRBarToFoo
-	BarToFoo.cpp
+  BarToFoo.cpp
 
-        ADDITIONAL_HEADER_DIRS
-        ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/BarToFoo
-
-   LINK_LIBS PUBLIC
-	BarOps
-	FooOps
-	)
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/BarToFoo
 
+  LINK_LIBS PUBLIC
+  MLIRBar
+  MLIRFoo
+  )
 ```
 
 add_mlir_conversion_library() is a thin wrapper around
@@ -161,9 +154,7 @@ is also linked in libMLIR.so.  The list can be retrieved from the
 MLIR_CONVERSION_LIBS global property:
 
 ```cmake
-
 get_property(dialect_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
-
 ```
 
 Note that it is only necessary to specify a PUBLIC dependence against

diff  --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 524203b87068..217a94995c0a 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -21,7 +21,7 @@ add_mlir_library(MLIRAnalysis
   mlir-headers
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface
@@ -43,7 +43,7 @@ add_mlir_library(MLIRLoopAnalysis
   mlir-headers
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface

diff  --git a/mlir/lib/CAPI/Standard/CMakeLists.txt b/mlir/lib/CAPI/Standard/CMakeLists.txt
index 662841c2d235..c8411666052e 100644
--- a/mlir/lib/CAPI/Standard/CMakeLists.txt
+++ b/mlir/lib/CAPI/Standard/CMakeLists.txt
@@ -7,5 +7,5 @@ add_mlir_library(MLIRCAPIStandard
 
   LINK_LIBS PUBLIC
   MLIRCAPIIR
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
index 47a371fcea87..45c398195d15 100644
--- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -11,10 +11,10 @@ add_mlir_conversion_library(MLIRAffineToStandard
   Core
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRSCF
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransforms
   MLIRIR
   )

diff  --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
index cce793fe5a6e..2da9c709079f 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -16,7 +16,7 @@ add_mlir_conversion_library(MLIRGPUToSPIRVTransforms
   MLIRPass
   MLIRSCFToSPIRV
   MLIRSPIRV
-  MLIRStandardOps
+  MLIRStandard
   MLIRStandardToSPIRVTransforms
   MLIRSupport
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
index b62f72fe9191..65733523531a 100644
--- a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
@@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRGPUToVulkanTransforms
   MLIRPass
   MLIRSPIRV
   MLIRSPIRVSerialization
-  MLIRStandardOps
+  MLIRStandard
   MLIRSupport
   MLIRTransforms
   MLIRTranslation

diff  --git a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
index d507b413fbec..9ae00bf1e80a 100644
--- a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
@@ -15,7 +15,7 @@ add_mlir_conversion_library(MLIRLinalgToLLVM
   MLIRAffineToStandard
   MLIREDSC
   MLIRIR
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRLLVMIR
   MLIRSCFToStandard
   MLIRStandardToLLVM

diff  --git a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
index 98553ad96748..e76e9b7f5012 100644
--- a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
@@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRLinalgToSPIRVTransforms
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRLinalgUtils
   MLIRPass
   MLIRSPIRV

diff  --git a/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt b/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
index 8cfb315bc6a1..b38a4b8e9f66 100644
--- a/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
@@ -13,7 +13,7 @@ add_mlir_conversion_library(MLIRLinalgToStandard
   LINK_LIBS PUBLIC
   MLIREDSC
   MLIRIR
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRPass
   MLIRSCF
   MLIRTransforms

diff  --git a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
index 1da4dacd190e..10fed819ca35 100644
--- a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
@@ -9,13 +9,13 @@ add_mlir_conversion_library(MLIRSCFToGPU
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAffineToStandard
   MLIRGPU
   MLIRIR
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
index 6d95813d717f..1a3867627720 100644
--- a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt
@@ -8,13 +8,13 @@ add_mlir_conversion_library(MLIRSCFToSPIRV
   MLIRConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAffineToStandard
   MLIRSPIRV
   MLIRIR
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRSupport
   MLIRTransforms
   )

diff  --git a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
index e60985984da3..5ccbcc6b3947 100644
--- a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -17,5 +17,5 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
   MLIRSupport
   MLIRTransformUtils
   MLIRSPIRV
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
index a0e8b6f90a3c..e753f4e5c0fc 100644
--- a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
@@ -8,10 +8,10 @@ add_mlir_dialect_library(MLIRAffineEDSC
   MLIRAffineOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIREDSC
   MLIRIR
   MLIRLoopLikeInterface
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
index 20bc86366668..03153389a33f 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(MLIRAffineOps
+add_mlir_dialect_library(MLIRAffine
   AffineMemoryOpInterfaces.cpp
   AffineOps.cpp
   AffineValueMap.cpp
@@ -15,5 +15,5 @@ add_mlir_dialect_library(MLIRAffineOps
   MLIRIR
   MLIRLoopLikeInterface
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
index c1d406ac08b4..899f36253652 100644
--- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
@@ -18,13 +18,13 @@ add_mlir_dialect_library(MLIRAffineTransforms
   MLIRLoopLikeInterfaceIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAffineUtils
   MLIREDSC
   MLIRIR
   MLIRPass
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransformUtils
   MLIRVector
   MLIRVectorToLLVM

diff  --git a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
index 59ae13dcabcf..e4a5d0bbd9f1 100644
--- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
@@ -5,6 +5,6 @@ add_mlir_dialect_library(MLIRAffineUtils
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index cdb06f44b6dc..d62ea7a7362a 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -21,7 +21,7 @@ add_mlir_dialect_library(MLIRGPU
   MLIRSCF
   MLIRPass
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   MLIRSupport
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
index 5bb56236a04d..b7c7a67fef1b 100644
--- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_mlir_dialect_library(MLIRLinalgAnalysis
   DependenceAnalysis.cpp
-  
+
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRLinalgOps
-  MLIRStandardOps
+  MLIRLinalg
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
index 91fdaa4f18a3..d7f4fff3bc38 100644
--- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
@@ -7,9 +7,9 @@ add_mlir_dialect_library(MLIRLinalgEDSC
   LINK_LIBS PUBLIC
   MLIREDSC
   MLIRIR
-  MLIRAffineOps
+  MLIRAffine
   MLIRAffineEDSC
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRSCF
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
index 3cd3401ec986..963260adad66 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(MLIRLinalgOps
+add_mlir_dialect_library(MLIRLinalg
   LinalgOps.cpp
   LinalgTypes.cpp
 
@@ -14,5 +14,5 @@ add_mlir_dialect_library(MLIRLinalgOps
   MLIRIR
   MLIRSideEffectInterfaces
   MLIRViewLikeInterface
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
index 73cd9194fe6f..a281aa55a44f 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -17,18 +17,18 @@ add_mlir_dialect_library(MLIRLinalgTransforms
   MLIRLinalgPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAnalysis
   MLIREDSC
   MLIRIR
   MLIRLinalgAnalysis
   MLIRLinalgEDSC
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRLinalgUtils
   MLIRSCF
   MLIRSCFTransforms
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRStandardToLLVM
   MLIRTransformUtils
   MLIRVector

diff  --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
index 8b3e89768c55..0d092ddae56a 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
-  MLIRAffineOps
+  MLIRAffine
   MLIREDSC
   MLIRIR
   MLIRLinalgEDSC
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRSCF
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/Quant/CMakeLists.txt b/mlir/lib/Dialect/Quant/CMakeLists.txt
index 130a415f21ac..f95b6ce4e568 100644
--- a/mlir/lib/Dialect/Quant/CMakeLists.txt
+++ b/mlir/lib/Dialect/Quant/CMakeLists.txt
@@ -21,6 +21,6 @@ add_mlir_dialect_library(MLIRQuant
   MLIRPass
   MLIRSideEffectInterfaces
   MLIRSupport
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransformUtils
   )

diff  --git a/mlir/lib/Dialect/SCF/CMakeLists.txt b/mlir/lib/Dialect/SCF/CMakeLists.txt
index a4805102ddcb..297e918cb6ab 100644
--- a/mlir/lib/Dialect/SCF/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/CMakeLists.txt
@@ -13,7 +13,7 @@ add_mlir_dialect_library(MLIRSCF
   MLIRIR
   MLIRLoopLikeInterface
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   )
 
 add_subdirectory(Transforms)

diff  --git a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
index 341780c21c60..b3b20027896e 100644
--- a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
@@ -11,11 +11,11 @@ add_mlir_dialect_library(MLIRSCFTransforms
   MLIRSCFPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRIR
   MLIRPass
   MLIRSCF
-  MLIRStandardOps
+  MLIRStandard
   MLIRSupport
   MLIRTransformUtils
 )

diff  --git a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
index e39f1c770f29..1ac5b3b1e856 100644
--- a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
@@ -17,5 +17,5 @@ add_mlir_dialect_library(MLIRShape
   MLIRInferTypeOpInterface
   MLIRIR
   MLIRSideEffectInterfaces
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
index 06284f5d1daa..e5188ecd59c1 100644
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRStandardOps
+add_mlir_dialect_library(MLIRStandard
   IR/Ops.cpp
   EDSC/Builders.cpp
   EDSC/Intrinsics.cpp

diff  --git a/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt
index 299fc2bd3ccd..d1204df2de76 100644
--- a/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt
@@ -12,6 +12,6 @@ add_mlir_dialect_library(MLIRStandardOpsTransforms
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransforms
   )

diff  --git a/mlir/lib/Dialect/Vector/CMakeLists.txt b/mlir/lib/Dialect/Vector/CMakeLists.txt
index 1087feba7fbd..7c8c58e3fbfb 100644
--- a/mlir/lib/Dialect/Vector/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/CMakeLists.txt
@@ -14,9 +14,9 @@ add_mlir_dialect_library(MLIRVector
   MLIRAffineEDSC
   MLIREDSC
   MLIRIR
-  MLIRStandardOps
-  MLIRAffineOps
-  MLIRLinalgOps
+  MLIRStandard
+  MLIRAffine
+  MLIRLinalg
   MLIRSCF
   MLIRLoopAnalysis
   MLIRSideEffectInterfaces

diff  --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt
index 16258ed18b68..c71caf06ee09 100644
--- a/mlir/lib/ExecutionEngine/CMakeLists.txt
+++ b/mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -60,7 +60,7 @@ add_mlir_library(MLIRJitRunner
   MLIRExecutionEngine
   MLIRIR
   MLIRParser
-  MLIRStandardOps
+  MLIRStandard
   MLIRTargetLLVMIR
   MLIRTransforms
   MLIRStandardToLLVM

diff  --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
index 58c5fa672088..8a057e397f75 100644
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -30,10 +30,10 @@ add_mlir_library(MLIRTransforms
   MLIRTransformsPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAnalysis
   MLIRCopyOpInterface
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRLoopLikeInterface
   MLIRSCF
   MLIRPass

diff  --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
index 3fc45a8c6676..9fa59bbde55a 100644
--- a/mlir/lib/Transforms/Utils/CMakeLists.txt
+++ b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -14,10 +14,10 @@ add_mlir_library(MLIRTransformUtils
   MLIRStandardOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAnalysis
   MLIRLoopAnalysis
   MLIRSCF
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   )

diff  --git a/mlir/test/EDSC/CMakeLists.txt b/mlir/test/EDSC/CMakeLists.txt
index 96a89d333600..5a73c250c774 100644
--- a/mlir/test/EDSC/CMakeLists.txt
+++ b/mlir/test/EDSC/CMakeLists.txt
@@ -10,14 +10,14 @@ llvm_update_compile_flags(mlir-edsc-builder-api-test)
 
 target_link_libraries(mlir-edsc-builder-api-test
   PRIVATE
-  MLIRAffineOps
+  MLIRAffine
   MLIRAffineEDSC
   MLIREDSC
   MLIRIR
+  MLIRLinalg
   MLIRLinalgEDSC
-  MLIRLinalgOps
   MLIRSCF
-  MLIRStandardOps
+  MLIRStandard
   MLIRTransforms
   MLIRVector
   )

diff  --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt
index b48d464e4317..696b43992971 100644
--- a/mlir/test/lib/Dialect/Test/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/Test/CMakeLists.txt
@@ -38,7 +38,7 @@ add_mlir_library(MLIRTestDialect
   MLIRInferTypeOpInterface
   MLIRLinalgTransforms
   MLIRPass
-  MLIRStandardOps
+  MLIRStandard
   MLIRStandardOpsTransforms
   MLIRTransformUtils
   MLIRTransforms

diff  --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
index 5bf606209ec2..6aaedf14cf4a 100644
--- a/mlir/test/lib/Transforms/CMakeLists.txt
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -39,12 +39,12 @@ add_mlir_library(MLIRTestTransforms
   MLIRStandardOpsIncGen
 
   LINK_LIBS PUBLIC
-  MLIRAffineOps
+  MLIRAffine
   MLIRAnalysis
   MLIREDSC
   MLIRGPU
   MLIRGPUToGPURuntimeTransforms
-  MLIRLinalgOps
+  MLIRLinalg
   MLIRLinalgTransforms
   MLIRNVVMIR
   MLIRSCF

More information about the flang-commits mailing list