From 8fbe873e1be43e5a8e22afd44df620e0c9ea8e1b Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 9 Oct 2024 10:37:32 +0000 Subject: [PATCH] build: correct setting for i915/xe prelim setting in package scripts rename i915 flag to uppercase, for consistency disable i915 / xe prelim by default in package scripts Signed-off-by: Mateusz Jablonski --- CMakeLists.txt | 8 ++++---- level_zero/core/source/cache/linux/CMakeLists.txt | 2 +- level_zero/core/source/device/CMakeLists.txt | 2 +- level_zero/core/source/dll/linux/CMakeLists.txt | 2 +- level_zero/core/source/fabric/linux/CMakeLists.txt | 2 +- .../test/unit_tests/sources/cache/linux/CMakeLists.txt | 2 +- .../test/unit_tests/sources/fabric/linux/CMakeLists.txt | 2 +- level_zero/tools/source/debug/linux/CMakeLists.txt | 2 +- .../tools/source/sysman/fabric_port/linux/CMakeLists.txt | 4 ++-- .../tools/source/sysman/firmware/linux/CMakeLists.txt | 4 ++-- .../tools/source/sysman/frequency/linux/CMakeLists.txt | 4 ++-- .../tools/source/sysman/memory/linux/CMakeLists.txt | 4 ++-- .../tools/source/sysman/performance/linux/CMakeLists.txt | 4 ++-- level_zero/tools/source/sysman/power/linux/CMakeLists.txt | 4 ++-- .../tools/source/sysman/scheduler/linux/CMakeLists.txt | 4 ++-- .../unit_tests/sources/debug/linux/prelim/CMakeLists.txt | 4 ++-- .../test/unit_tests/sources/metrics/linux/CMakeLists.txt | 2 +- .../sources/sysman/fabric_port/linux/CMakeLists.txt | 4 ++-- .../sources/sysman/firmware/linux/CMakeLists.txt | 4 ++-- .../sources/sysman/frequency/linux/CMakeLists.txt | 4 ++-- .../unit_tests/sources/sysman/linux/nl_api/CMakeLists.txt | 4 ++-- .../unit_tests/sources/sysman/memory/linux/CMakeLists.txt | 4 ++-- .../sources/sysman/performance/linux/CMakeLists.txt | 4 ++-- .../unit_tests/sources/sysman/power/linux/CMakeLists.txt | 4 ++-- .../sources/sysman/scheduler/linux/CMakeLists.txt | 4 ++-- opencl/test/unit_test/os_interface/linux/CMakeLists.txt | 4 ++-- .../l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec | 5 ++++- .../l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec | 5 ++++- scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules | 6 ++++-- scripts/packaging/opencl/rhel_8/SPECS/opencl.spec | 5 ++++- scripts/packaging/opencl/sles_15/SPECS/opencl.spec | 5 ++++- scripts/packaging/opencl/ubuntu_20.04/debian/rules | 6 ++++-- scripts/packaging/ubuntu/debian/rules | 6 ++++-- shared/source/os_interface/linux/CMakeLists.txt | 2 +- shared/test/common/libult/linux/CMakeLists.txt | 4 ++-- shared/test/common/os_interface/linux/CMakeLists.txt | 2 +- shared/test/unit_test/os_interface/linux/CMakeLists.txt | 2 +- 37 files changed, 79 insertions(+), 61 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5b5ce0b66..5b92513d62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,11 +562,11 @@ endif() if(UNIX) # prelim headers detection if(NOT ("${BRANCH_TYPE}" STREQUAL "")) - set(NEO_ENABLE_i915_PRELIM_DETECTION TRUE) - elseif(NOT DEFINED NEO_ENABLE_i915_PRELIM_DETECTION) - set(NEO_ENABLE_i915_PRELIM_DETECTION FALSE) + set(NEO_ENABLE_I915_PRELIM_DETECTION TRUE) + elseif(NOT DEFINED NEO_ENABLE_I915_PRELIM_DETECTION) + set(NEO_ENABLE_I915_PRELIM_DETECTION FALSE) endif() - message(STATUS "i915 prelim headers detection: ${NEO_ENABLE_i915_PRELIM_DETECTION}") + message(STATUS "i915 prelim headers detection: ${NEO_ENABLE_I915_PRELIM_DETECTION}") if(NOT ("${BRANCH_TYPE}" STREQUAL "")) set(NEO_ENABLE_XE_PRELIM_DETECTION TRUE) diff --git a/level_zero/core/source/cache/linux/CMakeLists.txt b/level_zero/core/source/cache/linux/CMakeLists.txt index 28583c9b29..2e91f332cc 100644 --- a/level_zero/core/source/cache/linux/CMakeLists.txt +++ b/level_zero/core/source/cache/linux/CMakeLists.txt @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cache_reservation_impl_prelim.cpp diff --git a/level_zero/core/source/device/CMakeLists.txt b/level_zero/core/source/device/CMakeLists.txt index 0781850d91..c11fd2665d 100644 --- a/level_zero/core/source/device/CMakeLists.txt +++ b/level_zero/core/source/device/CMakeLists.txt @@ -17,7 +17,7 @@ target_sources(${L0_STATIC_LIB_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/device_imp.h ) -if(UNIX AND NEO_ENABLE_i915_PRELIM_DETECTION) +if(UNIX AND NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device_imp_drm/device_imp_peer.cpp diff --git a/level_zero/core/source/dll/linux/CMakeLists.txt b/level_zero/core/source/dll/linux/CMakeLists.txt index f12f8685c5..c6c7c33917 100644 --- a/level_zero/core/source/dll/linux/CMakeLists.txt +++ b/level_zero/core/source/dll/linux/CMakeLists.txt @@ -13,7 +13,7 @@ if(UNIX) ) endif() - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${TARGET_NAME_L0} PRIVATE ${NEO_SOURCE_DIR}/level_zero/tools/source/debug/linux/prelim/debug_session_linux_helper.cpp diff --git a/level_zero/core/source/fabric/linux/CMakeLists.txt b/level_zero/core/source/fabric/linux/CMakeLists.txt index db53585a91..23d488619a 100644 --- a/level_zero/core/source/fabric/linux/CMakeLists.txt +++ b/level_zero/core/source/fabric/linux/CMakeLists.txt @@ -6,7 +6,7 @@ if(UNIX) - if(LIBGENL_FOUND AND NEO_ENABLE_i915_PRELIM_DETECTION) + if(LIBGENL_FOUND AND NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt diff --git a/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt b/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt index 00ed7d717a..09e935a4f4 100644 --- a/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/sources/cache/linux/CMakeLists.txt @@ -5,7 +5,7 @@ # if(UNIX) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/test_cache_reservation_impl_prelim.cpp diff --git a/level_zero/core/test/unit_tests/sources/fabric/linux/CMakeLists.txt b/level_zero/core/test/unit_tests/sources/fabric/linux/CMakeLists.txt index c67bad7fce..c00e9f1dde 100644 --- a/level_zero/core/test/unit_tests/sources/fabric/linux/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/sources/fabric/linux/CMakeLists.txt @@ -5,7 +5,7 @@ # if(UNIX) - if(LIBGENL_FOUND AND NEO_ENABLE_i915_PRELIM_DETECTION) + if(LIBGENL_FOUND AND NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/test_fabric_iaf.cpp diff --git a/level_zero/tools/source/debug/linux/CMakeLists.txt b/level_zero/tools/source/debug/linux/CMakeLists.txt index c32a4444c4..98d33395fe 100644 --- a/level_zero/tools/source/debug/linux/CMakeLists.txt +++ b/level_zero/tools/source/debug/linux/CMakeLists.txt @@ -12,7 +12,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/drm_helper.cpp ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/prelim/debug_session.cpp diff --git a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt index c73944ad98..5d3354bb67 100644 --- a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.cpp diff --git a/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt b/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt index eca5c7bd62..763b0a9580 100644 --- a/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -12,7 +12,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper_prelim.cpp diff --git a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt index ca3b3f61f2..ac182efb91 100644 --- a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.cpp diff --git a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt index 6fe6ce9721..298e450593 100755 --- a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.cpp diff --git a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt index 65e1fc3f79..ceb09c6f49 100644 --- a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021-2023 Intel Corporation +# Copyright (C) 2021-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.cpp diff --git a/level_zero/tools/source/sysman/power/linux/CMakeLists.txt b/level_zero/tools/source/sysman/power/linux/CMakeLists.txt index 7a660874d3..e2d46df83f 100644 --- a/level_zero/tools/source/sysman/power/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/power/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,7 +10,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.cpp diff --git a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt index 57fdc08a2a..7ced758239 100644 --- a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2023 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,7 +11,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp_prelim.cpp diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/CMakeLists.txt index 5903a59360..2416a69785 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/CMakeLists.txt @@ -1,11 +1,11 @@ # -# Copyright (C) 2022-2023 Intel Corporation +# Copyright (C) 2022-2024 Intel Corporation # # SPDX-License-Identifier: MIT # if(UNIX) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux.cpp diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt index d39678fed6..5ede221b07 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/CMakeLists.txt @@ -11,7 +11,7 @@ set(L0_TOOLS_METRICS_LINUX_TESTS_LINUX ) if(TESTS_PVC) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TOOLS_METRICS_LINUX_TESTS_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_metric_ip_sampling_linux_pvc_prelim.cpp ) diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt index f146523c4a..12564d61af 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_FABRICPORT_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) if(LIBGENL_FOUND) list(APPEND L0_TESTS_TOOLS_SYSMAN_FABRICPORT_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_fabric_device_prelim.cpp diff --git a/level_zero/tools/test/unit_tests/sources/sysman/firmware/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/firmware/linux/CMakeLists.txt index 1dfbf3b302..4b1ef1cd89 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/firmware/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/firmware/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_FIRMWARE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_FIRMWARE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_sysman_firmware_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_zes_sysman_firmware_prelim.h diff --git a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt index ebdab4c297..161dda6a16 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_FREQUENCY_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_FREQUENCY_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_frequency_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_frequency_prelim.h diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/CMakeLists.txt index bd11fcca34..ed06dcfba9 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -14,7 +14,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/mock_nl_dll.h ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_IAF_NLAPI_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_iaf_nl_api_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_nl_api_prelim.cpp diff --git a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt index c57b5ddba4..14189e0414 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_memory_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_prelim.h diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt index 0d21598eb8..34dc1b360c 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021-2022 Intel Corporation +# Copyright (C) 2021-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_performance_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_performance_prelim.h diff --git a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/CMakeLists.txt index e93ffd0241..851b83299b 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_POWER_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_POWER_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_power_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_power_helper_prelim.cpp diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt index cda5692aa5..c329eae26f 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,7 @@ set(L0_TESTS_TOOLS_SYSMAN_SCHEDULER_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND L0_TESTS_TOOLS_SYSMAN_SCHEDULER_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_scheduler_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_scheduler_prelim.h diff --git a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt index 6442689510..289d45a441 100644 --- a/opencl/test/unit_test/os_interface/linux/CMakeLists.txt +++ b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2023 Intel Corporation +# Copyright (C) 2018-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -15,7 +15,7 @@ set(IGDRCL_SRCS_tests_os_interface_linux ${CMAKE_CURRENT_SOURCE_DIR}/platform_tests_lin.cpp ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) if(TESTS_XE_HPC_CORE) list(APPEND IGDRCL_SRCS_tests_os_interface_linux ${CMAKE_CURRENT_SOURCE_DIR}/cl_mem_cache_clos_tests_xe_hpc.cpp diff --git a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec index 40ad07c5bb..c65968e6fe 100644 --- a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec @@ -3,6 +3,8 @@ %global rel xxx %global build_id xxx %global NEO_RELEASE_WITH_REGKEYS FALSE +%global NEO_ENABLE_I915_PRELIM_DETECTION FALSE +%global NEO_ENABLE_XE_PRELIM_DETECTION FALSE %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE %global NEO_I915_PRELIM_HEADERS_DIR %{nil} @@ -65,7 +67,8 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DNEO_BUILD_WITH_OCL=FALSE \ -DNEO_SKIP_UNIT_TESTS=TRUE \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=%{NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=%{NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \ -DL0_INSTALL_UDEV_RULES=1 \ diff --git a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec index 26702464c3..1639f41385 100644 --- a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec @@ -6,6 +6,8 @@ %global build_id xxx %global NEO_RELEASE_WITH_REGKEYS FALSE %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE +%global NEO_ENABLE_I915_PRELIM_DETECTION FALSE +%global NEO_ENABLE_XE_PRELIM_DETECTION FALSE %global NEO_I915_PRELIM_HEADERS_DIR %{nil} %define gmmlib_sover 12 @@ -75,7 +77,8 @@ Intel(R) Graphics Compute Runtime for oneAPI Level Zero - development headers -DCMAKE_BUILD_TYPE=%{build_type} \ -DNEO_BUILD_WITH_OCL=FALSE \ -DNEO_SKIP_UNIT_TESTS=TRUE \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=%{NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=%{NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \ -DL0_INSTALL_UDEV_RULES=1 \ diff --git a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules index bdf735f328..d534111448 100755 --- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules +++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules @@ -8,7 +8,8 @@ NEO_DISABLE_BUILTINS_COMPILATION ?= FALSE RELEASE_WITH_REGKEYS ?= FALSE IGDRCL_FORCE_USE_LIBVA ?= FALSE NEO_SKIP_UNIT_TESTS ?= FALSE -NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE +NEO_ENABLE_I915_PRELIM_DETECTION ?= FALSE +NEO_ENABLE_XE_PRELIM_DETECTION ?= FALSE NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE NEO_FORCE_USE_AUB_STREAM ?= TRUE NEO_LEGACY_PLATFORMS_SUPPORT ?= FALSE @@ -21,7 +22,8 @@ override_dh_auto_configure: -DNEO_OCLOC_VERSION_MODE=${NEO_OCLOC_VERSION_MODE} \ -DNEO_VERSION_BUILD=$(ver) \ -DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=${NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=${NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=${NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \ -DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \ diff --git a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec index 36ed4c770c..bf2725da9b 100644 --- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec +++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec @@ -5,6 +5,8 @@ %global NEO_OCL_VERSION_MINOR xxx %global NEO_OCL_VERSION_BUILD xxx %global NEO_RELEASE_WITH_REGKEYS FALSE +%global NEO_ENABLE_I915_PRELIM_DETECTION FALSE +%global NEO_ENABLE_XE_PRELIM_DETECTION FALSE %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE %global NEO_I915_PRELIM_HEADERS_DIR %{nil} @@ -62,7 +64,8 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DBUILD_WITH_L0=FALSE \ -DNEO_SKIP_UNIT_TESTS=TRUE \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=%{NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=%{NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \ -DCMAKE_VERBOSE_MAKEFILE=FALSE \ diff --git a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec index 2e8a48e406..9bb3e11bf6 100644 --- a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec +++ b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec @@ -7,6 +7,8 @@ %global NEO_OCL_VERSION_MINOR xxx %global NEO_OCL_VERSION_BUILD xxx %global NEO_RELEASE_WITH_REGKEYS FALSE +%global NEO_ENABLE_I915_PRELIM_DETECTION FALSE +%global NEO_ENABLE_XE_PRELIM_DETECTION FALSE %global NEO_ENABLE_XE_EU_DEBUG_SUPPORT FALSE %global NEO_I915_PRELIM_HEADERS_DIR %{nil} %global NEO_OCLOC_VERSION_MODE 1 @@ -71,7 +73,8 @@ Summary: ocloc package for opencl -DCMAKE_BUILD_TYPE=%{build_type} \ -DBUILD_WITH_L0=FALSE \ -DNEO_SKIP_UNIT_TESTS=TRUE \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=%{NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=%{NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=%{NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \ -DCMAKE_VERBOSE_MAKEFILE=FALSE \ diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules index 41abafecfe..eb1db911fd 100755 --- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules +++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules @@ -8,7 +8,8 @@ RELEASE_WITH_REGKEYS ?= FALSE IGDRCL_FORCE_USE_LIBVA ?= FALSE NEO_SKIP_UNIT_TESTS ?= FALSE NEO_SKIP_AUB_TESTS_RUN ?= TRUE -NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE +NEO_ENABLE_I915_PRELIM_DETECTION ?= FALSE +NEO_ENABLE_XE_PRELIM_DETECTION ?= FALSE NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE NEO_FORCE_USE_AUB_STREAM ?= TRUE NEO_LEGACY_PLATFORMS_SUPPORT ?= FALSE @@ -26,7 +27,8 @@ override_dh_auto_configure: -DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \ -DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \ -DNEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT} \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=${NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=${NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=${NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \ -DBUILD_WITH_L0=FALSE \ diff --git a/scripts/packaging/ubuntu/debian/rules b/scripts/packaging/ubuntu/debian/rules index 46dd0b935b..a6eb26cdec 100755 --- a/scripts/packaging/ubuntu/debian/rules +++ b/scripts/packaging/ubuntu/debian/rules @@ -8,7 +8,8 @@ RELEASE_WITH_REGKEYS ?= FALSE IGDRCL_FORCE_USE_LIBVA ?= FALSE NEO_SKIP_UNIT_TESTS ?= FALSE NEO_SKIP_AUB_TESTS_RUN ?= TRUE -NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE +NEO_ENABLE_I915_PRELIM_DETECTION ?= FALSE +NEO_ENABLE_XE_PRELIM_DETECTION ?= FALSE NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE NEO_FORCE_USE_AUB_STREAM ?= TRUE NEO_BUILD_WITH_L0 ?= TRUE @@ -28,7 +29,8 @@ override_dh_auto_configure: -DNEO_VERSION_HOTFIX=${NEO_VERSION_HOTFIX} \ -DNEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN} \ -DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \ - -DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \ + -DNEO_ENABLE_I915_PRELIM_DETECTION=${NEO_ENABLE_I915_PRELIM_DETECTION} \ + -DNEO_ENABLE_XE_PRELIM_DETECTION=${NEO_ENABLE_XE_PRELIM_DETECTION} \ -DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=${NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \ -DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \ -DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \ diff --git a/shared/source/os_interface/linux/CMakeLists.txt b/shared/source/os_interface/linux/CMakeLists.txt index 9f2e4a6702..2ab50f3334 100644 --- a/shared/source/os_interface/linux/CMakeLists.txt +++ b/shared/source/os_interface/linux/CMakeLists.txt @@ -121,7 +121,7 @@ else() ) endif() -if(NOT NEO_ENABLE_i915_PRELIM_DETECTION) +if(NOT NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND NEO_CORE_OS_INTERFACE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_getter_upstream.cpp ) diff --git a/shared/test/common/libult/linux/CMakeLists.txt b/shared/test/common/libult/linux/CMakeLists.txt index c0ec48499c..f22a3be2e7 100644 --- a/shared/test/common/libult/linux/CMakeLists.txt +++ b/shared/test/common/libult/linux/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021-2022 Intel Corporation +# Copyright (C) 2021-2024 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -12,7 +12,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_engine.cpp ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_prelim_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_prelim_context.h diff --git a/shared/test/common/os_interface/linux/CMakeLists.txt b/shared/test/common/os_interface/linux/CMakeLists.txt index 18c8dc3b84..e9ee6e6f8d 100644 --- a/shared/test/common/os_interface/linux/CMakeLists.txt +++ b/shared/test/common/os_interface/linux/CMakeLists.txt @@ -15,7 +15,7 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_extended.h ) - if(NEO_ENABLE_i915_PRELIM_DETECTION) + if(NEO_ENABLE_I915_PRELIM_DETECTION) target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_fixture_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_fixture_context.h diff --git a/shared/test/unit_test/os_interface/linux/CMakeLists.txt b/shared/test/unit_test/os_interface/linux/CMakeLists.txt index f0637efa21..5f8b70a5b2 100644 --- a/shared/test/unit_test/os_interface/linux/CMakeLists.txt +++ b/shared/test/unit_test/os_interface/linux/CMakeLists.txt @@ -44,7 +44,7 @@ set(NEO_CORE_OS_INTERFACE_TESTS_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_lin.cpp ) -if(NEO_ENABLE_i915_PRELIM_DETECTION) +if(NEO_ENABLE_I915_PRELIM_DETECTION) list(APPEND NEO_CORE_OS_INTERFACE_TESTS_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object_tests_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_cache_info_tests.cpp