Skip to content
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

[SYCL] [NATIVECPU] Implement generic atomic store for generic target #13428

Merged
merged 6 commits into from
May 22, 2024
Merged

[SYCL] [NATIVECPU] Implement generic atomic store for generic target #13428

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5763dbc
implement generic atomic store
PietroGhg Apr 15, 2024
90b668d
Merge branch 'sycl' into pietro/atomic_store
PietroGhg Apr 23, 2024
a49837a
use _CLC_GENERIC_AS_SUPPORTED macro
PietroGhg Apr 23, 2024
ce4f14d
Merge branch 'sycl' into pietro/atomic_store
PietroGhg May 15, 2024
40ffa8a
Merge branch 'sycl' into pietro/atomic_store
PietroGhg May 21, 2024
e3e4211
use #if for generic AS check
PietroGhg May 21, 2024
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
18 changes: 16 additions & 2 deletions libclc/generic/libspirv/atomic/atomic_load.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ TYPE __clc__atomic_##PREFIX##load_##AS##_##BYTE_SIZE##_##MEM_ORDER(volatile AS c

#define IMPL_AS(TYPE, TYPE_MANGLED, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, global, U3AS1, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, local, U3AS3, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, , , PREFIX, BYTE_SIZE)
IMPL(TYPE, TYPE_MANGLED, local, U3AS3, PREFIX, BYTE_SIZE)

IMPL_AS(int, i, , 4)
IMPL_AS(unsigned int, j, u, 4)
Expand All @@ -43,6 +42,21 @@ IMPL_AS(long, l, , 8)
IMPL_AS(unsigned long, m, u, 8)
#endif

#ifdef _CLC_GENERIC_AS_SUPPORTED

#define IMPL_GENERIC(TYPE, TYPE_MANGLED, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, , , PREFIX, BYTE_SIZE)

IMPL_GENERIC(int, i, , 4)
IMPL_GENERIC(unsigned int, j, u, 4)

#ifdef cl_khr_int64_base_atomics
IMPL_GENERIC(long, l, , 8)
IMPL_GENERIC(unsigned long, m, u, 8)
#endif

#endif //_CLC_GENERIC_AS_SUPPORTED

#undef FDECL
#undef IMPL_AS
#undef IMPL
51 changes: 33 additions & 18 deletions libclc/generic/libspirv/atomic/atomic_store.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ _Z19__spirv_AtomicStorePU3AS3fN5__spv5Scope4FlagENS1_19MemorySemanticsMask4FlagE
#define FDECL(TYPE, PREFIX, AS, BYTE_SIZE, MEM_ORDER) \
TYPE __clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_##MEM_ORDER(volatile AS const TYPE *, TYPE);

#define IMPL(TYPE, TYPE_MANGLED, AS, AS_MANGLED, PREFIX, BYTE_SIZE) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, unordered) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, release) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, seq_cst) \
_CLC_DEF void \
_Z19__spirv_AtomicStorePU3##AS_MANGLED##TYPE_MANGLED##N5__spv5Scope4FlagENS1_19MemorySemanticsMask4FlagE##TYPE_MANGLED( \
volatile AS TYPE *p, enum Scope scope, \
enum MemorySemanticsMask semantics, TYPE val) { \
if (semantics == Release) { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_release(p, val); \
} else if (semantics == SequentiallyConsistent) { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_seq_cst(p, val); \
} else { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_unordered(p, val); \
} \
#define IMPL(TYPE, TYPE_MANGLED, AS, AS_MANGLED, SUB, PREFIX, BYTE_SIZE) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, unordered) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, release) \
FDECL(TYPE, PREFIX, AS, BYTE_SIZE, seq_cst) \
_CLC_DEF void \
_Z19__spirv_AtomicStoreP##AS_MANGLED##TYPE_MANGLED##N5__spv5Scope4FlagENS##SUB##_19MemorySemanticsMask4FlagE##TYPE_MANGLED( \
volatile AS TYPE *p, enum Scope scope, \
enum MemorySemanticsMask semantics, TYPE val) { \
if (semantics == Release) { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_release(p, val); \
} else if (semantics == SequentiallyConsistent) { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_seq_cst(p, val); \
} else { \
__clc__atomic_##PREFIX##store_##AS##_##BYTE_SIZE##_unordered(p, val); \
} \
}

#define IMPL_AS(TYPE, TYPE_MANGLED, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, global, AS1, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, local, AS3, PREFIX, BYTE_SIZE)
#define IMPL_AS(TYPE, TYPE_MANGLED, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, global, U3AS1, 1, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, local, U3AS3, 1, PREFIX, BYTE_SIZE)

IMPL_AS(int, i, , 4)
IMPL_AS(unsigned int, j, u, 4)
Expand All @@ -58,6 +58,21 @@ IMPL_AS(long, l, , 8)
IMPL_AS(unsigned long, m, u, 8)
#endif

#ifdef _CLC_GENERIC_AS_SUPPORTED

#define IMPL_GENERIC(TYPE, TYPE_MANGLED, PREFIX, BYTE_SIZE) \
IMPL(TYPE, TYPE_MANGLED, , , 0, PREFIX, BYTE_SIZE)

IMPL_GENERIC(int, i, , 4)
IMPL_GENERIC(unsigned int, j, u, 4)

#ifdef cl_khr_int64_base_atomics
IMPL_GENERIC(long, l, , 8)
IMPL_GENERIC(unsigned long, m, u, 8)
#endif

#endif //_CLC_GENERIC_AS_SUPPORTED

#undef FDECL
#undef IMPL_AS
#undef IMPL
Loading