80 lines
4.1 KiB
Diff
80 lines
4.1 KiB
Diff
From 7b3c34e5885f663992eef87793848b7bab6c1a1b Mon Sep 17 00:00:00 2001
|
|
From: TheK0tYaRa <thek0tyara.alod123@gmail.com>
|
|
Date: Tue, 28 Apr 2026 09:10:05 +0300
|
|
Subject: [PATCH] fix generated test kernels for LLVM 22
|
|
|
|
---
|
|
level_zero/core/test/common/test_modules/CMakeLists.txt | 4 ++--
|
|
opencl/test/unit_test/CMakeLists.txt | 6 +++++-
|
|
target_unit_tests/CMakeLists.txt | 2 +-
|
|
3 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/level_zero/core/test/common/test_modules/CMakeLists.txt b/level_zero/core/test/common/test_modules/CMakeLists.txt
|
|
index 94044b3..cc9a19a 100644
|
|
--- a/level_zero/core/test/common/test_modules/CMakeLists.txt
|
|
+++ b/level_zero/core/test/common/test_modules/CMakeLists.txt
|
|
@@ -32,7 +32,7 @@ set(ADDITIONAL_INTERNAL_OPTIONS "-ze-intel-64bit-addressing")
|
|
macro(macro_for_each_platform)
|
|
foreach(REVISION_CONFIG ${${PLATFORM_IT}_${CORE_TYPE}_REVISIONS})
|
|
parse_revision_config(${REVISION_CONFIG} ${PLATFORM_IT_LOWER} DEVICE_ID REVISION_ID)
|
|
- level_zero_generate_kernels(l0_test_kernel_outputs ${PLATFORM_IT_LOWER} ${DEVICE_ID} ${REVISION_ID} "-g" ${TEST_MODULES})
|
|
+ level_zero_generate_kernels(l0_test_kernel_outputs ${PLATFORM_IT_LOWER} ${DEVICE_ID} ${REVISION_ID} "-cl-std=CL1.2" ${TEST_MODULES})
|
|
if("${CORE_TYPE_LOWER}" STREQUAL "xe3p_core")
|
|
foreach(GRF_SIZE ${GRF_SIZES} ${${PLATFORM_IT}_${CORE_TYPE}_GRF_ADDITIONAL_SIZES})
|
|
set(INTERNAL_OPTIONS "-cl-intel-exp-register-file-size ${GRF_SIZE} ${ADDITIONAL_INTERNAL_OPTIONS}")
|
|
@@ -48,7 +48,7 @@ macro(macro_for_each_platform)
|
|
endforeach()
|
|
endif()
|
|
|
|
- level_zero_generate_kernels_with_internal_options(l0_bindless_test_kernel_outputs ${PLATFORM_IT_LOWER} "bindless" ${DEVICE_ID} ${REVISION_ID} "-g" ${TEST_KERNEL_BINDLESS_internal_options} ${TEST_KERNEL_BINDLESS})
|
|
+ level_zero_generate_kernels_with_internal_options(l0_bindless_test_kernel_outputs ${PLATFORM_IT_LOWER} "bindless" ${DEVICE_ID} ${REVISION_ID} "-cl-std=CL1.2" ${TEST_KERNEL_BINDLESS_internal_options} ${TEST_KERNEL_BINDLESS})
|
|
|
|
endforeach()
|
|
endmacro()
|
|
diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt
|
|
index 047a260..9156603 100644
|
|
--- a/opencl/test/unit_test/CMakeLists.txt
|
|
+++ b/opencl/test/unit_test/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
|
|
|
|
add_custom_target(prepare_test_kernels_for_ocl)
|
|
add_dependencies(prepare_test_kernels_for_ocl ${BUILTINS_BINARIES_BINDFUL_LIB_NAME})
|
|
-add_custom_target(run_unit_tests ALL)
|
|
+add_custom_target(run_unit_tests)
|
|
|
|
add_custom_target(run_ocl_tests)
|
|
set_target_properties(run_ocl_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
|
|
@@ -239,6 +239,9 @@ set(TEST_KERNEL_options
|
|
)
|
|
|
|
file(GLOB_RECURSE TEST_KERNELS test_files/*.cl)
|
|
+list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/simple_nonuniform.cl")
|
|
+set(TEST_KERNEL_nonuniform test_files/simple_nonuniform.cl)
|
|
+set(TEST_KERNEL_nonuniform_options "-cl-std=CL1.2")
|
|
|
|
macro(macro_for_each_platform)
|
|
set(PLATFORM_TEST_KERNELS ${TEST_KERNELS})
|
|
@@ -257,6 +260,7 @@ macro(macro_for_each_platform)
|
|
parse_revision_config(${REVISION_CONFIG} ${PLATFORM_IT_LOWER} DEVICE_ID REVISION_ID)
|
|
neo_gen_kernels(${PLATFORM_IT_LOWER} ${DEVICE_ID} ${REVISION_ID} FALSE ${PLATFORM_TEST_KERNELS})
|
|
neo_gen_kernels_with_options(${PLATFORM_IT_LOWER} ${DEVICE_ID} ${REVISION_ID} ${TEST_KERNEL} ${TEST_KERNEL_options})
|
|
+ neo_gen_kernels_with_options(${PLATFORM_IT_LOWER} ${DEVICE_ID} ${REVISION_ID} ${TEST_KERNEL_nonuniform} ${TEST_KERNEL_nonuniform_options})
|
|
endforeach()
|
|
|
|
#compile gen specific kernels if any were found
|
|
diff --git a/target_unit_tests/CMakeLists.txt b/target_unit_tests/CMakeLists.txt
|
|
index a12ca8d..92cee46 100644
|
|
--- a/target_unit_tests/CMakeLists.txt
|
|
+++ b/target_unit_tests/CMakeLists.txt
|
|
@@ -12,7 +12,7 @@ if(NOT TARGET run_mt_unit_tests AND NOT NEO_SKIP_MT_UNIT_TESTS)
|
|
endif()
|
|
|
|
if(NOT TARGET run_unit_tests)
|
|
- add_custom_target(run_unit_tests ALL)
|
|
+ add_custom_target(run_unit_tests)
|
|
set_target_properties(run_unit_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
|
|
endif()
|
|
|
|
--
|
|
2.54.0
|
|
|