Rename plus in cmake macros to and_later

Related-To: NEO-5920 Signed-off-by: Szymon Morek <szymon.morek@intel.com>
2025-09-15 13:01:45 +08:00 · 2021-08-12 11:40:18 +00:00
parent 2661962ac3
commit a85ae676e7
28 changed files with 30 additions and 30 deletions
--- a/cmake/fill_gens.cmake
+++ b/cmake/fill_gens.cmake
@ -9,4 +9,4 @@ list(APPEND ALL_GEN_TYPES "GEN9")
 list(APPEND ALL_GEN_TYPES "GEN11")
 list(APPEND ALL_GEN_TYPES "GEN12LP")
 list(APPEND ALL_GEN_TYPES "XE_HP_CORE")
-list(APPEND XEHP_PLUS_GENS "XE_HP_CORE")
+list(APPEND XEHP_AND_LATER_GENS "XE_HP_CORE")
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@ -9,12 +9,12 @@ SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
 SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
 SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS")

-foreach(GEN_TYPE ${XEHP_PLUS_GENS})
+foreach(GEN_TYPE ${XEHP_AND_LATER_GENS})
  if(TESTS_${GEN_TYPE})
-    set(TESTS_XEHP_PLUS 1)
+    set(TESTS_XEHP_AND_LATER 1)
  endif()
  if(SUPPORT_${GEN_TYPE})
-    set(SUPPORT_XEHP_PLUS 1)
+    set(SUPPORT_XEHP_AND_LATER 1)
  endif()
  set(SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE} FALSE CACHE BOOL "Disabled support ${GEN_TYPE} for device side enqueue" FORCE)
 endforeach()
--- a/level_zero/core/source/CMakeLists.txt
+++ b/level_zero/core/source/CMakeLists.txt
@ -89,7 +89,7 @@ set(L0_RUNTIME_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_imp.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND L0_RUNTIME_SOURCES
       ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_xe_hp_core_plus.inl
--- a/opencl/source/command_queue/CMakeLists.txt
+++ b/opencl/source/command_queue/CMakeLists.txt
@ -45,7 +45,7 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
    ${CMAKE_CURRENT_SOURCE_DIR}/resource_barrier.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND RUNTIME_SRCS_COMMAND_QUEUE
       ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/gpgpu_walker_xehp_plus.inl
--- a/opencl/source/command_stream/CMakeLists.txt
+++ b/opencl/source/command_stream/CMakeLists.txt
@ -20,7 +20,7 @@ set(RUNTIME_SRCS_COMMAND_STREAM
    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/command_stream_receiver_simulated_hw.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND RUNTIME_SRCS_COMMAND_STREAM
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_hw_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_xehp_plus.inl
--- a/opencl/source/gtpin/CMakeLists.txt
+++ b/opencl/source/gtpin/CMakeLists.txt
@ -20,7 +20,7 @@ if(NOT DISABLED_GTPIN_SUPPORT)
      ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_defs.h
  )

-  if(SUPPORT_XEHP_PLUS)
+  if(SUPPORT_XEHP_AND_LATER)
    list(APPEND RUNTIME_SRCS_GTPIN
         ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper_xehp_plus.inl
    )
--- a/opencl/source/helpers/CMakeLists.txt
+++ b/opencl/source/helpers/CMakeLists.txt
@ -54,7 +54,7 @@ set(RUNTIME_SRCS_HELPERS_BASE
    ${CMAKE_CURRENT_SOURCE_DIR}/validators.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND RUNTIME_SRCS_HELPERS_BASE
       ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_xehp_plus.inl
--- a/opencl/source/mem_obj/CMakeLists.txt
+++ b/opencl/source/mem_obj/CMakeLists.txt
@ -28,7 +28,7 @@ set(RUNTIME_SRCS_MEM_OBJ
    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/image_ext.inl
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND RUNTIME_SRCS_MEM_OBJ
       ${CMAKE_CURRENT_SOURCE_DIR}/image_xehp_plus.inl
  )
--- a/opencl/source/os_interface/linux/CMakeLists.txt
+++ b/opencl/source/os_interface/linux/CMakeLists.txt
@ -19,7 +19,7 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND RUNTIME_SRCS_OS_INTERFACE_LINUX
       ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_xehp_plus.inl
  )
--- a/opencl/test/unit_test/command_queue/CMakeLists.txt
+++ b/opencl/test/unit_test/command_queue/CMakeLists.txt
@ -92,7 +92,7 @@ set(IGDRCL_SRCS_tests_command_queue
    ${CMAKE_CURRENT_SOURCE_DIR}/zero_size_enqueue_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_command_queue
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_xehp_plus.cpp
--- a/opencl/test/unit_test/command_stream/CMakeLists.txt
+++ b/opencl/test/unit_test/command_stream/CMakeLists.txt
@ -42,7 +42,7 @@ set(IGDRCL_SRCS_tests_command_stream
    ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests.h
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_command_stream
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_tests_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_flush_task_tests_xehp_plus.cpp
--- a/opencl/test/unit_test/helpers/CMakeLists.txt
+++ b/opencl/test/unit_test/helpers/CMakeLists.txt
@ -45,7 +45,7 @@ set(IGDRCL_SRCS_tests_helpers
    ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper.inl
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_helpers
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_hw_tests_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper_tests_xehp_plus.cpp
--- a/opencl/test/unit_test/kernel/CMakeLists.txt
+++ b/opencl/test/unit_test/kernel/CMakeLists.txt
@ -32,7 +32,7 @@ set(IGDRCL_SRCS_tests_kernel
    ${CMAKE_CURRENT_SOURCE_DIR}/substitute_kernel_heap_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_kernel
       ${CMAKE_CURRENT_SOURCE_DIR}/cache_flush_xehp_plus_tests.inl
  )
--- a/opencl/test/unit_test/mem_obj/CMakeLists.txt
+++ b/opencl/test/unit_test/mem_obj/CMakeLists.txt
@ -43,7 +43,7 @@ set(IGDRCL_SRCS_tests_mem_obj
    ${CMAKE_CURRENT_SOURCE_DIR}/zero_copy_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_mem_obj
       ${CMAKE_CURRENT_SOURCE_DIR}/buffer_tests_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_xehp_plus.cpp
--- a/opencl/test/unit_test/memory_manager/CMakeLists.txt
+++ b/opencl/test/unit_test/memory_manager/CMakeLists.txt
@ -33,7 +33,7 @@ if(UNIX)
  list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS})
 endif()

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_memory_manager
       ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_xehp_plus.h
--- a/opencl/test/unit_test/mocks/CMakeLists.txt
+++ b/opencl/test/unit_test/mocks/CMakeLists.txt
@ -62,7 +62,7 @@ set(IGDRCL_SRCS_tests_mocks
    ${NEO_CORE_tests_compiler_mocks}
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_mocks
       ${CMAKE_CURRENT_SOURCE_DIR}/mock_scratch_space_controller_xehp_plus.h
  )
--- a/opencl/test/unit_test/sampler/CMakeLists.txt
+++ b/opencl/test/unit_test/sampler/CMakeLists.txt
@ -11,7 +11,7 @@ set(IGDRCL_SRCS_tests_sampler
    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND IGDRCL_SRCS_tests_sampler
       ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_xehp_plus.cpp
  )
--- a/shared/source/aub/CMakeLists.txt
+++ b/shared/source/aub/CMakeLists.txt
@ -20,7 +20,7 @@ set(NEO_CORE_AUB
    ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_AUB
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_xehp_plus.inl
  )
--- a/shared/source/aub_mem_dump/CMakeLists.txt
+++ b/shared/source/aub_mem_dump/CMakeLists.txt
@ -22,7 +22,7 @@ if(NOT DEFINED AUB_STREAM_PROJECT_NAME)
  )
 endif()

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_AUB_MEM_DUMP
       ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump_xehp_plus.inl
  )
--- a/shared/source/command_container/CMakeLists.txt
+++ b/shared/source/command_container/CMakeLists.txt
@ -17,7 +17,7 @@ set(NEO_CORE_COMMAND_CONTAINER
    ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_COMMAND_CONTAINER
       ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_raytracing_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_xehp_plus.inl
--- a/shared/source/command_stream/CMakeLists.txt
+++ b/shared/source/command_stream/CMakeLists.txt
@ -48,7 +48,7 @@ set(NEO_CORE_COMMAND_STREAM
    ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_COMMAND_STREAM
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/preemption_xehp_plus.inl
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@ -118,7 +118,7 @@ set(NEO_CORE_HELPERS
    ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/pipe_control_args.cpp
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_HELPERS
       ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/cache_flush_xehp_plus.inl
--- a/shared/source/os_interface/CMakeLists.txt
+++ b/shared/source/os_interface/CMakeLists.txt
@ -40,7 +40,7 @@ set(NEO_CORE_OS_INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls_common.h
 )

-if(SUPPORT_XEHP_PLUS)
+if(SUPPORT_XEHP_AND_LATER)
  list(APPEND NEO_CORE_OS_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_xehp_plus.inl)
 endif()

--- a/shared/test/common/cmd_parse/CMakeLists.txt
+++ b/shared/test/common/cmd_parse/CMakeLists.txt
@ -21,7 +21,7 @@ set(NEO_SHARED_TESTS_CMD_PARSE
    ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.inl
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND NEO_SHARED_TESTS_CMD_PARSE
       ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_xehp_plus.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_l3_control_xehp_plus.inl
--- a/shared/test/common/helpers/CMakeLists.txt
+++ b/shared/test/common/helpers/CMakeLists.txt
@ -36,7 +36,7 @@ set(NEO_CORE_HELPERS_TESTS
    ${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  list(APPEND NEO_CORE_HELPERS_TESTS
       ${CMAKE_CURRENT_SOURCE_DIR}/test_blit_commands_helper_xehp_plus.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_xehp_plus.inl
--- a/shared/test/unit_test/encoders/CMakeLists.txt
+++ b/shared/test/unit_test/encoders/CMakeLists.txt
@ -20,7 +20,7 @@ target_sources(${TARGET_NAME} PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/test_implicit_scaling.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  target_sources(${TARGET_NAME} PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_xehp_plus.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_xehp_plus.cpp
--- a/shared/test/unit_test/preemption/CMakeLists.txt
+++ b/shared/test/unit_test/preemption/CMakeLists.txt
@ -9,7 +9,7 @@ target_sources(${TARGET_NAME} PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/preemption_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  target_sources(${TARGET_NAME} PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xehp_plus.cpp
  )
--- a/shared/test/unit_test/scratch_space_controler/CMakeLists.txt
+++ b/shared/test/unit_test/scratch_space_controler/CMakeLists.txt
@ -9,7 +9,7 @@ target_sources(${TARGET_NAME} PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_tests.cpp
 )

-if(TESTS_XEHP_PLUS)
+if(TESTS_XEHP_AND_LATER)
  target_sources(${TARGET_NAME} PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_xehp_plus_tests.cpp
  )