Moved MEMORY_ON_[HOST|DEVICE] from tsl::oneAPI to tsl namespace

db-tu-dresden · Oct 17, 2023 · 6f20ba5 · 6f20ba5
1 parent ef863e6
commit 6f20ba5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/examples/oneAPIfpga/clz_rtl_example.cpp b/examples/oneAPIfpga/clz_rtl_example.cpp
@@ -31,12 +31,11 @@ int main(void) {
   auto host_mem_data       = cpu_executor.allocate<uint32_t>(128);
   auto host_mem_result     = cpu_executor.allocate<uint32_t>(128);
   // allocate memory accessible from host and FPGA device
-  // WATCH OUT: oneAPI::MEMORY_ON_HOST and oneAPI::MEMORY_ON_DEVICE will soon be moved up in the namespace hierarchy
-  auto usm_host_mem_data   = fpga_executor.allocate<uint32_t>(128, oneAPI::MEMORY_ON_HOST{});
-  auto usm_host_mem_result = fpga_executor.allocate<uint32_t>(128, oneAPI::MEMORY_ON_HOST{});
+  auto usm_host_mem_data   = fpga_executor.allocate<uint32_t>(128, MEMORY_ON_HOST{});
+  auto usm_host_mem_result = fpga_executor.allocate<uint32_t>(128, MEMORY_ON_HOST{});
   // allocate memory on FPGA device
-  auto usm_dev_mem_data    = fpga_executor.allocate<uint32_t>(128, oneAPI::MEMORY_ON_DEVICE{});
-  auto usm_dev_mem_result  = fpga_executor.allocate<uint32_t>(128, oneAPI::MEMORY_ON_DEVICE{});
+  auto usm_dev_mem_data    = fpga_executor.allocate<uint32_t>(128, MEMORY_ON_DEVICE{});
+  auto usm_dev_mem_result  = fpga_executor.allocate<uint32_t>(128, MEMORY_ON_DEVICE{});
 
   // initialize input data
   host_mem_data[0] = 0;

diff --git a/generator/static_files/core/utils/runtime.yaml b/generator/static_files/core/utils/runtime.yaml
@@ -6,6 +6,9 @@ includes:
   - "<utility>"
 implementations:
   - |
+    struct MEMORY_ON_HOST{};
+    struct MEMORY_ON_DEVICE{};
+
     template<class ExecTarget>
       class executor {
         private:

diff --git a/supplementary/runtime/oneApiFPGA/include/tslOneAPIrt.hpp b/supplementary/runtime/oneApiFPGA/include/tslOneAPIrt.hpp
@@ -76,9 +76,6 @@ namespace tsl {
       sycl::ext::intel::tsl_helper_loop_fuse_independent<N>(f, 0);
     }
 
-    struct MEMORY_ON_HOST{};
-    struct MEMORY_ON_DEVICE{};
-
     namespace details {      
       template <typename T, typename = void>
       struct multi_ptr_base_type {
@@ -177,7 +174,7 @@ namespace tsl {
         }
       public:
         template<typename _T>
-          auto allocate(size_t element_count, ::tsl::oneAPI::MEMORY_ON_HOST, size_t alignment = 0) {
+          auto allocate(size_t element_count, ::tsl::MEMORY_ON_HOST, size_t alignment = 0) {
             using T = std::remove_pointer_t<std::remove_reference_t<_T>>;
             T * buffer;
             if (alignment == 0) {
@@ -194,7 +191,7 @@ namespace tsl {
             return sycl::host_ptr<T>{buffer};
           }
         template<typename _T>
-          auto allocate(size_t element_count, ::tsl::oneAPI::MEMORY_ON_DEVICE, size_t alignment = 0) {
+          auto allocate(size_t element_count, ::tsl::MEMORY_ON_DEVICE, size_t alignment = 0) {
             using T = std::remove_pointer_t<std::remove_reference_t<_T>>;
             T * buffer;
             if (alignment == 0) {