Skip to content

Commit 7a4639a

Browse files
author
Sergey Kanaev
committed
[SYCL] Fix some code-style issues
Signed-off-by: Sergey Kanaev <[email protected]>
1 parent a78909d commit 7a4639a

File tree

1 file changed

+73
-69
lines changed

1 file changed

+73
-69
lines changed

sycl/include/CL/__spirv/spirv_ops.hpp

Lines changed: 73 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ template <class RetT, typename ImageT, typename TempArgT>
3131
extern SYCL_EXTERNAL RetT __spirv_ImageRead(ImageT, TempArgT);
3232

3333
template <typename ImageT, typename SampledType>
34-
extern SYCL_EXTERNAL
35-
SampledType __spirv_SampledImage(ImageT, __ocl_sampler_t);
34+
extern SYCL_EXTERNAL SampledType __spirv_SampledImage(ImageT, __ocl_sampler_t);
3635

3736
template <typename SampledType, typename TempRetT, typename TempArgT>
38-
extern SYCL_EXTERNAL TempRetT
39-
__spirv_ImageSampleExplicitLod(SampledType, TempArgT, int, float);
37+
extern SYCL_EXTERNAL TempRetT __spirv_ImageSampleExplicitLod(SampledType,
38+
TempArgT, int,
39+
float);
4040

4141
#ifdef __SYCL_NVPTX__
4242

@@ -73,8 +73,8 @@ __ocl_event_t __spirv_GroupAsyncCopy(__spv::Scope Execution,
7373
template <typename dataT>
7474
extern SYCL_EXTERNAL __ocl_event_t __spirv_GroupAsyncCopy(
7575
__spv::Scope Execution, __attribute__((opencl_local)) dataT *Dest,
76-
__attribute__((opencl_global)) dataT *Src, size_t NumElements, size_t Stride,
77-
__ocl_event_t E) noexcept;
76+
__attribute__((opencl_global)) dataT *Src, size_t NumElements,
77+
size_t Stride, __ocl_event_t E) noexcept;
7878

7979
template <typename dataT>
8080
extern SYCL_EXTERNAL __ocl_event_t __spirv_GroupAsyncCopy(
@@ -88,44 +88,44 @@ extern SYCL_EXTERNAL __ocl_event_t __spirv_GroupAsyncCopy(
8888

8989
// Atomic SPIR-V builtins
9090
#define __SPIRV_ATOMIC_LOAD(AS, Type) \
91-
extern SYCL_EXTERNAL Type __spirv_AtomicLoad( \
91+
extern SYCL_EXTERNAL Type __spirv_AtomicLoad( \
9292
AS const Type *P, __spv::Scope S, __spv::MemorySemanticsMask O);
9393
#define __SPIRV_ATOMIC_STORE(AS, Type) \
94-
extern SYCL_EXTERNAL void __spirv_AtomicStore( \
94+
extern SYCL_EXTERNAL void __spirv_AtomicStore( \
9595
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
9696
#define __SPIRV_ATOMIC_EXCHANGE(AS, Type) \
97-
extern SYCL_EXTERNAL Type __spirv_AtomicExchange( \
97+
extern SYCL_EXTERNAL Type __spirv_AtomicExchange( \
9898
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
9999
#define __SPIRV_ATOMIC_CMP_EXCHANGE(AS, Type) \
100-
extern SYCL_EXTERNAL Type __spirv_AtomicCompareExchange( \
100+
extern SYCL_EXTERNAL Type __spirv_AtomicCompareExchange( \
101101
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask E, \
102102
__spv::MemorySemanticsMask U, Type V, Type C);
103103
#define __SPIRV_ATOMIC_IADD(AS, Type) \
104-
extern SYCL_EXTERNAL Type __spirv_AtomicIAdd( \
104+
extern SYCL_EXTERNAL Type __spirv_AtomicIAdd( \
105105
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
106106
#define __SPIRV_ATOMIC_ISUB(AS, Type) \
107-
extern SYCL_EXTERNAL Type __spirv_AtomicISub( \
107+
extern SYCL_EXTERNAL Type __spirv_AtomicISub( \
108108
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
109109
#define __SPIRV_ATOMIC_SMIN(AS, Type) \
110-
extern SYCL_EXTERNAL Type __spirv_AtomicSMin( \
110+
extern SYCL_EXTERNAL Type __spirv_AtomicSMin( \
111111
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
112112
#define __SPIRV_ATOMIC_UMIN(AS, Type) \
113-
extern SYCL_EXTERNAL Type __spirv_AtomicUMin( \
113+
extern SYCL_EXTERNAL Type __spirv_AtomicUMin( \
114114
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
115115
#define __SPIRV_ATOMIC_SMAX(AS, Type) \
116-
extern SYCL_EXTERNAL Type __spirv_AtomicSMax( \
116+
extern SYCL_EXTERNAL Type __spirv_AtomicSMax( \
117117
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
118118
#define __SPIRV_ATOMIC_UMAX(AS, Type) \
119-
extern SYCL_EXTERNAL Type __spirv_AtomicUMax( \
119+
extern SYCL_EXTERNAL Type __spirv_AtomicUMax( \
120120
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
121121
#define __SPIRV_ATOMIC_AND(AS, Type) \
122-
extern SYCL_EXTERNAL Type __spirv_AtomicAnd( \
122+
extern SYCL_EXTERNAL Type __spirv_AtomicAnd( \
123123
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
124124
#define __SPIRV_ATOMIC_OR(AS, Type) \
125-
extern SYCL_EXTERNAL Type __spirv_AtomicOr( \
125+
extern SYCL_EXTERNAL Type __spirv_AtomicOr( \
126126
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
127127
#define __SPIRV_ATOMIC_XOR(AS, Type) \
128-
extern SYCL_EXTERNAL Type __spirv_AtomicXor( \
128+
extern SYCL_EXTERNAL Type __spirv_AtomicXor( \
129129
AS Type *P, __spv::Scope S, __spv::MemorySemanticsMask O, Type V);
130130

131131
#define __SPIRV_ATOMIC_FLOAT(AS, Type) \
@@ -182,49 +182,58 @@ __SPIRV_ATOMICS(__SPIRV_ATOMIC_UNSIGNED, unsigned long long)
182182
__SPIRV_ATOMICS(__SPIRV_ATOMIC_MINMAX, Min)
183183
__SPIRV_ATOMICS(__SPIRV_ATOMIC_MINMAX, Max)
184184

185-
extern SYCL_EXTERNAL bool
186-
__spirv_GroupAll(__spv::Scope Execution, bool Predicate) noexcept;
185+
extern SYCL_EXTERNAL bool __spirv_GroupAll(__spv::Scope Execution,
186+
bool Predicate) noexcept;
187187

188-
extern SYCL_EXTERNAL bool
189-
__spirv_GroupAny(__spv::Scope Execution, bool Predicate) noexcept;
188+
extern SYCL_EXTERNAL bool __spirv_GroupAny(__spv::Scope Execution,
189+
bool Predicate) noexcept;
190190

191191
template <typename dataT>
192-
extern SYCL_EXTERNAL dataT __spirv_GroupBroadcast(
193-
__spv::Scope Execution, dataT Value, uint32_t LocalId) noexcept;
192+
extern SYCL_EXTERNAL dataT __spirv_GroupBroadcast(__spv::Scope Execution,
193+
dataT Value,
194+
uint32_t LocalId) noexcept;
194195

195196
template <typename dataT>
196-
extern SYCL_EXTERNAL
197-
dataT __spirv_GroupBroadcast(__spv::Scope Execution, dataT Value,
198-
__ocl_vec_t<size_t, 2> LocalId) noexcept;
197+
extern SYCL_EXTERNAL dataT
198+
__spirv_GroupBroadcast(__spv::Scope Execution, dataT Value,
199+
__ocl_vec_t<size_t, 2> LocalId) noexcept;
199200
template <typename dataT>
200-
extern SYCL_EXTERNAL
201-
dataT __spirv_GroupBroadcast(__spv::Scope Execution, dataT Value,
202-
__ocl_vec_t<size_t, 3> LocalId) noexcept;
201+
extern SYCL_EXTERNAL dataT
202+
__spirv_GroupBroadcast(__spv::Scope Execution, dataT Value,
203+
__ocl_vec_t<size_t, 3> LocalId) noexcept;
203204

204205
template <typename dataT>
205-
extern SYCL_EXTERNAL dataT __spirv_GroupIAdd(
206-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
206+
extern SYCL_EXTERNAL dataT __spirv_GroupIAdd(__spv::Scope Execution,
207+
__spv::GroupOperation Op,
208+
dataT Value) noexcept;
207209
template <typename dataT>
208-
extern SYCL_EXTERNAL dataT __spirv_GroupFAdd(
209-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
210+
extern SYCL_EXTERNAL dataT __spirv_GroupFAdd(__spv::Scope Execution,
211+
__spv::GroupOperation Op,
212+
dataT Value) noexcept;
210213
template <typename dataT>
211-
extern SYCL_EXTERNAL dataT __spirv_GroupUMin(
212-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
214+
extern SYCL_EXTERNAL dataT __spirv_GroupUMin(__spv::Scope Execution,
215+
__spv::GroupOperation Op,
216+
dataT Value) noexcept;
213217
template <typename dataT>
214-
extern SYCL_EXTERNAL dataT __spirv_GroupSMin(
215-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
218+
extern SYCL_EXTERNAL dataT __spirv_GroupSMin(__spv::Scope Execution,
219+
__spv::GroupOperation Op,
220+
dataT Value) noexcept;
216221
template <typename dataT>
217-
extern SYCL_EXTERNAL dataT __spirv_GroupFMin(
218-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
222+
extern SYCL_EXTERNAL dataT __spirv_GroupFMin(__spv::Scope Execution,
223+
__spv::GroupOperation Op,
224+
dataT Value) noexcept;
219225
template <typename dataT>
220-
extern SYCL_EXTERNAL dataT __spirv_GroupUMax(
221-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
226+
extern SYCL_EXTERNAL dataT __spirv_GroupUMax(__spv::Scope Execution,
227+
__spv::GroupOperation Op,
228+
dataT Value) noexcept;
222229
template <typename dataT>
223-
extern SYCL_EXTERNAL dataT __spirv_GroupSMax(
224-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
230+
extern SYCL_EXTERNAL dataT __spirv_GroupSMax(__spv::Scope Execution,
231+
__spv::GroupOperation Op,
232+
dataT Value) noexcept;
225233
template <typename dataT>
226-
extern SYCL_EXTERNAL dataT __spirv_GroupFMax(
227-
__spv::Scope Execution, __spv::GroupOperation Op, dataT Value) noexcept;
234+
extern SYCL_EXTERNAL dataT __spirv_GroupFMax(__spv::Scope Execution,
235+
__spv::GroupOperation Op,
236+
dataT Value) noexcept;
228237
template <typename dataT>
229238
extern SYCL_EXTERNAL dataT
230239
__spirv_SubgroupShuffleINTEL(dataT Data, uint32_t InvocationId) noexcept;
@@ -266,12 +275,13 @@ __spirv_SubgroupBlockWriteINTEL(__attribute__((opencl_global)) uint32_t *Ptr,
266275
dataT Data) noexcept;
267276

268277
template <typename dataT>
269-
extern SYCL_EXTERNAL int32_t __spirv_ReadPipe(
270-
RPipeTy<dataT> Pipe, dataT *Data, int32_t Size, int32_t Alignment) noexcept;
278+
extern SYCL_EXTERNAL int32_t __spirv_ReadPipe(RPipeTy<dataT> Pipe, dataT *Data,
279+
int32_t Size,
280+
int32_t Alignment) noexcept;
271281
template <typename dataT>
272-
extern SYCL_EXTERNAL int32_t
273-
__spirv_WritePipe(WPipeTy<dataT> Pipe, const dataT *Data, int32_t Size,
274-
int32_t Alignment) noexcept;
282+
extern SYCL_EXTERNAL int32_t __spirv_WritePipe(WPipeTy<dataT> Pipe,
283+
const dataT *Data, int32_t Size,
284+
int32_t Alignment) noexcept;
275285
template <typename dataT>
276286
extern SYCL_EXTERNAL void
277287
__spirv_ReadPipeBlockingINTEL(RPipeTy<dataT> Pipe, dataT *Data, int32_t Size,
@@ -281,12 +291,10 @@ extern SYCL_EXTERNAL void
281291
__spirv_WritePipeBlockingINTEL(WPipeTy<dataT> Pipe, const dataT *Data,
282292
int32_t Size, int32_t Alignment) noexcept;
283293
template <typename dataT>
284-
extern SYCL_EXTERNAL RPipeTy<dataT>
285-
__spirv_CreatePipeFromPipeStorage_read(
294+
extern SYCL_EXTERNAL RPipeTy<dataT> __spirv_CreatePipeFromPipeStorage_read(
286295
const ConstantPipeStorage *Storage) noexcept;
287296
template <typename dataT>
288-
extern SYCL_EXTERNAL WPipeTy<dataT>
289-
__spirv_CreatePipeFromPipeStorage_write(
297+
extern SYCL_EXTERNAL WPipeTy<dataT> __spirv_CreatePipeFromPipeStorage_write(
290298
const ConstantPipeStorage *Storage) noexcept;
291299

292300
extern SYCL_EXTERNAL void
@@ -335,20 +343,16 @@ __SPIRV_COMPARISON(LessOrGreater)
335343

336344
#undef __SPIRV_COMPARISON
337345

338-
template <typename RetT, typename T>
339-
extern SYCL_EXTERNAL RetT __spirv_Any(T);
346+
template <typename RetT, typename T> extern SYCL_EXTERNAL RetT __spirv_Any(T);
340347

341-
template <typename RetT, typename T>
342-
extern SYCL_EXTERNAL RetT __spirv_All(T);
348+
template <typename RetT, typename T> extern SYCL_EXTERNAL RetT __spirv_All(T);
343349

344350
template <typename RetT, typename T>
345351
extern SYCL_EXTERNAL RetT __spirv_IsFinite(T);
346352

347-
template <typename RetT, typename T>
348-
extern SYCL_EXTERNAL RetT __spirv_IsInf(T);
353+
template <typename RetT, typename T> extern SYCL_EXTERNAL RetT __spirv_IsInf(T);
349354

350-
template <typename RetT, typename T>
351-
extern SYCL_EXTERNAL RetT __spirv_IsNan(T);
355+
template <typename RetT, typename T> extern SYCL_EXTERNAL RetT __spirv_IsNan(T);
352356

353357
template <typename RetT, typename T>
354358
extern SYCL_EXTERNAL RetT __spirv_IsNormal(T);
@@ -561,12 +565,12 @@ extern void __spirv_ocl_prefetch(const char *Ptr, size_t NumBytes) noexcept;
561565

562566
#endif // !__SYCL_DEVICE_ONLY__
563567

564-
extern SYCL_EXTERNAL void
565-
__spirv_ControlBarrier(__spv::Scope Execution, __spv::Scope Memory,
566-
uint32_t Semantics) noexcept;
568+
extern SYCL_EXTERNAL void __spirv_ControlBarrier(__spv::Scope Execution,
569+
__spv::Scope Memory,
570+
uint32_t Semantics) noexcept;
567571

568-
extern SYCL_EXTERNAL void
569-
__spirv_MemoryBarrier(__spv::Scope Memory, uint32_t Semantics) noexcept;
572+
extern SYCL_EXTERNAL void __spirv_MemoryBarrier(__spv::Scope Memory,
573+
uint32_t Semantics) noexcept;
570574

571575
extern SYCL_EXTERNAL void
572576
__spirv_GroupWaitEvents(__spv::Scope Execution, uint32_t NumEvents,

0 commit comments

Comments
 (0)