Make alpaka work with SYCL

CMakeLists.txt

@@ -237,7 +237,6 @@ if( TRACCC_SETUP_ALPAKA )
    # Default options for the Alpaka build.
    set( alpaka_ACC_CPU_B_SEQ_T_THREADS_ENABLE TRUE CACHE BOOL
       "Enable the serial backend of Alpaka" )
-
    if( TRACCC_USE_SYSTEM_ALPAKA )
       find_package( alpaka REQUIRED )
    else()

cmake/traccc-alpaka-functions.cmake

@@ -67,3 +67,16 @@ function( traccc_add_alpaka_library fullname basename )
    endif()
 
 endfunction( traccc_add_alpaka_library )
+
+macro (traccc_enable_language_alpaka)
+   #enable_language cannot be called by a function: put it in a macro
+   if(alpaka_ACC_GPU_CUDA_ENABLE)
+     enable_language(CUDA)
+     include( traccc-compiler-options-cuda )
+   elseif(alpaka_ACC_GPU_HIP_ENABLE)
+     enable_language(HIP)
+   elseif(alpaka_ACC_SYCL_ENABLE)
+     enable_language(SYCL)
+     include( traccc-compiler-options-sycl )
+   endif()
+endmacro(traccc_enable_language_alpaka)

device/alpaka/CMakeLists.txt

@@ -11,15 +11,16 @@ include( traccc-compiler-options-cpp )
 set(PUBLIC_LIBRARIES traccc::core traccc::device_common vecmem::core covfie::core)
 set(PRIVATE_LIBRARIES alpaka::alpaka traccc::Thrust)
 
-if(alpaka_ACC_GPU_CUDA_ENABLE)
-  enable_language(CUDA)
-  include( traccc-compiler-options-cuda )
+traccc_enable_language_alpaka()
 
+if(alpaka_ACC_GPU_CUDA_ENABLE)
   list(APPEND PRIVATE_LIBRARIES CUDA::cudart vecmem::cuda)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
-  enable_language(HIP)
   find_package( HIPToolkit REQUIRED )
   list(APPEND PRIVATE_LIBRARIES HIP::hiprt vecmem::hip)
+elseif(alpaka_ACC_SYCL_ENABLE)
+  include( traccc-compiler-options-sycl )
+  list(APPEND PRIVATE_LIBRARIES vecmem::sycl)
 endif()
 
 traccc_add_alpaka_library( traccc_alpaka alpaka TYPE SHARED

device/alpaka/include/traccc/alpaka/utils/vecmem_types.hpp

@@ -24,6 +24,7 @@
 #elif defined(ALPAKA_ACC_SYCL_ENABLED)
 #include <vecmem/memory/sycl/device_memory_resource.hpp>
 #include <vecmem/memory/sycl/host_memory_resource.hpp>
+#include <vecmem/memory/sycl/shared_memory_resource.hpp>
 #include <vecmem/utils/sycl/copy.hpp>
 
 #else
@@ -52,7 +53,7 @@ class copy;
 namespace sycl {
 class host_memory_resource;
 class device_memory_resource;
-class managed_memory_resource;
+class shared_memory_resource;
 class copy;
 }  // namespace sycl
 }  // namespace vecmem
@@ -84,20 +85,21 @@ template <>
 struct host_device_types<::alpaka::TagCpuSycl> {
     using device_memory_resource = ::vecmem::sycl::device_memory_resource;
     using host_memory_resource = ::vecmem::sycl::host_memory_resource;
-    using managed_memory_resource = ::vecmem::sycl::host_memory_resource;
+    using managed_memory_resource = ::vecmem::sycl::shared_memory_resource;
     using device_copy = ::vecmem::sycl::copy;
 };
 template <>
 struct host_device_types<::alpaka::TagFpgaSyclIntel> {
     using device_memory_resource = ::vecmem::sycl::device_memory_resource;
     using host_memory_resource = ::vecmem::sycl::host_memory_resource;
-    using managed_memory_resource = ::vecmem::sycl::host_memory_resource;
+    using managed_memory_resource = ::vecmem::sycl::shared_memory_resource;
     using device_copy = ::vecmem::sycl::copy;
 };
 template <>
 struct host_device_types<::alpaka::TagGpuSyclIntel> {
     using device_memory_resource = ::vecmem::sycl::device_memory_resource;
     using host_memory_resource = ::vecmem::sycl::host_memory_resource;
+    using managed_memory_resource = ::vecmem::sycl::shared_memory_resource;
     using device_copy = ::vecmem::sycl::copy;
 };
 }  // namespace traccc::alpaka::vecmem

examples/run/alpaka/CMakeLists.txt

@@ -11,17 +11,20 @@ set(TRACCC_ALPAKA_EXAMPLE_SOURCES
     seeding_example_alpaka.cpp
 )
 
+include(traccc-alpaka-functions)
+traccc_enable_language_alpaka()
+
 if(alpaka_ACC_GPU_CUDA_ENABLE)
-  enable_language(CUDA)
-  include( traccc-compiler-options-cuda )
   set_source_files_properties(${TRACCC_ALPAKA_EXAMPLE_SOURCES} PROPERTIES LANGUAGE CUDA)
 
-  list (APPEND EXTRA_LIBS vecmem::cuda traccc::cuda)
+  list (APPEND EXTRA_LIBS vecmem::cuda)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
-  enable_language(HIP)
   find_package( HIPToolkit REQUIRED )
   set_source_files_properties(${TRACCC_ALPAKA_EXAMPLE_SOURCES} PROPERTIES LANGUAGE HIP)
   list(APPEND EXTRA_LIBS HIP::hiprt vecmem::hip)
+elseif(alpaka_ACC_SYCL_ENABLE)
+  list(APPEND EXTRA_LIBS vecmem::sycl)
+  set_source_files_properties(${TRACCC_ALPAKA_EXAMPLE_SOURCES} PROPERTIES LANGUAGE SYCL)
 endif()
 
 set(LIBRARIES vecmem::core traccc::io traccc::performance

examples/run/alpaka/seeding_example_alpaka.cpp

@@ -43,6 +43,10 @@
 #include "detray/propagator/propagator.hpp"
 #include "detray/propagator/rk_stepper.hpp"
 #include "traccc/alpaka/utils/vecmem_types.hpp"
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+#include <sycl/sycl.hpp>
+#include <vecmem/utils/sycl/queue_wrapper.hpp>
+#endif
 
 // System include(s).
 #include <exception>
@@ -63,6 +67,21 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts,
     using Idx = uint32_t;
 
     using Acc = ::alpaka::ExampleDefaultAcc<Dim, Idx>;
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+    ::sycl::queue q;
+    vecmem::sycl::queue_wrapper qw{&q};
+    traccc::alpaka::vecmem::host_device_types<
+        ::alpaka::trait::AccToTag<Acc>::type>::device_copy copy(qw);
+    traccc::alpaka::vecmem::host_device_types<
+        ::alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr(qw);
+    traccc::alpaka::vecmem::host_device_types<
+        ::alpaka::trait::AccToTag<Acc>::type>::device_memory_resource
+        device_mr(qw);
+    traccc::alpaka::vecmem::host_device_types<
+        ::alpaka::trait::AccToTag<Acc>::type>::managed_memory_resource
+        mng_mr(qw);
+    traccc::memory_resource mr{device_mr, &host_mr};
+#else
     traccc::alpaka::vecmem::host_device_types<
         ::alpaka::trait::AccToTag<Acc>::type>::device_copy copy;
     traccc::alpaka::vecmem::host_device_types<
@@ -72,6 +91,7 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts,
     traccc::alpaka::vecmem::host_device_types<
         ::alpaka::trait::AccToTag<Acc>::type>::managed_memory_resource mng_mr;
     traccc::memory_resource mr{device_mr, &host_mr};
+#endif
 
     // Performance writer
     traccc::seeding_performance_writer sd_performance_writer(

examples/run/alpaka/seq_example_alpaka.cpp

@@ -13,6 +13,11 @@
 #include "traccc/alpaka/seeding/spacepoint_formation_algorithm.hpp"
 #include "traccc/alpaka/seeding/track_params_estimation.hpp"
 #include "traccc/alpaka/utils/vecmem_types.hpp"
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+#include <sycl/sycl.hpp>
+#include <vecmem/utils/sycl/queue_wrapper.hpp>
+#endif
+
 #include "traccc/clusterization/clusterization_algorithm.hpp"
 #include "traccc/efficiency/seeding_performance_writer.hpp"
 #include "traccc/io/read_cells.hpp"
@@ -65,12 +70,24 @@ int seq_run(const traccc::opts::detector& detector_opts,
 
     using Acc = ::alpaka::ExampleDefaultAcc<Dim, Idx>;
     // Memory resources used by the application.
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+    ::sycl::queue q;
+    vecmem::sycl::queue_wrapper qw{&q};
     traccc::alpaka::vecmem::host_device_types<
-        alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr;
+        alpaka::trait::AccToTag<Acc>::type>::device_copy copy(qw);
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr(qw);
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::device_memory_resource
+        device_mr(qw);
+#else
     traccc::alpaka::vecmem::host_device_types<
         alpaka::trait::AccToTag<Acc>::type>::device_copy copy;
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr;
     traccc::alpaka::vecmem::host_device_types<
         alpaka::trait::AccToTag<Acc>::type>::device_memory_resource device_mr;
+#endif
     traccc::memory_resource mr{device_mr, &host_mr};
 
     // Construct the detector description object.

tests/alpaka/CMakeLists.txt

@@ -9,15 +9,19 @@ set(TRACCC_ALPAKA_TEST_SOURCES
   test_cca.cpp
 )
 
+
+include(traccc-alpaka-functions)
+traccc_enable_language_alpaka()
+
 if(alpaka_ACC_GPU_CUDA_ENABLE)
-  enable_language(CUDA)
   set_source_files_properties(${TRACCC_ALPAKA_TEST_SOURCES} PROPERTIES LANGUAGE CUDA)
-  include( traccc-compiler-options-cuda )
   list(APPEND DEVICE_LIBRARIES vecmem::cuda)
 elseif(alpaka_ACC_GPU_HIP_ENABLE)
-  enable_language(HIP)
   set_source_files_properties(${TRACCC_ALPAKA_TEST_SOURCES} PROPERTIES LANGUAGE HIP)
   list(APPEND DEVICE_LIBRARIES vecmem::hip)
+elseif(alpaka_ACC_SYCL_ENABLE)
+  list(APPEND DEVICE_LIBRARIES vecmem::sycl)
+  set_source_files_properties(${TRACCC_ALPAKA_TEST_SOURCES} PROPERTIES LANGUAGE SYCL)
 endif()
 
 traccc_add_test( alpaka

tests/alpaka/alpaka_basic.cpp

@@ -15,14 +15,11 @@
 #include <vecmem/memory/host_memory_resource.hpp>
 #include <vecmem/utils/copy.hpp>
 
-#if defined(ALPAKA_ACC_GPU_CUDA_ENABLED)
-#include <vecmem/memory/cuda/device_memory_resource.hpp>
-#include <vecmem/memory/cuda/host_memory_resource.hpp>
-#include <vecmem/utils/cuda/copy.hpp>
-#elif defined(ALPAKA_ACC_GPU_HIP_ENABLED)
-#include <vecmem/memory/hip/device_memory_resource.hpp>
-#include <vecmem/memory/hip/host_memory_resource.hpp>
-#include <vecmem/utils/hip/copy.hpp>
+#include "traccc/alpaka/utils/vecmem_types.hpp"
+
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+#include <sycl/sycl.hpp>
+#include <vecmem/utils/sycl/queue_wrapper.hpp>
 #endif
 
 // GoogleTest include(s).
@@ -139,18 +136,21 @@ GTEST_TEST(AlpakaBasic, VecMemOp) {
     using WorkDiv = WorkDivMembers<Dim, Idx>;
     auto workDiv = WorkDiv{blocksPerGrid, threadsPerBlock, elementsPerThread};
 
-    vecmem::host_memory_resource host_mr;
-#if defined(ALPAKA_ACC_GPU_CUDA_ENABLED)
-    vecmem::cuda::copy vm_copy;
-    vecmem::cuda::device_memory_resource device_mr;
-#elif defined(ALPAKA_ACC_GPU_HIP_ENABLED)
-    vecmem::hip::copy vm_copy;
-    vecmem::hip::device_memory_resource device_mr;
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+    ::sycl::queue q;
+    vecmem::sycl::queue_wrapper qw{&q};
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::device_copy vm_copy(qw);
 #else
-    vecmem::copy vm_copy;
-    vecmem::host_memory_resource device_mr;
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::device_copy vm_copy;
 #endif
 
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr;
+    traccc::alpaka::vecmem::host_device_types<
+        alpaka::trait::AccToTag<Acc>::type>::device_memory_resource device_mr;
+
     vecmem::vector<float> host_vector{n, &host_mr};
 
     auto host_buffer = vecmem::get_data(host_vector);

tests/alpaka/test_cca.cpp

@@ -12,6 +12,11 @@
 #include <functional>
 #include <vecmem/memory/host_memory_resource.hpp>
 
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+#include <sycl/sycl.hpp>
+#include <vecmem/utils/sycl/queue_wrapper.hpp>
+#endif
+
 #include "tests/cca_test.hpp"
 #include "traccc/alpaka/clusterization/clusterization_algorithm.hpp"
 #include "traccc/alpaka/utils/vecmem_types.hpp"
@@ -31,13 +36,26 @@ cca_function_t get_f_with(traccc::clustering_config cfg) {
         using Idx = uint32_t;
 
         using Acc = ExampleDefaultAcc<Dim, Idx>;
+#ifdef ALPAKA_ACC_SYCL_ENABLED
+        ::sycl::queue q;
+        vecmem::sycl::queue_wrapper qw{&q};
+        traccc::alpaka::vecmem::host_device_types<
+            alpaka::trait::AccToTag<Acc>::type>::host_memory_resource
+            host_mr(qw);
+        traccc::alpaka::vecmem::host_device_types<
+            alpaka::trait::AccToTag<Acc>::type>::device_copy copy(qw);
+        traccc::alpaka::vecmem::host_device_types<
+            alpaka::trait::AccToTag<Acc>::type>::device_memory_resource
+            device_mr;
+#else
         traccc::alpaka::vecmem::host_device_types<
             alpaka::trait::AccToTag<Acc>::type>::host_memory_resource host_mr;
         traccc::alpaka::vecmem::host_device_types<
             alpaka::trait::AccToTag<Acc>::type>::device_copy copy;
         traccc::alpaka::vecmem::host_device_types<
             alpaka::trait::AccToTag<Acc>::type>::device_memory_resource
             device_mr;
+#endif
 
         traccc::alpaka::clusterization_algorithm cc({device_mr}, copy, cfg);