Merge pull request #178 from UoB-HPC/revert-177-patch-5

Revert "Remove AdaptiveCpp workaround in dpl_shim.h to allow for automatic prefetch optimization"

src/dpl_shim.h

@@ -55,10 +55,22 @@ static constexpr auto exe_policy = std::execution::par_unseq;
 #endif
 
 #ifdef USE_STD_PTR_ALLOC_DEALLOC
+
+#if defined(__HIPSYCL__) || defined(__OPENSYCL__)
+#include <CL/sycl.hpp>
+
+// TODO We temporarily use malloc_shared/free here for hipSYCL stdpar because there's a linking issue if we let it hijack new/delete
+//  for this to work, we compile with --hipsycl-stdpar-system-usm so that hijacking is disabled
+static cl::sycl::queue queue{cl::sycl::default_selector_v};
+template <typename T> T *alloc_raw(size_t size) { return cl::sycl::malloc_shared<T>(size, queue); }
+template <typename T> void dealloc_raw(T *ptr) { cl::sycl::free(ptr, queue); }
+
+#else
 template<typename T>
 T *alloc_raw(size_t size) { return (T *) aligned_alloc(ALIGNMENT, sizeof(T) * size); }
 
 template<typename T>
 void dealloc_raw(T *ptr) { free(ptr); }
+#endif
 
 #endif