Some minor fixes:

- Fix SUPPORT_X and TESTS_X flags in cmake Previously it was possible to enable TESTS_X with disabled SUPPORT_X - Remove genX dirs from include paths Change-Id: I70aa6ee4df6cc1ca641cce2e99b66f92f99fd4e1
2025-12-19 06:24:51 +08:00 · 2018-01-09 10:55:47 +01:00
parent 9564c5c2c1
commit 4f884496a6
16 changed files with 21 additions and 46 deletions
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -36,7 +36,7 @@ components:
  internal:
    branch: master
    dest_dir: internal
-    revision: 3909a5da3ff443b77162f613d7fdf3eab03be7ae
+    revision: 0eff1e75599adcc562a6a491d53172949f94d4eb
    type: git
  khronos:
    branch: master
--- a/platforms.cmake
+++ b/platforms.cmake
@@ -123,38 +123,25 @@ set(SUPPORT_GEN_DEFAULT TRUE CACHE BOOL "default value for SUPPORT_GENx")
 # default flag for platform support
 set(SUPPORT_PLATFORM_DEFAULT TRUE CACHE BOOL "default value for support platform")

-# Define the hardware configurations we support
-set(SUPPORT_GEN8 ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support Gen8 devices")
-set(SUPPORT_GEN9 ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support Gen9 devices")
-
-# Define the hardware configurations we test
-set(TESTS_GEN8 ${SUPPORT_GEN8} CACHE BOOL "Build ULTs for Gen8 devices")
-set(TESTS_GEN9 ${SUPPORT_GEN9} CACHE BOOL "Build ULTs for Gen9 devices")
+# Define the hardware configurations we support and test
+foreach(GEN_NUM 8 9)
+  set(SUPPORT_GEN${GEN_NUM} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support Gen${GEN_NUM} devices")
+  set(TESTS_GEN${GEN_NUM} ${SUPPORT_GEN${GEN_NUM}} CACHE BOOL "Build ULTs for Gen${GEN_NUM} devices")
+  if(NOT SUPPORT_GEN${GEN_NUM})
+    set(TESTS_GEN${GEN_NUM} FALSE)
+  endif()
+endforeach()

 if(SUPPORT_GEN9)
-  set(SUPPORT_SKL ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support SKL")
-  set(SUPPORT_KBL ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support KBL")
-  set(SUPPORT_BXT ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support BXT")
-  set(SUPPORT_GLK ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support GLK")
-  set(SUPPORT_CFL ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support CFL")
-endif()
-
-if(TESTS_GEN9)
-  if(SUPPORT_SKL)
-    set(TESTS_SKL ${TESTS_GEN9} CACHE BOOL "Build ULTs for SKL")
-  endif()
-  if(SUPPORT_KBL)
-    set(TESTS_KBL ${TESTS_GEN9} CACHE BOOL "Build ULTs for KBL")
-  endif()
-  if(SUPPORT_GLK)
-    set(TESTS_GLK ${TESTS_GEN9} CACHE BOOL "Build ULTs for GLK")
-  endif()
-  if(SUPPORT_BXT)
-    set(TESTS_BXT ${TESTS_GEN9} CACHE BOOL "Build ULTs for BXT")
-  endif()
-  if(SUPPORT_CFL)
-    set(TESTS_CFL ${TESTS_GEN9} CACHE BOOL "Build ULTs for CFL")
-  endif()
+  foreach(GEN9_PLATFORM "SKL" "KBL" "BXT" "GLK" "CFL")
+    set(SUPPORT_${GEN9_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${GEN9_PLATFORM}")
+    if(TESTS_GEN9)
+      set(TESTS_${GEN9_PLATFORM} ${SUPPORT_${GEN9_PLATFORM}} CACHE BOOL "Build ULTs for ${GEN9_PLATFORM}")
+    endif()
+    if(NOT SUPPORT_${GEN9_PLATFORM} OR NOT TESTS_GEN9)
+      set(TESTS_${GEN9_PLATFORM} FALSE)
+    endif()
+  endforeach()
 endif()

 # Init lists
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -691,8 +691,7 @@ foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
      endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_IT}")
    endforeach(SRC_IT)

-    # Set-up gen include dir and sources for the dll
-    list(APPEND HW_SRC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM})
+    # Set-up gen sources for the dll
    list(APPEND HW_SRC_LINK ${GEN${GEN_NUM}_SRC_LINK})

    source_group("gen${GEN_NUM}" FILES ${RUNTIME_SRCS_GEN${GEN_NUM}} ${GEN${GEN_NUM}_SRC_LINK} )
--- a/runtime/builtin_kernels_simulation/CMakeLists.txt
+++ b/runtime/builtin_kernels_simulation/CMakeLists.txt
@@ -58,7 +58,6 @@ foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1)
  GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
  if(${GENX_HAS_PLATFORMS})
    list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_GEN${GEN_NUM}_PLATFORM=${DEFAULT_SUPPORTED_GEN${GEN_NUM}_PLATFORM})
-    list (APPEND HEADER_INCLUDES ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM})
    list (APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/scheduler_simulation.cpp)
  endif()
 endforeach()
--- a/runtime/command_queue/command_queue.cpp
+++ b/runtime/command_queue/command_queue.cpp
@@ -30,7 +30,6 @@
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/get_info.h"
-#include "hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
--- a/runtime/command_stream/aub_command_stream_receiver.cpp
+++ b/runtime/command_stream/aub_command_stream_receiver.cpp
@@ -20,9 +20,9 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/helpers/debug_helpers.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_inc.h"
--- a/runtime/command_stream/tbx_command_stream_receiver.cpp
+++ b/runtime/command_stream/tbx_command_stream_receiver.cpp
@@ -20,8 +20,8 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include <string>

--- a/runtime/device/device_caps.cpp
+++ b/runtime/device/device_caps.cpp
@@ -24,7 +24,6 @@
 #include <algorithm>
 #include "runtime/device/device.h"
 #include "runtime/helpers/basic_math.h"
-#include "hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/sharings/sharing_factory.h"
--- a/runtime/device_queue/device_queue.cpp
+++ b/runtime/device_queue/device_queue.cpp
@@ -23,7 +23,6 @@
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/context/context.h"
-#include "hw_info.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/queue_helpers.h"
--- a/runtime/gen8/windows/wddm.cpp
+++ b/runtime/gen8/windows/wddm.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "hw_cmds.h"
 #include "runtime/os_interface/windows/wddm.h"
 #include "runtime/os_interface/windows/wddm.inl"
--- a/runtime/gen9/windows/wddm.cpp
+++ b/runtime/gen9/windows/wddm.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "hw_cmds.h"
 #include "runtime/os_interface/windows/wddm.h"
 #include "runtime/os_interface/windows/wddm.inl"
--- a/runtime/os_interface/windows/device_factory.cpp
+++ b/runtime/os_interface/windows/device_factory.cpp
@@ -22,7 +22,6 @@

 #ifdef _WIN32

-#include "hw_info.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
--- a/unit_tests/libult/CMakeLists.txt
+++ b/unit_tests/libult/CMakeLists.txt
@@ -33,7 +33,6 @@ foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1)
      endif()
    endforeach()
    GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS)
-    list (APPEND HW_SRC_INCLUDES ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM} ${IGDRCL_SOURCE_DIR}/unit_tests/gen${GEN_NUM})
    list (APPEND IGDRCL_SRCS_LIB_ULT
      ${IGDRCL_SOURCE_DIR}/unit_tests/libult/gen${GEN_NUM}.cpp
      ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_family_full.cpp
--- a/unit_tests/libult/create_command_stream.cpp
+++ b/unit_tests/libult/create_command_stream.cpp
@@ -22,7 +22,6 @@

 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/options.h"
-#include "hw_info.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
--- a/unit_tests/libult/gen8.cpp
+++ b/unit_tests/libult/gen8.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "hw_cmds.h"
 #include "runtime/command_stream/command_stream_receiver_hw.inl"
 #include "runtime/memory_manager/memory_manager.h"
--- a/unit_tests/libult/gen9.cpp
+++ b/unit_tests/libult/gen9.cpp
@@ -20,7 +20,6 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "hw_info.h"
 #include "hw_cmds.h"
 #include "runtime/command_stream/command_stream_receiver_hw.inl"
 #include "runtime/memory_manager/memory_manager.h"