implement memory visibility

alpaka-group · Oct 11, 2023 · 5fdcb22 · 5fdcb22
1 parent 2b64195
commit 5fdcb22
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 0 deletions.
diff --git a/include/alpaka/acc/AccCpuOmp2Blocks.hpp b/include/alpaka/acc/AccCpuOmp2Blocks.hpp
@@ -206,6 +206,12 @@ namespace alpaka
         {
             using type = alpaka::AccCpuOmp2Blocks<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleCPU;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccCpuOmp2Threads.hpp b/include/alpaka/acc/AccCpuOmp2Threads.hpp
@@ -216,6 +216,12 @@ namespace alpaka
         {
             using type = alpaka::AccCpuOmp2Threads<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleCPU;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccCpuSerial.hpp b/include/alpaka/acc/AccCpuSerial.hpp
@@ -33,6 +33,7 @@
 #include "alpaka/acc/Tag.hpp"
 #include "alpaka/core/Concepts.hpp"
 #include "alpaka/dev/DevCpu.hpp"
+#include "alpaka/mem/Visibility.hpp"
 
 #include <memory>
 #include <typeinfo>
@@ -200,6 +201,12 @@ namespace alpaka
         {
             using type = alpaka::AccCpuSerial<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleCPU;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccCpuSycl.hpp b/include/alpaka/acc/AccCpuSycl.hpp
@@ -87,6 +87,12 @@ namespace alpaka::trait
     {
         using type = alpaka::AccCpuSycl<TDim, TIdx>;
     };
+
+    template<typename TDim, typename TIdx>
+    struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+    {
+        using type = alpaka::MemVisibleCPU;
+    };
 } // namespace alpaka::trait
 
 #endif
diff --git a/include/alpaka/acc/AccCpuTbbBlocks.hpp b/include/alpaka/acc/AccCpuTbbBlocks.hpp
@@ -197,6 +197,12 @@ namespace alpaka
         {
             using type = alpaka::AccCpuTbbBlocks<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleCPU;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccCpuThreads.hpp b/include/alpaka/acc/AccCpuThreads.hpp
@@ -224,6 +224,12 @@ namespace alpaka
         {
             using type = alpaka::AccCpuThreads<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleCPU;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccFpgaSyclIntel.hpp b/include/alpaka/acc/AccFpgaSyclIntel.hpp
@@ -87,6 +87,12 @@ namespace alpaka::trait
     {
         using type = alpaka::AccFpgaSyclIntel<TDim, TIdx>;
     };
+
+    template<typename TDim, typename TIdx>
+    struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+    {
+        using type = alpaka::MemVisibleFpgaSyclIntel;
+    };
 } // namespace alpaka::trait
 
 #endif
diff --git a/include/alpaka/acc/AccGenericSycl.hpp b/include/alpaka/acc/AccGenericSycl.hpp
@@ -102,6 +102,12 @@ namespace alpaka::trait
         using type = TAcc<TDim, TIdx>;
     };
 
+    template<typename TDim, typename TIdx>
+    struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+    {
+        using type = alpaka::MemVisibleGenericSycl;
+    };
+
     //! The SYCL accelerator device properties get trait specialization.
     template<template<typename, typename> typename TAcc, typename TDim, typename TIdx>
     struct GetAccDevProps<

diff --git a/include/alpaka/acc/AccGpuCudaRt.hpp b/include/alpaka/acc/AccGpuCudaRt.hpp
@@ -28,6 +28,12 @@ namespace alpaka
         {
             using type = alpaka::AccGpuCudaRt<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleGpuCudaRt;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccGpuHipRt.hpp b/include/alpaka/acc/AccGpuHipRt.hpp
@@ -28,6 +28,12 @@ namespace alpaka
         {
             using type = alpaka::AccGpuHipRt<TDim, TIdx>;
         };
+
+        template<typename TDim, typename TIdx>
+        struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+        {
+            using type = alpaka::MemVisibleGpuHipRt;
+        };
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/acc/AccGpuSyclIntel.hpp b/include/alpaka/acc/AccGpuSyclIntel.hpp
@@ -87,6 +87,12 @@ namespace alpaka::trait
     {
         using type = alpaka::AccGpuSyclIntel<TDim, TIdx>;
     };
+
+    template<typename TDim, typename TIdx>
+    struct MemVisibility<alpaka::AccCpuSerial<TDim, TIdx>>
+    {
+        using type = alpaka::MemVisibleGpuSyclIntel;
+    };
 } // namespace alpaka::trait
 
 #endif
diff --git a/include/alpaka/mem/Visibility.hpp b/include/alpaka/mem/Visibility.hpp
@@ -0,0 +1,47 @@
+/* Copyright 2023 Simeon Ehrig
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+#pragma once
+
+#include "alpaka/meta/TypeListOps.hpp"
+
+#include <iostream>
+
+#define CREATE_MEM_VISIBILITY(mem_name)                                                                               \
+    struct mem_name                                                                                                   \
+    {                                                                                                                 \
+        static std::string get_name()                                                                                 \
+        {                                                                                                             \
+            return #mem_name;                                                                                         \
+        }                                                                                                             \
+    }
+
+namespace alpaka
+{
+    CREATE_MEM_VISIBILITY(MemVisibleCPU);
+    CREATE_MEM_VISIBILITY(MemVisibleFpgaSyclIntel);
+    CREATE_MEM_VISIBILITY(MemVisibleGenericSycl);
+    CREATE_MEM_VISIBILITY(MemVisibleGpuCudaRt);
+    CREATE_MEM_VISIBILITY(MemVisibleGpuHipRt);
+    CREATE_MEM_VISIBILITY(MemVisibleGpuSyclIntel);
+
+    namespace trait
+    {
+        //! Get memory visibility from a type.
+        //! Normally it is acc or buffer type.
+        //!
+        //! \tparam Type which implements the trait
+        //! \return Memory visibility type
+        template<typename TType>
+        struct MemVisibility;
+    } // namespace trait
+
+    template<typename TAcc, typename TBuf>
+    inline constexpr bool hasSameMemView()
+    {
+        return alpaka::meta::Contains<
+            typename alpaka::trait::MemVisibility<TBuf>::type,
+            typename alpaka::trait::MemVisibility<TAcc>::type>::value;
+    }
+} // namespace alpaka
diff --git a/include/alpaka/mem/buf/BufCpu.hpp b/include/alpaka/mem/buf/BufCpu.hpp
@@ -11,6 +11,7 @@
 #include "alpaka/core/Vectorize.hpp"
 #include "alpaka/dev/DevCpu.hpp"
 #include "alpaka/dev/Traits.hpp"
+#include "alpaka/mem/Visibility.hpp"
 #include "alpaka/mem/alloc/AllocCpuAligned.hpp"
 #include "alpaka/mem/buf/Traits.hpp"
 #include "alpaka/mem/view/ViewAccessOps.hpp"
@@ -307,6 +308,13 @@ namespace alpaka
         {
             using type = TIdx;
         };
+
+        template<typename TElem, typename TDim, typename TIdx>
+        struct MemVisibility<BufCpu<TElem, TDim, TIdx>>
+        {
+            using type = std::tuple<alpaka::MemVisibleCPU>;
+        };
+
     } // namespace trait
 } // namespace alpaka
 

diff --git a/include/alpaka/mem/buf/BufCpuSycl.hpp b/include/alpaka/mem/buf/BufCpuSycl.hpp
@@ -13,6 +13,12 @@ namespace alpaka
 {
     template<typename TElem, typename TDim, typename TIdx>
     using BufCpuSycl = BufGenericSycl<TElem, TDim, TIdx, PlatformCpuSycl>;
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufCpuSycl<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleCPU>;
+    };
 } // namespace alpaka
 
 #endif
diff --git a/include/alpaka/mem/buf/BufCudaRt.hpp b/include/alpaka/mem/buf/BufCudaRt.hpp
@@ -13,6 +13,12 @@ namespace alpaka
 {
     template<typename TElem, typename TDim, typename TIdx>
     using BufCudaRt = BufUniformCudaHipRt<ApiCudaRt, TElem, TDim, TIdx>;
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufCudaRt<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleGpuCudaRt>;
+    };
 } // namespace alpaka
 
 #endif // ALPAKA_ACC_GPU_CUDA_ENABLED
diff --git a/include/alpaka/mem/buf/BufFpgaSyclIntel.hpp b/include/alpaka/mem/buf/BufFpgaSyclIntel.hpp
@@ -13,6 +13,12 @@ namespace alpaka
 {
     template<typename TElem, typename TDim, typename TIdx>
     using BufFpgaSyclIntel = BufGenericSycl<TElem, TDim, TIdx, DevFpgaSyclIntel>;
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufFpgaSyclIntel<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleFpgaSyclIntel>;
+    };
 } // namespace alpaka
 
 #endif
diff --git a/include/alpaka/mem/buf/BufGenericSycl.hpp b/include/alpaka/mem/buf/BufGenericSycl.hpp
@@ -258,6 +258,12 @@ namespace alpaka::trait
             return getPtrNative(buf);
         }
     };
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufGenericSycl<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleGenericSycl>;
+    };
 } // namespace alpaka::trait
 
 #    include "alpaka/mem/buf/sycl/Copy.hpp"

diff --git a/include/alpaka/mem/buf/BufGpuSyclIntel.hpp b/include/alpaka/mem/buf/BufGpuSyclIntel.hpp
@@ -13,6 +13,12 @@ namespace alpaka
 {
     template<typename TElem, typename TDim, typename TIdx>
     using BufGpuSyclIntel = BufGenericSycl<TElem, TDim, TIdx, PlatformGpuSyclIntel>;
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufGpuSyclIntel<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleGpuSyclIntel>;
+    };
 } // namespace alpaka
 
 #endif
diff --git a/include/alpaka/mem/buf/BufHipRt.hpp b/include/alpaka/mem/buf/BufHipRt.hpp
@@ -13,6 +13,12 @@ namespace alpaka
 {
     template<typename TElem, typename TDim, typename TIdx>
     using BufHipRt = BufUniformCudaHipRt<ApiHipRt, TElem, TDim, TIdx>;
+
+    template<typename TElem, typename TDim, typename TIdx>
+    struct MemVisibility<BufUniformCudaHipRt<TElem, TDim, TIdx>>
+    {
+        using type = std::tuple<alpaka::MemVisibleGpuHipRt>;
+    };
 } // namespace alpaka
 
 #endif // ALPAKA_ACC_GPU_HIP_ENABLED