Skip to content

Commit b24b3a8

Browse files
MrSidimsMrSidims
authored
[SYCL][NFC] Cleanup global namespace from pipes a bit (#3986)
Signed-off-by: Dmitry Sidorov <dmitry.sidorov@intel.com>
1 parent c222497 commit b24b3a8

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

‎sycl/include/CL/__spirv/spirv_ops.hpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -604,26 +604,28 @@ __spirv_ArbitraryFloatPowNINTEL(ap_int<WA> A, int32_t MA, ap_int<WB> B,
604604
int32_t RoundingAccuracy = 0) noexcept;
605605

606606
template <typename dataT>
607-
extern SYCL_EXTERNAL int32_t __spirv_ReadPipe(RPipeTy<dataT> Pipe, dataT *Data,
608-
int32_t Size,
607+
extern SYCL_EXTERNAL int32_t __spirv_ReadPipe(__ocl_RPipeTy<dataT> Pipe,
608+
dataT *Data, int32_t Size,
609609
int32_t Alignment) noexcept;
610610
template <typename dataT>
611-
extern SYCL_EXTERNAL int32_t __spirv_WritePipe(WPipeTy<dataT> Pipe,
611+
extern SYCL_EXTERNAL int32_t __spirv_WritePipe(__ocl_WPipeTy<dataT> Pipe,
612612
const dataT *Data, int32_t Size,
613613
int32_t Alignment) noexcept;
614614
template <typename dataT>
615615
extern SYCL_EXTERNAL void
616-
__spirv_ReadPipeBlockingINTEL(RPipeTy<dataT> Pipe, dataT *Data, int32_t Size,
617-
int32_t Alignment) noexcept;
616+
__spirv_ReadPipeBlockingINTEL(__ocl_RPipeTy<dataT> Pipe, dataT *Data,
617+
int32_t Size, int32_t Alignment) noexcept;
618618
template <typename dataT>
619619
extern SYCL_EXTERNAL void
620-
__spirv_WritePipeBlockingINTEL(WPipeTy<dataT> Pipe, const dataT *Data,
620+
__spirv_WritePipeBlockingINTEL(__ocl_WPipeTy<dataT> Pipe, const dataT *Data,
621621
int32_t Size, int32_t Alignment) noexcept;
622622
template <typename dataT>
623-
extern SYCL_EXTERNAL RPipeTy<dataT> __spirv_CreatePipeFromPipeStorage_read(
623+
extern SYCL_EXTERNAL __ocl_RPipeTy<dataT>
624+
__spirv_CreatePipeFromPipeStorage_read(
624625
const ConstantPipeStorage *Storage) noexcept;
625626
template <typename dataT>
626-
extern SYCL_EXTERNAL WPipeTy<dataT> __spirv_CreatePipeFromPipeStorage_write(
627+
extern SYCL_EXTERNAL __ocl_WPipeTy<dataT>
628+
__spirv_CreatePipeFromPipeStorage_write(
627629
const ConstantPipeStorage *Storage) noexcept;
628630

629631
extern SYCL_EXTERNAL void

‎sycl/include/CL/__spirv/spirv_types.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,16 @@ struct __spirv_JointMatrixINTEL;
117117
#ifdef __SYCL_DEVICE_ONLY__
118118
// OpenCL pipe types
119119
template <typename dataT>
120-
using RPipeTy = __attribute__((pipe("read_only"))) const dataT;
120+
using __ocl_RPipeTy = __attribute__((pipe("read_only"))) const dataT;
121121
template <typename dataT>
122-
using WPipeTy = __attribute__((pipe("write_only"))) const dataT;
122+
using __ocl_WPipeTy = __attribute__((pipe("write_only"))) const dataT;
123123

124124
// OpenCL vector types
125125
template <typename dataT, int dims>
126126
using __ocl_vec_t = dataT __attribute__((ext_vector_type(dims)));
127127

128128
// Struct representing layout of pipe storage
129+
// TODO: rename to __spirv_ConstantPipeStorage
129130
struct ConstantPipeStorage {
130131
int32_t _PacketSize;
131132
int32_t _PacketAlignment;

‎sycl/include/sycl/ext/intel/pipes.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ template <class _name, class _dataT, int32_t _min_capacity = 0> class pipe {
2424
// friendly LLVM IR.
2525
static _dataT read(bool &_Success) {
2626
#ifdef __SYCL_DEVICE_ONLY__
27-
RPipeTy<_dataT> _RPipe =
27+
__ocl_RPipeTy<_dataT> _RPipe =
2828
__spirv_CreatePipeFromPipeStorage_read<_dataT>(&m_Storage);
2929
_dataT TempData;
3030
_Success = !static_cast<bool>(
@@ -40,7 +40,7 @@ template <class _name, class _dataT, int32_t _min_capacity = 0> class pipe {
4040
// friendly LLVM IR.
4141
static void write(const _dataT &_Data, bool &_Success) {
4242
#ifdef __SYCL_DEVICE_ONLY__
43-
WPipeTy<_dataT> _WPipe =
43+
__ocl_WPipeTy<_dataT> _WPipe =
4444
__spirv_CreatePipeFromPipeStorage_write<_dataT>(&m_Storage);
4545
_Success = !static_cast<bool>(
4646
__spirv_WritePipe(_WPipe, &_Data, m_Size, m_Alignment));
@@ -56,7 +56,7 @@ template <class _name, class _dataT, int32_t _min_capacity = 0> class pipe {
5656
// friendly LLVM IR.
5757
static _dataT read() {
5858
#ifdef __SYCL_DEVICE_ONLY__
59-
RPipeTy<_dataT> _RPipe =
59+
__ocl_RPipeTy<_dataT> _RPipe =
6060
__spirv_CreatePipeFromPipeStorage_read<_dataT>(&m_Storage);
6161
_dataT TempData;
6262
__spirv_ReadPipeBlockingINTEL(_RPipe, &TempData, m_Size, m_Alignment);
@@ -70,7 +70,7 @@ template <class _name, class _dataT, int32_t _min_capacity = 0> class pipe {
7070
// friendly LLVM IR.
7171
static void write(const _dataT &_Data) {
7272
#ifdef __SYCL_DEVICE_ONLY__
73-
WPipeTy<_dataT> _WPipe =
73+
__ocl_WPipeTy<_dataT> _WPipe =
7474
__spirv_CreatePipeFromPipeStorage_write<_dataT>(&m_Storage);
7575
__spirv_WritePipeBlockingINTEL(_WPipe, &_Data, m_Size, m_Alignment);
7676
#else
@@ -117,7 +117,7 @@ class kernel_readable_io_pipe {
117117
// friendly LLVM IR.
118118
static _dataT read(bool &_Success) {
119119
#ifdef __SYCL_DEVICE_ONLY__
120-
RPipeTy<_dataT> _RPipe =
120+
__ocl_RPipeTy<_dataT> _RPipe =
121121
__spirv_CreatePipeFromPipeStorage_read<_dataT>(&m_Storage);
122122
_dataT TempData;
123123
_Success = !static_cast<bool>(
@@ -134,7 +134,7 @@ class kernel_readable_io_pipe {
134134
// friendly LLVM IR.
135135
static _dataT read() {
136136
#ifdef __SYCL_DEVICE_ONLY__
137-
RPipeTy<_dataT> _RPipe =
137+
__ocl_RPipeTy<_dataT> _RPipe =
138138
__spirv_CreatePipeFromPipeStorage_read<_dataT>(&m_Storage);
139139
_dataT TempData;
140140
__spirv_ReadPipeBlockingINTEL(_RPipe, &TempData, m_Size, m_Alignment);
@@ -163,7 +163,7 @@ class kernel_writeable_io_pipe {
163163
// friendly LLVM IR.
164164
static void write(const _dataT &_Data, bool &_Success) {
165165
#ifdef __SYCL_DEVICE_ONLY__
166-
WPipeTy<_dataT> _WPipe =
166+
__ocl_WPipeTy<_dataT> _WPipe =
167167
__spirv_CreatePipeFromPipeStorage_write<_dataT>(&m_Storage);
168168
_Success = !static_cast<bool>(
169169
__spirv_WritePipe(_WPipe, &_Data, m_Size, m_Alignment));
@@ -179,7 +179,7 @@ class kernel_writeable_io_pipe {
179179
// friendly LLVM IR.
180180
static void write(const _dataT &_Data) {
181181
#ifdef __SYCL_DEVICE_ONLY__
182-
WPipeTy<_dataT> _WPipe =
182+
__ocl_WPipeTy<_dataT> _WPipe =
183183
__spirv_CreatePipeFromPipeStorage_write<_dataT>(&m_Storage);
184184
__spirv_WritePipeBlockingINTEL(_WPipe, &_Data, m_Size, m_Alignment);
185185
#else

0 commit comments

Comments
 (0)