Debug configuration in llvm prebuilds

Enabled usage of debug configuration with prebuild llvm on Windows.

Author: mgrzywac

IGC/cmake/igc_find_liblldELF.cmake

@@ -6,36 +6,65 @@
 #
 #============================ end_copyright_notice =============================
 
-#   IGC_OPTION__LLDELF_LIB_DIR - Specify additional directories for searching lldELF library
+#   IGC_OPTION__LLD_DIR - Specify additional directories for searching lld libraries and executables
 #   IGC_OPTION__LLDELF_H_DIR - Specify additional directories for searching lldELF headers
-#   IGC_OPTION__LLD_BIN_DIR - Specify additional directories for searching lld executable
 
 function(add_lld_library LIB_NAME)
-  find_library(${LIB_NAME}_PATH
+  find_library(${LIB_NAME}_PATH_RELEASE
     ${LIB_NAME}
-    PATHS "${IGC_OPTION__LLDELF_LIB_DIR}"
+    PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
     PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
 
-  if(${LIB_NAME}_PATH-NOTFOUND)
+  if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
     message(FATAL_ERROR
-    "Cannot find ${LIB_NAME} library, please install missing library or provide the path by IGC_OPTION__LLDELF_LIB_DIR")
+    "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
   endif()
+
+  find_library(${LIB_NAME}_PATH_DEBUG
+    ${LIB_NAME}
+    PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
+    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+  if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
+    message(FATAL_ERROR
+    "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
+  endif()
+
   add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
-  set_target_properties(${LIB_NAME} PROPERTIES IMPORTED_LOCATION ${${LIB_NAME}_PATH})
+  set_target_properties(${LIB_NAME} PROPERTIES
+    IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
+    IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
+    IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
+    )
 endfunction()
 
 function(add_lld_executable EXE_NAME)
-  find_program(${EXE_NAME}_PATH
+  find_program(${EXE_NAME}_PATH_RELEASE
     ${EXE_NAME}
-    PATHS "${IGC_OPTION__LLD_BIN_DIR}"
+    PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
     PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
 
-  if(${EXE_NAME}_PATH-NOTFOUND)
+  if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
     message(FATAL_ERROR
-    "Cannot find ${EXE_NAME} executable, please install missing executable or provide the path by IGC_OPTION__LLD_BIN_DIR")
+    "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
   endif()
+
+  find_program(${EXE_NAME}_PATH_DEBUG
+    ${EXE_NAME}
+    PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
+    PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+  if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
+    message(FATAL_ERROR
+    "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
+  endif()
+
   add_executable(${EXE_NAME} IMPORTED GLOBAL)
-  set_target_properties(${EXE_NAME} PROPERTIES IMPORTED_LOCATION ${${EXE_NAME}_PATH})
+  set_target_properties(${EXE_NAME} PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
+  IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
+  IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
+  )
 endfunction()
 
 if(IGC_BUILD__LLVM_SOURCES)

IGC/cmake/igc_llvm.cmake

@@ -15,9 +15,9 @@ if(NOT IGC_BUILD__LLVM_SOURCES)
   message(STATUS "[IGC] Found LLVM: ${LLVM_DIR}")
 
   set(LLVM_DIR "${LLVM_DIR}" PARENT_SCOPE)
-  set(LLVM_LIB_DIR "${LLVM_DIR}/lib")
-  set(LLVM_LIB_DIR "${LLVM_LIB_DIR}" PARENT_SCOPE)
-  set(LLVM_BIN_DIR "${LLVM_DIR}/bin")
+
+  set(LLVM_DIR_CONFIGURATION_ADJUSTED "${LLVM_DIR}/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:ReleaseInternal>:Release>")
+  set(LLVM_BIN_DIR_CONFIGURATION_ADJUSTED "${LLVM_DIR_CONFIGURATION_ADJUSTED}/bin")
 
   # Tell the build that we are using prebuilds.
   set(IGC_BUILD__LLVM_PREBUILDS ON)
@@ -32,16 +32,15 @@ set(CMAKE_MODULE_PATH
 if(IGC_OPTION__LLVM_MODE STREQUAL PREBUILDS_MODE_NAME AND WIN32)
   set(IGC_OPTION__LLVM_MODE "${IGC_OPTION__LLVM_MODE}" CACHE STRING "")
 
-  set(IGC_OPTION__LLDELF_LIB_DIR "${LLVM_LIB_DIR}")
-  set(IGC_OPTION__LLD_BIN_DIR "${LLVM_BIN_DIR}")
+  set(IGC_OPTION__LLD_DIR "${LLVM_DIR}")
   set(IGC_OPTION__LLDELF_H_DIR "${DEFAULT_IGC_LLVM_SOURCES_DIR}/lld")
 
-  set(LLVM_LINK_EXE "${LLVM_BIN_DIR}/llvm-link" CACHE STRING "")
-  set(LLVM_AS_EXE "${LLVM_BIN_DIR}/llvm-as.exe" CACHE STRING "")
-  set(LLVM_OPT_EXE "${LLVM_BIN_DIR}/opt.exe" CACHE STRING "")
-  set(LLVM_TABLEGEN_EXE "${LLVM_BIN_DIR}/llvm-tblgen.exe")
+  set(LLVM_LINK_EXE "${LLVM_BIN_DIR_CONFIGURATION_ADJUSTED}/llvm-link.exe" CACHE STRING "")
+  set(LLVM_AS_EXE "${LLVM_BIN_DIR_CONFIGURATION_ADJUSTED}/llvm-as.exe" CACHE STRING "")
+  set(LLVM_OPT_EXE "${LLVM_BIN_DIR_CONFIGURATION_ADJUSTED}/opt.exe" CACHE STRING "")
+  set(LLVM_TABLEGEN_EXE "${LLVM_BIN_DIR_CONFIGURATION_ADJUSTED}/llvm-tblgen.exe" CACHE STRING "")
 
-  set(LLVM_INCLUDE_DIRS "${LLVM_DIR}/include;${DEFAULT_IGC_LLVM_SOURCES_DIR}/llvm/include")
+  set(LLVM_INCLUDE_DIRS "${LLVM_DIR_CONFIGURATION_ADJUSTED}/include;${DEFAULT_IGC_LLVM_SOURCES_DIR}/llvm/include")
   set(LLVM_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}" PARENT_SCOPE)
 else()
   set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")

IGC/cmake/igc_llvm_utils.cmake

@@ -40,12 +40,31 @@ function(igc_get_llvm_targets RET)
     set(PRE_BUILT_TARGETS)
     foreach(tmp_name ${TARGETS})
         unset(found_name CACHE)
-        find_library(found_name ${tmp_name} PATHS "${LLVM_LIB_DIR}")
-        if(EXISTS ${found_name})
-            list(APPEND PRE_BUILT_TARGETS ${found_name})
-        else()
-            message(FATAL_ERROR "File not found for: ${tmp_name}")
+
+        find_library(found_name_release ${tmp_name} PATHS "${LLVM_DIR}/Release/lib")
+
+        if("${found_name_release}" STREQUAL "${found_name_release}-NOTFOUND")
+          message(FATAL_ERROR
+          "Cannot find ${tmp_name} in Release version in ${LLVM_DIR}")
+        endif()
+
+        find_library(found_name_debug ${tmp_name} PATHS "${LLVM_DIR}/Debug/lib")
+
+        if("${found_name_debug}" STREQUAL "${found_name_debug}-NOTFOUND")
+          message(FATAL_ERROR
+          "Cannot find ${tmp_name} in Debug version in ${LLVM_DIR}")
+        endif()
+
+        # Add lib as imported target if not already added
+        if (NOT TARGET ${tmp_name})
+          add_library(${tmp_name} UNKNOWN IMPORTED)
+          set_target_properties(${tmp_name} PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${found_name_release}"
+            IMPORTED_LOCATION_RELEASEINTERNAL "${found_name_release}"
+            IMPORTED_LOCATION_DEBUG "${found_name_debug}"
+            )
         endif()
+        list(APPEND PRE_BUILT_TARGETS ${tmp_name})
     endforeach()
 
     set(TARGETS ${PRE_BUILT_TARGETS})

IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake

@@ -15,63 +15,93 @@
 # Optionally, llvm-spirv tool will be checked and LLVMSPIRVTranslator_Tool_FOUND
 # will be set to true and llvm-spirv executable target will be defined.
 
-find_library(SPIRVLLVMTranslator_Library LLVMSPIRVLib PATHS ${LLVM_LIB_DIR})
+find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
+find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
+
 find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
   PATH_SUFFIXES LLVMSPIRVLib
   PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
   )
 
 # Try to find version and llvm-spirv.
-if(SPIRVLLVMTranslator_Library)
+if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
   set(SPIRVLLVMTranslator_Library_FOUND YES)
 
-  get_filename_component(_libdir ${SPIRVLLVMTranslator_Library} DIRECTORY)
+  get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
+  get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
 
   # Get library version. Manual parsing is used because it is quite easy and
   # will work for both linux and windows (which is lacking pkg-config).
-  file(STRINGS "${_libdir}/pkgconfig/LLVMSPIRVLib.pc" _version_file
+  file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
+    REGEX "Version: .*")
+  file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
     REGEX "Version: .*")
-  if(NOT _version_file)
+
+  if(NOT _version_file_release OR NOT _version_file_debug)
     message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
   endif()
-  string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION "${_version_file}")
-  set(SPIRVLLVMTranslator_VERSION ${SPIRVLLVMTranslator_VERSION} CACHE STRING "SPIRVLLVMTranslator version")
+  string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
+  string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
+  set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
+  set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
 
   # Try to find llvm-spirv.
-  find_program(SPIRVLLVMTranslator_Tool llvm-spirv
-    PATHS ${_libdir}/../bin
+  find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
+    PATHS ${_libdir_Release}/../bin
     NO_DEFAULT_PATH
     )
-  if(SPIRVLLVMTranslator_Tool)
+  find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
+    PATHS ${_libdir_Debug}/../bin
+    NO_DEFAULT_PATH
+    )
+
+  if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
     set(SPIRVLLVMTranslator_Tool_FOUND YES)
   endif()
 
   unset(_libdir)
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SPIRVLLVMTranslator
-  REQUIRED_VARS SPIRVLLVMTranslator_Library SPIRVLLVMTranslator_INCLUDE_DIR
-  VERSION_VAR SPIRVLLVMTranslator_VERSION
+find_package_handle_standard_args(SPIRVLLVMTranslator_Release
+  REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
+  VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
+  HANDLE_COMPONENTS
+  )
+find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
+  REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
+  VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
   HANDLE_COMPONENTS
   )
 
 # Mark all cached variables as advanced.
-if(SPIRVLLVMTranslator_FOUND)
-  mark_as_advanced(SPIRVLLVMTranslator_Library)
+if(SPIRVLLVMTranslator_Release_FOUND)
+  mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
+  mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+  mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
+endif()
+
+if(SPIRVLLVMTranslator_Debug_FOUND)
+  mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
   mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
-  mark_as_advanced(SPIRVLLVMTranslator_VERSION)
+  mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
+endif()
+
+if(SPIRVLLVMTranslator_Tool_Release_FOUND)
+  mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
 endif()
 
-if(SPIRVLLVMTranslator_Tool_FOUND)
-  mark_as_advanced(SPIRVLLVMTranslator_Tool)
+if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
+mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
 endif()
 
 # Add interface target for library.
 if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
   add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
   set_target_properties(LLVMSPIRVLib PROPERTIES
-    IMPORTED_LOCATION ${SPIRVLLVMTranslator_Library}
+    IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
+    IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
+    IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
     INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
     )
 endif()
@@ -86,6 +116,8 @@ endif()
 if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
   add_executable(llvm-spirv IMPORTED)
   set_target_properties(llvm-spirv PROPERTIES
-    IMPORTED_LOCATION ${SPIRVLLVMTranslator_Tool}
+    IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
+    IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
+    IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
     )
 endif()

external/llvm/llvm_prebuilt_path.cmake

@@ -16,5 +16,5 @@ if(DEFINED BUILD_TYPE)
   endif()
 endif()
 
-list(APPEND DEFAULT_IGC_LLVM_PREBUILDS_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../prebuild-llvm/${LLVM_BUILD_TYPE}")
+list(APPEND DEFAULT_IGC_LLVM_PREBUILDS_DIRS "${BS_DIR_EXTERNAL_COMPONENTS}/prebuild-llvm")
 list(APPEND DEFAULT_IGC_LLVM_PREBUILDS_DIRS "/opt/intel-llvm-static-${IGC_OPTION__LLVM_PREFERRED_VERSION}")