Added support for static SYCL members inside Platform

alpaka-group · Jan 18, 2023 · 4894703 · 4894703
1 parent 1f874de
commit 4894703
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 39 deletions.
diff --git a/include/alpaka/mem/buf/BufGenericSycl.hpp b/include/alpaka/mem/buf/BufGenericSycl.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2022 Jan Stephan
+/* Copyright 2022 Jan Stephan, Luca Ferragina, Aurora Perego
  *
  * This file is part of Alpaka.
  *
@@ -224,22 +224,20 @@ namespace alpaka::trait
     };
 
     //! The pinned/mapped memory allocation trait specialization for the SYCL devices.
-    template<typename TElem, typename TDim, typename TIdx, typename TPltf>
-    struct BufAllocMapped<TElem, TDim, TIdx, DevGenericSycl<TPltf>>
+    template<typename TPltf, typename TElem, typename TDim, typename TIdx>
+    struct BufAllocMapped
     {
         template<typename TExtent>
-        ALPAKA_FN_HOST static auto allocMappedBuf(
-            DevCpu const& host,
-            DevGenericSycl<TPltf> const& dev,
-            TExtent const& extent) -> BufCpu<TElem, TDim, TIdx>
+        ALPAKA_FN_HOST static auto allocMappedBuf(DevCpu const& host, TExtent const& extent)
+            -> BufCpu<TElem, TDim, TIdx>
         {
             ALPAKA_DEBUG_MINIMAL_LOG_SCOPE;
 
             // Allocate SYCL page-locked memory on the host, mapped into the TPltf address space and
             // accessible to all devices in the TPltf.
-            TElem* memPtr
-                = sycl::malloc_host<TElem>(static_cast<std::size_t>(getExtentProduct(extent)), dev.get_context());
-            auto deleter = [&dev](TElem* ptr) { sycl::free(ptr, dev.get_context()); };
+            auto ctx = TPltf::syclContext();
+            TElem* memPtr = sycl::malloc_host<TElem>(static_cast<std::size_t>(getExtentProduct(extent)), ctx);
+            auto deleter = [ctx](TElem* ptr) { sycl::free(ptr, ctx); };
 
             return BufCpu<TElem, TDim, TIdx>(host, memPtr, std::move(deleter), extent);
         }

diff --git a/include/alpaka/pltf/PltfCpuSyclIntel.hpp b/include/alpaka/pltf/PltfCpuSyclIntel.hpp
@@ -45,13 +45,7 @@ namespace alpaka
     } // namespace detail
 
     //! The SYCL device manager.
-    class PltfCpuSyclIntel : public PltfGenericSycl
-    {
-    public:
-        PltfCpuSyclIntel() = delete;
-
-        using selector = detail::IntelCpuSelector;
-    };
+    using PltfCpuSyclIntel = PltfGenericSycl<detail::IntelCpuSelector>;
 } // namespace alpaka
 
 namespace alpaka::trait

diff --git a/include/alpaka/pltf/PltfFpgaSyclIntel.hpp b/include/alpaka/pltf/PltfFpgaSyclIntel.hpp
@@ -18,8 +18,6 @@
 #    include <CL/sycl.hpp>
 #    include <sycl/ext/intel/fpga_extensions.hpp>
 
-#    include <string>
-
 namespace alpaka
 {
     //! The SYCL device manager.

diff --git a/include/alpaka/pltf/PltfFpgaSyclXilinx.hpp b/include/alpaka/pltf/PltfFpgaSyclXilinx.hpp
@@ -45,13 +45,7 @@ namespace alpaka
     } // namespace detail
 
     //! The SYCL device manager.
-    class PltfFpgaSyclXilinx : public PltfGenericSycl
-    {
-    public:
-        PltfFpgaSyclXilinx() = delete;
-
-        using selector = detail::XilinxFpgaSelector;
-    };
+    using PltfFgpaSyclIntel = PltfGenericSycl<detail::XilinxFpgaSelector>;
 } // namespace alpaka
 
 namespace alpaka::trait

diff --git a/include/alpaka/pltf/PltfGenericSycl.hpp b/include/alpaka/pltf/PltfGenericSycl.hpp
@@ -137,26 +137,26 @@ namespace alpaka
 namespace alpaka::trait
 {
     //! The SYCL platform device count get trait specialization.
-    template<typename TPltf>
-    struct GetDevCount<TPltf, std::enable_if_t<std::is_base_of_v<PltfGenericSycl, TPltf>>>
+    template<typename TSelector>
+    struct GetDevCount<alpaka::PltfGenericSycl<TSelector>>
     {
         static auto getDevCount() -> std::size_t
         {
             ALPAKA_DEBUG_FULL_LOG_SCOPE;
 
-            return alpaka::experimental::PltfGenericSycl<TSelector>::syclDevices().size();
+            return alpaka::PltfGenericSycl<TSelector>::syclDevices().size();
         }
     };
 
     //! The SYCL platform device get trait specialization.
-    template<typename TPltf>
-    struct GetDevByIdx<TPltf, std::enable_if_t<std::is_base_of_v<PltfGenericSycl, TPltf>>>
+    template<typename TSelector>
+    struct GetDevByIdx<alpaka::PltfGenericSycl<TSelector>>
     {
         static auto getDevByIdx(std::size_t const& devIdx)
         {
             ALPAKA_DEBUG_FULL_LOG_SCOPE;
 
-            using SyclPltf = alpaka::experimental::PltfGenericSycl<TSelector>;
+            using SyclPltf = alpaka::PltfGenericSycl<TSelector>;
 
             auto const dev_num = getDevCount<SyclPltf>();
 

diff --git a/include/alpaka/pltf/PltfGpuSyclIntel.hpp b/include/alpaka/pltf/PltfGpuSyclIntel.hpp
@@ -46,13 +46,7 @@ namespace alpaka
     } // namespace detail
 
     //! The SYCL device manager.
-    class PltfGpuSyclIntel : public PltfGenericSycl
-    {
-    public:
-        PltfGpuSyclIntel() = delete;
-
-        using selector = detail::IntelGpuSelector;
-    };
+    using PltfGpuSyclIntel = PltfGenericSycl<detail::IntelGpuSelector>;
 } // namespace alpaka
 
 namespace alpaka::trait