Revert "build: enable xe drm detection by default"

This reverts commit 973757a58d. Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2024-03-18 07:59:53 +00:00 · 2024-03-18 07:59:53 +00:00 · 19dcc80e44
parent a022acbdf3
commit 19dcc80e44
16 changed files with 112 additions and 41 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -522,6 +522,14 @@ if(UNIX)
  endif()
  message(STATUS "i915 prelim headers detection: ${NEO_ENABLE_i915_PRELIM_DETECTION}")

+  # drm-xe support
+  if(NOT ("${BRANCH_TYPE}" STREQUAL ""))
+    set(NEO_ENABLE_XE_DRM_DETECTION TRUE)
+  elseif(NOT DEFINED NEO_ENABLE_XE_DRM_DETECTION)
+    set(NEO_ENABLE_XE_DRM_DETECTION FALSE)
+  endif()
+  message(STATUS "Xe drm detection: ${NEO_ENABLE_XE_DRM_DETECTION}")
+
  get_filename_component(THIRD_PARTY_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}" ABSOLUTE)
  include_directories(BEFORE ${THIRD_PARTY_DIR})

--- a/level_zero/core/source/dll/linux/CMakeLists.txt
+++ b/level_zero/core/source/dll/linux/CMakeLists.txt
@ -5,11 +5,13 @@
 #

 if(UNIX)
-  target_sources(${TARGET_NAME_L0}
-                 PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${NEO_SOURCE_DIR}/level_zero/tools/source/debug/linux/xe/debug_session_xe_helper.cpp
-  )
+  if(NEO_ENABLE_XE_DRM_DETECTION)
+    target_sources(${TARGET_NAME_L0}
+                   PRIVATE
+                   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                   ${NEO_SOURCE_DIR}/level_zero/tools/source/debug/linux/xe/debug_session_xe_helper.cpp
+    )
+  endif()

  if(NEO_ENABLE_i915_PRELIM_DETECTION)
    target_sources(${TARGET_NAME_L0}
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/CMakeLists.txt
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/CMakeLists.txt
@ -6,8 +6,6 @@

 set(L0_TESTS_SYSMAN_ENGINE_LINUX
    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_engine_xe.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_engine_xe.h
 )

 if(NEO_ENABLE_i915_PRELIM_DETECTION)
@ -23,6 +21,13 @@ else()
  )
 endif()

+if(NEO_ENABLE_XE_DRM_DETECTION)
+  list(APPEND L0_TESTS_SYSMAN_ENGINE_LINUX
+       ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_engine_xe.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/mock_engine_xe.h
+  )
+endif()
+
 if(UNIX)
  target_sources(${TARGET_NAME}
                 PRIVATE
--- a/level_zero/tools/source/debug/linux/CMakeLists.txt
+++ b/level_zero/tools/source/debug/linux/CMakeLists.txt
@ -10,8 +10,6 @@ if(UNIX)
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/debug_session.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_helper.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/xe/debug_session.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/xe/debug_session.h
  )

  if(NEO_ENABLE_i915_PRELIM_DETECTION)
@ -21,5 +19,15 @@ if(UNIX)
                   ${CMAKE_CURRENT_SOURCE_DIR}/prelim/debug_session.h
    )
  endif()
-endif()

+  if(NEO_ENABLE_XE_DRM_DETECTION)
+    target_sources(${L0_STATIC_LIB_NAME}
+                   PRIVATE
+                   ${CMAKE_CURRENT_SOURCE_DIR}/xe/debug_session.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/xe/debug_session.h
+    )
+  endif()
+
+  add_subdirectories()
+
+endif()
--- a/level_zero/tools/test/unit_tests/sources/debug/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/debug/linux/CMakeLists.txt
@ -10,6 +10,6 @@ if(UNIX)
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_debug_session_linux.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux.cpp
  )
-  add_subdirectories()
 endif()

+add_subdirectories()
--- a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/CMakeLists.txt
@ -4,10 +4,15 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
-               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/test_debug_api_linux_xe.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux_xe.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux_xe.cpp
-)
+if(UNIX)
+  if(NEO_ENABLE_XE_DRM_DETECTION)
+    target_sources(${TARGET_NAME} PRIVATE
+                   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                   ${CMAKE_CURRENT_SOURCE_DIR}/test_debug_api_linux_xe.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux_xe.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/debug_session_fixtures_linux_xe.cpp
+    )
+  endif()
+
+endif()

--- 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,7 @@
 %global rel xxx
 %global build_id xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
+%global NEO_ENABLE_XE_DRM_DETECTION FALSE
 %global I915_HEADERS_DIR %{nil}

 %define _source_payload w5T16.xzdio
@ -65,6 +66,7 @@ cd build
   -DNEO_BUILD_WITH_OCL=FALSE \
   -DNEO_SKIP_UNIT_TESTS=TRUE \
   -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
+   -DNEO_ENABLE_XE_DRM_DETECTION=%{NEO_ENABLE_XE_DRM_DETECTION} \
   -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
   -DL0_INSTALL_UDEV_RULES=1 \
   -DUDEV_RULES_DIR=/etc/udev/rules.d/ \
--- 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
@ -5,6 +5,7 @@
 %global rel xxx
 %global build_id xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
+%global NEO_ENABLE_XE_DRM_DETECTION FALSE
 %global I915_HEADERS_DIR %{nil}

 %define gmmlib_sover 12
@ -75,6 +76,7 @@ Intel(R) Graphics Compute Runtime for oneAPI Level Zero - development headers
   -DNEO_BUILD_WITH_OCL=FALSE \
   -DNEO_SKIP_UNIT_TESTS=TRUE \
   -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
+   -DNEO_ENABLE_XE_DRM_DETECTION=%{NEO_ENABLE_XE_DRM_DETECTION} \
   -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
   -DL0_INSTALL_UDEV_RULES=1 \
   -DUDEV_RULES_DIR=/etc/udev/rules.d/ \
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
@ -9,6 +9,7 @@ RELEASE_WITH_REGKEYS ?= FALSE
 IGDRCL_FORCE_USE_LIBVA ?= FALSE
 NEO_SKIP_UNIT_TESTS ?= FALSE
 NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
+NEO_ENABLE_XE_DRM_DETECTION ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE

 override_dh_auto_configure:
@ -17,6 +18,7 @@ override_dh_auto_configure:
 		-DNEO_VERSION_BUILD=$(ver) \
 		-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
 		-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
+		-DNEO_ENABLE_XE_DRM_DETECTION=${NEO_ENABLE_XE_DRM_DETECTION} \
 		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
 		-DNEO_BUILD_WITH_OCL=FALSE \
 		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
--- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
@ -5,6 +5,7 @@
 %global NEO_OCL_VERSION_MINOR xxx
 %global NEO_OCL_VERSION_BUILD xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
+%global NEO_ENABLE_XE_DRM_DETECTION FALSE
 %global I915_HEADERS_DIR %{nil}

 %define _source_payload w5T16.xzdio
@ -62,6 +63,7 @@ cd build
   -DBUILD_WITH_L0=FALSE \
   -DNEO_SKIP_UNIT_TESTS=TRUE \
   -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
+   -DNEO_ENABLE_XE_DRM_DETECTION=%{NEO_ENABLE_XE_DRM_DETECTION} \
   -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
   -DCMAKE_VERBOSE_MAKEFILE=FALSE \
   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
--- a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
@ -7,6 +7,7 @@
 %global NEO_OCL_VERSION_MINOR xxx
 %global NEO_OCL_VERSION_BUILD xxx
 %global NEO_RELEASE_WITH_REGKEYS FALSE
+%global NEO_ENABLE_XE_DRM_DETECTION FALSE
 %global I915_HEADERS_DIR %{nil}

 %define gmmlib_sover 12
@ -70,6 +71,7 @@ Summary:        ocloc package for opencl
   -DBUILD_WITH_L0=FALSE \
   -DNEO_SKIP_UNIT_TESTS=TRUE \
   -DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
+   -DNEO_ENABLE_XE_DRM_DETECTION=%{NEO_ENABLE_XE_DRM_DETECTION} \
   -DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
   -DCMAKE_VERBOSE_MAKEFILE=FALSE \
   -DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@ -8,6 +8,7 @@ RELEASE_WITH_REGKEYS ?= FALSE
 IGDRCL_FORCE_USE_LIBVA ?= FALSE
 NEO_SKIP_UNIT_TESTS ?= FALSE
 NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
+NEO_ENABLE_XE_DRM_DETECTION ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE

 override_dh_auto_configure:
@ -19,6 +20,7 @@ override_dh_auto_configure:
 		-DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \
 		-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
 		-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
+		-DNEO_ENABLE_XE_DRM_DETECTION=${NEO_ENABLE_XE_DRM_DETECTION} \
 		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
 		-DBUILD_WITH_L0=FALSE \
 		-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \
--- a/shared/source/os_interface/linux/CMakeLists.txt
+++ b/shared/source/os_interface/linux/CMakeLists.txt
@ -40,6 +40,7 @@ set(NEO_CORE_OS_INTERFACE_LINUX
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler_default.h
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_operations_handler_with_aub_dump.h
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_create_multi_host_allocation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/drm_version.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_wrappers_checks.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_wrappers.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/drm_wrappers.h
@ -133,5 +134,11 @@ if("${BRANCH_TYPE}" STREQUAL "")
  endif()
 endif()

+if(NEO_ENABLE_XE_DRM_DETECTION)
+  list(REMOVE_ITEM NEO_CORE_OS_INTERFACE_LINUX
+       ${CMAKE_CURRENT_SOURCE_DIR}/drm_version.cpp
+  )
+endif()
+
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
 add_subdirectories()
--- a/shared/source/os_interface/linux/drm_version.cpp
+++ b/shared/source/os_interface/linux/drm_version.cpp
@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022-2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/os_interface/linux/drm_neo.h"
+
+namespace NEO {
+bool Drm::isDrmSupported(int fileDescriptor) {
+    auto drmVersion = Drm::getDrmVersion(fileDescriptor);
+    return "i915" == drmVersion;
+}
+
+bool Drm::queryDeviceIdAndRevision() {
+    return queryI915DeviceIdAndRevision();
+}
+
+} // namespace NEO
--- a/shared/source/os_interface/linux/xe/CMakeLists.txt
+++ b/shared/source/os_interface/linux/xe/CMakeLists.txt
@ -4,15 +4,17 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_OS_INTERFACE_LINUX_XE
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/drm_version_xe.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_debugger.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_string_value_getter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_vm_export.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_perf.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe.h
-)
+if(NEO_ENABLE_XE_DRM_DETECTION)
+  set(NEO_CORE_OS_INTERFACE_LINUX_XE
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/drm_version_xe.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_debugger.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_string_value_getter.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_vm_export.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}ioctl_helper_xe_perf.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe.h
+  )

-set_property(GLOBAL APPEND PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX_XE})
+  set_property(GLOBAL APPEND PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX_XE})
+endif()
--- a/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt
@ -4,18 +4,20 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_debugger_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_vm_export_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_perf_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_tests.h
-)
-set_property(GLOBAL APPEND PROPERTY NEO_CORE_OS_INTERFACE_TESTS_LINUX ${NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE})
+if(NEO_ENABLE_XE_DRM_DETECTION)
+  set(NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_tests.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_debugger_tests.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_vm_export_tests.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_perf_tests.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_tests.h
+  )
+  set_property(GLOBAL APPEND PROPERTY NEO_CORE_OS_INTERFACE_TESTS_LINUX ${NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE})

-if(UNIX)
-  target_sources(neo_shared_tests PRIVATE ${NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE})
+  if(UNIX)
+    target_sources(neo_shared_tests PRIVATE ${NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE})
+  endif()
+
+  add_subdirectories()
 endif()
-
-add_subdirectories()