Remove platform.def

Author: aelovikov-intel

libsycl/include/sycl/__impl/info/platform.def

@@ -19,36 +19,40 @@
 #include <string>
 
 _LIBSYCL_BEGIN_NAMESPACE_SYCL
+class platform;
+
+namespace detail {
+template <typename Desc, typename DescOf> struct info_desc_tag {};
+template <typename Desc, typename DescOf, typename = void>
+struct is_info_desc : std::false_type {};
+template <typename Desc, typename DescOf>
+struct is_info_desc<
+    Desc, DescOf,
+    std::enable_if_t<std::is_base_of_v<info_desc_tag<Desc, DescOf>, Desc>>>
+    : std::true_type {
+  using return_type = typename Desc::return_type;
+};
+
+template <typename T>
+using is_platform_info_desc_t = typename is_info_desc<T, platform>::return_type;
+} // namespace detail
 
 // A.1. Platform information descriptors
 namespace info {
 namespace platform {
-#define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, OffloadCode)         \
-  struct Desc {                                                                \
-    using return_type = ReturnT;                                               \
-  };
-
 // 4.6.2.4. Information descriptors
-#include <sycl/__impl/info/platform.def>
-
-#undef __SYCL_PARAM_TRAITS_SPEC
+struct version : detail::info_desc_tag<version, sycl::platform> {
+  using return_type = std::string;
+};
+struct name : detail::info_desc_tag<name, sycl::platform> {
+  using return_type = std::string;
+};
+struct vendor : detail::info_desc_tag<vendor, sycl::platform> {
+  using return_type = std::string;
+};
 } // namespace platform
 } // namespace info
 
-namespace detail {
-template <typename T> struct is_platform_info_desc : std::false_type {};
-
-#define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, OffloadCode)         \
-  template <>                                                                  \
-  struct is_##DescType##_info_desc<info::DescType::Desc> : std::true_type {    \
-    using return_type = info::DescType::Desc::return_type;                     \
-  };
-
-#include <sycl/__impl/info/platform.def>
-
-#undef __SYCL_PARAM_TRAITS_SPEC
-} // namespace detail
-
 _LIBSYCL_END_NAMESPACE_SYCL
 
 #endif // _LIBSYCL___IMPL_INFO_PLATFORM_HPP

libsycl/include/sycl/__impl/info/platform.hpp

@@ -76,7 +76,7 @@ class _LIBSYCL_EXPORT platform
   ///
   /// The return type depends on information being queried.
   template <typename Param>
-  typename detail::is_platform_info_desc<Param>::return_type get_info() const;
+  detail::is_platform_info_desc_t<Param> get_info() const;
 
   // template <typename Param>
   // typename detail::is_backend_info_desc<Param>::return_type

libsycl/include/sycl/__impl/platform.hpp

@@ -52,6 +52,27 @@ void call_and_throw(FunctionType &Function, ArgsT &&...Args) {
 
 backend convertBackend(ol_platform_backend_t Backend);
 
+/// Helper to map SYCL information descriptors to OL_<HANDLE>_INFO_<SMTH>. To be
+/// used like this:
+///
+/// using Map = info_ol_mapping<ol_foo_info_t>;
+/// constexpr auto olInfo = map_info_desc<FromDesc, ol_foo_info_t>(
+///                                            Map::M<DescVal0>{OL_FOO_INFO_VAL0},
+///                                            Map::M<DescVal1>{OL_FOO_INFO_VAL1},
+///                                            ...)
+template <typename To> struct info_ol_mapping {
+  template <typename From> struct M {
+    To value;
+    constexpr M(To value) : value(value) {}
+  };
+};
+template <typename From, typename To, typename... Ts>
+constexpr To map_info_desc(typename info_ol_mapping<To>::template M<Ts>... ms) {
+  return std::get<typename info_ol_mapping<To>::template M<From>>(
+             std::tuple{ms...})
+      .value;
+}
+
 } // namespace detail
 
 _LIBSYCL_END_NAMESPACE_SYCL

libsycl/src/detail/offload/info_code.hpp

@@ -14,7 +14,6 @@
 #include <sycl/__impl/platform.hpp>
 
 #include <detail/common.hpp>
-#include <detail/offload/info_code.hpp>
 #include <detail/offload/offload_utils.hpp>
 
 #include <OffloadAPI.h>
@@ -76,15 +75,22 @@ class platform_impl {
   ///
   /// The return type depends on information being queried.
   template <typename Param> typename Param::return_type get_info() const {
+    using namespace info::platform;
+    using Map = info_ol_mapping<ol_platform_info_t>;
+
+    constexpr ol_platform_info_t olInfo =
+        map_info_desc<Param, ol_platform_info_t>(
+            Map::M<version>{OL_PLATFORM_INFO_VERSION},
+            Map::M<name>{OL_PLATFORM_INFO_NAME},
+            Map::M<vendor>{OL_PLATFORM_INFO_VENDOR_NAME});
     // for now we have only std::string properties
     static_assert(std::is_same_v<typename Param::return_type, std::string>);
     size_t ExpectedSize = 0;
-    call_and_throw(olGetPlatformInfoSize, MOffloadPlatform,
-                   detail::OffloadInfoCode<Param>::value, &ExpectedSize);
+    call_and_throw(olGetPlatformInfoSize, MOffloadPlatform, olInfo,
+                   &ExpectedSize);
     std::string Result;
     Result.resize(ExpectedSize - 1);
-    call_and_throw(olGetPlatformInfo, MOffloadPlatform,
-                   detail::OffloadInfoCode<Param>::value, ExpectedSize,
+    call_and_throw(olGetPlatformInfo, MOffloadPlatform, olInfo, ExpectedSize,
                    Result.data());
     return Result;
   }

libsycl/src/detail/offload/offload_utils.hpp

@@ -29,15 +29,17 @@ std::vector<platform> platform::get_platforms() {
 }
 
 template <typename Param>
-typename detail::is_platform_info_desc<Param>::return_type
-platform::get_info() const {
+detail::is_platform_info_desc_t<Param> platform::get_info() const {
   return impl.get_info<Param>();
 }
 
-#define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, PiCode)              \
-  template _LIBSYCL_EXPORT ReturnT platform::get_info<info::platform::Desc>()  \
-      const;
-#include <sycl/__impl/info/platform.def>
-#undef __SYCL_PARAM_TRAITS_SPEC
+#define __SYCL_EXPORT_GET_INFO(Desc)                                           \
+  template _LIBSYCL_EXPORT                                                     \
+      detail::is_platform_info_desc_t<info::platform::Desc>                    \
+      platform::get_info<info::platform::Desc>() const;
+__SYCL_EXPORT_GET_INFO(version)
+__SYCL_EXPORT_GET_INFO(name)
+__SYCL_EXPORT_GET_INFO(vendor)
+#undef __SYCL_EXPORT_GET_INFO
 
 _LIBSYCL_END_NAMESPACE_SYCL