[OFFLOAD] Build DeviceRTL with SPIRV backend #174675
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,7 +131,14 @@ struct IdentTy { | |
|
|
||
| using __kmpc_impl_lanemask_t = LaneMaskTy; | ||
|
|
||
| #ifdef __SPIRV__ | ||
| const uint32_t ProgramAS = 9; | ||
| using FnPtrTy = __attribute__((address_space(ProgramAS))) void *; | ||
|
Contributor
Author
There was a problem hiding this comment. Using attributes in [[]] form causes compilation error
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. Yes. FnPtrTy is used as a type since SPIRV backend has issues that are related to address space of parameters. Since the issue is related to SPIRV only and to minimize code changes FnPtrTy was introduced as a type of pointer with attribute for SPIRV, and as a regular pointer for the rest. The correct use of c++ attributes requires to put it after a variable, while attribute can be put before type which makes it easier to use.
Member
There was a problem hiding this comment. This deserves a comment, I mean the AS stuff above.
Contributor
Author
There was a problem hiding this comment. Added comments in the code
Contributor
There was a problem hiding this comment. Do the C++ attributes not work? And just make this constexpr or put the
Contributor
Author
There was a problem hiding this comment. The C++ attributes do not work because in this case they are placed in incorrect place. I believe we have discussed it couple of weeks back. I replaced the constant with the actual value. Regarding why we need a special address space for function better to check with @sarnex as he originally introduced it.
Contributor
There was a problem hiding this comment. This doesn't work? https://godbolt.org/z/T94q8jz5q
Contributor
Author
There was a problem hiding this comment. That worked. Thanks, fixed |
||
| #else | ||
| using FnPtrTy = void *; | ||
| #endif | ||
|
|
||
| using ParallelRegionFnTy = FnPtrTy; | ||
|
Comment on lines
+134
to
+144
Contributor
There was a problem hiding this comment. C++ style attributes |
||
|
|
||
| using CriticalNameTy = int32_t[8]; | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,17 @@ | |
|
|
||
| namespace ompx { | ||
|
|
||
| // SPIR-V backend does not support variadic functions except for | ||
|
Contributor
There was a problem hiding this comment. I have #175076 up but will need some SPIR-V people to look at it. |
||
| // __spirv_ocl_printf. This is to provide a workaround to use | ||
| // regular printf that is used in the code. | ||
| #if defined(__SPIRV__) | ||
| template <size_t N, typename... Args> | ||
| int printf(const char (&Format)[N], Args... args) { | ||
| return __spirv_ocl_printf(Format, args...); | ||
| } | ||
| #else | ||
| int printf(const char *Format, ...); | ||
| #endif | ||
|
|
||
| } // namespace ompx | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -258,6 +258,63 @@ void setCriticalLock(omp_lock_t *Lock) { setLock(Lock); } | |
| #endif | ||
| ///} | ||
|
|
||
| #if defined(__SPIRV__) | ||
|
|
||
| uint32_t atomicInc(uint32_t *Address, uint32_t Val, atomic::OrderingTy Ordering, | ||
|
Contributor
There was a problem hiding this comment. This bit was changed in a previous PR to use the
Contributor
Author
There was a problem hiding this comment. Copied the implementation for spirv backend until backend is fixed |
||
| atomic::MemScopeTy MemScope) { | ||
| uint32_t old; | ||
|
|
||
| while (true) { | ||
| old = atomic::load(Address, Ordering, MemScope); | ||
| if (old >= Val) { | ||
| if (atomic::cas(Address, old, 0, Ordering, Ordering)) | ||
| break; | ||
| } else if (atomic::cas(Address, old, old + 1, Ordering, Ordering)) | ||
| break; | ||
| } | ||
| return old; | ||
| } | ||
|
|
||
| void namedBarrierInit() {} // TODO | ||
| void namedBarrier() {} // TODO | ||
|
|
||
| void fenceTeam(atomic::OrderingTy Ordering) { | ||
| return __scoped_atomic_thread_fence(Ordering, atomic::workgroup); | ||
| } | ||
|
|
||
| void fenceKernel(atomic::OrderingTy Ordering) { | ||
|
Contributor
There was a problem hiding this comment. I should probably make these common, I thought I did that already.
Contributor
There was a problem hiding this comment. I made #177710 hopefully this will let us simplify some of this if it lands without issue |
||
| return __scoped_atomic_thread_fence(Ordering, atomic::device); | ||
| } | ||
|
|
||
| void fenceSystem(atomic::OrderingTy Ordering) { | ||
| return __scoped_atomic_thread_fence(Ordering, atomic::system); | ||
| } | ||
|
|
||
| void syncWarp(__kmpc_impl_lanemask_t mask) { __gpu_sync_lane(mask); } | ||
| void syncThreads(atomic::OrderingTy Ordering) { __gpu_sync_threads(); } | ||
| void unsetLock(omp_lock_t *Lock) { | ||
| atomic::store((int32_t *)Lock, 0, atomic::seq_cst); | ||
| } | ||
| int testLock(omp_lock_t *Lock) { | ||
| return atomic::add((int32_t *)Lock, 0, atomic::seq_cst); | ||
| } | ||
| void initLock(omp_lock_t *Lock) { unsetLock(Lock); } | ||
| void destroyLock(omp_lock_t *Lock) { unsetLock(Lock); } | ||
| void setLock(omp_lock_t *Lock) { | ||
| int32_t *lock_ptr = (int32_t *)Lock; | ||
| bool acquired = false; | ||
| int32_t expected; | ||
|
Member
There was a problem hiding this comment. Style. Please review your patches for style before posting them. |
||
| while (!acquired) { | ||
| expected = 0; | ||
| if (expected == atomic::load(lock_ptr, atomic::seq_cst)) | ||
| acquired = | ||
| atomic::cas(lock_ptr, expected, 1, atomic::seq_cst, atomic::seq_cst); | ||
| } | ||
| } | ||
|
|
||
| void unsetCriticalLock(omp_lock_t *Lock) { unsetLock(Lock); } | ||
| void setCriticalLock(omp_lock_t *Lock) { setLock(Lock); } | ||
| void syncThreadsAligned(atomic::OrderingTy Ordering) { syncThreads(Ordering); } | ||
| #endif | ||
|
|
||
| } // namespace impl | ||
|
|
||
| void synchronize::init(bool IsSPMD) { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't belong here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This belongs next to the usage
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed