Skip to content

Commit 61310e3

Browse files
author
Steffen Larsen
committed
Consistent bitfield definition
Signed-off-by: Steffen Larsen <[email protected]>
1 parent 00e942f commit 61310e3

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

sycl/include/CL/sycl/detail/pi.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,11 @@ constexpr pi_sampler_properties PI_SAMPLER_PROPERTIES_FILTER_MODE =
513513
CL_SAMPLER_FILTER_MODE;
514514

515515
using pi_memory_order_capabilities = pi_bitfield;
516-
typedef enum {
517-
PI_MEMORY_ORDER_RELAXED = 0x01,
518-
PI_MEMORY_ORDER_ACQUIRE = 0x02,
519-
PI_MEMORY_ORDER_RELEASE = 0x04,
520-
PI_MEMORY_ORDER_ACQ_REL = 0x08,
521-
PI_MEMORY_ORDER_SEQ_CST = 0x10,
522-
} _pi_memory_order_capability;
516+
constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_RELAXED = 0x01;
517+
constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_ACQUIRE = 0x02;
518+
constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_RELEASE = 0x04;
519+
constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_ACQ_REL = 0x08;
520+
constexpr pi_memory_order_capabilities PI_MEMORY_ORDER_SEQ_CST = 0x10;
523521

524522
typedef enum {
525523
PI_PROFILING_INFO_COMMAND_QUEUED = CL_PROFILING_COMMAND_QUEUED,

sycl/include/CL/sycl/memory_enums.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ inline constexpr auto memory_order_seq_cst = memory_order::seq_cst;
4646
namespace detail {
4747

4848
inline std::vector<memory_order>
49-
readMemoryOrderBitfield(_pi_memory_order_capability bits) {
49+
readMemoryOrderBitfield(pi_memory_order_capabilities bits) {
5050
std::vector<memory_order> result;
5151
if (bits & PI_MEMORY_ORDER_RELAXED)
5252
result.push_back(memory_order::relaxed);

sycl/source/detail/context_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ context_impl::get_info<info::context::atomic_memory_order_capabilities>()
155155
cl::sycl::memory_order::release, cl::sycl::memory_order::acq_rel,
156156
cl::sycl::memory_order::seq_cst};
157157

158-
_pi_memory_order_capability Result;
158+
pi_memory_order_capabilities Result;
159159
getPlugin().call<PiApiKind::piContextGetInfo>(
160160
MContext,
161161
pi::cast<pi_context_info>(

sycl/source/detail/context_info.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct get_context_info<info::context::atomic_memory_order_capabilities> {
3838
info::context::atomic_memory_order_capabilities>::return_type;
3939

4040
static RetType get(RT::PiContext ctx, const plugin &Plugin) {
41-
_pi_memory_order_capability Result;
41+
pi_memory_order_capabilities Result;
4242
Plugin.call<PiApiKind::piContextGetInfo>(
4343
ctx,
4444
pi::cast<pi_context_info>(

sycl/source/detail/device_info.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ template <>
255255
struct get_device_info<std::vector<memory_order>,
256256
info::device::atomic_memory_order_capabilities> {
257257
static std::vector<memory_order> get(RT::PiDevice dev, const plugin &Plugin) {
258-
_pi_memory_order_capability result;
258+
pi_memory_order_capabilities result;
259259
Plugin.call_nocheck<PiApiKind::piDeviceGetInfo>(
260260
dev,
261261
pi::cast<RT::PiDeviceInfo>(
262262
info::device::atomic_memory_order_capabilities),
263-
sizeof(_pi_memory_order_capability), &result, nullptr);
263+
sizeof(pi_memory_order_capabilities), &result, nullptr);
264264
return readMemoryOrderBitfield(result);
265265
}
266266
};

0 commit comments

Comments
 (0)