[LLVM15] Switch to LLVM 15

bokrzesi · fda0 · commit a56b87e4acbc · 2025-04-11T13:11:04.000+02:00
* Switch to LLVM 15 * Adjust SPIRV-Translator paths, to make them consistent (cherry picked from commit 374a909)
diff --git a/external/llvm/llvm_preferred_version.cmake b/external/llvm/llvm_preferred_version.cmake
@@ -6,4 +6,5 @@
 #
 #============================ end_copyright_notice =============================
 
-    set(DEFAULT_IGC_LLVM_VERSION "14.0.5")
+set(DEFAULT_IGC_LLVM_VERSION "15.0.7")
+
diff --git a/external/llvm/llvm_spirv_source_path.cmake b/external/llvm/llvm_spirv_source_path.cmake
@@ -14,8 +14,8 @@ if (WIN32)
     )
 else()
   list(APPEND IGC_LLVM_SPIRV_PATHS
-    ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator
-    ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator
+    ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}
+    ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}
     )
 endif()
 list(APPEND IGC_LLVM_SPIRV_PATHS

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ if (WIN32)`
`14`	`14`	`)`
`15`	`15`	`else()`
`16`	`16`	`list(APPEND IGC_LLVM_SPIRV_PATHS`
`17`		`- ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator`
`18`		`- ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator`
	`17`	`+ ${CMAKE_CURRENT_LIST_DIR}/../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}`
	`18`	`+ ${CMAKE_CURRENT_LIST_DIR}/../../../../SPIRV-LLVM-Translator_${IGC_OPTION__LLVM_PREFERRED_VERSION}`
`19`	`19`	`)`
`20`	`20`	`endif()`
`21`	`21`	`list(APPEND IGC_LLVM_SPIRV_PATHS`