Refactor pool_properties struct

Author: omarahmed1111

sycl/include/sycl/context.hpp

@@ -256,12 +256,6 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   ext_oneapi_get_default_memory_pool(const device &dev,
                                      sycl::usm::alloc kind) const;
 
-  /// Gets default memory pool associated with the context and allocation kind.
-  ///
-  /// \return a memory pool associated with this context.
-  sycl::ext::oneapi::experimental::memory_pool
-  ext_oneapi_get_default_memory_pool(sycl::usm::alloc kind) const;
-
 private:
   /// Constructs a SYCL context object from a valid context_impl instance.
   context(std::shared_ptr<detail::context_impl> Impl);

sycl/include/sycl/ext/oneapi/experimental/async_alloc/memory_pool.hpp

@@ -63,9 +63,9 @@ class __SYCL_EXPORT memory_pool {
 
 protected:
   struct pool_properties {
-    std::pair<bool, size_t> initial_threshold;
-    std::pair<bool, size_t> maximum_size;
-    std::pair<bool, bool> zero_init;
+    size_t initial_threshold;
+    size_t maximum_size;
+    bool zero_init;
   };
 
   std::shared_ptr<detail::memory_pool_impl> impl;
@@ -89,17 +89,17 @@ class __SYCL_EXPORT memory_pool {
   template <typename Properties> pool_properties stripProps(Properties props) {
     pool_properties poolProps{};
     if constexpr (decltype(props)::template has_property<initial_threshold>()) {
-      poolProps.initial_threshold = {
-          true, props.template get_property<initial_threshold>().value};
+      poolProps.initial_threshold =
+          props.template get_property<initial_threshold>().value;
     }
 
     if constexpr (decltype(props)::template has_property<maximum_size>()) {
-      poolProps.maximum_size = {
-          true, props.template get_property<maximum_size>().value};
+      poolProps.maximum_size =
+          props.template get_property<maximum_size>().value;
     }
 
     if constexpr (decltype(props)::template has_property<zero_init>()) {
-      poolProps.zero_init = {true, true};
+      poolProps.zero_init = true;
     }
     return poolProps;
   }

sycl/source/context.cpp

@@ -135,10 +135,6 @@ const property_list &context::getPropList() const {
 sycl::ext::oneapi::experimental::memory_pool
 context::ext_oneapi_get_default_memory_pool(const device &dev,
                                             sycl::usm::alloc kind) const {
-  if (kind == sycl::usm::alloc::host)
-    throw sycl::exception(
-        sycl::make_error_code(sycl::errc::invalid),
-        "Default host memory pool requested but device supplied!");
   if (kind == sycl::usm::alloc::unknown)
     throw sycl::exception(sycl::make_error_code(sycl::errc::invalid),
                           "Unknown allocation kinds are disallowed!");
@@ -153,20 +149,5 @@ context::ext_oneapi_get_default_memory_pool(const device &dev,
       impl->get_default_memory_pool(*this, dev, kind));
 }
 
-sycl::ext::oneapi::experimental::memory_pool
-context::ext_oneapi_get_default_memory_pool(sycl::usm::alloc kind) const {
-  if (kind == sycl::usm::alloc::device || kind == sycl::usm::alloc::shared)
-    throw sycl::exception(sycl::make_error_code(sycl::errc::invalid),
-                          "Device and shared allocation kinds are disallowed "
-                          "without specifying a device!");
-  if (kind == sycl::usm::alloc::unknown)
-    throw sycl::exception(sycl::make_error_code(sycl::errc::invalid),
-                          "Unknown allocation kinds are disallowed!");
-
-  throw sycl::exception(
-      sycl::make_error_code(sycl::errc::feature_not_supported),
-      "Host allocated pools are unsupported!");
-}
-
 } // namespace _V1
 } // namespace sycl

sycl/source/detail/graph_memory_pool.cpp

@@ -34,7 +34,7 @@ graph_mem_pool::malloc(size_t Size, usm::alloc AllocType,
   // Collect relevant properties from memory pool
   if (MemPool) {
     auto Props = MemPool->getProps();
-    if (Props.zero_init.second) {
+    if (Props.zero_init) {
       AllocInfo.ZeroInit = true;
     }
   }

sycl/source/detail/memory_pool.cpp

@@ -44,20 +44,13 @@ __SYCL_EXPORT void memory_pool::increase_threshold_to(size_t newThreshold) {
 memory_pool::memory_pool(const sycl::context &ctx, const sycl::device &dev,
                          sycl::usm::alloc kind,
                          memory_pool::pool_properties props) {
-  if (kind == sycl::usm::alloc::host)
-    throw sycl::exception(
-        sycl::make_error_code(sycl::errc::invalid),
-        "Host allocated memory pools selected but device supplied!");
-
   if (kind != sycl::usm::alloc::device)
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),
         "Only device allocated memory pools are supported!");
 
-  detail::pool_properties poolProps{
-      {props.initial_threshold.first, props.initial_threshold.second},
-      {props.maximum_size.first, props.maximum_size.second},
-      {props.zero_init.first, props.zero_init.second}};
+  detail::pool_properties poolProps{props.initial_threshold, props.maximum_size,
+                                    props.zero_init};
   impl = std::make_shared<detail::memory_pool_impl>(ctx, dev, kind, poolProps);
 }
 

sycl/source/detail/memory_pool_impl.cpp

@@ -65,9 +65,9 @@ memory_pool_impl::memory_pool_impl(const sycl::context &ctx,
       MKind(kind), MProps(props) {
 
   if (kind == sycl::usm::alloc::device)
-    MPoolHandle = create_memory_pool_device(
-        ctx, dev, MProps.initial_threshold.second, MProps.maximum_size.second,
-        MProps.zero_init.second);
+    MPoolHandle =
+        create_memory_pool_device(ctx, dev, MProps.initial_threshold,
+                                  MProps.maximum_size, MProps.zero_init);
   else
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::feature_not_supported),

sycl/source/detail/memory_pool_impl.hpp

@@ -22,9 +22,9 @@ namespace detail {
 // Every property is represented by a pair that represent
 // (is_property_assigned, property_value)
 struct pool_properties {
-  std::pair<bool, size_t> initial_threshold;
-  std::pair<bool, size_t> maximum_size;
-  std::pair<bool, bool> zero_init;
+  size_t initial_threshold;
+  size_t maximum_size;
+  bool zero_init;
 };
 
 class memory_pool_impl {