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 {

sycl/test/abi/sycl_symbols_linux.dump

@@ -2993,8 +2993,8 @@ _ZN4sycl3_V13ext6oneapi12experimental10async_freeERKNS0_5queueEPvRKNS0_6detail13
 _ZN4sycl3_V13ext6oneapi12experimental10async_freeERNS0_7handlerEPv
 _ZN4sycl3_V13ext6oneapi12experimental10mem_adviseENS0_5queueEPvmiRKNS0_6detail13code_locationE
 _ZN4sycl3_V13ext6oneapi12experimental11memory_pool21increase_threshold_toEm
-_ZN4sycl3_V13ext6oneapi12experimental11memory_poolC1ERKNS0_7contextERKNS0_6deviceENS0_3usm5allocENS4_15pool_propertiesE
-_ZN4sycl3_V13ext6oneapi12experimental11memory_poolC2ERKNS0_7contextERKNS0_6deviceENS0_3usm5allocENS4_15pool_propertiesE
+_ZN4sycl3_V13ext6oneapi12experimental11memory_poolC1ERKNS0_7contextERKNS0_6deviceENS0_3usm5allocERKNS0_13property_listE
+_ZN4sycl3_V13ext6oneapi12experimental11memory_poolC2ERKNS0_7contextERKNS0_6deviceENS0_3usm5allocERKNS0_13property_listE
 _ZN4sycl3_V13ext6oneapi12experimental12async_mallocERKNS0_5queueENS0_3usm5allocEmRKNS0_6detail13code_locationE
 _ZN4sycl3_V13ext6oneapi12experimental12async_mallocERNS0_7handlerENS0_3usm5allocEm
 _ZN4sycl3_V13ext6oneapi12experimental12create_imageENS3_16image_mem_handleERKNS3_16image_descriptorERKNS0_5queueE
@@ -3266,8 +3266,6 @@ _ZN4sycl3_V16detail12buffer_plainC2EmmRKNS0_13property_listESt10unique_ptrINS1_1
 _ZN4sycl3_V16detail12compile_implERKNS0_13kernel_bundleILNS0_12bundle_stateE0EEERKSt6vectorINS0_6deviceESaIS8_EERKNS0_13property_listE
 _ZN4sycl3_V16detail12isOutOfRangeENS0_3vecIiLi4EEENS0_15addressing_modeENS0_5rangeILi3EEE
 _ZN4sycl3_V16detail12make_contextEmRKSt8functionIFvNS0_14exception_listEEENS0_7backendEbRKSt6vectorINS0_6deviceESaISA_EE
-_ZN4sycl3_V16detail13HandlerAccess10preProcessERNS0_7handlerENS1_19type_erased_cgfo_tyE
-_ZN4sycl3_V16detail13HandlerAccess11postProcessERNS0_7handlerENS1_19type_erased_cgfo_tyE
 _ZN4sycl3_V16detail13host_pipe_map3addEPKvPKc
 _ZN4sycl3_V16detail13lgamma_r_implENS1_9half_impl4halfEPi
 _ZN4sycl3_V16detail13lgamma_r_implEdPi
@@ -3298,7 +3296,6 @@ _ZN4sycl3_V16detail16AccessorBaseHostC1ENS0_2idILi3EEENS0_5rangeILi3EEES6_NS0_6a
 _ZN4sycl3_V16detail16AccessorBaseHostC1ENS0_2idILi3EEENS0_5rangeILi3EEES6_NS0_6access4modeEPviimbRKNS0_13property_listE
 _ZN4sycl3_V16detail16AccessorBaseHostC2ENS0_2idILi3EEENS0_5rangeILi3EEES6_NS0_6access4modeEPviibmbRKNS0_13property_listE
 _ZN4sycl3_V16detail16AccessorBaseHostC2ENS0_2idILi3EEENS0_5rangeILi3EEES6_NS0_6access4modeEPviimbRKNS0_13property_listE
-_ZN4sycl3_V16detail16reduGetMaxWGSizeERNS0_7handlerEm
 _ZN4sycl3_V16detail16reduGetMaxWGSizeESt10shared_ptrINS1_10queue_implEEm
 _ZN4sycl3_V16detail17HostProfilingInfo3endEv
 _ZN4sycl3_V16detail17HostProfilingInfo5startEv
@@ -3333,7 +3330,6 @@ _ZN4sycl3_V16detail22get_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6devi
 _ZN4sycl3_V16detail22get_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EERKS5_INS0_9kernel_idESaISB_EENS0_12bundle_stateE
 _ZN4sycl3_V16detail22has_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EENS0_12bundle_stateE
 _ZN4sycl3_V16detail22has_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EERKS5_INS0_9kernel_idESaISB_EENS0_12bundle_stateE
-_ZN4sycl3_V16detail22reduGetPreferredWGSizeERNS0_7handlerEm
 _ZN4sycl3_V16detail22reduGetPreferredWGSizeERSt10shared_ptrINS1_10queue_implEEm
 _ZN4sycl3_V16detail22removeDuplicateDevicesERKSt6vectorINS0_6deviceESaIS3_EE
 _ZN4sycl3_V16detail23constructorNotificationEPvS2_NS0_6access6targetENS3_4modeERKNS1_13code_locationE
@@ -3353,7 +3349,6 @@ _ZN4sycl3_V16detail30UnsampledImageAccessorBaseHost6getPtrEv
 _ZN4sycl3_V16detail30UnsampledImageAccessorBaseHostC1ENS0_5rangeILi3EEENS0_6access4modeEPviiNS0_2idILi3EEENS0_18image_channel_typeENS0_19image_channel_orderERKNS0_13property_listE
 _ZN4sycl3_V16detail30UnsampledImageAccessorBaseHostC2ENS0_5rangeILi3EEENS0_6access4modeEPviiNS0_2idILi3EEENS0_18image_channel_typeENS0_19image_channel_orderERKNS0_13property_listE
 _ZN4sycl3_V16detail33enable_ext_oneapi_default_contextEb
-_ZN4sycl3_V16detail33reduGetMaxNumConcurrentWorkGroupsERNS0_7handlerE
 _ZN4sycl3_V16detail33reduGetMaxNumConcurrentWorkGroupsESt10shared_ptrINS1_10queue_implEE
 _ZN4sycl3_V16detail34addHostSampledImageAccessorAndWaitEPNS1_28SampledImageAccessorImplHostE
 _ZN4sycl3_V16detail35sampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_12image_targetEEPKvjRKNS1_13code_locationE
@@ -3611,7 +3606,6 @@ _ZN4sycl3_V17handler6memcpyEPvPKvm
 _ZN4sycl3_V17handler6memsetEPvim
 _ZN4sycl3_V17handler7setTypeENS0_6detail6CGTypeE
 _ZN4sycl3_V17handler8finalizeEv
-_ZN4sycl3_V17handler8getQueueEv
 _ZN4sycl3_V17handler8prefetchEPKvm
 _ZN4sycl3_V17handler9clearArgsEv
 _ZN4sycl3_V17handler9fill_implEPvPKvmm
@@ -3665,6 +3659,7 @@ _ZNK4sycl3_V115device_selector13select_deviceEv
 _ZNK4sycl3_V116default_selectorclERKNS0_6deviceE
 _ZNK4sycl3_V120accelerator_selectorclERKNS0_6deviceE
 _ZNK4sycl3_V13ext6oneapi12experimental11memory_pool10get_deviceEv
+_ZNK4sycl3_V13ext6oneapi12experimental11memory_pool11getPropListEv
 _ZNK4sycl3_V13ext6oneapi12experimental11memory_pool11get_contextEv
 _ZNK4sycl3_V13ext6oneapi12experimental11memory_pool13get_thresholdEv
 _ZNK4sycl3_V13ext6oneapi12experimental11memory_pool14get_alloc_kindEv

sycl/test/abi/sycl_symbols_windows.dump

@@ -4114,7 +4114,6 @@
 ?getPtr@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBAPEAXXZ
 ?getPtr@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAPEAXXZ
 ?getPtr@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEBAPEAXXZ
-?getQueue@handler@_V1@sycl@@AEAA?AVqueue@23@XZ
 ?getRowPitch@image_plain@detail@_V1@sycl@@IEBA_KXZ
 ?getSampler@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBA?AUimage_sampler@34@XZ
 ?getSampler@image_plain@detail@_V1@sycl@@IEBA?AUimage_sampler@34@XZ
@@ -4343,8 +4342,6 @@
 ?pitched_alloc_device@experimental@oneapi@ext@_V1@sycl@@YAPEAXPEA_KAEBUimage_descriptor@12345@AEBVqueue@45@@Z
 ?pitched_alloc_device@experimental@oneapi@ext@_V1@sycl@@YAPEAXPEA_K_K1IAEBVdevice@45@AEBVcontext@45@@Z
 ?pitched_alloc_device@experimental@oneapi@ext@_V1@sycl@@YAPEAXPEA_K_K1IAEBVqueue@45@@Z
-?postProcess@HandlerAccess@detail@_V1@sycl@@SAXAEAVhandler@34@Vtype_erased_cgfo_ty@234@@Z
-?preProcess@HandlerAccess@detail@_V1@sycl@@SAXAEAVhandler@34@Vtype_erased_cgfo_ty@234@@Z
 ?prefetch@handler@_V1@sycl@@QEAAXPEBX_K@Z
 ?prefetch@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KAEBUcode_location@detail@23@@Z
 ?prefetch@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KAEBV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@AEBUcode_location@detail@23@@Z
@@ -4356,12 +4353,9 @@
 ?processArg@handler@_V1@sycl@@AEAAXPEAXAEBW4kernel_param_kind_t@detail@23@H_KAEA_K_N4@Z
 ?query@tls_code_loc_t@detail@_V1@sycl@@QEAAAEBUcode_location@234@XZ
 ?reduComputeWGSize@detail@_V1@sycl@@YA_K_K0AEA_K@Z
-?reduGetMaxNumConcurrentWorkGroups@detail@_V1@sycl@@YAIAEAVhandler@23@@Z
 ?reduGetMaxNumConcurrentWorkGroups@detail@_V1@sycl@@YAIV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@@Z
-?reduGetMaxWGSize@detail@_V1@sycl@@YA_KAEAVhandler@23@_K@Z
 ?reduGetMaxWGSize@detail@_V1@sycl@@YA_KV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@_K@Z
 ?reduGetPreferredWGSize@detail@_V1@sycl@@YA_KAEAV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@_K@Z
-?reduGetPreferredWGSize@detail@_V1@sycl@@YA_KAEAVhandler@23@_K@Z
 ?registerDynamicParameter@handler@_V1@sycl@@AEAAXAEAVdynamic_parameter_base@detail@experimental@oneapi@ext@23@H@Z
 ?registerDynamicParameter@handler@_V1@sycl@@AEAAXPEAVdynamic_parameter_impl@detail@experimental@oneapi@ext@23@H@Z
 ?release_external_memory@experimental@oneapi@ext@_V1@sycl@@YAXUexternal_mem@12345@AEBVdevice@45@AEBVcontext@45@@Z
@@ -4393,7 +4387,6 @@
 ?setArgHelper@handler@_V1@sycl@@AEAAXHAEAVwork_group_memory_impl@detail@23@@Z
 ?setArgsHelper@handler@_V1@sycl@@AEAAXH@Z
 ?setArgsToAssociatedAccessors@handler@_V1@sycl@@AEAAXXZ
-?setDevice@HostProfilingInfo@detail@_V1@sycl@@QEAAXPEAVdevice_impl@234@@Z
 ?setHandlerKernelBundle@handler@_V1@sycl@@AEAAXAEBV?$shared_ptr@Vkernel_bundle_impl@detail@_V1@sycl@@@std@@@Z
 ?setHandlerKernelBundle@handler@_V1@sycl@@AEAAXVkernel@23@@Z
 ?setKernelCacheConfig@handler@_V1@sycl@@AEAAXW4StableKernelCacheConfig@123@@Z