Skip to content

[SYCL] spir-v vars should not be defined for GPU targets #18676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 28, 2025
Merged

[SYCL] spir-v vars should not be defined for GPU targets #18676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
943b71a
[SYCL] spir-v vars should not be defined for GPU targets
jchlanda May 27, 2025
416df90
Move stubs over to spirv_vars.h
jchlanda May 28, 2025
51b62ad
cstddef
jchlanda May 28, 2025
706487e
Merge remote-tracking branch 'upstream/sycl' into jakub/spirv_vars_gpu
jchlanda May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions libdevice/crt_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,24 @@ int memcmp(const void *s1, const void *s2, size_t n) {
DEVICE_EXTERN_C_INLINE
int rand() {
size_t gid =
#if defined(__NVPTX__) || defined(__AMDGCN__)
(__spirv_GlobalInvocationId_x() * __spirv_GlobalSize_y() *
__spirv_GlobalSize_z()) +
(__spirv_GlobalInvocationId_y() * __spirv_GlobalSize_z()) +
__spirv_GlobalInvocationId_z();
#else
(__spirv_BuiltInGlobalInvocationId.x * __spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z) +
(__spirv_BuiltInGlobalInvocationId.y * __spirv_BuiltInGlobalSize.z) +
__spirv_BuiltInGlobalInvocationId.z;
size_t global_size = __spirv_BuiltInGlobalSize.x *
__spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z;
#endif
size_t global_size =
#if defined(__NVPTX__) || defined(__AMDGCN__)
__spirv_GlobalSize_x() * __spirv_GlobalSize_y() * __spirv_GlobalSize_z();
#else
__spirv_BuiltInGlobalSize.x * __spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z;
#endif
size_t gid1 =
(global_size > RAND_NEXT_LEN) ? (gid & (RAND_NEXT_LEN - 1)) : gid;
if (RAND_NEXT_ACC[gid1] == 0)
Expand All @@ -73,13 +84,24 @@ int rand() {
DEVICE_EXTERN_C_INLINE
void srand(unsigned int seed) {
size_t gid =
#if defined(__NVPTX__) || defined(__AMDGCN__)
(__spirv_GlobalInvocationId_x() * __spirv_GlobalSize_y() *
__spirv_GlobalSize_z()) +
(__spirv_GlobalInvocationId_y() * __spirv_GlobalSize_z()) +
__spirv_GlobalInvocationId_z();
#else
(__spirv_BuiltInGlobalInvocationId.x * __spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z) +
(__spirv_BuiltInGlobalInvocationId.y * __spirv_BuiltInGlobalSize.z) +
__spirv_BuiltInGlobalInvocationId.z;
size_t global_size = __spirv_BuiltInGlobalSize.x *
__spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z;
#endif
size_t global_size =
#if defined(__NVPTX__) || defined(__AMDGCN__)
__spirv_GlobalSize_x() * __spirv_GlobalSize_y() * __spirv_GlobalSize_z();
#else
__spirv_BuiltInGlobalSize.x * __spirv_BuiltInGlobalSize.y *
__spirv_BuiltInGlobalSize.z;
#endif
size_t gid1 =
(global_size > RAND_NEXT_LEN) ? (gid & (RAND_NEXT_LEN - 1)) : gid;
RAND_NEXT_ACC[gid1] = seed;
Expand Down
20 changes: 16 additions & 4 deletions libdevice/spirv_vars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,23 @@
#define __LIBDEVICE_SPIRV_VARS_H

#include "device.h"
#include <cstddef>

#if defined(__SPIR__) || defined(__SPIRV__) || defined(__NVPTX__) || \
defined(__AMDGCN__)
#if defined(__NVPTX__) || defined(__AMDGCN__)
// For AMD/Cuda those symbols will be provided by libclc.
DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_x();
DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_y();
DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_z();
DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_x();
DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_y();
DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_z();
DEVICE_EXTERNAL size_t __spirv_GlobalSize_x();
DEVICE_EXTERNAL size_t __spirv_GlobalSize_y();
DEVICE_EXTERNAL size_t __spirv_GlobalSize_z();
#endif // __NVPTX__ || __AMDGCN__

#if defined(__SPIR__) || defined(__SPIRV__)

#include <cstddef>
#include <cstdint>

#define __SPIRV_VAR_QUALIFIERS EXTERN_C const
Expand Down Expand Up @@ -63,5 +75,5 @@ const size_t_vec __spirv_BuiltInGlobalInvocationId{};
const size_t_vec __spirv_BuiltInLocalInvocationId{};
#endif // !__SPIR__ && !__SPIRV__

#endif // __SPIR__ || __SPIRV__ || __NVPTX__ || __AMDGCN__
#endif // __SPIR__ || __SPIRV__
#endif // __LIBDEVICE_SPIRV_VARS_H