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 <mateusz.jablonski@intel.com>
2025-12-19 06:24:51 +08:00 · 2024-10-09 10:37:32 +00:00
parent 296d442e52
commit 8fbe873e1b
37 changed files with 79 additions and 61 deletions
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
    )
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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 \
--- 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} \
--- 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 \
--- 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 \
--- 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 \
--- 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} \
--- 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
  )
--- 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
--- 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
--- 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