use the feature macro dictionary attributes in more places

api/appendix_h.asciidoc

@@ -121,10 +121,10 @@ OpenCL C compilers supporting atomics orders or scopes beyond the mandated
 minimum will define some or all of following feature macros as appropriate:
 
 [none]
-* `+__opencl_c_atomic_order_acq_rel+` -- Indicating atomic operations support acquire-release orderings.
-* `+__opencl_c_atomic_order_seq_cst+` -- Indicating atomic operations and fences support acquire sequentially consistent orderings.
-* `+__opencl_c_atomic_scope_device+` -- Indicating atomic operations and fences support device-wide memory ordering constraints.
-* `+__opencl_c_atomic_scope_all_devices+` -- Indicating atomic operations and fences support all-device memory ordering constraints, across any host threads and all devices that can share SVM memory with each other and the host process.
+* {opencl_c_atomic_order_acq_rel} -- Indicating atomic operations support acquire-release orderings.
+* {opencl_c_atomic_order_seq_cst} -- Indicating atomic operations and fences support acquire sequentially consistent orderings.
+* {opencl_c_atomic_scope_device} -- Indicating atomic operations and fences support device-wide memory ordering constraints.
+* {opencl_c_atomic_scope_all_devices} -- Indicating atomic operations and fences support all-device memory ordering constraints, across any host threads and all devices that can share SVM memory with each other and the host process.
 
 == Device-Side Enqueue
 
@@ -184,9 +184,9 @@ When device-side enqueue is supported but a replaceable default on-device queue
 
 |====
 
-OpenCL C compilers supporting device-side enqueue and on-device queues will define the feature macro `+__opencl_c_device_enqueue+`.
-OpenCL C compilers that define the feature macro `+__opencl_c_device_enqueue+` must also define the feature macro `+__opencl_c_generic_address_space+` because some OpenCL C functions for device-side enqueue accept pointers to the generic address space.
-OpenCL C compilers that define the feature macro `+__opencl_c_device_enqueue+` must also define the feature macro `+__opencl_c_program_scope_global_variables+` because an implementation of blocks may interact with program scope variables in global address space as part of ABI.
+OpenCL C compilers supporting device-side enqueue and on-device queues will define the feature macro {opencl_c_device_enqueue}.
+OpenCL C compilers that define the feature macro {opencl_c_device_enqueue} must also define the feature macro {opencl_c_generic_address_space} because some OpenCL C functions for device-side enqueue accept pointers to the generic address space.
+OpenCL C compilers that define the feature macro {opencl_c_device_enqueue} must also define the feature macro {opencl_c_program_scope_global_variables} because an implementation of blocks may interact with program scope variables in global address space as part of ABI.
 
 == Pipes
 
@@ -216,8 +216,8 @@ When pipes are not supported:
 
 |====
 
-OpenCL C compilers supporting pipes will define the feature macro `+__opencl_c_pipes+`.
-OpenCL C compilers that define the feature macro `+__opencl_c_pipes+` must also define the feature macro `+__opencl_c_generic_address_space+` because some OpenCL C functions for pipes accept pointers to the generic address space.
+OpenCL C compilers supporting pipes will define the feature macro {opencl_c_pipes}.
+OpenCL C compilers that define the feature macro {opencl_c_pipes} must also define the feature macro {opencl_c_generic_address_space} because some OpenCL C functions for pipes accept pointers to the generic address space.
 
 == Program Scope Global Variables
 
@@ -243,7 +243,7 @@ When program scope global variables are not supported:
 
 |====
 
-OpenCL C compilers supporting program scope global variables will define the feature macro `+__opencl_c_program_scope_global_variables+`.
+OpenCL C compilers supporting program scope global variables will define the feature macro {opencl_c_program_scope_global_variables}.
 
 // TODO: There is no SPIR-V capability specific to program scope global variables.
 // May need to update the validation rules to disallow program scope global variables
@@ -294,7 +294,7 @@ When read-write images are not supported:
 
 |====
 
-OpenCL C compilers supporting read-write images will define the feature macro `+__opencl_c_read_write_images+`.
+OpenCL C compilers supporting read-write images will define the feature macro {opencl_c_read_write_images}.
 
 == Creating 2D Images From Buffers
 
@@ -434,7 +434,7 @@ When sub-groups are not supported:
 
 |====
 
-OpenCL C compilers supporting sub-groups will define the feature macro `+__opencl_c_subgroups+`.
+OpenCL C compilers supporting sub-groups will define the feature macro {opencl_c_subgroups}.
 
 == Program Initialization and Clean-Up Kernels
 
@@ -479,7 +479,7 @@ When writing to 3D image objects is not supported:
 
 |====
 
-OpenCL C compilers supporting writing to 3D image objects will define the feature macro `+__opencl_c_3d_image_writes+`.
+OpenCL C compilers supporting writing to 3D image objects will define the feature macro {opencl_c_3d_image_writes}.
 
 == Work-group Collective Functions
 
@@ -497,7 +497,7 @@ When work-group collective functions are not supported:
 
 |====
 
-OpenCL C compilers supporting work-group collective functions will define the feature macro `+__opencl_c_work_group_collective_functions+`.
+OpenCL C compilers supporting work-group collective functions will define the feature macro {opencl_c_work_group_collective_functions}.
 
 == Generic Address Space
 
@@ -515,7 +515,7 @@ When the generic address space is not supported:
 
 |====
 
-OpenCL C compilers supporting the generic address space will define the feature macro `+__opencl_c_generic_address_space+`.
+OpenCL C compilers supporting the generic address space will define the feature macro {opencl_c_generic_address_space}.
 
 //== Required APIs
 //
@@ -549,6 +549,6 @@ OpenCL C compilers supporting the generic address space will define the feature
 Some OpenCL C language features were already optional before OpenCL 3.0, the API mechanisms for querying these have not changed.
 
 New feature macros for these optional features have been added to OpenCL C to provide a consistent mechanism for using optional features in OpenCL C 3.0.
-OpenCL C compilers supporting images will define the feature macro `+__opencl_c_images+`.
-OpenCL C compilers supporting the `double` type will define the feature macro `+__opencl_c_fp64+`.
-OpenCL C compilers supporting the `long`, `unsigned long` and `ulong` types will define the feature macro `+__opencl_c_int64+`, note that compilers for FULL_PROFILE devices must support these types and define the macro unconditionally.
+OpenCL C compilers supporting images will define the feature macro {opencl_c_images}.
+OpenCL C compilers supporting the `double` type will define the feature macro {opencl_c_fp64}.
+OpenCL C compilers supporting the `long`, `unsigned long` and `ulong` types will define the feature macro {opencl_c_int64}, note that compilers for FULL_PROFILE devices must support these types and define the macro unconditionally.

api/opencl_architecture.asciidoc

@@ -2168,7 +2168,7 @@ OpenCL 3.0 also adds a new version of the OpenCL C programming language, which m
 The new version of OpenCL C is backwards compatible with OpenCL C 1.2, but is not backwards compatible with OpenCL C 2.0.
 The new version of OpenCL C must be explicitly requested via the `-cl-std=` build option, otherwise a program will continue to be compiled using the highest OpenCL C 1.x language version supported for the device.
 +
-Whenever an OpenCL C feature is optional in the new version of the OpenCL C programming language, it will be paired with a feature macro, such as `+__opencl_c_feature_name+`, and a corresponding API query.
+Whenever an OpenCL C feature is optional in the new version of the OpenCL C programming language, it will be paired with a feature macro, such as {opencl_c_feature_name}, and a corresponding API query.
 If a feature macro is defined then the feature is supported by the OpenCL C compiler, otherwise the optional feature is not supported.
 
 In order to allow future versions of OpenCL to support new types of

api/opencl_platform_layer.asciidoc

@@ -2068,9 +2068,9 @@ returned for {CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES_KHR}:
 |====
 | Feature Bit | Feature Macro
 | {CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR}
- | `__opencl_c_integer_dot_product_input_4x8bit_packed`
+ | {opencl_c_integer_dot_product_input_4x8bit_packed}
 | {CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR}
- | `__opencl_c_integer_dot_product_input_4x8bit`
+ | {opencl_c_integer_dot_product_input_4x8bit}
 |====
 endif::cl_khr_integer_dot_product[]
 

c/footnotes.asciidoc

@@ -22,12 +22,12 @@ The <<C11-spec,C11>> consume operation is not supported. \
 
 :fn-atomic-double-supported: pass:n[ \
 The `atomic_double` type is only supported if double precision is supported and the *cl_khr_int64_base_atomics* and *cl_khr_int64_extended_atomics* extensions are supported and have been enabled. \
-If this is the case then an OpenCL C 3.0 compiler must also define the `+__opencl_c_fp64+` feature. \
+If this is the case then an OpenCL C 3.0 compiler must also define the {opencl_c_fp64} feature. \
 ]
 
 :fn-atomic-int64-supported: pass:n[ \
 The atomic_long and atomic_ulong types are supported if the *cl_khr_int64_base_atomics* and *cl_khr_int64_extended_atomics* extensions are supported and have been enabled. \
-If this is the case then an OpenCL C 3.0 compiler must also define the `+__opencl_c_int64+` feature. \
+If this is the case then an OpenCL C 3.0 compiler must also define the {opencl_c_int64} feature. \
 ]
 
 :fn-atomic-size_t-supported: pass:n[ \
@@ -77,17 +77,17 @@ Although `CL_UNORM_INT_101010_2` was added in OpenCL 2.1, because there was no O
 
 :fn-double: pass:n[ \
 The `double` scalar type is an optional type that is supported if the value of the `CL_DEVICE_DOUBLE_FP_CONFIG` device query is not zero. \
-If this is the case then an OpenCL C 3.0 compiler must also define the `+__opencl_c_fp64+` feature macro. \
+If this is the case then an OpenCL C 3.0 compiler must also define the {opencl_c_fp64} feature macro. \
 ]
 
 :fn-double-supported: pass:n[ \
 Only if double precision is supported. \
-In OpenCL C 3.0 this will be indicated by the presence of the `+__opencl_c_fp64+` feature macro. \
+In OpenCL C 3.0 this will be indicated by the presence of the {opencl_c_fp64} feature macro. \
 ]
 
 :fn-double-vec: pass:n[ \
 The `double__n__` vector type is an optional type that is supported if the value of the `CL_DEVICE_DOUBLE_FP_CONFIG` device query is not zero. \
-If this is the case then an OpenCL C 3.0 compiler must also define the `+__opencl_c_fp64+` feature macro. \
+If this is the case then an OpenCL C 3.0 compiler must also define the {opencl_c_fp64} feature macro. \
 ]
 
 :fn-dse-CLK_ENQUEUE_FLAGS_WAIT_WORK_GROUP: pass:n[ \
@@ -132,7 +132,7 @@ If an implementation extends this specification to support IEEE-754 flags or exc
 
 :fn-float-types-supported: pass:n[ \
 The `half` scalar and vector types can only be used if the *cl_khr_fp16* extension is supported and has been enabled. \
-The `double` scalar and vector types can only be used if `double` precision is supported, e.g. for OpenCL C 3.0 the `+__opencl_c_fp64+` feature macro is present. \
+The `double` scalar and vector types can only be used if `double` precision is supported, e.g. for OpenCL C 3.0 the {opencl_c_fp64} feature macro is present. \
 ]
 
 :fn-fmin-fmax-nan: pass:n[ \
@@ -155,7 +155,7 @@ Refer to the detailed description of the built-in <<image-read-and-write-functio
 
 :fn-int64-supported: pass:n[ \
 Only if 64-bit integers are supported. \
-In OpenCL C 3.0 this will be indicated by the presence of the `+__opencl_c_int64+` feature macro. \
+In OpenCL C 3.0 this will be indicated by the presence of the {opencl_c_int64} feature macro. \
 ]
 
 :fn-integer-conversion-rank: pass:n[ \
@@ -168,12 +168,12 @@ Integer promotion is described in <<C99-spec,section 6.3.1.1 of the C99 Specific
 
 :fn-long: pass:n[ \
 The `long`, `unsigned long` and `ulong` scalar types are optional types for EMBEDDED profile devices that are supported if the value of the `CL_DEVICE_EXTENSIONS` device query contains *cles_khr_int64*. \
-An OpenCL C 3.0 compiler must also define the `+__opencl_c_int64+` feature macro unconditionally for FULL profile devices, or for EMBEDDED profile devices that support these types. \
+An OpenCL C 3.0 compiler must also define the {opencl_c_int64} feature macro unconditionally for FULL profile devices, or for EMBEDDED profile devices that support these types. \
 ]
 
 :fn-long-vec: pass:n[ \
 The `long__n__` and `ulong__n__` vector types are optional types for EMBEDDED profile devices that are supported if the value of the `CL_DEVICE_EXTENSIONS` device query contains *cles_khr_int64*. \
-An OpenCL C 3.0 compiler must also define the `+__opencl_c_int64+` feature macro unconditionally for FULL profile devices, or for EMBEDDED profile devices that support these types. \
+An OpenCL C 3.0 compiler must also define the {opencl_c_int64} feature macro unconditionally for FULL profile devices, or for EMBEDDED profile devices that support these types. \
 ]
 
 :fn-mad-caution: pass:n[ \

ext/to_core_features.asciidoc

@@ -60,4 +60,4 @@
 === For OpenCL 3.0:
 
 * The API functionality described by *cl_khr_extended_versioning* is now part of the core API feature set, with minor modifications.
-* The built-in functions described by *cl_khr_subgroups* are now supported in OpenCL C 3.0 when the `+__opencl_c_subgroups+` feature is supported.
+* The built-in functions described by *cl_khr_subgroups* are now supported in OpenCL C 3.0 when the {opencl_c_subgroups} feature is supported.