Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 2058d12

Browse files
author
Pavel Samolysov
authored
[SYCL] Rename deprecated access::target::global_buffer (#647)
The sycl::access::target::global_buffer enumeration is deprecated in SYCL 2020, the target::device one should be used instead. Signed-off-by: Pavel Samolysov <[email protected]>
1 parent 5ac927c commit 2058d12

29 files changed

+176
-191
lines changed

‎SYCL/Basic/access_to_subset.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <CL/sycl.hpp>
1515

1616
using namespace cl::sycl;
17-
using acc_w =
18-
accessor<int, 2, access::mode::write, access::target::global_buffer>;
17+
using acc_w = accessor<int, 2, access::mode::write, access::target::device>;
1918

2019
int main() {
2120

‎SYCL/Basic/accessor/accessor.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct IdxID3 {
3232

3333
template <typename T>
3434
using AccAlias = cl::sycl::accessor<T, 1, cl::sycl::access::mode::write,
35-
cl::sycl::access::target::global_buffer>;
35+
cl::sycl::access::target::device>;
3636
template <typename T> struct InheritedAccessor : public AccAlias<T> {
3737

3838
using AccAlias<T>::AccAlias;
@@ -431,7 +431,7 @@ int main() {
431431
sycl::queue queue;
432432
queue.submit([&](sycl::handler &cgh) {
433433
sycl::accessor<int, 0, sycl::access::mode::read_write,
434-
sycl::access::target::global_buffer>
434+
sycl::access::target::device>
435435
B(b, cgh);
436436
cgh.single_task<class acc_with_zero_dim>([=]() {
437437
auto B2 = B;
@@ -463,13 +463,13 @@ int main() {
463463
sycl::queue queue;
464464
queue.submit([&](sycl::handler &cgh) {
465465
sycl::accessor<int, 0, sycl::access::mode::read_write,
466-
sycl::access::target::global_buffer>
466+
sycl::access::target::device>
467467
acc1(buf1, cgh);
468468
sycl::accessor<int, 1, sycl::access::mode::read_write,
469-
sycl::access::target::global_buffer>
469+
sycl::access::target::device>
470470
acc2(buf2, cgh);
471471
sycl::accessor<int, 1, sycl::access::mode::read_write,
472-
sycl::access::target::global_buffer>
472+
sycl::access::target::device>
473473
acc3(buf3, cgh, sycl::range<1>(1));
474474
cgh.single_task<class acc_alloc_buf>([=]() {
475475
acc1 *= 2;
@@ -506,7 +506,7 @@ int main() {
506506
sycl::queue queue;
507507
queue.submit([&](sycl::handler &cgh) {
508508
sycl::accessor<int, 1, sycl::access::mode::write,
509-
sycl::access::target::global_buffer>
509+
sycl::access::target::device>
510510
D(d, cgh);
511511
sycl::accessor<int, 1, sycl::access::mode::read,
512512
sycl::access::target::constant_buffer>
@@ -536,7 +536,7 @@ int main() {
536536
sycl::buffer<int, 1> c(&cnst, sycl::range<1>(1));
537537

538538
sycl::accessor<int, 1, sycl::access::mode::write,
539-
sycl::access::target::global_buffer,
539+
sycl::access::target::device,
540540
sycl::access::placeholder::true_t>
541541
D(d);
542542
sycl::accessor<int, 1, sycl::access::mode::read,
@@ -574,7 +574,7 @@ int main() {
574574
sycl::queue queue;
575575
queue.submit([&](sycl::handler &cgh) {
576576
sycl::accessor<int, 1, sycl::access::mode::write,
577-
sycl::access::target::global_buffer>
577+
sycl::access::target::device>
578578
AccA(A, cgh);
579579
sycl::accessor<int, 1, sycl::access::mode::read,
580580
sycl::access::target::constant_buffer>
@@ -609,7 +609,7 @@ int main() {
609609
sycl::queue queue;
610610
queue.submit([&](sycl::handler &cgh) {
611611
sycl::accessor<int, 1, sycl::access::mode::read_write,
612-
sycl::access::target::global_buffer>
612+
sycl::access::target::device>
613613
B(b, cgh);
614614
auto B1 = b1.template get_access<sycl::access::mode::read_write>(cgh);
615615

‎SYCL/Basic/buffer/buffer.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ int main() {
392392
});
393393

394394
myQueue.submit([&](handler &cgh) {
395-
accessor<int, 2, access::mode::write, access::target::global_buffer,
395+
accessor<int, 2, access::mode::write, access::target::device,
396396
access::placeholder::false_t>
397397
B(Buffer, cgh, range<2>(20, 20), id<2>(10, 10));
398398
cgh.parallel_for<class bufferByRangeOffset>(
@@ -621,10 +621,10 @@ int main() {
621621
{
622622
buffer<int, 1> a(data1.data(), range<1>(10));
623623
buffer<int, 1> b(data2);
624-
accessor<int, 1, access::mode::read_write, access::target::global_buffer,
624+
accessor<int, 1, access::mode::read_write, access::target::device,
625625
access::placeholder::true_t>
626626
A(a);
627-
accessor<int, 1, access::mode::read_write, access::target::global_buffer,
627+
accessor<int, 1, access::mode::read_write, access::target::device,
628628
access::placeholder::true_t>
629629
B(b);
630630
queue myQueue;
@@ -679,10 +679,12 @@ int main() {
679679

680680
queue Queue;
681681
Queue.submit([&](handler &CGH) {
682-
auto AK0 = accessor<char, 0, access::mode::read_write,
683-
access::target::global_buffer>(Buf_1, CGH);
684-
auto BK0 = accessor<char, 0, access::mode::read_write,
685-
access::target::global_buffer>(Buf_2, CGH);
682+
auto AK0 =
683+
accessor<char, 0, access::mode::read_write, access::target::device>(
684+
Buf_1, CGH);
685+
auto BK0 =
686+
accessor<char, 0, access::mode::read_write, access::target::device>(
687+
Buf_2, CGH);
686688
assert(AK0.get_size() == sizeof(char));
687689
assert(BK0.get_size() == sizeof(char));
688690
assert(AK0.get_count() == 1);

‎SYCL/Basic/event_profiling_info.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ int main() {
5151
// buffer copy
5252
queue copyQueue{sycl::property::queue::enable_profiling()};
5353
event copyEvent = copyQueue.submit([&](sycl::handler &Cgh) {
54-
accessor<int, 1, access::mode::read, access::target::global_buffer>
55-
AccessorFrom(BufferFrom, Cgh, range<1>(Size));
56-
accessor<int, 1, access::mode::write, access::target::global_buffer>
57-
AccessorTo(BufferTo, Cgh, range<1>(Size));
54+
accessor<int, 1, access::mode::read, access::target::device> AccessorFrom(
55+
BufferFrom, Cgh, range<1>(Size));
56+
accessor<int, 1, access::mode::write, access::target::device> AccessorTo(
57+
BufferTo, Cgh, range<1>(Size));
5858
Cgh.copy(AccessorFrom, AccessorTo);
5959
});
6060

‎SYCL/Basic/free_function_queries/free_function_queries.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ int main() {
3737
sycl::queue q;
3838
q.submit([&](sycl::handler &cgh) {
3939
sycl::accessor<int, 1, sycl::access::mode::write,
40-
sycl::access::target::global_buffer>
40+
sycl::access::target::device>
4141
acc(buf.get_access<sycl::access::mode::write>(cgh));
4242
sycl::accessor<int, 1, sycl::access::mode::write,
43-
sycl::access::target::global_buffer>
43+
sycl::access::target::device>
4444
results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
4545
cgh.parallel_for<class IdTest>(n, [=](sycl::id<1> i) {
4646
auto that_id = sycl::ext::oneapi::experimental::this_id<1>();
@@ -71,10 +71,10 @@ int main() {
7171
sycl::queue q;
7272
q.submit([&](sycl::handler &cgh) {
7373
sycl::accessor<int, 1, sycl::access::mode::write,
74-
sycl::access::target::global_buffer>
74+
sycl::access::target::device>
7575
acc(buf.get_access<sycl::access::mode::write>(cgh));
7676
sycl::accessor<int, 1, sycl::access::mode::write,
77-
sycl::access::target::global_buffer>
77+
sycl::access::target::device>
7878
results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
7979
cgh.parallel_for<class ItemTest>(n, [=](auto i) {
8080
static_assert(std::is_same<decltype(i), sycl::item<1>>::value,
@@ -106,10 +106,10 @@ int main() {
106106
sycl::id<1> offset(1);
107107
q.submit([&](sycl::handler &cgh) {
108108
sycl::accessor<int, 1, sycl::access::mode::write,
109-
sycl::access::target::global_buffer>
109+
sycl::access::target::device>
110110
acc(buf.get_access<sycl::access::mode::write>(cgh));
111111
sycl::accessor<int, 1, sycl::access::mode::write,
112-
sycl::access::target::global_buffer>
112+
sycl::access::target::device>
113113
results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
114114
cgh.parallel_for<class ItemOffsetTest>(
115115
sycl::range<1>{n}, offset, [=](sycl::item<1, true> i) {
@@ -140,10 +140,10 @@ int main() {
140140
sycl::nd_range<1> NDR(sycl::range<1>{n}, sycl::range<1>{2});
141141
q.submit([&](sycl::handler &cgh) {
142142
sycl::accessor<int, 1, sycl::access::mode::write,
143-
sycl::access::target::global_buffer>
143+
sycl::access::target::device>
144144
acc(buf.get_access<sycl::access::mode::write>(cgh));
145145
sycl::accessor<int, 1, sycl::access::mode::write,
146-
sycl::access::target::global_buffer>
146+
sycl::access::target::device>
147147
results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
148148
cgh.parallel_for<class NdItemTest>(NDR, [=](auto nd_i) {
149149
static_assert(std::is_same<decltype(nd_i), sycl::nd_item<1>>::value,

‎SYCL/Basic/free_function_queries/free_function_queries_sub_group.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ int main() {
4646
sycl::nd_range<1> NDR(sycl::range<1>{n}, sycl::range<1>{2});
4747
q.submit([&](cl::sycl::handler &cgh) {
4848
sycl::accessor<int, 1, sycl::access::mode::write,
49-
sycl::access::target::global_buffer>
49+
sycl::access::target::device>
5050
acc(buf.get_access<sycl::access::mode::write>(cgh));
5151
sycl::accessor<int, 1, sycl::access::mode::write,
52-
sycl::access::target::global_buffer>
52+
sycl::access::target::device>
5353
results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
5454
cgh.parallel_for<class NdItemTest>(NDR, [=](auto nd_i) {
5555
static_assert(std::is_same<decltype(nd_i), sycl::nd_item<1>>::value,

‎SYCL/Basic/handler/handler_copy_with_offset.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using namespace cl::sycl;
2323
constexpr access::mode read = access::mode::read;
2424
constexpr access::mode write = access::mode::write;
25-
constexpr access::target global_buffer = access::target::global_buffer;
25+
constexpr access::target ondevice = access::target::device;
2626

2727
int main() {
2828
{
@@ -39,8 +39,8 @@ int main() {
3939
Queue.submit([&](handler &CGH) {
4040
range<1> AccessRange{4};
4141
id<1> AccessOffset{2};
42-
auto Accessor = Buffer.get_access<write, global_buffer>(
43-
CGH, AccessRange, AccessOffset);
42+
auto Accessor =
43+
Buffer.get_access<write, ondevice>(CGH, AccessRange, AccessOffset);
4444
CGH.copy(DataGold.data(), Accessor);
4545
});
4646
Queue.wait();
@@ -63,8 +63,8 @@ int main() {
6363
Queue.submit([&](handler &CGH) {
6464
range<1> AccessRange{4};
6565
id<1> AccessOffset{2};
66-
auto Accessor = Buffer.get_access<read, global_buffer>(CGH, AccessRange,
67-
AccessOffset);
66+
auto Accessor =
67+
Buffer.get_access<read, ondevice>(CGH, AccessRange, AccessOffset);
6868
CGH.copy(Accessor, DataRaw.data());
6969
});
7070
Queue.wait();

‎SYCL/Basic/handler/handler_generic_integral_lambda.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ int main() {
2626
sycl::queue q;
2727
q.submit([&](cl::sycl::handler &cgh) {
2828
sycl::accessor<int, 1, sycl::access::mode::write,
29-
sycl::access::target::global_buffer>
29+
sycl::access::target::device>
3030
acc(buf.get_access<sycl::access::mode::write>(cgh));
3131
cgh.parallel_for<class GenericLambda>(
3232
length, [=](auto item) { acc[item.get_id()] = item; });
@@ -44,7 +44,7 @@ int main() {
4444
sycl::queue q;
4545
q.submit([&](cl::sycl::handler &cgh) {
4646
sycl::accessor<int, 1, sycl::access::mode::write,
47-
sycl::access::target::global_buffer>
47+
sycl::access::target::device>
4848
acc(buf.get_access<sycl::access::mode::write>(cgh));
4949
cgh.parallel_for<class SizeTLambda>(
5050
length, [=](std::size_t item) { acc[item] = item; });
@@ -62,7 +62,7 @@ int main() {
6262
sycl::queue q;
6363
q.submit([&](cl::sycl::handler &cgh) {
6464
sycl::accessor<int, 1, sycl::access::mode::write,
65-
sycl::access::target::global_buffer>
65+
sycl::access::target::device>
6666
acc(buf.get_access<sycl::access::mode::write>(cgh));
6767
cgh.parallel_for<class IntLambda>(length,
6868
[=](int item) { acc[item] = item; });

0 commit comments

Comments
 (0)