[PATCH] D74592: Do not build the CUBIN conversion pass when NVPTX Backend isn't configured

[Mehdi AMINI via Phabricator via llvm-commits]

mehdi_amini updated this revision to Diff 244585.
mehdi_amini added a comment.

ifdef out the pass registration


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74592/new/

https://reviews.llvm.org/D74592

Files:
  mlir/CMakeLists.txt
  mlir/include/mlir/InitAllPasses.h
  mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
  mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp


Index: mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
===================================================================
--- mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
+++ mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
@@ -57,9 +57,10 @@
     gpu::GPUModuleOp module = getOperation();
 
     // Make sure the NVPTX target is initialized.
-    llvm::InitializeAllTargets();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllAsmPrinters();
+    LLVMInitializeNVPTXTarget();
+    LLVMInitializeNVPTXTargetInfo();
+    LLVMInitializeNVPTXTargetMC();
+    LLVMInitializeNVPTXAsmPrinter();
 
     auto llvmModule = translateModuleToNVVMIR(module);
     if (!llvmModule)
Index: mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
===================================================================
--- mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -1,7 +1,16 @@
-add_llvm_library(MLIRGPUtoCUDATransforms
+set(LLVM_OPTIONAL_SOURCES
   ConvertKernelFuncToCubin.cpp
+)
+
+set(SOURCES
   ConvertLaunchFuncToCudaCalls.cpp
 )
+
+if (MLIR_CUDA_CONVERSIONS_ENABLED)
+ append(SOURCES   ConvertKernelFuncToCubin.cpp)
+endif()
+
+add_llvm_library(MLIRGPUtoCUDATransforms ${SOURCES})
 target_link_libraries(MLIRGPUtoCUDATransforms
   MLIRGPU
   MLIRLLVMIR
Index: mlir/include/mlir/InitAllPasses.h
===================================================================
--- mlir/include/mlir/InitAllPasses.h
+++ mlir/include/mlir/InitAllPasses.h
@@ -90,8 +90,10 @@
 
   // CUDA
   createConvertGpuLaunchFuncToCudaCallsPass();
+#if MLIR_CUDA_CONVERSIONS_ENABLED
   createConvertGPUKernelToCubinPass(
       [](const std::string &, Location, StringRef) { return nullptr; });
+#endif
   createLowerGpuOpsToNVVMOpsPass();
 
   // Linalg
Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -44,6 +44,8 @@
 else()
   set(MLIR_CUDA_CONVERSIONS_ENABLED 0)
 endif()
+# TODO: we should use a config.h file like LLVM does
+add_definitions(-DMLIR_CUDA_CONVERSIONS_ENABLED=${MLIR_CUDA_CONVERSIONS_ENABLED})
 
 set(MLIR_CUDA_RUNNER_ENABLED 0 CACHE BOOL "Enable building the mlir CUDA runner")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74592.244585.patch
Type: text/x-patch
Size: 2247 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200214/566193e7/attachment.bin>