cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Revert "Remove AdaptiveCpp workaround in dpl_shim.h to allow for automatic prefetch optimization"
This commit is contained in:
Tom Deakin 2023-12-04 12:43:17 +00:00 committed by GitHub
commit ad61a0dba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dpl_shim.h
View File

@ -55,10 +55,22 @@ static constexpr auto exe_policy = std::execution::par_unseq;
#endif #endif
#ifdef USE_STD_PTR_ALLOC_DEALLOC #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> template<typename T>
T *alloc_raw(size_t size) { return (T *) aligned_alloc(ALIGNMENT, sizeof(T) * size); } T *alloc_raw(size_t size) { return (T *) aligned_alloc(ALIGNMENT, sizeof(T) * size); }
template<typename T> template<typename T>
void dealloc_raw(T *ptr) { free(ptr); } void dealloc_raw(T *ptr) { free(ptr); }
#endif
#endif #endif