Move xegpu pass to imex-only build

Author: kurapov-peter

.gitignore

@@ -3,3 +3,4 @@
 build/
 externals/
 compile_commands.json
+install/

cmake/functions.cmake

@@ -111,10 +111,17 @@ endfunction()
 
 function(gc_add_mlir_dialect_library name)
     add_mlir_dialect_library(${ARGV})
-    target_link_libraries(obj.${name} PUBLIC GcInterface)
     set_property(GLOBAL APPEND PROPERTY GC_DIALECT_LIBS ${name})
 
     if(GcInterface IN_LIST ARGN)
         target_link_libraries(obj.${name} PUBLIC GcInterface)
     endif()
-endfunction()
+endfunction()
+
+function(gc_add_mlir_translation_library name)
+    add_mlir_translation_library(${ARGV})
+    set_property(GLOBAL APPEND PROPERTY GC_MLIR_LIBS ${name})
+    if(GcInterface IN_LIST ARGN)
+        target_link_libraries(obj.${name} PUBLIC GcInterface)
+    endif()
+endfunction()

lib/gc/Dialect/LLVMIR/CMakeLists.txt

@@ -16,5 +16,6 @@ add_mlir_dialect_library(MLIRGENDialect
   MLIRIR
   MLIRLLVMDialect
   MLIRSideEffectInterfaces
+  GcInterface
   )
 set_property(GLOBAL APPEND PROPERTY GC_DIALECT_LIBS MLIRGENDialect)

lib/gc/Target/LLVM/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRGENTarget
+gc_add_mlir_dialect_library(MLIRGENTarget
   GEN/Target.cpp
 
   OBJECT
@@ -14,4 +14,5 @@ add_mlir_dialect_library(MLIRGENTarget
   MLIRGPUDialect
   MLIRTargetLLVM
   MLIRGENToLLVMIRTranslation
+  GcInterface
   )

lib/gc/Target/LLVMIR/Dialect/GEN/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_mlir_translation_library(MLIRGENToLLVMIRTranslation
+gc_add_mlir_translation_library(MLIRGENToLLVMIRTranslation
   GENToLLVMIRTranslation.cpp
 
   DEPENDS
@@ -13,4 +13,5 @@ add_mlir_translation_library(MLIRGENToLLVMIRTranslation
   MLIRGENDialect
   MLIRSupport
   MLIRTargetLLVMIRExport
+  GcInterface
   )

lib/gc/Transforms/CMakeLists.txt

@@ -25,6 +25,4 @@ gc_add_mlir_library(GcPasses
     GcInterface
   )
 
-if(GC_ENABLE_IMEX)
-  add_subdirectory(GPU)
-endif()
+add_subdirectory(GPU)

lib/gc/Transforms/GPU/CMakeLists.txt

@@ -1,9 +1,9 @@
 gc_add_mlir_library(GcGpuPasses
-  LinalgToXeGPU.cpp
   GPULegalizeModule.cpp
   ConvertGpuSignaturesToLLVM.cpp
   GPUAttachGenTarget.cpp
 
+  PARTIAL_SOURCES_INTENDED
   DEPENDS
     GraphCompilerPassIncGen
 
@@ -23,3 +23,25 @@ gc_add_mlir_library(GcGpuPasses
     GcUtilsIR
 )
 
+if(GC_ENABLE_IMEX)
+gc_add_mlir_library(GcIMEXPasses
+  LinalgToXeGPU.cpp
+
+  PARTIAL_SOURCES_INTENDED
+  DEPENDS
+    GraphCompilerPassIncGen
+
+  LINK_LIBS PUBLIC
+    MLIRGPUDialect
+    MLIRXeGPUDialect
+    MLIRGPUTransforms
+    MLIRGPUToSPIRV
+    MLIRSCFToGPU
+    MLIRSCFToSPIRV
+    MLIRMathToSPIRV
+    MLIRControlFlowToSPIRV
+    MLIRMemRefTransforms
+    GcInterface
+    GcUtilsIR
+)
+endif()

src/dnnl/CMakeLists.txt

@@ -24,9 +24,12 @@ set(GC_DNNL_SOURCES
   JsonParser.cpp
   dnnl_graph_compiler.cpp
 )
+# todo: replace with a gpu rutnime library once we have an appropriate target
+get_property(gc_passes_libs GLOBAL PROPERTY GC_PASS_LIBS)
 set(GC_DNNL_LINKED_LIBS
   GcJitWrapper
   GcCpuRuntime
+  ${gc_passes_libs}
 )
 gc_add_mlir_library(GcDnnl SHARED
   ${GC_DNNL_SOURCES}

src/gc-opt/CMakeLists.txt

@@ -20,23 +20,24 @@ if(NOT GC_ENABLE_OPT)
   return()
 endif()
 
+# todo: this needs further cleanup
 if(GC_DEV_LINK_LLVM_DYLIB)
   set(MLIR_LINK_COMPONENTS
     MLIR
   )
   get_property(dialect_libs GLOBAL PROPERTY GC_DIALECT_LIBS)
-  get_property(conversion_libs GLOBAL PROPERTY GC_PASS_LIBS)
-  get_property(extension_libs GLOBAL PROPERTY GC_EXTENSION_LIBS)
 else()
   set(MLIR_LINK_COMPONENTS
     MLIROptLib
     MLIRToLLVMIRTranslationRegistration
   )
   get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-  get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
-  get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
 endif()
 
+get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
+get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
+get_property(gc_passes_libs GLOBAL PROPERTY GC_PASS_LIBS)
+
 add_llvm_executable(gc-opt gc-opt.cpp)
 llvm_update_compile_flags(gc-opt)
 mlir_check_all_link_libraries(gc-opt)
@@ -45,8 +46,9 @@ target_link_libraries(gc-opt PUBLIC GcInterface)
 target_link_libraries(gc-opt PRIVATE
   ${dialect_libs}
   ${conversion_libs}
+  ${extension_libs}
   ${MLIR_LINK_COMPONENTS}
-  GcPasses
+  ${gc_passes_libs}
 )
 
 if(GC_ENABLE_IMEX)
@@ -55,7 +57,7 @@ if(GC_ENABLE_IMEX)
   get_property(IMEX_INCLUDES GLOBAL PROPERTY IMEX_INCLUDES)
   target_include_directories(gc-opt PRIVATE ${IMEX_INCLUDES})
   target_link_libraries(gc-opt PRIVATE
-    GcGpuPasses
+    GcGpuIMEXPasses
     IMEXGPUXDialect
     IMEXXeTileDialect
     IMEXRegionDialect