[SYCL] Change graph_support_level namespace (#256)

Matching implementation change to specification PR #255
reble · Jul 12, 2023 · cfb2c40 · cfb2c40
1 parent 7d88887
commit cfb2c40
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 56 deletions.
diff --git a/sycl/include/sycl/info/ext_oneapi_device_traits.def b/sycl/include/sycl/info/ext_oneapi_device_traits.def
@@ -9,7 +9,7 @@ __SYCL_PARAM_TRAITS_TEMPLATE_SPEC(ext::oneapi::experimental,device, max_work_gro
 
 __SYCL_PARAM_TRAITS_SPEC(
  ext::oneapi::experimental, device, graph_support,
- ext::oneapi::experimental::info::device::graph_support_level,
+ ext::oneapi::experimental::info::graph_support_level,
  0 /* No PI device code needed */)
 
 __SYCL_PARAM_TRAITS_SPEC(ext::oneapi::experimental, device, architecture,

diff --git a/sycl/include/sycl/info/info_desc.hpp b/sycl/include/sycl/info/info_desc.hpp
@@ -185,12 +185,14 @@ template <typename T, T param> struct compatibility_param_traits {};
  } /*namespace info */ \
  } /*namespace Namespace */
 
-namespace ext::oneapi::experimental::info::device {
-template <int Dimensions> struct max_work_groups;
+namespace ext::oneapi::experimental::info {
 
 enum class graph_support_level { unsupported = 0, native, emulated };
 
-} // namespace ext::oneapi::experimental::info::device
+namespace device {
+template <int Dimensions> struct max_work_groups;
+} // namespace device
+} // namespace ext::oneapi::experimental::info
 #include <sycl/info/ext_codeplay_device_traits.def>
 #include <sycl/info/ext_intel_device_traits.def>
 #include <sycl/info/ext_oneapi_device_traits.def>

diff --git a/sycl/source/detail/device_info.hpp b/sycl/source/detail/device_info.hpp
@@ -888,17 +888,16 @@ struct get_device_info_impl<
 // Specialization for graph extension support
 template <>
 struct get_device_info_impl<
- ext::oneapi::experimental::info::device::graph_support_level,
+ ext::oneapi::experimental::info::graph_support_level,
  ext::oneapi::experimental::info::device::graph_support> {
- static ext::oneapi::experimental::info::device::graph_support_level
+ static ext::oneapi::experimental::info::graph_support_level
  get(const DeviceImplPtr &Dev) {
  size_t ResultSize = 0;
  Dev->getPlugin()->call<PiApiKind::piDeviceGetInfo>(
  Dev->getHandleRef(), PI_DEVICE_INFO_EXTENSIONS, 0, nullptr,
  &ResultSize);
  if (ResultSize == 0)
- return ext::oneapi::experimental::info::device::graph_support_level::
- unsupported;
+ return ext::oneapi::experimental::info::graph_support_level::unsupported;
 
  std::unique_ptr<char[]> Result(new char[ResultSize]);
  Dev->getPlugin()->call<PiApiKind::piDeviceGetInfo>(
@@ -908,10 +907,10 @@ struct get_device_info_impl<
  std::string_view ExtensionsString(Result.get());
  bool CmdBufferSupport =
  ExtensionsString.find("ur_exp_command_buffer") != std::string::npos;
- return CmdBufferSupport ? ext::oneapi::experimental::info::device::
-  graph_support_level::native
-  : ext::oneapi::experimental::info::device::
-  graph_support_level::unsupported;
+ return CmdBufferSupport
+ ? ext::oneapi::experimental::info::graph_support_level::native
+ : ext::oneapi::experimental::info::graph_support_level::
+ unsupported;
  }
 };
 
@@ -1810,11 +1809,10 @@ inline uint32_t get_device_info_host<
 }
 
 template <>
-inline ext::oneapi::experimental::info::device::graph_support_level
+inline ext::oneapi::experimental::info::graph_support_level
 get_device_info_host<ext::oneapi::experimental::info::device::graph_support>() {
  // No support for graphs on the host device.
- return ext::oneapi::experimental::info::device::graph_support_level::
- unsupported;
+ return ext::oneapi::experimental::info::graph_support_level::unsupported;
 }
 
 } // namespace detail

diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp
@@ -589,7 +589,7 @@ void executable_command_graph::finalizeImpl() {
  bool CmdBufSupport =
  Device.get_info<
  ext::oneapi::experimental::info::device::graph_support>() ==
- info::device::graph_support_level::native;
+ info::graph_support_level::native;
 
 #if FORCE_EMULATION_MODE
  // Above query should still succeed in emulation mode, but ignore the

diff --git a/sycl/test-e2e/Graph/device_query.cpp b/sycl/test-e2e/Graph/device_query.cpp
@@ -11,15 +11,13 @@ int main() {
 
  auto Device = Queue.get_device();
 
- exp_ext::info::device::graph_support_level SupportsGraphs =
+ exp_ext::info::graph_support_level SupportsGraphs =
  Device.get_info<exp_ext::info::device::graph_support>();
  auto Backend = Device.get_backend();
 
  if (Backend == backend::ext_oneapi_level_zero) {
- assert(SupportsGraphs ==
- exp_ext::info::device::graph_support_level::native);
+ assert(SupportsGraphs == exp_ext::info::graph_support_level::native);
  } else {
- assert(SupportsGraphs ==
- exp_ext::info::device::graph_support_level::unsupported);
+ assert(SupportsGraphs == exp_ext::info::graph_support_level::unsupported);
  }
 }