UR port platform/device to get sycl-ls working

Author: aarongreig

sycl/include/sycl/detail/info_desc_helpers.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <sycl/detail/pi.h> // for pi_device_info
+#include <ur_api.h>
 
 #include <type_traits> // for true_type
 
@@ -23,6 +24,7 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 template <typename T> struct PiInfoCode;
+template <typename T> struct UrInfoCode;
 template <typename T> struct is_platform_info_desc : std::false_type {};
 template <typename T> struct is_context_info_desc : std::false_type {};
 template <typename T> struct is_device_info_desc : std::false_type {};
@@ -54,7 +56,7 @@ template <typename T> struct is_backend_info_desc : std::false_type {};
 #include <sycl/info/context_traits.def>
 #include <sycl/info/event_traits.def>
 #include <sycl/info/kernel_traits.def>
-#include <sycl/info/platform_traits.def>
+// #include <sycl/info/platform_traits.def>
 #include <sycl/info/queue_traits.def>
 #undef __SYCL_PARAM_TRAITS_SPEC
 #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)              \
@@ -68,6 +70,28 @@ template <typename T> struct is_backend_info_desc : std::false_type {};
 #include <sycl/info/event_profiling_traits.def>
 #undef __SYCL_PARAM_TRAITS_SPEC
 
+// Normally we would just use std::enable_if to limit valid get_info template
+// arguments. However, there is a mangling mismatch of
+// "std::enable_if<is*_desc::value>::type" between gcc clang (it appears that
+// gcc lacks a E terminator for unresolved-qualifier-level sequence). As a
+// workaround, we use return_type alias from is_*info_desc that doesn't run into
+// the same problem.
+// TODO remove once this gcc/clang discrepancy is resolved
+#define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, UrCode)              \
+  template <> struct UrInfoCode<info::DescType::Desc> {                        \
+    static constexpr ur_##DescType##_info_t value = UrCode;                    \
+  };                                                                           \
+  template <>                                                                  \
+  struct is_##DescType##_info_desc<info::DescType::Desc> : std::true_type {    \
+    using return_type = info::DescType::Desc::return_type;                     \
+  };
+// #include <sycl/info/context_traits.def>
+// #include <sycl/info/event_traits.def>
+// #include <sycl/info/kernel_traits.def>
+#include <sycl/info/platform_traits.def>
+// #include <sycl/info/queue_traits.def>
+#undef __SYCL_PARAM_TRAITS_SPEC
+
 template <typename Param> struct IsSubGroupInfo : std::false_type {};
 template <>
 struct IsSubGroupInfo<info::kernel_device_specific::max_num_sub_groups>
@@ -98,9 +122,8 @@ struct IsSubGroupInfo<info::kernel_device_specific::compile_sub_group_size>
 // Need a static_cast here since piDeviceGetInfo can also accept
 // pi_usm_capability_query values.
 #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)              \
-  template <> struct PiInfoCode<info::DescType::Desc> {                        \
-    static constexpr pi_device_info value =                                    \
-        static_cast<pi_device_info>(PiCode);                                   \
+  template <> struct UrInfoCode<info::DescType::Desc> {                        \
+    static constexpr ur_device_info_t value = PiCode;                          \
   };                                                                           \
   template <>                                                                  \
   struct is_##DescType##_info_desc<info::DescType::Desc> : std::true_type {    \
@@ -113,11 +136,11 @@ struct IsSubGroupInfo<info::kernel_device_specific::compile_sub_group_size>
 
 #undef __SYCL_PARAM_TRAITS_SPEC
 #undef __SYCL_PARAM_TRAITS_SPEC_SPECIALIZED
-
+// changes changes changes
 #define __SYCL_PARAM_TRAITS_SPEC(Namespace, DescType, Desc, ReturnT, PiCode)   \
-  template <> struct PiInfoCode<Namespace::info::DescType::Desc> {             \
-    static constexpr pi_device_info value =                                    \
-        static_cast<pi_device_info>(PiCode);                                   \
+  template <> struct UrInfoCode<Namespace::info::DescType::Desc> {             \
+    static constexpr ur_device_info_t value =                                  \
+        static_cast<ur_device_info_t>(PiCode);                                 \
   };                                                                           \
   template <>                                                                  \
   struct is_##DescType##_info_desc<Namespace::info::DescType::Desc>            \