Merge pull request llvm#398 from AMD-Lightning-Internal/amd/dev/jlambert/mainline-spirv-check

Amd/dev/jlambert/mainline spirv check

Author: lamb-j

amd/comgr/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.13.4)
 
+include(CheckIncludeFileCXX)
+
 file(READ "VERSION.txt" comgr_ver_file)
 
 string(REGEX MATCH "#COMGR_VERSION_MAJOR\n([0-9]*)" _ ${comgr_ver_file})
@@ -169,16 +171,31 @@ set(AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS ${LLVM_DEFINITIONS})
 set(AMD_COMGR_PUBLIC_LINKER_OPTIONS)
 set(AMD_COMGR_PRIVATE_LINKER_OPTIONS)
 
+list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS "AMD_COMGR_GIT_COMMIT=${AMD_COMGR_GIT_COMMIT}")
+list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS "AMD_COMGR_GIT_BRANCH=${AMD_COMGR_GIT_BRANCH}")
+message("----COMGR_GIT_COMMIT: ${AMD_COMGR_GIT_COMMIT}")
+message("----COMGR_GIT_BRANCH: ${AMD_COMGR_GIT_BRANCH}")
+message("")
+
 option(COMGR_DISABLE_SPIRV "To disable SPIRV in Comgr" OFF)
+
+if (NOT COMGR_DISABLE_SPIRV)
+  # TODO: Explore switching this to CHECK_INCLUDE_FILE_CXX() macro
+  if (NOT EXISTS "${LLVM_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVLib.h")
+    message("-- LLVMSPIRVLib/LLVMSPIRVLib.h not found")
+    set(COMGR_DISABLE_SPIRV ON)
+  else()
+    message("-- LLVMSPIRVLib/LLVMSPIRVLib.h found")
+  endif()
+endif()
+
 if(${COMGR_DISABLE_SPIRV})
     list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS "COMGR_DISABLE_SPIRV")
+  message("-- Comgr SPIRV Disabled")
+else()
+  message("-- Comgr SPIRV Enabled")
 endif()
 
-list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "-DAMD_COMGR_GIT_COMMIT=${AMD_COMGR_GIT_COMMIT}")
-list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "-DAMD_COMGR_GIT_BRANCH=${AMD_COMGR_GIT_BRANCH}")
-message("----COMGR_GIT_COMMIT: ${AMD_COMGR_GIT_COMMIT}")
-message("----COMGR_GIT_BRANCH: ${AMD_COMGR_GIT_BRANCH}")
-message("")
 
 if (UNIX)
   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS
@@ -392,11 +409,9 @@ set(LLD_LIBS
   lldCommon)
 
 if (${COMGR_DISABLE_SPIRV})
-  message("-- Comgr SPIRV Disabled")
   set(SPIRV_DYNAMIC_LIB "")
   set(SPIRV_STATIC_LIB "")
 else()
-  message("-- Comgr SPIRV Enabled")
   set(SPIRV_DYNAMIC_LIB "LLVMSPIRVAMDLib")
   set(SPIRV_STATIC_LIB "SPIRVAMDLib")
 endif()