bytedance · qingyunqu · Aug 20, 2024 · Aug 19, 2024 · Aug 19, 2024
diff --git a/compiler/cmake/MLIR.cmake b/compiler/cmake/MLIR.cmake
@@ -45,6 +45,18 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT LLVM_INSTALL_PREFIX)
 endif()
 message(STATUS "CMAKE_INSTALL_PREFIX    : " ${CMAKE_INSTALL_PREFIX})
 
+# Declare the library associated with a dialect.
+function(add_byteir_dialect_library name)
+  set_property(GLOBAL APPEND PROPERTY BYTEIR_DIALECT_LIBS ${name})
+  add_mlir_library(${ARGV} DEPENDS mlir-headers)
+endfunction(add_byteir_dialect_library)
+
+# Declare the library associated with a pipeline.
+function(add_byteir_pipeline_library name)
+  set_property(GLOBAL APPEND PROPERTY BYTEIR_PIPELINE_LIBS ${name})
+  add_mlir_library(${ARGV} DEPENDS mlir-headers)
+endfunction(add_byteir_pipeline_library)
+
 # Declare the library associated with a conversion.
 function(add_byteir_conversion_library name)
   set_property(GLOBAL APPEND PROPERTY BYTEIR_CONVERSION_LIBS ${name})

diff --git a/compiler/dialects/lib/Dialect/Ace/CMakeLists.txt b/compiler/dialects/lib/Dialect/Ace/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAceDialect
+add_byteir_dialect_library(MLIRAceDialect
   IR/AceDialect.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/compiler/dialects/lib/Dialect/Ccl/IR/CMakeLists.txt b/compiler/dialects/lib/Dialect/Ccl/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRCclDialect
+add_byteir_dialect_library(MLIRCclDialect
   CclOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -10,4 +10,4 @@ add_mlir_dialect_library(MLIRCclDialect
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRSupport
-)
+)
diff --git a/compiler/lib/CAPI/CMakeLists.txt b/compiler/lib/CAPI/CMakeLists.txt
@@ -1,3 +1,7 @@
+get_property(byteir_dialect_libs GLOBAL PROPERTY BYTEIR_DIALECT_LIBS)
+get_property(byteir_pipeline_libs GLOBAL PROPERTY BYTEIR_PIPELINE_LIBS)
+get_property(byteir_conversion_libs GLOBAL PROPERTY BYTEIR_CONVERSION_LIBS)
+get_property(byteir_translation_libs GLOBAL PROPERTY BYTEIR_TRANSLATION_LIBS)
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
 
@@ -8,46 +12,16 @@ add_mlir_public_c_api_library(ByteIRCAPI
   PDLValue.cpp
 
   LINK_LIBS PUBLIC
+  ${byteir_dialect_libs}
+  ${byteir_pipeline_libs}
+  ${byteir_conversion_libs}
+  ${byteir_translation_libs}
   ${dialect_libs}
   ${extension_libs}
-  MLIRCatDialect
-  MLIRCclTransformOps
-
-  # conversion passes
-  ByteIRGPUToNVVM
-  ByteIRHloToCat
-  ByteIRHloToTensor
-  ByteIRToAce
-  ByteIRToAIT
-  ByteIRToByre
-  ByteIRToGPU
-  ByteIRToMhlo
-  ByteIRToLinalg
-  ByteIRToLLVM
-  ByteIRToPTX
-  ByteIRLcclToByre
 
   # transofrm passes
   ByteIRTransforms
 
-  # dialect specific passes
-  ByteIRAffinePasses
-  ByteIRByrePasses
-  ByteIRGPUPasses
-  ByteIRLinalgPasses
-  ByteIRMemRefPasses
-  ByteIRMhloPasses
-  ByteIRSCFPasses
-  ByteIRTransformPasses
-
-  # pipelines
-  ByteIRGPUPipelines
-  ByteIRHostPipelines
-  ByteIRPipelines
-
   # translate passes
   MLIRTranslateLib
-  ByteIRTargetPTX
-  ByteIRTargetCUDA
-  ByteIRTargetCpp
 )
diff --git a/compiler/lib/CMakeLists.txt b/compiler/lib/CMakeLists.txt
@@ -1,9 +1,11 @@
 add_subdirectory(Analysis)
-add_subdirectory(CAPI)
 add_subdirectory(Conversion)
 add_subdirectory(Dialect)
 add_subdirectory(Pipelines)
 add_subdirectory(Stat)
 add_subdirectory(Target)
 add_subdirectory(Transforms)
 add_subdirectory(Utils)
+
+# note: CAPI depends on byteir property, so add it at last
+add_subdirectory(CAPI)
diff --git a/compiler/lib/Dialect/Ace/CMakeLists.txt b/compiler/lib/Dialect/Ace/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRAcePasses
+add_byteir_dialect_library(ByteIRAcePasses
   Transforms/BufferizableOpInterfaceImpl.cpp
   Transforms/Bufferize.cpp
 
@@ -19,4 +19,4 @@ add_mlir_dialect_library(ByteIRAcePasses
   MLIRBufferizationTransforms
   MLIRLaceDialect
   MLIRMemRefDialect
-  )
+)
diff --git a/compiler/lib/Dialect/Affine/CMakeLists.txt b/compiler/lib/Dialect/Affine/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRAffinePasses
+add_byteir_dialect_library(ByteIRAffinePasses
   Transforms/AffineLoopFusionEx.cpp
   Transforms/InsertTrivialAffineLoop.cpp
   Transforms/RewriteAffineToMemref.cpp
@@ -20,4 +20,4 @@ add_mlir_dialect_library(ByteIRAffinePasses
   MLIRMemRefDialect
   MLIRSideEffectInterfaces
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/Byre/CMakeLists.txt b/compiler/lib/Dialect/Byre/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRByreDialect
+add_byteir_dialect_library(MLIRByreDialect
   IR/ByreDialect.cpp
   IR/Common.cpp
 
@@ -16,9 +16,9 @@ add_mlir_dialect_library(MLIRByreDialect
   MLIRSideEffectInterfaces
   MLIRSupport
   MLIRLLVMDialect
-  )
+)
 
-add_mlir_dialect_library(MLIRByreSerialization
+add_byteir_dialect_library(MLIRByreSerialization
   IR/Serialization/ByreSerialOps.cpp
   IR/Serialization/Bytecode.cpp
   IR/Serialization/Versioning.cpp
@@ -35,9 +35,9 @@ add_mlir_dialect_library(MLIRByreSerialization
   MLIRIR
   MLIRSupport
   MLIRByreDialect
-  )
+)
 
-add_mlir_dialect_library(ByteIRByrePasses
+add_byteir_dialect_library(ByteIRByrePasses
   Transforms/BufferizableOpInterfaceImpl.cpp
   Transforms/Serial.cpp
 
@@ -57,4 +57,4 @@ add_mlir_dialect_library(ByteIRByrePasses
   MLIRByreSerialization
   MLIRMemRefDialect
   MLIRTensorDialect
-  )
+)
diff --git a/compiler/lib/Dialect/Cat/IR/CMakeLists.txt b/compiler/lib/Dialect/Cat/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRCatDialect
+add_byteir_dialect_library(MLIRCatDialect
   CatDialect.cpp
 
   DEPENDS

diff --git a/compiler/lib/Dialect/Ccl/TransformOps/CMakeLists.txt b/compiler/lib/Dialect/Ccl/TransformOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRCclTransformOps
+add_byteir_dialect_library(MLIRCclTransformOps
   CclTransformOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -16,4 +16,4 @@ add_mlir_dialect_library(MLIRCclTransformOps
   MLIRPDLDialect
   MLIRSideEffectInterfaces
   MLIRTransformDialect
-  )
+)
diff --git a/compiler/lib/Dialect/Ccl/Transforms/CMakeLists.txt b/compiler/lib/Dialect/Ccl/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRCclPasses
+add_byteir_dialect_library(ByteIRCclPasses
   CclMoveDown.cpp
   CclBufferizeOpInterfaceImpl.cpp
 
@@ -14,4 +14,4 @@ add_mlir_dialect_library(ByteIRCclPasses
   MLIRIR
   MhloDialect
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/GPU/TransformOps/CMakeLists.txt b/compiler/lib/Dialect/GPU/TransformOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRGPUExtTransformOps
+add_byteir_dialect_library(MLIRGPUExtTransformOps
   GPUExtTransformOps.cpp
   Utils.cpp
 

diff --git a/compiler/lib/Dialect/GPU/Transforms/CMakeLists.txt b/compiler/lib/Dialect/GPU/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRGPUPasses
+add_byteir_dialect_library(ByteIRGPUPasses
   GPUBlockSwizzle.cpp
   GPUDistributeSharedMemoryCopy.cpp
   GPUDistributeToWarp.cpp

diff --git a/compiler/lib/Dialect/Lace/CMakeLists.txt b/compiler/lib/Dialect/Lace/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLaceDialect
+add_byteir_dialect_library(MLIRLaceDialect
   IR/LaceDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -14,4 +14,4 @@ add_mlir_dialect_library(MLIRLaceDialect
   MLIRSupport
   MLIRViewLikeInterface
   MLIRAceDialect
-)
+)
diff --git a/compiler/lib/Dialect/Lccl/IR/CMakeLists.txt b/compiler/lib/Dialect/Lccl/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLcclDialect
+add_byteir_dialect_library(MLIRLcclDialect
   LcclOps.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/compiler/lib/Dialect/Linalg/IR/CMakeLists.txt b/compiler/lib/Dialect/Linalg/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLinalgExt
+add_byteir_dialect_library(MLIRLinalgExt
   LinalgExtInterfaces.cpp
   LinalgExtOps.cpp
 

diff --git a/compiler/lib/Dialect/Linalg/TransformOps/CMakeLists.txt b/compiler/lib/Dialect/Linalg/TransformOps/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLinalgExtTransformOps
+add_byteir_dialect_library(MLIRLinalgExtTransformOps
   LinalgExtTransformOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -24,4 +24,4 @@ add_mlir_dialect_library(MLIRLinalgExtTransformOps
   MLIRTensorTilingInterfaceImplExt
   MLIRTransformDialect
   MLIRVectorDialect
-  )
+)
diff --git a/compiler/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/compiler/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRLinalgPasses
+add_byteir_dialect_library(ByteIRLinalgPasses
   BufferizableOpInterfaceImpl.cpp
   Bufferize.cpp
   CanonicalizeExt.cpp
@@ -39,4 +39,4 @@ add_mlir_dialect_library(ByteIRLinalgPasses
   MLIRLinalgTransforms
   MLIRMemRefDialect
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/Linalg/Util/CMakeLists.txt b/compiler/lib/Dialect/Linalg/Util/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRLinalgExtUtils
+add_byteir_dialect_library(MLIRLinalgExtUtils
   Util.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -7,4 +7,4 @@ add_mlir_dialect_library(MLIRLinalgExtUtils
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRLinalgDialect
-  )
+)
diff --git a/compiler/lib/Dialect/MemRef/CMakeLists.txt b/compiler/lib/Dialect/MemRef/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRMemRefPasses
+add_byteir_dialect_library(ByteIRMemRefPasses
   Transforms/ApplyMemRefAffineLayout.cpp
   Transforms/ExtractAddressComputation.cpp
   Transforms/RemoveCopy.cpp
@@ -25,4 +25,4 @@ add_mlir_dialect_library(ByteIRMemRefPasses
   MLIRMemRefDialect
   MLIRMemRefTransforms
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/SCF/Transforms/CMakeLists.txt b/compiler/lib/Dialect/SCF/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRSCFPasses
+add_byteir_dialect_library(ByteIRSCFPasses
   ForallCollapsing.cpp
   FuseNestedForall.cpp
   InsertTrivialSCFLoop.cpp
@@ -21,4 +21,4 @@ add_mlir_dialect_library(ByteIRSCFPasses
   MLIRSCFTransforms
   MLIRSideEffectInterfaces
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/SCF/Util/CMakeLists.txt b/compiler/lib/Dialect/SCF/Util/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRSCFExtUtils
+add_byteir_dialect_library(MLIRSCFExtUtils
   Util.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -7,4 +7,4 @@ add_mlir_dialect_library(MLIRSCFExtUtils
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRSCFDialect
-  )
+)
diff --git a/compiler/lib/Dialect/Shape/CMakeLists.txt b/compiler/lib/Dialect/Shape/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRShapeExt
+add_byteir_dialect_library(MLIRShapeExt
   IR/ShapeExtOps.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRShapeExt
   MLIRSupport
 )
 
-add_mlir_dialect_library(ByteIRShapePasses
+add_byteir_dialect_library(ByteIRShapePasses
   Transforms/InsertTieShape.cpp
   Transforms/ResolveShapeConstraint.cpp
   Transforms/SetAssumingAlwaysTrue.cpp
@@ -33,4 +33,4 @@ add_mlir_dialect_library(ByteIRShapePasses
   MLIRShapeDialect
   MLIRShapeExt
   MLIRSupport
-  )
+)
diff --git a/compiler/lib/Dialect/Tensor/IR/CMakeLists.txt b/compiler/lib/Dialect/Tensor/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRTensorTilingInterfaceImplExt
+add_byteir_dialect_library(MLIRTensorTilingInterfaceImplExt
   TilingInterfaceImpl.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/compiler/lib/Dialect/Tensor/Transforms/CMakeLists.txt b/compiler/lib/Dialect/Tensor/Transforms/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-add_mlir_dialect_library(ByteIRTensorPasses
+add_byteir_dialect_library(ByteIRTensorPasses
   CanonicalizeExt.cpp
   ExtractSliceSpecialization.cpp
   TensorPadSpecialization.cpp
@@ -17,4 +16,4 @@ add_mlir_dialect_library(ByteIRTensorPasses
   MLIRSupport
   MLIRSCFDialect
   ByteIRUtils
-  )
+)
diff --git a/compiler/lib/Dialect/Transform/IR/CMakeLists.txt b/compiler/lib/Dialect/Transform/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRTransformExtDialect
+add_byteir_dialect_library(MLIRTransformExtDialect
   TransformExtOps.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/compiler/lib/Dialect/Transform/Transforms/CMakeLists.txt b/compiler/lib/Dialect/Transform/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRTransformPasses
+add_byteir_dialect_library(ByteIRTransformPasses
   TransformDialectInterpreter.cpp
   TransformInsertion.cpp
 

diff --git a/compiler/lib/Dialect/Vector/Transforms/CMakeLists.txt b/compiler/lib/Dialect/Vector/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(ByteIRVectorPasses
+add_byteir_dialect_library(ByteIRVectorPasses
   CanonicalizeExt.cpp
   VectorLowerings.cpp
   VectorWarpDistribute.cpp