Skip to content

Commit f184627

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

File tree

2 files changed

+224
-274
lines changed

2 files changed

+224
-274
lines changed

‎sycl/include/sycl/usm.hpp

100644100755
Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -21,247 +21,247 @@ namespace sycl {
2121
// Explicit USM
2222
///
2323
__SYCL_EXPORT void *malloc_device(size_t size, const device &dev,
24-
const context &ctxt _CODELOCPARAM(&CL));
24+
const context &ctxt _CODELOCPARAM(&CodeLoc));
2525
__SYCL_EXPORT void *
2626
malloc_device(size_t size, const device &dev, const context &ctxt,
27-
const property_list &propList _CODELOCPARAM(&CL));
27+
const property_list &propList _CODELOCPARAM(&CodeLoc));
2828
__SYCL_EXPORT void *malloc_device(size_t size,
29-
const queue &q _CODELOCPARAM(&CL));
29+
const queue &q _CODELOCPARAM(&CodeLoc));
3030
__SYCL_EXPORT void *
3131
malloc_device(size_t size, const queue &q,
32-
const property_list &propList _CODELOCPARAM(&CL));
32+
const property_list &propList _CODELOCPARAM(&CodeLoc));
3333

3434
__SYCL_EXPORT void *
3535
aligned_alloc_device(size_t alignment, size_t size, const device &dev,
36-
const context &ctxt _CODELOCPARAM(&CL));
36+
const context &ctxt _CODELOCPARAM(&CodeLoc));
3737
__SYCL_EXPORT void *
3838
aligned_alloc_device(size_t alignment, size_t size, const device &dev,
3939
const context &ctxt,
40-
const property_list &propList _CODELOCPARAM(&CL));
40+
const property_list &propList _CODELOCPARAM(&CodeLoc));
4141
__SYCL_EXPORT void *aligned_alloc_device(size_t alignment, size_t size,
42-
const queue &q _CODELOCPARAM(&CL));
42+
const queue &q _CODELOCPARAM(&CodeLoc));
4343
__SYCL_EXPORT void *
4444
aligned_alloc_device(size_t alignment, size_t size, const queue &q,
45-
const property_list &propList _CODELOCPARAM(&CL));
45+
const property_list &propList _CODELOCPARAM(&CodeLoc));
4646

47-
__SYCL_EXPORT void free(void *ptr, const context &ctxt _CODELOCPARAM(&CL));
48-
__SYCL_EXPORT void free(void *ptr, const queue &q _CODELOCPARAM(&CL));
47+
__SYCL_EXPORT void free(void *ptr, const context &ctxt _CODELOCPARAM(&CodeLoc));
48+
__SYCL_EXPORT void free(void *ptr, const queue &q _CODELOCPARAM(&CodeLoc));
4949

5050
///
5151
// Restricted USM
5252
///
5353
__SYCL_EXPORT void *malloc_host(size_t size,
54-
const context &ctxt _CODELOCPARAM(&CL));
54+
const context &ctxt _CODELOCPARAM(&CodeLoc));
5555
__SYCL_EXPORT void *
5656
malloc_host(size_t size, const context &ctxt,
57-
const property_list &propList _CODELOCPARAM(&CL));
58-
__SYCL_EXPORT void *malloc_host(size_t size, const queue &q _CODELOCPARAM(&CL));
57+
const property_list &propList _CODELOCPARAM(&CodeLoc));
58+
__SYCL_EXPORT void *malloc_host(size_t size, const queue &q _CODELOCPARAM(&CodeLoc));
5959
__SYCL_EXPORT void *
6060
malloc_host(size_t size, const queue &q,
61-
const property_list &propList _CODELOCPARAM(&CL));
61+
const property_list &propList _CODELOCPARAM(&CodeLoc));
6262

6363
__SYCL_EXPORT void *malloc_shared(size_t size, const device &dev,
64-
const context &ctxt _CODELOCPARAM(&CL));
64+
const context &ctxt _CODELOCPARAM(&CodeLoc));
6565
__SYCL_EXPORT void *
6666
malloc_shared(size_t size, const device &dev, const context &ctxt,
67-
const property_list &propList _CODELOCPARAM(&CL));
67+
const property_list &propList _CODELOCPARAM(&CodeLoc));
6868
__SYCL_EXPORT void *malloc_shared(size_t size,
69-
const queue &q _CODELOCPARAM(&CL));
69+
const queue &q _CODELOCPARAM(&CodeLoc));
7070
__SYCL_EXPORT void *
7171
malloc_shared(size_t size, const queue &q,
72-
const property_list &propList _CODELOCPARAM(&CL));
72+
const property_list &propList _CODELOCPARAM(&CodeLoc));
7373

7474
__SYCL_EXPORT void *aligned_alloc_host(size_t alignment, size_t size,
75-
const context &ctxt _CODELOCPARAM(&CL));
75+
const context &ctxt _CODELOCPARAM(&CodeLoc));
7676
__SYCL_EXPORT void *
7777
aligned_alloc_host(size_t alignment, size_t size, const context &ctxt,
78-
const property_list &propList _CODELOCPARAM(&CL));
78+
const property_list &propList _CODELOCPARAM(&CodeLoc));
7979
__SYCL_EXPORT void *aligned_alloc_host(size_t alignment, size_t size,
80-
const queue &q _CODELOCPARAM(&CL));
80+
const queue &q _CODELOCPARAM(&CodeLoc));
8181
__SYCL_EXPORT void *
8282
aligned_alloc_host(size_t alignment, size_t size, const queue &q,
83-
const property_list &propList _CODELOCPARAM(&CL));
83+
const property_list &propList _CODELOCPARAM(&CodeLoc));
8484

8585
__SYCL_EXPORT void *
8686
aligned_alloc_shared(size_t alignment, size_t size, const device &dev,
87-
const context &ctxt _CODELOCPARAM(&CL));
87+
const context &ctxt _CODELOCPARAM(&CodeLoc));
8888
__SYCL_EXPORT void *
8989
aligned_alloc_shared(size_t alignment, size_t size, const device &dev,
9090
const context &ctxt,
91-
const property_list &propList _CODELOCPARAM(&CL));
91+
const property_list &propList _CODELOCPARAM(&CodeLoc));
9292
__SYCL_EXPORT void *aligned_alloc_shared(size_t alignment, size_t size,
93-
const queue &q _CODELOCPARAM(&CL));
93+
const queue &q _CODELOCPARAM(&CodeLoc));
9494
__SYCL_EXPORT void *
9595
aligned_alloc_shared(size_t alignment, size_t size, const queue &q,
96-
const property_list &propList _CODELOCPARAM(&CL));
96+
const property_list &propList _CODELOCPARAM(&CodeLoc));
9797

9898
///
9999
// single form
100100
///
101101
__SYCL_EXPORT void *malloc(size_t size, const device &dev, const context &ctxt,
102-
usm::alloc kind _CODELOCPARAM(&CL));
102+
usm::alloc kind _CODELOCPARAM(&CodeLoc));
103103
__SYCL_EXPORT void *malloc(size_t size, const device &dev, const context &ctxt,
104104
usm::alloc kind,
105-
const property_list &propList _CODELOCPARAM(&CL));
105+
const property_list &propList _CODELOCPARAM(&CodeLoc));
106106
__SYCL_EXPORT void *malloc(size_t size, const queue &q,
107-
usm::alloc kind _CODELOCPARAM(&CL));
107+
usm::alloc kind _CODELOCPARAM(&CodeLoc));
108108
__SYCL_EXPORT void *malloc(size_t size, const queue &q, usm::alloc kind,
109-
const property_list &propList _CODELOCPARAM(&CL));
109+
const property_list &propList _CODELOCPARAM(&CodeLoc));
110110

111111
__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size,
112112
const device &dev, const context &ctxt,
113-
usm::alloc kind _CODELOCPARAM(&CL));
113+
usm::alloc kind _CODELOCPARAM(&CodeLoc));
114114
__SYCL_EXPORT void *
115115
aligned_alloc(size_t alignment, size_t size, const device &dev,
116116
const context &ctxt, usm::alloc kind,
117-
const property_list &propList _CODELOCPARAM(&CL));
117+
const property_list &propList _CODELOCPARAM(&CodeLoc));
118118
__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size, const queue &q,
119-
usm::alloc kind _CODELOCPARAM(&CL));
119+
usm::alloc kind _CODELOCPARAM(&CodeLoc));
120120
__SYCL_EXPORT void *
121121
aligned_alloc(size_t alignment, size_t size, const queue &q, usm::alloc kind,
122-
const property_list &propList _CODELOCPARAM(&CL));
122+
const property_list &propList _CODELOCPARAM(&CodeLoc));
123123

124124
///
125125
// Template forms
126126
///
127127
template <typename T>
128128
T *malloc_device(
129129
size_t Count, const device &Dev, const context &Ctxt,
130-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
131-
_CODELOCARG(&CL);
130+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
131+
_CODELOCARG(&CodeLoc);
132132
return static_cast<T *>(aligned_alloc_device(alignof(T), Count * sizeof(T),
133-
Dev, Ctxt, PropList, CL));
133+
Dev, Ctxt, PropList, CodeLoc));
134134
}
135135

136136
template <typename T>
137137
T *malloc_device(
138138
size_t Count, const queue &Q,
139-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
140-
_CODELOCARG(&CL);
141-
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList, CL);
139+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
140+
_CODELOCARG(&CodeLoc);
141+
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc);
142142
}
143143

144144
template <typename T>
145145
T *aligned_alloc_device(
146146
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
147-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
148-
_CODELOCARG(&CL);
147+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
148+
_CODELOCARG(&CodeLoc);
149149
return static_cast<T *>(aligned_alloc_device(
150-
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CL));
150+
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
151151
}
152152

153153
template <typename T>
154154
T *aligned_alloc_device(
155155
size_t Alignment, size_t Count, const queue &Q,
156-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
157-
_CODELOCARG(&CL);
156+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
157+
_CODELOCARG(&CodeLoc);
158158
return aligned_alloc_device<T>(Alignment, Count, Q.get_device(),
159-
Q.get_context(), PropList, CL);
159+
Q.get_context(), PropList, CodeLoc);
160160
}
161161

162162
template <typename T>
163163
T *malloc_host(
164164
size_t Count, const context &Ctxt,
165-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
166-
_CODELOCARG(&CL);
165+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
166+
_CODELOCARG(&CodeLoc);
167167
return static_cast<T *>(
168-
aligned_alloc_host(alignof(T), Count * sizeof(T), Ctxt, PropList, CL));
168+
aligned_alloc_host(alignof(T), Count * sizeof(T), Ctxt, PropList, CodeLoc));
169169
}
170170

171171
template <typename T>
172172
T *malloc_host(
173173
size_t Count, const queue &Q,
174-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
175-
_CODELOCARG(&CL);
176-
return malloc_host<T>(Count, Q.get_context(), PropList, CL);
174+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
175+
_CODELOCARG(&CodeLoc);
176+
return malloc_host<T>(Count, Q.get_context(), PropList, CodeLoc);
177177
}
178178

179179
template <typename T>
180180
T *malloc_shared(
181181
size_t Count, const device &Dev, const context &Ctxt,
182-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
183-
_CODELOCARG(&CL);
182+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
183+
_CODELOCARG(&CodeLoc);
184184
return static_cast<T *>(aligned_alloc_shared(alignof(T), Count * sizeof(T),
185-
Dev, Ctxt, PropList, CL));
185+
Dev, Ctxt, PropList, CodeLoc));
186186
}
187187

188188
template <typename T>
189189
T *malloc_shared(
190190
size_t Count, const queue &Q,
191-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
192-
_CODELOCARG(&CL);
193-
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList, CL);
191+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
192+
_CODELOCARG(&CodeLoc);
193+
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc);
194194
}
195195

196196
template <typename T>
197197
T *aligned_alloc_host(
198198
size_t Alignment, size_t Count, const context &Ctxt,
199-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
200-
_CODELOCARG(&CL);
199+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
200+
_CODELOCARG(&CodeLoc);
201201
return static_cast<T *>(aligned_alloc_host(
202-
std ::max(Alignment, alignof(T)), Count * sizeof(T), Ctxt, PropList, CL));
202+
std ::max(Alignment, alignof(T)), Count * sizeof(T), Ctxt, PropList, CodeLoc));
203203
}
204204

205205
template <typename T>
206206
T *aligned_alloc_host(
207207
size_t Alignment, size_t Count, const queue &Q,
208-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
209-
_CODELOCARG(&CL);
210-
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList, CL);
208+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
209+
_CODELOCARG(&CodeLoc);
210+
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList, CodeLoc);
211211
}
212212

213213
template <typename T>
214214
T *aligned_alloc_shared(
215215
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
216-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
217-
_CODELOCARG(&CL);
216+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
217+
_CODELOCARG(&CodeLoc);
218218
return static_cast<T *>(aligned_alloc_shared(
219-
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CL));
219+
max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
220220
}
221221

222222
template <typename T>
223223
T *aligned_alloc_shared(
224224
size_t Alignment, size_t Count, const queue &Q,
225-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
226-
_CODELOCARG(&CL);
225+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
226+
_CODELOCARG(&CodeLoc);
227227
return aligned_alloc_shared<T>(Alignment, Count, Q.get_device(),
228-
Q.get_context(), PropList, CL);
228+
Q.get_context(), PropList, CodeLoc);
229229
}
230230

231231
template <typename T>
232232
T *malloc(
233233
size_t Count, const device &Dev, const context &Ctxt, usm::alloc Kind,
234-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
235-
_CODELOCARG(&CL);
234+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
235+
_CODELOCARG(&CodeLoc);
236236
return static_cast<T *>(aligned_alloc(alignof(T), Count * sizeof(T), Dev,
237-
Ctxt, Kind, PropList, CL));
237+
Ctxt, Kind, PropList, CodeLoc));
238238
}
239239

240240
template <typename T>
241241
T *malloc(
242242
size_t Count, const queue &Q, usm::alloc Kind,
243-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
244-
_CODELOCARG(&CL);
245-
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList, CL);
243+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
244+
_CODELOCARG(&CodeLoc);
245+
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList, CodeLoc);
246246
}
247247

248248
template <typename T>
249249
T *aligned_alloc(
250250
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
251-
usm::alloc Kind, const property_list &PropList = {} _CODELOCPARAM(&CL)) {
252-
_CODELOCARG(&CL);
251+
usm::alloc Kind, const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
252+
_CODELOCARG(&CodeLoc);
253253
return static_cast<T *>(aligned_alloc(max(Alignment, alignof(T)),
254254
Count * sizeof(T), Dev, Ctxt, Kind,
255-
PropList, CL));
255+
PropList, CodeLoc));
256256
}
257257

258258
template <typename T>
259259
T *aligned_alloc(
260260
size_t Alignment, size_t Count, const queue &Q, usm::alloc Kind,
261-
const property_list &PropList = {} _CODELOCPARAM(&CL)) {
262-
_CODELOCARG(&CL);
261+
const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) {
262+
_CODELOCARG(&CodeLoc);
263263
return aligned_alloc<T>(Alignment, Count, Q.get_device(), Q.get_context(),
264-
Kind, PropList, CL);
264+
Kind, PropList, CodeLoc);
265265
}
266266

267267
// Pointer queries

0 commit comments

Comments
 (0)