LLVM-related paths update

LLVM-related paths are changed for windows.

Author: krystian-andrzejewski

IGC/cmake/igc_find_opencl_clang.cmake

@@ -48,9 +48,15 @@ if(NOT CCLANG_FROM_SYSTEM)
     # Detect CPU architecture
     igc_arch_get_cpu(cpuSuffix)
     set(CCLANG_BUILD_PREBUILDS_DIR "${IGC_BUILD__GFX_DEV_SRC_DIR}/../../prebuild-opencl-clang/Release/${cpuSuffix}")
+    if (WIN32)
+      set(CCLANG_BUILD_PREBUILDS_DIR "${IGC_BUILD__GFX_DEV_SRC_DIR}/../../prebuild-opencl-clang_${IGC_OPTION__LLVM_PREFERRED_VERSION}/Release/${cpuSuffix}")
+    endif()
 
     if(NOT EXISTS ${CCLANG_BUILD_PREBUILDS_DIR})
       set(CCLANG_BUILD_PREBUILDS_DIR "${IGC_BUILD__GFX_DEV_SRC_DIR}/../prebuild-opencl-clang/Release/${cpuSuffix}")
+      if (WIN32)
+        set(CCLANG_BUILD_PREBUILDS_DIR "${IGC_BUILD__GFX_DEV_SRC_DIR}/../prebuild-opencl-clang_${IGC_OPTION__LLVM_PREFERRED_VERSION}/Release/${cpuSuffix}")
+      endif()
     endif()
   endif()
   set(CCLANG_BUILD_INTREE_LLVM_DIR ${LLVM_SOURCE_DIR}/projects/opencl-clang)

external/llvm/llvm.cmake

@@ -48,7 +48,7 @@ endif()
 # Handle dependent options for Prebuild mode.
 if(IGC_OPTION__LLVM_MODE STREQUAL PREBUILDS_MODE_NAME)
   if(WIN32)
-    set(LLVM_ROOT "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows" CACHE PATH "Path to LLVM prebuilt binaries")
+    set(LLVM_ROOT "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows_${IGC_OPTION__LLVM_PREFERRED_VERSION}" CACHE PATH "Path to LLVM prebuilt binaries")
   else()
     set(LLVM_ROOT "${DEFAULT_IGC_LLVM_PREBUILDS_DIRS}" CACHE PATH
       "Paths to LLVM prebuild (multiple paths can be specified separated by ;")
@@ -69,7 +69,7 @@ if(NOT IGC_OPTION__LLVM_MODE)
   else()
     # Set defaults and stop.
     if(WIN32)
-      set(LLVM_ROOT "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows" CACHE PATH "Path to LLVM prebuilt binaries")
+      set(LLVM_ROOT "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows_${IGC_OPTION__LLVM_PREFERRED_VERSION}" CACHE PATH "Path to LLVM prebuilt binaries")
     else()
       set(LLVM_ROOT ${DEFAULT_IGC_LLVM_PREBUILDS_DIRS})
     endif()

external/llvm/llvm_deps.cmake

@@ -28,7 +28,7 @@ set(IGC_OPTION__LLVM_LLD ON)
 include(llvm_preferred_version)
 set(IGC_OPTION__LLVM_PREFERRED_VERSION ${DEFAULT_IGC_LLVM_VERSION} CACHE STRING "Preferred version of LLVM to use")
 
-set(IGC_LLVM_WORKSPACE ${CMAKE_CURRENT_BINARY_DIR}/llvm-deps)
+set(IGC_LLVM_WORKSPACE ${CMAKE_CURRENT_BINARY_DIR}/llvm-deps-${IGC_OPTION__LLVM_PREFERRED_VERSION})
 set(IGC_LLVM_WORKSPACE_SRC ${IGC_LLVM_WORKSPACE}/src)
 
 # Get useful macros for llvm hooks.

external/llvm/llvm_prebuilt_path.cmake

@@ -16,6 +16,6 @@ if(DEFINED BUILD_TYPE)
   endif()
 endif()
 
-list(APPEND DEFAULT_IGC_LLVM_PREBUILDS_DIRS "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows")
+list(APPEND DEFAULT_IGC_LLVM_PREBUILDS_DIRS "${BS_DIR_EXTERNAL_COMPONENTS}/llvm_prebuilt_windows_${IGC_OPTION__LLVM_PREFERRED_VERSION}")
 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}")

external/llvm/llvm_spirv_source_path.cmake

@@ -7,9 +7,18 @@
 #============================ end_copyright_notice =============================
 
 # Add some default paths where SPIRV can be placed.
+if (WIN32)
+  list(APPEND IGC_LLVM_SPIRV_PATHS
+    ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}
+    ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}
+    )
+else()
+  list(APPEND IGC_LLVM_SPIRV_PATHS
+    ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator
+    ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator
+    )
+endif()
 list(APPEND IGC_LLVM_SPIRV_PATHS
-  ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator
-  ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator
   ${CMAKE_CURRENT_LIST_DIR}/../../../llvm-spirv
   ${CMAKE_CURRENT_LIST_DIR}/../../../../llvm-spirv
   )