[SYCL] fix post-commit failure introduced by override of get_info<parent_device> (#7290)

gcc and clang++ differ in warnings for duplicate specializations.
get_info<parent_device> is overridden, leading to a duplicate
specialization, leading to failures in post-commit where clang++ is used
to compile.

This PR removes the duplication entirely. 

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

sycl/include/sycl/detail/info_desc_helpers.hpp

@@ -94,8 +94,13 @@ struct IsSubGroupInfo<info::kernel_device_specific::compile_sub_group_size>
   struct is_##DescType##_info_desc<info::DescType::Desc> : std::true_type {    \
     using return_type = info::DescType::Desc::return_type;                     \
   };
+#define __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED(DescType, Desc, ReturnT, PiCode)  \
+  __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)
+
 #include <sycl/info/device_traits.def>
+
 #undef __SYCL_PARAM_TRAITS_SPEC
+#undef __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED
 
 #define __SYCL_PARAM_TRAITS_SPEC(Namespace, DescType, Desc, ReturnT, PiCode)   \
   template <> struct PiInfoCode<Namespace::info::DescType::Desc> {             \

sycl/include/sycl/info/device_traits.def

@@ -149,8 +149,6 @@ __SYCL_PARAM_TRAITS_SPEC(device, printf_buffer_size, size_t,
                          PI_DEVICE_INFO_PRINTF_BUFFER_SIZE)
 __SYCL_PARAM_TRAITS_SPEC(device, preferred_interop_user_sync, bool,
                          PI_DEVICE_INFO_PREFERRED_INTEROP_USER_SYNC)
-__SYCL_PARAM_TRAITS_SPEC(device, parent_device, sycl::device,
-                         PI_DEVICE_INFO_PARENT_DEVICE)
 __SYCL_PARAM_TRAITS_SPEC(device, partition_max_sub_devices, pi_uint32,
                          PI_DEVICE_INFO_PARTITION_MAX_SUB_DEVICES)
 __SYCL_PARAM_TRAITS_SPEC(device, partition_properties,
@@ -165,6 +163,11 @@ __SYCL_PARAM_TRAITS_SPEC(device, partition_type_property,
 __SYCL_PARAM_TRAITS_SPEC(device, partition_type_affinity_domain,
                          info::partition_affinity_domain,
                          PI_DEVICE_INFO_PARTITION_TYPE)
+
+// Has custom specialization. 
+__SYCL_PARAM_TRAITS_SPEC_SPECIALIZED(device, parent_device, sycl::device,
+                         PI_DEVICE_INFO_PARENT_DEVICE)
+
 // Extensions/deprecated
 __SYCL_PARAM_TRAITS_SPEC(device, atomic64, bool, PI_DEVICE_INFO_ATOMIC_64)
 __SYCL_PARAM_TRAITS_SPEC(device, kernel_kernel_pipe_support, bool, 0)

sycl/include/sycl/info/info_desc.hpp

@@ -103,8 +103,12 @@ template <int Dimensions> struct max_work_item_sizes;
   template <> struct Desc {                                                    \
     using return_type = ReturnT;                                               \
   };
+#define __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED(DescType, Desc, ReturnT, PiCode)  \
+  __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)
+
 #include <sycl/info/device_traits.def>
 } // namespace device
+#undef __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC
 
 // A.4 Queue information descriptors

sycl/source/device.cpp

@@ -127,6 +127,7 @@ device::get_info() const {
   return impl->template get_info<Param>();
 }
 
+// Explicit override. Not fulfilled by #include device_traits.def below.
 template <> device device::get_info<info::device::parent_device>() const {
   // With ONEAPI_DEVICE_SELECTOR the impl.MRootDevice is preset and may be
   // overridden (ie it may be nullptr on a sub-device) The PI of the sub-devices
@@ -143,7 +144,10 @@ template <> device device::get_info<info::device::parent_device>() const {
 #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)              \
   template __SYCL_EXPORT ReturnT device::get_info<info::device::Desc>() const;
 
+#define __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED(DescType, Desc, ReturnT, PiCode)
+
 #include <sycl/info/device_traits.def>
+#undef __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED
 #undef __SYCL_PARAM_TRAITS_SPEC
 
 #define __SYCL_PARAM_TRAITS_SPEC(Namespace, DescType, Desc, ReturnT, PiCode)   \