Skip to content

Commit 763d58e

Browse files
HabKaffeeHabKaffee
authored
[SYCL][NFC] Resolve variable name conflict with a macro (#5513)
This patch renames conflicted `detail::code_location` name from `detail::code_location CL` to `detail::code_location codeLoc`. It fixes #5479
1 parent 0ed5862 commit 763d58e

File tree

2 files changed

+92
-85
lines changed

2 files changed

+92
-85
lines changed

‎sycl/include/CL/sycl/usm.hpp‎

Lines changed: 86 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -20,133 +20,133 @@ namespace sycl {
2020
///
2121
__SYCL_EXPORT void *malloc_device(
2222
size_t size, const device &dev, const context &ctxt,
23-
const detail::code_location CL = detail::code_location::current());
23+
const detail::code_location CodeLoc = detail::code_location::current());
2424
__SYCL_EXPORT void *malloc_device(
2525
size_t size, const device &dev, const context &ctxt,
2626
const property_list &propList,
27-
const detail::code_location CL = detail::code_location::current());
27+
const detail::code_location CodeLoc = detail::code_location::current());
2828
__SYCL_EXPORT void *malloc_device(
2929
size_t size, const queue &q,
30-
const detail::code_location CL = detail::code_location::current());
30+
const detail::code_location CodeLoc = detail::code_location::current());
3131
__SYCL_EXPORT void *malloc_device(
3232
size_t size, const queue &q, const property_list &propList,
33-
const detail::code_location CL = detail::code_location::current());
33+
const detail::code_location CodeLoc = detail::code_location::current());
3434

3535
__SYCL_EXPORT void *aligned_alloc_device(
3636
size_t alignment, size_t size, const device &dev, const context &ctxt,
37-
const detail::code_location CL = detail::code_location::current());
37+
const detail::code_location CodeLoc = detail::code_location::current());
3838
__SYCL_EXPORT void *aligned_alloc_device(
3939
size_t alignment, size_t size, const device &dev, const context &ctxt,
4040
const property_list &propList,
41-
const detail::code_location CL = detail::code_location::current());
41+
const detail::code_location CodeLoc = detail::code_location::current());
4242
__SYCL_EXPORT void *aligned_alloc_device(
4343
size_t alignment, size_t size, const queue &q,
44-
const detail::code_location CL = detail::code_location::current());
44+
const detail::code_location CodeLoc = detail::code_location::current());
4545
__SYCL_EXPORT void *aligned_alloc_device(
4646
size_t alignment, size_t size, const queue &q,
4747
const property_list &propList,
48-
const detail::code_location CL = detail::code_location::current());
48+
const detail::code_location CodeLoc = detail::code_location::current());
4949

5050
__SYCL_EXPORT void
5151
free(void *ptr, const context &ctxt,
52-
const detail::code_location CL = detail::code_location::current());
52+
const detail::code_location CodeLoc = detail::code_location::current());
5353
__SYCL_EXPORT void
5454
free(void *ptr, const queue &q,
55-
const detail::code_location CL = detail::code_location::current());
55+
const detail::code_location CodeLoc = detail::code_location::current());
5656

5757
///
5858
// Restricted USM
5959
///
60-
__SYCL_EXPORT void *
61-
malloc_host(size_t size, const context &ctxt,
62-
const detail::code_location CL = detail::code_location::current());
63-
__SYCL_EXPORT void *
64-
malloc_host(size_t size, const context &ctxt, const property_list &propList,
65-
const detail::code_location CL = detail::code_location::current());
66-
__SYCL_EXPORT void *
67-
malloc_host(size_t size, const queue &q,
68-
const detail::code_location CL = detail::code_location::current());
69-
__SYCL_EXPORT void *
70-
malloc_host(size_t size, const queue &q, const property_list &propList,
71-
const detail::code_location CL = detail::code_location::current());
60+
__SYCL_EXPORT void *malloc_host(
61+
size_t size, const context &ctxt,
62+
const detail::code_location CodeLoc = detail::code_location::current());
63+
__SYCL_EXPORT void *malloc_host(
64+
size_t size, const context &ctxt, const property_list &propList,
65+
const detail::code_location CodeLoc = detail::code_location::current());
66+
__SYCL_EXPORT void *malloc_host(
67+
size_t size, const queue &q,
68+
const detail::code_location CodeLoc = detail::code_location::current());
69+
__SYCL_EXPORT void *malloc_host(
70+
size_t size, const queue &q, const property_list &propList,
71+
const detail::code_location CodeLoc = detail::code_location::current());
7272

7373
__SYCL_EXPORT void *malloc_shared(
7474
size_t size, const device &dev, const context &ctxt,
75-
const detail::code_location CL = detail::code_location::current());
75+
const detail::code_location CodeLoc = detail::code_location::current());
7676
__SYCL_EXPORT void *malloc_shared(
7777
size_t size, const device &dev, const context &ctxt,
7878
const property_list &propList,
79-
const detail::code_location CL = detail::code_location::current());
79+
const detail::code_location CodeLoc = detail::code_location::current());
8080
__SYCL_EXPORT void *malloc_shared(
8181
size_t size, const queue &q,
82-
const detail::code_location CL = detail::code_location::current());
82+
const detail::code_location CodeLoc = detail::code_location::current());
8383
__SYCL_EXPORT void *malloc_shared(
8484
size_t size, const queue &q, const property_list &propList,
85-
const detail::code_location CL = detail::code_location::current());
85+
const detail::code_location CodeLoc = detail::code_location::current());
8686

8787
__SYCL_EXPORT void *aligned_alloc_host(
8888
size_t alignment, size_t size, const context &ctxt,
89-
const detail::code_location CL = detail::code_location::current());
89+
const detail::code_location CodeLoc = detail::code_location::current());
9090
__SYCL_EXPORT void *aligned_alloc_host(
9191
size_t alignment, size_t size, const context &ctxt,
9292
const property_list &propList,
93-
const detail::code_location CL = detail::code_location::current());
93+
const detail::code_location CodeLoc = detail::code_location::current());
9494
__SYCL_EXPORT void *aligned_alloc_host(
9595
size_t alignment, size_t size, const queue &q,
96-
const detail::code_location CL = detail::code_location::current());
96+
const detail::code_location CodeLoc = detail::code_location::current());
9797
__SYCL_EXPORT void *aligned_alloc_host(
9898
size_t alignment, size_t size, const queue &q,
9999
const property_list &propList,
100-
const detail::code_location CL = detail::code_location::current());
100+
const detail::code_location CodeLoc = detail::code_location::current());
101101

102102
__SYCL_EXPORT void *aligned_alloc_shared(
103103
size_t alignment, size_t size, const device &dev, const context &ctxt,
104-
const detail::code_location CL = detail::code_location::current());
104+
const detail::code_location CodeLoc = detail::code_location::current());
105105
__SYCL_EXPORT void *aligned_alloc_shared(
106106
size_t alignment, size_t size, const device &dev, const context &ctxt,
107107
const property_list &propList,
108-
const detail::code_location CL = detail::code_location::current());
108+
const detail::code_location CodeLoc = detail::code_location::current());
109109
__SYCL_EXPORT void *aligned_alloc_shared(
110110
size_t alignment, size_t size, const queue &q,
111-
const detail::code_location CL = detail::code_location::current());
111+
const detail::code_location CodeLoc = detail::code_location::current());
112112
__SYCL_EXPORT void *aligned_alloc_shared(
113113
size_t alignment, size_t size, const queue &q,
114114
const property_list &propList,
115-
const detail::code_location CL = detail::code_location::current());
115+
const detail::code_location CodeLoc = detail::code_location::current());
116116

117117
///
118118
// single form
119119
///
120120
__SYCL_EXPORT void *
121121
malloc(size_t size, const device &dev, const context &ctxt, usm::alloc kind,
122-
const detail::code_location CL = detail::code_location::current());
122+
const detail::code_location CodeLoc = detail::code_location::current());
123123
__SYCL_EXPORT void *
124124
malloc(size_t size, const device &dev, const context &ctxt, usm::alloc kind,
125125
const property_list &propList,
126-
const detail::code_location CL = detail::code_location::current());
126+
const detail::code_location CodeLoc = detail::code_location::current());
127127
__SYCL_EXPORT void *
128128
malloc(size_t size, const queue &q, usm::alloc kind,
129-
const detail::code_location CL = detail::code_location::current());
129+
const detail::code_location CodeLoc = detail::code_location::current());
130130
__SYCL_EXPORT void *
131131
malloc(size_t size, const queue &q, usm::alloc kind,
132132
const property_list &propList,
133-
const detail::code_location CL = detail::code_location::current());
133+
const detail::code_location CodeLoc = detail::code_location::current());
134134

135135
__SYCL_EXPORT void *aligned_alloc(
136136
size_t alignment, size_t size, const device &dev, const context &ctxt,
137137
usm::alloc kind,
138-
const detail::code_location CL = detail::code_location::current());
138+
const detail::code_location CodeLoc = detail::code_location::current());
139139
__SYCL_EXPORT void *aligned_alloc(
140140
size_t alignment, size_t size, const device &dev, const context &ctxt,
141141
usm::alloc kind, const property_list &propList,
142-
const detail::code_location CL = detail::code_location::current());
142+
const detail::code_location CodeLoc = detail::code_location::current());
143143
__SYCL_EXPORT void *aligned_alloc(
144144
size_t alignment, size_t size, const queue &q, usm::alloc kind,
145-
const detail::code_location CL = detail::code_location::current());
145+
const detail::code_location CodeLoc = detail::code_location::current());
146146
__SYCL_EXPORT void *aligned_alloc(
147147
size_t alignment, size_t size, const queue &q, usm::alloc kind,
148148
const property_list &propList,
149-
const detail::code_location CL = detail::code_location::current());
149+
const detail::code_location CodeLoc = detail::code_location::current());
150150

151151
///
152152
// Template forms
@@ -155,132 +155,139 @@ template <typename T>
155155
T *malloc_device(
156156
size_t Count, const device &Dev, const context &Ctxt,
157157
const property_list &PropList = {},
158-
const detail::code_location CL = detail::code_location::current()) {
158+
const detail::code_location CodeLoc = detail::code_location::current()) {
159159
return static_cast<T *>(
160-
malloc_device(Count * sizeof(T), Dev, Ctxt, PropList, CL));
160+
malloc_device(Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
161161
}
162162

163163
template <typename T>
164164
T *malloc_device(
165165
size_t Count, const queue &Q, const property_list &PropList = {},
166-
const detail::code_location CL = detail::code_location::current()) {
167-
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList, CL);
166+
const detail::code_location CodeLoc = detail::code_location::current()) {
167+
return malloc_device<T>(Count, Q.get_device(), Q.get_context(), PropList,
168+
CodeLoc);
168169
}
169170

170171
template <typename T>
171172
T *aligned_alloc_device(
172173
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
173174
const property_list &PropList = {},
174-
const detail::code_location CL = detail::code_location::current()) {
175+
const detail::code_location CodeLoc = detail::code_location::current()) {
175176
return static_cast<T *>(aligned_alloc_device(Alignment, Count * sizeof(T),
176-
Dev, Ctxt, PropList, CL));
177+
Dev, Ctxt, PropList, CodeLoc));
177178
}
178179

179180
template <typename T>
180181
T *aligned_alloc_device(
181182
size_t Alignment, size_t Count, const queue &Q,
182183
const property_list &PropList = {},
183-
const detail::code_location CL = detail::code_location::current()) {
184+
const detail::code_location CodeLoc = detail::code_location::current()) {
184185
return aligned_alloc_device<T>(Alignment, Count, Q.get_device(),
185-
Q.get_context(), PropList, CL);
186+
Q.get_context(), PropList, CodeLoc);
186187
}
187188

188189
template <typename T>
189190
T *malloc_host(
190191
size_t Count, const context &Ctxt, const property_list &PropList = {},
191-
const detail::code_location CL = detail::code_location::current()) {
192-
return static_cast<T *>(malloc_host(Count * sizeof(T), Ctxt, PropList, CL));
192+
const detail::code_location CodeLoc = detail::code_location::current()) {
193+
return static_cast<T *>(
194+
malloc_host(Count * sizeof(T), Ctxt, PropList, CodeLoc));
193195
}
194196

195197
template <typename T>
196198
T *malloc_host(
197199
size_t Count, const queue &Q, const property_list &PropList = {},
198-
const detail::code_location CL = detail::code_location::current()) {
199-
return malloc_host<T>(Count, Q.get_context(), PropList, CL);
200+
const detail::code_location CodeLoc = detail::code_location::current()) {
201+
return malloc_host<T>(Count, Q.get_context(), PropList, CodeLoc);
200202
}
201203

202204
template <typename T>
203205
T *malloc_shared(
204206
size_t Count, const device &Dev, const context &Ctxt,
205207
const property_list &PropList = {},
206-
const detail::code_location CL = detail::code_location::current()) {
208+
const detail::code_location CodeLoc = detail::code_location::current()) {
207209
return static_cast<T *>(
208-
malloc_shared(Count * sizeof(T), Dev, Ctxt, PropList, CL));
210+
malloc_shared(Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc));
209211
}
210212

211213
template <typename T>
212214
T *malloc_shared(
213215
size_t Count, const queue &Q, const property_list &PropList = {},
214-
const detail::code_location CL = detail::code_location::current()) {
215-
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList, CL);
216+
const detail::code_location CodeLoc = detail::code_location::current()) {
217+
return malloc_shared<T>(Count, Q.get_device(), Q.get_context(), PropList,
218+
CodeLoc);
216219
}
217220

218221
template <typename T>
219222
T *aligned_alloc_host(
220223
size_t Alignment, size_t Count, const context &Ctxt,
221224
const property_list &PropList = {},
222-
const detail::code_location CL = detail::code_location::current()) {
223-
return static_cast<T *>(
224-
aligned_alloc_host(Alignment, Count * sizeof(T), Ctxt, PropList, CL));
225+
const detail::code_location CodeLoc = detail::code_location::current()) {
226+
return static_cast<T *>(aligned_alloc_host(Alignment, Count * sizeof(T), Ctxt,
227+
PropList, CodeLoc));
225228
}
226229

227230
template <typename T>
228231
T *aligned_alloc_host(
229232
size_t Alignment, size_t Count, const queue &Q,
230233
const property_list &PropList = {},
231-
const detail::code_location CL = detail::code_location::current()) {
232-
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList, CL);
234+
const detail::code_location CodeLoc = detail::code_location::current()) {
235+
return aligned_alloc_host<T>(Alignment, Count, Q.get_context(), PropList,
236+
CodeLoc);
233237
}
234238

235239
template <typename T>
236240
T *aligned_alloc_shared(
237241
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
238242
const property_list &PropList = {},
239-
const detail::code_location CL = detail::code_location::current()) {
243+
const detail::code_location CodeLoc = detail::code_location::current()) {
240244
return static_cast<T *>(aligned_alloc_shared(Alignment, Count * sizeof(T),
241-
Dev, Ctxt, PropList, CL));
245+
Dev, Ctxt, PropList, CodeLoc));
242246
}
243247

244248
template <typename T>
245249
T *aligned_alloc_shared(
246250
size_t Alignment, size_t Count, const queue &Q,
247251
const property_list &PropList = {},
248-
const detail::code_location CL = detail::code_location::current()) {
252+
const detail::code_location CodeLoc = detail::code_location::current()) {
249253
return aligned_alloc_shared<T>(Alignment, Count, Q.get_device(),
250-
Q.get_context(), PropList, CL);
254+
Q.get_context(), PropList, CodeLoc);
251255
}
252256

253257
template <typename T>
254-
T *malloc(size_t Count, const device &Dev, const context &Ctxt, usm::alloc Kind,
255-
const property_list &PropList = {},
256-
const detail::code_location CL = detail::code_location::current()) {
258+
T *malloc(
259+
size_t Count, const device &Dev, const context &Ctxt, usm::alloc Kind,
260+
const property_list &PropList = {},
261+
const detail::code_location CodeLoc = detail::code_location::current()) {
257262
return static_cast<T *>(
258-
malloc(Count * sizeof(T), Dev, Ctxt, Kind, PropList, CL));
263+
malloc(Count * sizeof(T), Dev, Ctxt, Kind, PropList, CodeLoc));
259264
}
260265

261266
template <typename T>
262-
T *malloc(size_t Count, const queue &Q, usm::alloc Kind,
263-
const property_list &PropList = {},
264-
const detail::code_location CL = detail::code_location::current()) {
265-
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList, CL);
267+
T *malloc(
268+
size_t Count, const queue &Q, usm::alloc Kind,
269+
const property_list &PropList = {},
270+
const detail::code_location CodeLoc = detail::code_location::current()) {
271+
return malloc<T>(Count, Q.get_device(), Q.get_context(), Kind, PropList,
272+
CodeLoc);
266273
}
267274

268275
template <typename T>
269276
T *aligned_alloc(
270277
size_t Alignment, size_t Count, const device &Dev, const context &Ctxt,
271278
usm::alloc Kind, const property_list &PropList = {},
272-
const detail::code_location CL = detail::code_location::current()) {
279+
const detail::code_location CodeLoc = detail::code_location::current()) {
273280
return static_cast<T *>(aligned_alloc(Alignment, Count * sizeof(T), Dev, Ctxt,
274-
Kind, PropList, CL));
281+
Kind, PropList, CodeLoc));
275282
}
276283

277284
template <typename T>
278285
T *aligned_alloc(
279286
size_t Alignment, size_t Count, const queue &Q, usm::alloc Kind,
280287
const property_list &PropList = {},
281-
const detail::code_location CL = detail::code_location::current()) {
288+
const detail::code_location CodeLoc = detail::code_location::current()) {
282289
return aligned_alloc<T>(Alignment, Count, Q.get_device(), Q.get_context(),
283-
Kind, PropList, CL);
290+
Kind, PropList, CodeLoc);
284291
}
285292

286293
// Pointer queries

‎sycl/include/CL/sycl/usm/usm_allocator.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ __SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size,
2626
const device &dev, const context &ctxt,
2727
usm::alloc kind,
2828
const property_list &propList,
29-
const detail::code_location CL);
29+
const detail::code_location CodeLoc);
3030
__SYCL_EXPORT void free(void *ptr, const context &ctxt,
31-
const detail::code_location CL);
31+
const detail::code_location CodeLoc);
3232

3333
template <typename T, usm::alloc AllocKind, size_t Alignment = alignof(T)>
3434
class usm_allocator {
@@ -77,12 +77,12 @@ class usm_allocator {
7777
/// Allocates memory.
7878
///
7979
/// \param NumberOfElements is a count of elements to allocate memory for.
80-
T *allocate(size_t NumberOfElements, const detail::code_location CL =
80+
T *allocate(size_t NumberOfElements, const detail::code_location CodeLoc =
8181
detail::code_location::current()) {
8282

8383
auto Result = reinterpret_cast<T *>(
8484
aligned_alloc(getAlignment(), NumberOfElements * sizeof(value_type),
85-
MDevice, MContext, AllocKind, MPropList, CL));
85+
MDevice, MContext, AllocKind, MPropList, CodeLoc));
8686
if (!Result) {
8787
throw memory_allocation_error();
8888
}
@@ -95,9 +95,9 @@ class usm_allocator {
9595
/// \param Size is a number of elements previously passed to allocate.
9696
void deallocate(
9797
T *Ptr, size_t,
98-
const detail::code_location CL = detail::code_location::current()) {
98+
const detail::code_location CodeLoc = detail::code_location::current()) {
9999
if (Ptr) {
100-
free(Ptr, MContext, CL);
100+
free(Ptr, MContext, CodeLoc);
101101
}
102102
}
103103

0 commit comments

Comments
 (0)