This is an archive of the discontinued LLVM Phabricator instance.

Differential D108392

[OpenCL] Fix parsing of opencl-c.h in CL 3.0 with device-scope atomics enabled
Needs ReviewPublic

Authored by kpet on Aug 19 2021, 10:32 AM.

Details

Reviewers
Anastasia
Summary

Also declare and test the opencl_c_atomic_scope_device and
opencl_c_atomic_scope_all_devices features. The header is testing for them
but they were never defined by Clang.

With the new features declared, test/Headers/opencl-c-header.cl does
exercise the declaration this change fixes.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>

Diff Detail

Event Timeline

kpet created this revision.Aug 19 2021, 10:32 AM
Herald added subscribers: ldrumm, jfb, kristof.beyls, yaxunl. · View Herald TranscriptAug 19 2021, 10:32 AM
kpet requested review of this revision.Aug 19 2021, 10:32 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 19 2021, 10:32 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B120371: Diff 367545.Aug 19 2021, 11:12 AM
Anastasia added a subscriber: azabaznov.Aug 25 2021, 2:53 AM
Anastasia added inline comments.
clang/include/clang/Basic/OpenCLExtensions.def
113

Do we need to add anything to clang for those features? If not they should just go into the headers, see guidelines https://clang.llvm.org/docs/OpenCLSupport.html#implementation-guidelines

CC @azabaznov

clang/lib/Headers/opencl-c.h
13381

This is a fairly trivial fix. You can just commit it straight away if you like. :)

Kevin Petit <kevin.petit@arm.com> mentioned this in rGb8b6a5bc86f5: [OpenCL] Fix parsing of opencl-c.h as CL 3.0 with device-scope atomics enabled.Nov 4 2021, 7:18 AM
kpet added inline comments.Nov 4 2021, 7:19 AM
clang/lib/Headers/opencl-c.h
13381

I've committed the fix alone as b8b6a5bc86f570a6fb94b88b8c9d634c3af71eca.

azabaznov added inline comments.Nov 4 2021, 8:49 AM
clang/include/clang/Basic/OpenCLExtensions.def
114

Oops, sorry I missed that. @Anastasia, I think this one is header only. We discussed that here: https://reviews.llvm.org/D103241. We should either extend -cl-ext for unknown features (finally) or use it as -D__opencl_c_atomic_scope_all_devices

Revision Contents

PathSize
clang/
include/
clang/
Basic/
2 lines
lib/
Headers/
2 lines
test/
SemaOpenCL/
4 lines

Diff 367545

clang/include/clang/Basic/OpenCLExtensions.def

Context not available.
OPENCL_OPTIONALCOREFEATURE(__opencl_c_generic_address_space, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_generic_address_space, false, 300, OCL_C_30)
OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_acq_rel, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_acq_rel, false, 300, OCL_C_30)
OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_seq_cst, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_seq_cst, false, 300, OCL_C_30)
OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_scope_device, false, 300, OCL_C_30)
AnastasiaUnsubmitted
Not Done
ReplyInline Actions

Do we need to add anything to clang for those features? If not they should just go into the headers, see guidelines https://clang.llvm.org/docs/OpenCLSupport.html#implementation-guidelines

CC @azabaznov

Anastasia: Do we need to add anything to clang for those features? If not they should just go into the…
OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_scope_all_devices, false, 300, OCL_C_30)
azabaznovUnsubmitted
Not Done
ReplyInline Actions

Oops, sorry I missed that. @Anastasia, I think this one is header only. We discussed that here: https://reviews.llvm.org/D103241. We should either extend -cl-ext for unknown features (finally) or use it as -D__opencl_c_atomic_scope_all_devices

azabaznov: Oops, sorry I missed that. @Anastasia, I think this one is header only. We discussed that here…
OPENCL_OPTIONALCOREFEATURE(__opencl_c_subgroups, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_subgroups, false, 300, OCL_C_30)
OPENCL_OPTIONALCOREFEATURE(__opencl_c_3d_image_writes, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_3d_image_writes, false, 300, OCL_C_30)
OPENCL_OPTIONALCOREFEATURE(__opencl_c_device_enqueue, false, 300, OCL_C_30) OPENCL_OPTIONALCOREFEATURE(__opencl_c_device_enqueue, false, 300, OCL_C_30)
Context not available.

clang/lib/Headers/opencl-c.h

Context not available.
int __ovld atomic_fetch_xor(volatile __global atomic_int *object, int operand); int __ovld atomic_fetch_xor(volatile __global atomic_int *object, int operand);
int __ovld atomic_fetch_xor(volatile __local atomic_int *object, int operand); int __ovld atomic_fetch_xor(volatile __local atomic_int *object, int operand);
uint __ovld atomic_fetch_xor(volatile __global atomic_uint *object, uint operand); uint __ovld atomic_fetch_xor(volatile __global atomic_uint *object, uint operand);
uint __ovld atomic_fetch_xor(volatile __local atomic_uint *object, uint operand);i uint __ovld atomic_fetch_xor(volatile __local atomic_uint *object, uint operand);
AnastasiaUnsubmitted
Not Done
ReplyInline Actions

This is a fairly trivial fix. You can just commit it straight away if you like. :)

Anastasia: This is a fairly trivial fix. You can just commit it straight away if you like. :)
kpetAuthorUnsubmitted
Done
ReplyInline Actions

I've committed the fix alone as b8b6a5bc86f570a6fb94b88b8c9d634c3af71eca.

kpet: I've committed the fix alone as b8b6a5bc86f570a6fb94b88b8c9d634c3af71eca.
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-uint __ovld atomic_fetch_xor(volatile __local atomic_uint *object, uint operand);
+uint __ovld atomic_fetch_xor(volatile __local atomic_uint *object,
+                             uint operand);
Lint: Pre-merge checks: clang-format: please reformat the code ``` -uint __ovld atomic_fetch_xor(volatile __local…
int __ovld atomic_fetch_and(volatile __global atomic_int *object, int operand); int __ovld atomic_fetch_and(volatile __global atomic_int *object, int operand);
int __ovld atomic_fetch_and(volatile __local atomic_int *object, int operand); int __ovld atomic_fetch_and(volatile __local atomic_int *object, int operand);
uint __ovld atomic_fetch_and(volatile __global atomic_uint *object, uint operand); uint __ovld atomic_fetch_and(volatile __global atomic_uint *object, uint operand);
Context not available.

clang/test/SemaOpenCL/features.cl

Context not available.
// FEATURES: #define __opencl_c_3d_image_writes 1 // FEATURES: #define __opencl_c_3d_image_writes 1
// FEATURES: #define __opencl_c_atomic_order_acq_rel 1 // FEATURES: #define __opencl_c_atomic_order_acq_rel 1
// FEATURES: #define __opencl_c_atomic_order_seq_cst 1 // FEATURES: #define __opencl_c_atomic_order_seq_cst 1
// FEATURES: #define __opencl_c_atomic_scope_all_devices 1
// FEATURES: #define __opencl_c_atomic_scope_device 1
// FEATURES: #define __opencl_c_device_enqueue 1 // FEATURES: #define __opencl_c_device_enqueue 1
// FEATURES: #define __opencl_c_fp64 1 // FEATURES: #define __opencl_c_fp64 1
// FEATURES: #define __opencl_c_generic_address_space 1 // FEATURES: #define __opencl_c_generic_address_space 1
Context not available.
// NO-FEATURES-NOT: __opencl_c_3d_image_writes // NO-FEATURES-NOT: __opencl_c_3d_image_writes
// NO-FEATURES-NOT: __opencl_c_atomic_order_acq_rel // NO-FEATURES-NOT: __opencl_c_atomic_order_acq_rel
// NO-FEATURES-NOT: __opencl_c_atomic_order_seq_cst // NO-FEATURES-NOT: __opencl_c_atomic_order_seq_cst
// NO-FEATURES-NOT: __opencl_c_atomic_scope_all_devices
// NO-FEATURES-NOT: __opencl_c_atomic_scope_device
// NO-FEATURES-NOT: __opencl_c_device_enqueue // NO-FEATURES-NOT: __opencl_c_device_enqueue
// NO-FEATURES-NOT: __opencl_c_fp64 // NO-FEATURES-NOT: __opencl_c_fp64
// NO-FEATURES-NOT: __opencl_c_generic_address_space // NO-FEATURES-NOT: __opencl_c_generic_address_space
Context not available.