Remove unneeded changes to device_traits.def, update ext_intel_device_traits.def luid to use HANDLED_IN_RT, remove unneeded EXPORT_GET_INFO and static_assert, regenerate ur_device_info_ret_types.inc using script and remove unneeded FileCheck

Author: DBDuncan

sycl/include/sycl/info/device_traits.def

@@ -237,9 +237,6 @@ __SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_max_work_groups_3d, id<3>,
 __SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_max_global_work_groups, size_t, __SYCL_TRAIT_HANDLED_IN_RT)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_cuda_cluster_group, bool, __SYCL_TRAIT_HANDLED_IN_RT)
 
-__SYCL_PARAM_TRAITS_SPEC(device, ext_intel_device_info_luid, detail::luid_type,
-                         UR_DEVICE_INFO_LUID)
-
 #ifdef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC_NEEDS_UNDEF
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC_NEEDS_UNDEF

sycl/include/sycl/info/ext_intel_device_traits.def

@@ -21,7 +21,7 @@ __SYCL_PARAM_TRAITS_SPEC(ext::intel, device, current_clock_throttle_reasons, std
 __SYCL_PARAM_TRAITS_SPEC(ext::intel, device, fan_speed, int32_t, UR_DEVICE_INFO_FAN_SPEED)
 __SYCL_PARAM_TRAITS_SPEC(ext::intel, device, min_power_limit, int32_t, UR_DEVICE_INFO_MIN_POWER_LIMIT)
 __SYCL_PARAM_TRAITS_SPEC(ext::intel, device, max_power_limit, int32_t, UR_DEVICE_INFO_MAX_POWER_LIMIT)
-__SYCL_PARAM_TRAITS_SPEC(ext::intel, device, luid, detail::luid_type, UR_DEVICE_INFO_LUID)
+__SYCL_PARAM_TRAITS_SPEC(ext::intel, device, luid, detail::luid_type, __SYCL_TRAIT_HANDLED_IN_RT)
 #ifdef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC_NEEDS_UNDEF
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC_NEEDS_UNDEF

sycl/source/detail/device_impl.cpp

@@ -510,7 +510,6 @@ EXPORT_GET_INFO(ext::intel::info::device::current_clock_throttle_reasons)
 EXPORT_GET_INFO(ext::intel::info::device::fan_speed)
 EXPORT_GET_INFO(ext::intel::info::device::min_power_limit)
 EXPORT_GET_INFO(ext::intel::info::device::max_power_limit)
-EXPORT_GET_INFO(ext::intel::info::device::luid)
 
 EXPORT_GET_INFO(ext::codeplay::experimental::info::device::supports_fusion)
 EXPORT_GET_INFO(ext::codeplay::experimental::info::device::max_registers_per_work_group)

sycl/source/detail/device_impl.hpp

@@ -1200,8 +1200,6 @@ class device_impl : public std::enable_shared_from_this<device_impl> {
         throw exception(
             make_error_code(errc::feature_not_supported),
             "The device does not have the ext_intel_device_info_luid aspect");
-      // TODO: we're essentially memcpy'ing here...
-      static_assert(std::is_same_v<luid_type, std::array<unsigned char, 8>>);
       return get_info_impl<UR_DEVICE_INFO_LUID>();
     }
     else {
@@ -2325,7 +2323,6 @@ EXPORT_GET_INFO(ext::intel::info::device::current_clock_throttle_reasons)
 EXPORT_GET_INFO(ext::intel::info::device::fan_speed)
 EXPORT_GET_INFO(ext::intel::info::device::min_power_limit)
 EXPORT_GET_INFO(ext::intel::info::device::max_power_limit)
-EXPORT_GET_INFO(ext::intel::info::device::luid)
 
 EXPORT_GET_INFO(ext::codeplay::experimental::info::device::supports_fusion)
 EXPORT_GET_INFO(ext::codeplay::experimental::info::device::max_registers_per_work_group)

sycl/source/detail/ur_device_info_ret_types.inc

@@ -129,7 +129,6 @@ MAP(UR_DEVICE_INFO_ATOMIC_MEMORY_ORDER_CAPABILITIES, ur_memory_order_capability_
 MAP(UR_DEVICE_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES, ur_memory_scope_capability_flags_t)
 MAP(UR_DEVICE_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES, ur_memory_order_capability_flags_t)
 MAP(UR_DEVICE_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES, ur_memory_scope_capability_flags_t)
-MAP(UR_DEVICE_INFO_LUID, std::array<uint8_t, 8>)
 // Deprecated, we're not using it, so comment out to avoid warnings:
 // MAP(UR_DEVICE_INFO_BFLOAT16, ur_bool_t)
 MAP(UR_DEVICE_INFO_MAX_COMPUTE_QUEUE_INDICES, uint32_t)
@@ -155,6 +154,9 @@ MAP(UR_DEVICE_INFO_FAN_SPEED, int32_t)
 MAP(UR_DEVICE_INFO_MIN_POWER_LIMIT, int32_t)
 MAP(UR_DEVICE_INFO_MAX_POWER_LIMIT, int32_t)
 MAP(UR_DEVICE_INFO_BFLOAT16_CONVERSIONS_NATIVE, ur_bool_t)
+MAP(UR_DEVICE_INFO_KERNEL_LAUNCH_CAPABILITIES, ur_kernel_launch_properties_flags_t)
+// Manually changed std::vector<uint8_t> -> std::array<uint8_t, 8>
+MAP(UR_DEVICE_INFO_LUID, std::array<uint8_t, 8>)
 
 // These aren't present in the specification, extracted from ur_api.h
 // instead.
@@ -188,5 +190,4 @@ MAP(UR_DEVICE_INFO_MIPMAP_LEVEL_REFERENCE_SUPPORT_EXP, ur_bool_t)
 MAP(UR_DEVICE_INFO_MIPMAP_MAX_ANISOTROPY_EXP, uint32_t)
 MAP(UR_DEVICE_INFO_MIPMAP_SUPPORT_EXP, ur_bool_t)
 MAP(UR_DEVICE_INFO_TIMESTAMP_RECORDING_SUPPORT_EXP, ur_bool_t)
-MAP(UR_DEVICE_INFO_KERNEL_LAUNCH_CAPABILITIES, ur_kernel_launch_properties_flags_t)
 // clang-format on

sycl/test-e2e/Adapters/level_zero/luid.cpp

@@ -2,11 +2,10 @@
 // REQUIRES: gpu, level_zero, level_zero_dev_kit, windows
 
 // RUN: %{build} %level_zero_options -o %t.out
-// RUN: %{run} %t.out 2>&1 | FileCheck %s
+// RUN: %{run} %t.out
 
 // Test that the LUID is read correctly from Level Zero.
 
-// CHECK: PASSED
 #include <iomanip>
 #include <iostream>
 #include <level_zero/ze_api.h>