Skip to content

Commit 58adc01

Browse files
smaslov-intelsmaslov-intel
committed
format
Signed-off-by: Sergey V Maslov <[email protected]>
1 parent f184627 commit 58adc01

File tree

2 files changed

+87
-63
lines changed

2 files changed

+87
-63
lines changed

‎sycl/include/sycl/usm.hpp

100755100644
Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ __SYCL_EXPORT void *
3838
aligned_alloc_device(size_t alignment, size_t size, const device &dev,
3939
const context &ctxt,
4040
const property_list &propList _CODELOCPARAM(&CodeLoc));
41-
__SYCL_EXPORT void *aligned_alloc_device(size_t alignment, size_t size,
42-
const queue &q _CODELOCPARAM(&CodeLoc));
41+
__SYCL_EXPORT void *
42+
aligned_alloc_device(size_t alignment, size_t size,
43+
const queue &q _CODELOCPARAM(&CodeLoc));
4344
__SYCL_EXPORT void *
4445
aligned_alloc_device(size_t alignment, size_t size, const queue &q,
4546
const property_list &propList _CODELOCPARAM(&CodeLoc));
@@ -55,7 +56,8 @@ __SYCL_EXPORT void *malloc_host(size_t size,
5556
__SYCL_EXPORT void *
5657
malloc_host(size_t size, const context &ctxt,
5758
const property_list &propList _CODELOCPARAM(&CodeLoc));
58-
__SYCL_EXPORT void *malloc_host(size_t size, const queue &q _CODELOCPARAM(&CodeLoc));
59+
__SYCL_EXPORT void *malloc_host(size_t size,
60+
const queue &q _CODELOCPARAM(&CodeLoc));
5961
__SYCL_EXPORT void *
6062
malloc_host(size_t size, const queue &q,
6163
const property_list &propList _CODELOCPARAM(&CodeLoc));
@@ -71,8 +73,9 @@ __SYCL_EXPORT void *
7173
malloc_shared(size_t size, const queue &q,
7274
const property_list &propList _CODELOCPARAM(&CodeLoc));
7375

74-
__SYCL_EXPORT void *aligned_alloc_host(size_t alignment, size_t size,
75-
const context &ctxt _CODELOCPARAM(&CodeLoc));
76+
__SYCL_EXPORT void *
77+
aligned_alloc_host(size_t alignment, size_t size,
78+
const context &ctxt _CODELOCPARAM(&CodeLoc));
7679
__SYCL_EXPORT void *
7780
aligned_alloc_host(size_t alignment, size_t size, const context &ctxt,
7881
const property_list &propList _CODELOCPARAM(&CodeLoc));
@@ -89,8 +92,9 @@ __SYCL_EXPORT void *
8992
aligned_alloc_shared(size_t alignment, size_t size, const device &dev,
9093
const context &ctxt,
9194
const property_list &propList _CODELOCPARAM(&CodeLoc));
92-
__SYCL_EXPORT void *aligned_alloc_shared(size_t alignment, size_t size,
93-
const queue &q _CODELOCPARAM(&CodeLoc));
95+
__SYCL_EXPORT void *
96+
aligned_alloc_shared(size_t alignment, size_t size,
97+
const queue &q _CODELOCPARAM(&CodeLoc));
9498
__SYCL_EXPORT void *
9599
aligned_alloc_shared(size_t alignment, size_t size, const queue &q,
96100
const property_list &propList _CODELOCPARAM(&CodeLoc));
@@ -100,13 +104,14 @@ aligned_alloc_shared(size_t alignment, size_t size, const queue &q,
100104
///
101105
__SYCL_EXPORT void *malloc(size_t size, const device &dev, const context &ctxt,
102106
usm::alloc kind _CODELOCPARAM(&CodeLoc));
103-
__SYCL_EXPORT void *malloc(size_t size, const device &dev, const context &ctxt,
104-
usm::alloc kind,
105-
const property_list &propList _CODELOCPARAM(&CodeLoc));
107+
__SYCL_EXPORT void *
108+
malloc(size_t size, const device &dev, const context &ctxt, usm::alloc kind,
109+
const property_list &propList _CODELOCPARAM(&CodeLoc));
106110
__SYCL_EXPORT void *malloc(size_t size, const queue &q,
107111
usm::alloc kind _CODELOCPARAM(&CodeLoc));
108-
__SYCL_EXPORT void *malloc(size_t size, const queue &q, usm::alloc kind,
109-
const property_list &propList _CODELOCPARAM(&CodeLoc));
112+
__SYCL_EXPORT void *
113+
malloc(size_t size, const queue &q, usm::alloc kind,
114+
const property_list &propList _CODELOCPARAM(&CodeLoc));
110115

111116
__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size,
112117
const device &dev, const context &ctxt,
@@ -138,16 +143,18 @@ T *malloc_device(
138143
size_t Count, const queue &Q,
139144
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
140145
_CODELOCARG(&CodeLoc);
141-
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc);
146+
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList,
147+
CodeLoc);
142148
}
143149

144150
template <typename T>
145151
T *aligned_alloc_device(
146152
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
147153
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
148154
_CODELOCARG(&CodeLoc);
149-
return static_cast<T *>(aligned_alloc_device(
150-
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
155+
return static_cast<T *>(aligned_alloc_device(max(Alignment, alignof(T)),
156+
Count * sizeof(T), Dev, Ctxt,
157+
PropList, CodeLoc));
151158
}
152159

153160
template <typename T>
@@ -164,8 +171,8 @@ T *malloc_host(
164171
size_t Count, const context &Ctxt,
165172
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
166173
_CODELOCARG(&CodeLoc);
167-
return static_cast<T *>(
168-
aligned_alloc_host(alignof(T), Count * sizeof(T), Ctxt, PropList, CodeLoc));
174+
return static_cast<T *>(aligned_alloc_host(alignof(T), Count * sizeof(T),
175+
Ctxt, PropList, CodeLoc));
169176
}
170177

171178
template <typename T>
@@ -190,33 +197,37 @@ T *malloc_shared(
190197
size_t Count, const queue &Q,
191198
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
192199
_CODELOCARG(&CodeLoc);
193-
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc);
200+
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList,
201+
CodeLoc);
194202
}
195203

196204
template <typename T>
197205
T *aligned_alloc_host(
198206
size_t Alignment, size_t Count, const context &Ctxt,
199207
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
200208
_CODELOCARG(&CodeLoc);
201-
return static_cast<T *>(aligned_alloc_host(
202-
std ::max(Alignment, alignof(T)), Count * sizeof(T), Ctxt, PropList, CodeLoc));
209+
return static_cast<T *>(aligned_alloc_host(std ::max(Alignment, alignof(T)),
210+
Count * sizeof(T), Ctxt, PropList,
211+
CodeLoc));
203212
}
204213

205214
template <typename T>
206215
T *aligned_alloc_host(
207216
size_t Alignment, size_t Count, const queue &Q,
208217
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
209218
_CODELOCARG(&CodeLoc);
210-
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList, CodeLoc);
219+
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList,
220+
CodeLoc);
211221
}
212222

213223
template <typename T>
214224
T *aligned_alloc_shared(
215225
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
216226
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
217227
_CODELOCARG(&CodeLoc);
218-
return static_cast<T *>(aligned_alloc_shared(
219-
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
228+
return static_cast<T *>(aligned_alloc_shared(max(Alignment, alignof(T)),
229+
Count * sizeof(T), Dev, Ctxt,
230+
PropList, CodeLoc));
220231
}
221232

222233
template <typename T>
@@ -242,13 +253,15 @@ T *malloc(
242253
size_t Count, const queue &Q, usm::alloc Kind,
243254
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
244255
_CODELOCARG(&CodeLoc);
245-
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList, CodeLoc);
256+
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList,
257+
CodeLoc);
246258
}
247259

248260
template <typename T>
249261
T *aligned_alloc(
250262
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
251-
usm::alloc Kind, const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
263+
usm::alloc Kind,
264+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
252265
_CODELOCARG(&CodeLoc);
253266
return static_cast<T *>(aligned_alloc(max(Alignment, alignof(T)),
254267
Count * sizeof(T), Dev, Ctxt, Kind,

‎sycl/source/detail/usm/usm_impl.cpp

100755100644
Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
// traces using the trace framework
2525
#include "xpti/xpti_trace_framework.hpp"
2626

27-
#define XPTI_CREATE_TRACEPOINT(CodeLoc) \
27+
#define XPTI_CREATE_TRACEPOINT(CodeLoc) \
2828
std::unique_ptr<xpti::framework::tracepoint_t> _TP(nullptr); \
2929
if (xptiTraceEnabled()) { \
30-
xpti::payload_t Payload{CodeLoc.functionName(), CodeLoc.fileName(), \
31-
static_cast<int>(CodeLoc.lineNumber()), \
32-
static_cast<int>(CodeLoc.columnNumber()), nullptr}; \
30+
xpti::payload_t Payload{CodeLoc.functionName(), CodeLoc.fileName(), \
31+
static_cast<int>(CodeLoc.lineNumber()), \
32+
static_cast<int>(CodeLoc.columnNumber()), \
33+
nullptr}; \
3334
_TP = std::make_unique<xpti::framework::tracepoint_t>(&Payload); \
3435
} \
3536
(void)_TP;
@@ -216,7 +217,8 @@ void *alignedAlloc(size_t Alignment, size_t Size, const context &Ctxt,
216217
return RetVal;
217218
}
218219

219-
void free(void *Ptr, const context &Ctxt, const detail::code_location &CodeLoc) {
220+
void free(void *Ptr, const context &Ctxt,
221+
const detail::code_location &CodeLoc) {
220222
XPTI_CREATE_TRACEPOINT(CodeLoc);
221223
if (Ptr == nullptr)
222224
return;
@@ -290,7 +292,8 @@ aligned_alloc_device(size_t Alignment, size_t Size, const queue &Q,
290292
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
291293
_CODELOCARG(&CodeLoc);
292294
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
293-
Q.get_device(), alloc::device, PropList, CodeLoc);
295+
Q.get_device(), alloc::device, PropList,
296+
CodeLoc);
294297
}
295298

296299
void free(void *ptr, const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) {
@@ -363,8 +366,9 @@ void *aligned_alloc_host(size_t Alignment, size_t Size,
363366
property_list{}, CodeLoc);
364367
}
365368

366-
void *aligned_alloc_host(size_t Alignment, size_t Size, const context &Ctxt,
367-
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
369+
void *
370+
aligned_alloc_host(size_t Alignment, size_t Size, const context &Ctxt,
371+
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
368372
_CODELOCARG(&CodeLoc);
369373
return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host,
370374
PropList, CodeLoc);
@@ -377,8 +381,9 @@ void *aligned_alloc_host(size_t Alignment, size_t Size,
377381
alloc::host, property_list{}, CodeLoc);
378382
}
379383

380-
void *aligned_alloc_host(size_t Alignment, size_t Size, const queue &Q,
381-
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
384+
void *
385+
aligned_alloc_host(size_t Alignment, size_t Size, const queue &Q,
386+
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
382387
_CODELOCARG(&CodeLoc);
383388
return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(),
384389
alloc::host, PropList, CodeLoc);
@@ -413,7 +418,8 @@ aligned_alloc_shared(size_t Alignment, size_t Size, const queue &Q,
413418
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
414419
_CODELOCARG(&CodeLoc);
415420
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
416-
Q.get_device(), alloc::shared, PropList, CodeLoc);
421+
Q.get_device(), alloc::shared, PropList,
422+
CodeLoc);
417423
}
418424

419425
// single form
@@ -422,78 +428,83 @@ void *malloc(size_t Size, const device &Dev, const context &Ctxt, alloc Kind,
422428
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
423429
_CODELOCARG(&CodeLoc);
424430
if (Kind == alloc::host)
425-
return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, PropList, CodeLoc);
431+
return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, PropList,
432+
CodeLoc);
426433
return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, PropList, CodeLoc);
427434
}
428435

429436
void *malloc(size_t Size, const device &Dev, const context &Ctxt,
430437
alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
431438
_CODELOCARG(&CodeLoc);
432439
if (Kind == alloc::host)
433-
return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, property_list{}, CodeLoc);
434-
return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind,
435-
property_list{}, CodeLoc);
440+
return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, property_list{},
441+
CodeLoc);
442+
return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, property_list{},
443+
CodeLoc);
436444
}
437445

438-
void *malloc(size_t Size, const queue &Q, alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
446+
void *malloc(size_t Size, const queue &Q,
447+
alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
439448
_CODELOCARG(&CodeLoc);
440449
if (Kind == alloc::host)
441450
return detail::usm::alignedAllocHost(0, Size, Q.get_context(), Kind,
442-
property_list{}, CodeLoc);
443-
return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(),
444-
Kind, property_list{}, CodeLoc);
451+
property_list{}, CodeLoc);
452+
return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(),
453+
Kind, property_list{}, CodeLoc);
445454
}
446455

447456
void *malloc(size_t Size, const queue &Q, alloc Kind,
448457
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
449458
_CODELOCARG(&CodeLoc);
450459
if (Kind == alloc::host)
451460
return detail::usm::alignedAllocHost(0, Size, Q.get_context(), Kind,
452-
PropList, CodeLoc);
453-
return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(),
454-
Kind, PropList, CodeLoc);
461+
PropList, CodeLoc);
462+
return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(),
463+
Kind, PropList, CodeLoc);
455464
}
456465

457466
void *aligned_alloc(size_t Alignment, size_t Size, const device &Dev,
458-
const context &Ctxt, alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
467+
const context &Ctxt,
468+
alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
459469
_CODELOCARG(&CodeLoc);
460470
if (Kind == alloc::host)
461471
return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind,
462-
property_list{}, CodeLoc);
472+
property_list{}, CodeLoc);
463473

464-
return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind,
465-
property_list{}, CodeLoc);
474+
return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind,
475+
property_list{}, CodeLoc);
466476
}
467477

468478
void *aligned_alloc(size_t Alignment, size_t Size, const device &Dev,
469479
const context &Ctxt, alloc Kind,
470480
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
471481
_CODELOCARG(&CodeLoc);
472482
if (Kind == alloc::host)
473-
return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind,
474-
PropList, CodeLoc);
475-
return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind,
476-
PropList, CodeLoc);
483+
return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind, PropList,
484+
CodeLoc);
485+
return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, PropList,
486+
CodeLoc);
477487
}
478488

479489
void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q,
480490
alloc Kind _CODELOCPARAMDEF(&CodeLoc)) {
481491
_CODELOCARG(&CodeLoc);
482492
if (Kind == alloc::host)
483-
return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(),
484-
Kind, property_list{}, CodeLoc);
485-
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
486-
Q.get_device(), Kind, property_list{}, CodeLoc);
493+
return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), Kind,
494+
property_list{}, CodeLoc);
495+
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
496+
Q.get_device(), Kind, property_list{},
497+
CodeLoc);
487498
}
488499

489500
void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, alloc Kind,
490501
const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) {
491502
_CODELOCARG(&CodeLoc);
492503
if (Kind == alloc::host)
493-
return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(),
494-
Kind, PropList, CodeLoc);
495-
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
496-
Q.get_device(), Kind, PropList, CodeLoc);
504+
return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), Kind,
505+
PropList, CodeLoc);
506+
return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(),
507+
Q.get_device(), Kind, PropList, CodeLoc);
497508
}
498509

499510
// Pointer queries

0 commit comments

Comments
 (0)