Skip to content

Commit c68c40d

Browse files
dguzhaevigcbot
authored andcommitted
Moved up spirv-tools logic for ocloc_tests
1 parent 09a2f59 commit c68c40d

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

IGC/ocloc_tests/CMakeLists.txt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,23 @@ if(NOT IGC_OPTION__ENABLE_OCLOC_LIT_TESTS)
1111
endif()
1212

1313

14+
if ((LLVM_VERSION_MAJOR LESS 14) OR SPIRV_SKIP_EXECUTABLES)
15+
set(IGC_BUILD__PROJ__llvm_spirv "")
16+
set(IGC_LLVM_SPIRV_DIR "")
17+
else()
18+
set(IGC_BUILD__PROJ__llvm_spirv "llvm-spirv")
19+
set(IGC_LLVM_SPIRV_DIR "$<TARGET_FILE_DIR:llvm-spirv>")
20+
endif()
21+
22+
if (NOT SPIRV_SKIP_EXECUTABLES)
23+
set(IGC_BUILD__PROJ__spirv_as "spirv-as")
24+
set(IGC_SPIRV_AS_DIR "$<TARGET_FILE_DIR:spirv-as>")
25+
else()
26+
set(IGC_BUILD__PROJ__spirv_as "")
27+
set(IGC_SPIRV_AS_DIR "")
28+
endif()
29+
30+
1431
# Variables set here are used by `configure_file` call and by
1532
# `add_lit_testsuite` later on.
1633
set(IGC_LIBRARY_DIR "$<TARGET_FILE_DIR:${IGC_BUILD__PROJ__igc_dll}>")
@@ -24,22 +41,6 @@ endif()
2441
set(IGC_OCLOC_LIBRARY_DIR "$<$<TARGET_EXISTS:ocloc_lib>:$<TARGET_FILE_DIR:ocloc_lib>>")
2542
set(IGC_BUILD__PROJ__ocloc_lib "$<$<TARGET_EXISTS:ocloc_lib>:ocloc_lib>")
2643

27-
if ((LLVM_VERSION_MAJOR LESS 14) OR SPIRV_SKIP_EXECUTABLES)
28-
set(IGC_BUILD__PROJ__llvm_spirv "")
29-
set(IGC_LLVM_SPIRV_DIR "")
30-
else()
31-
set(IGC_BUILD__PROJ__llvm_spirv "llvm-spirv")
32-
set(IGC_LLVM_SPIRV_DIR "$<TARGET_FILE_DIR:llvm-spirv>")
33-
endif()
34-
35-
if (NOT SPIRV_SKIP_EXECUTABLES)
36-
set(IGC_BUILD__PROJ__spirv_as "spirv-as")
37-
set(IGC_SPIRV_AS_DIR "$<TARGET_FILE_DIR:spirv-as>")
38-
else()
39-
set(IGC_BUILD__PROJ__spirv_as "")
40-
set(IGC_SPIRV_AS_DIR "")
41-
endif()
42-
4344
# If any new tool is required by any of the LIT tests add it here:
4445
set(IGC_OCLOC_TEST_DEPENDS
4546
FileCheck

0 commit comments

Comments
 (0)