Skip to content

Commit 089d914

Browse files
frasercrmckfrasercrmck
committed
[CTS] Replace use of deprecated <CL/sycl.hpp>
1 parent 633ec40 commit 089d914

File tree

11 files changed

+103
-113
lines changed

11 files changed

+103
-113
lines changed

‎test/conformance/device_code/bar.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
9-
cl::sycl::queue deviceQueue;
10-
cl::sycl::range<1> numOfItems{1};
9+
sycl::queue deviceQueue;
10+
sycl::range<1> numOfItems{1};
1111

12-
deviceQueue.submit([&](cl::sycl::handler &cgh) {
13-
auto kern = [=](cl::sycl::id<1>) {};
12+
deviceQueue.submit([&](sycl::handler &cgh) {
13+
auto kern = [=](sycl::id<1>) {};
1414
cgh.parallel_for<class Bar>(numOfItems, kern);
1515
});
1616

‎test/conformance/device_code/fill.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
size_t array_size = 16;
1010
std::vector<uint32_t> A(array_size, 1);
1111
uint32_t val = 42;
12-
cl::sycl::queue sycl_queue;
13-
auto A_buff =
14-
cl::sycl::buffer<uint32_t>(A.data(), cl::sycl::range<1>(array_size));
15-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
16-
auto A_acc = A_buff.get_access<cl::sycl::access::mode::write>(cgh);
17-
cgh.parallel_for<class fill>(cl::sycl::range<1>{array_size},
18-
[A_acc, val](cl::sycl::item<1> itemId) {
12+
sycl::queue sycl_queue;
13+
auto A_buff = sycl::buffer<uint32_t>(A.data(), sycl::range<1>(array_size));
14+
sycl_queue.submit([&](sycl::handler &cgh) {
15+
auto A_acc = A_buff.get_access<sycl::access::mode::write>(cgh);
16+
cgh.parallel_for<class fill>(sycl::range<1>{array_size},
17+
[A_acc, val](sycl::item<1> itemId) {
1918
auto id = itemId.get_id(0);
2019
A_acc[id] = val;
2120
});

‎test/conformance/device_code/fill_2d.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
size_t nd_range_x = 8;
1010
size_t nd_range_y = 8;
11-
auto nd_range = cl::sycl::range<2>(nd_range_x, nd_range_y);
11+
auto nd_range = sycl::range<2>(nd_range_x, nd_range_y);
1212

1313
std::vector<uint32_t> A(nd_range_x * nd_range_y, 1);
1414
uint32_t val = 42;
15-
cl::sycl::queue sycl_queue;
15+
sycl::queue sycl_queue;
1616

17-
auto work_range = cl::sycl::nd_range<2>(nd_range, cl::sycl::range<2>(1, 1));
18-
auto A_buff = cl::sycl::buffer<uint32_t>(
19-
A.data(), cl::sycl::range<1>(nd_range_x * nd_range_y));
20-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
21-
auto A_acc = A_buff.get_access<cl::sycl::access::mode::write>(cgh);
17+
auto work_range = sycl::nd_range<2>(nd_range, sycl::range<2>(1, 1));
18+
auto A_buff = sycl::buffer<uint32_t>(
19+
A.data(), sycl::range<1>(nd_range_x * nd_range_y));
20+
sycl_queue.submit([&](sycl::handler &cgh) {
21+
auto A_acc = A_buff.get_access<sycl::access::mode::write>(cgh);
2222
cgh.parallel_for<class fill_2d>(
23-
work_range, [A_acc, val](cl::sycl::nd_item<2> item_id) {
23+
work_range, [A_acc, val](sycl::nd_item<2> item_id) {
2424
auto id = item_id.get_global_linear_id();
2525
A_acc[id] = val;
2626
});

‎test/conformance/device_code/fill_3d.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,25 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
size_t nd_range_x = 4;
1010
size_t nd_range_y = 4;
1111
size_t nd_range_z = 4;
12-
auto nd_range = cl::sycl::range<3>(nd_range_x, nd_range_y, nd_range_z);
12+
auto nd_range = sycl::range<3>(nd_range_x, nd_range_y, nd_range_z);
1313

1414
std::vector<uint32_t> A(nd_range_x * nd_range_y * nd_range_y, 1);
1515
uint32_t val = 42;
16-
cl::sycl::queue sycl_queue;
16+
sycl::queue sycl_queue;
1717

18-
auto work_range =
19-
cl::sycl::nd_range<3>(nd_range, cl::sycl::range<3>(1, 1, 1));
20-
auto A_buff = cl::sycl::buffer<uint32_t>(
21-
A.data(), cl::sycl::range<1>(nd_range_x * nd_range_y));
22-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
23-
auto A_acc = A_buff.get_access<cl::sycl::access::mode::write>(cgh);
18+
auto work_range = sycl::nd_range<3>(nd_range, sycl::range<3>(1, 1, 1));
19+
auto A_buff = sycl::buffer<uint32_t>(
20+
A.data(), sycl::range<1>(nd_range_x * nd_range_y));
21+
sycl_queue.submit([&](sycl::handler &cgh) {
22+
auto A_acc = A_buff.get_access<sycl::access::mode::write>(cgh);
2423
cgh.parallel_for<class fill_3d>(
25-
work_range, [A_acc, val](cl::sycl::nd_item<3> item_id) {
24+
work_range, [A_acc, val](sycl::nd_item<3> item_id) {
2625
auto id = item_id.get_global_linear_id();
2726
A_acc[id] = val;
2827
});

‎test/conformance/device_code/fill_usm.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
size_t array_size = 16;
1010
std::vector<uint32_t> A(array_size, 1);
1111
uint32_t val = 42;
12-
cl::sycl::queue sycl_queue;
13-
uint32_t *data = cl::sycl::malloc_shared<uint32_t>(array_size, sycl_queue);
14-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
15-
cgh.parallel_for<class fill_usm>(cl::sycl::range<1>{array_size},
16-
[data, val](cl::sycl::item<1> itemId) {
12+
sycl::queue sycl_queue;
13+
uint32_t *data = sycl::malloc_shared<uint32_t>(array_size, sycl_queue);
14+
sycl_queue.submit([&](sycl::handler &cgh) {
15+
cgh.parallel_for<class fill_usm>(sycl::range<1>{array_size},
16+
[data, val](sycl::item<1> itemId) {
1717
auto id = itemId.get_id(0);
1818
data[id] = val;
1919
});

‎test/conformance/device_code/foo.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
9-
cl::sycl::queue deviceQueue;
10-
cl::sycl::range<1> numOfItems{1};
9+
sycl::queue deviceQueue;
10+
sycl::range<1> numOfItems{1};
1111

12-
deviceQueue.submit([&](cl::sycl::handler &cgh) {
13-
auto kern = [=](cl::sycl::id<1>) {};
12+
deviceQueue.submit([&](sycl::handler &cgh) {
13+
auto kern = [=](sycl::id<1>) {};
1414
cgh.parallel_for<class Foo>(numOfItems, kern);
1515
});
1616

‎test/conformance/device_code/image_copy.cpp‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,40 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
9-
cl::sycl::queue sycl_queue;
9+
sycl::queue sycl_queue;
1010

1111
const int height = 8;
1212
const int width = 8;
13-
auto image_range = cl::sycl::range<2>(height, width);
13+
auto image_range = sycl::range<2>(height, width);
1414
const int channels = 4;
1515
std::vector<float> in_data(height * width * channels, 0.5f);
1616
std::vector<float> out_data(height * width * channels, 0);
1717

18-
cl::sycl::image<2> image_in(
19-
in_data.data(), cl::sycl::image_channel_order::rgba,
20-
cl::sycl::image_channel_type::fp32, image_range);
21-
cl::sycl::image<2> image_out(
22-
out_data.data(), cl::sycl::image_channel_order::rgba,
23-
cl::sycl::image_channel_type::fp32, image_range);
18+
sycl::image<2> image_in(in_data.data(), sycl::image_channel_order::rgba,
19+
sycl::image_channel_type::fp32, image_range);
20+
sycl::image<2> image_out(out_data.data(), sycl::image_channel_order::rgba,
21+
sycl::image_channel_type::fp32, image_range);
2422

25-
auto work_range =
26-
cl::sycl::nd_range<2>(image_range, cl::sycl::range<2>(1, 1));
27-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
28-
cl::sycl::accessor<cl::sycl::float4, 2, cl::sycl::access::mode::read,
29-
cl::sycl::access::target::image>
23+
auto work_range = sycl::nd_range<2>(image_range, sycl::range<2>(1, 1));
24+
sycl_queue.submit([&](sycl::handler &cgh) {
25+
sycl::accessor<sycl::float4, 2, sycl::access::mode::read,
26+
sycl::access::target::image>
3027
in_acc(image_in, cgh);
31-
cl::sycl::accessor<cl::sycl::float4, 2, cl::sycl::access::mode::write,
32-
cl::sycl::access::target::image>
28+
sycl::accessor<sycl::float4, 2, sycl::access::mode::write,
29+
sycl::access::target::image>
3330
out_acc(image_out, cgh);
3431

35-
cl::sycl::sampler smpl(
36-
cl::sycl::coordinate_normalization_mode::unnormalized,
37-
cl::sycl::addressing_mode::clamp,
38-
cl::sycl::filtering_mode::nearest);
32+
sycl::sampler smpl(sycl::coordinate_normalization_mode::unnormalized,
33+
sycl::addressing_mode::clamp,
34+
sycl::filtering_mode::nearest);
3935

4036
cgh.parallel_for<class image_copy>(
41-
work_range, [=](cl::sycl::nd_item<2> item_id) {
42-
auto coords = cl::sycl::int2(item_id.get_global_id(0),
43-
item_id.get_global_id(1));
37+
work_range, [=](sycl::nd_item<2> item_id) {
38+
auto coords = sycl::int2(item_id.get_global_id(0),
39+
item_id.get_global_id(1));
4440
out_acc.write(coords, in_acc.read(coords, smpl));
4541
});
4642
});

‎test/conformance/device_code/indexers_usm.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
9-
const cl::sycl::range<3> global_range(8, 8, 8);
10-
const cl::sycl::range<3> local_range(2, 2, 2);
11-
const cl::sycl::id<3> global_offset(4, 4, 4);
12-
const cl::sycl::nd_range<3> nd_range(global_range, local_range,
13-
global_offset);
9+
const sycl::range<3> global_range(8, 8, 8);
10+
const sycl::range<3> local_range(2, 2, 2);
11+
const sycl::id<3> global_offset(4, 4, 4);
12+
const sycl::nd_range<3> nd_range(global_range, local_range, global_offset);
1413

15-
cl::sycl::queue sycl_queue;
14+
sycl::queue sycl_queue;
1615
const size_t elements_per_work_item = 6;
17-
int *ptr = cl::sycl::malloc_shared<int>(global_range[0] * global_range[1] *
18-
global_range[2] *
19-
elements_per_work_item,
20-
sycl_queue);
16+
int *ptr =
17+
sycl::malloc_shared<int>(global_range[0] * global_range[1] *
18+
global_range[2] * elements_per_work_item,
19+
sycl_queue);
2120

22-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
21+
sycl_queue.submit([&](sycl::handler &cgh) {
2322
cgh.parallel_for<class indexers>(
24-
nd_range, [ptr](cl::sycl::nd_item<3> index) {
23+
nd_range, [ptr](sycl::nd_item<3> index) {
2524
int *wi_ptr =
2625
ptr + index.get_global_linear_id() * elements_per_work_item;
2726

‎test/conformance/device_code/mean.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
const int array_size = 16;
1010
const int wg_size = 4;
1111
std::vector<uint32_t> in(array_size * wg_size, 1);
1212
std::vector<uint32_t> out(array_size, 0);
13-
cl::sycl::queue sycl_queue;
14-
auto in_buff = cl::sycl::buffer<uint32_t>(
15-
in.data(), cl::sycl::range<1>(array_size * wg_size));
13+
sycl::queue sycl_queue;
14+
auto in_buff =
15+
sycl::buffer<uint32_t>(in.data(), sycl::range<1>(array_size * wg_size));
1616
auto out_buff =
17-
cl::sycl::buffer<uint32_t>(out.data(), cl::sycl::range<1>(array_size));
18-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
17+
sycl::buffer<uint32_t>(out.data(), sycl::range<1>(array_size));
18+
sycl_queue.submit([&](sycl::handler &cgh) {
1919
sycl::local_accessor<uint32_t> local_mem(wg_size, cgh);
20-
auto in_acc = in_buff.get_access<cl::sycl::access::mode::read>(cgh);
21-
auto out_acc = out_buff.get_access<cl::sycl::access::mode::write>(cgh);
20+
auto in_acc = in_buff.get_access<sycl::access::mode::read>(cgh);
21+
auto out_acc = out_buff.get_access<sycl::access::mode::write>(cgh);
2222

23-
cl::sycl::range<1> num_groups{array_size};
24-
cl::sycl::range<1> group_size{wg_size};
23+
sycl::range<1> num_groups{array_size};
24+
sycl::range<1> group_size{wg_size};
2525
cgh.parallel_for_work_group<class mean>(
26-
num_groups, group_size, [=](cl::sycl::group<1> group) {
26+
num_groups, group_size, [=](sycl::group<1> group) {
2727
auto group_id = group.get_group_id();
2828
group.parallel_for_work_item([&](sycl::h_item<1> item) {
2929
auto local_id = item.get_local_id(0);
3030
auto in_index = (group_id * wg_size) + local_id;
3131
local_mem[local_id] = in_acc[in_index];
3232
});
33-
cl::sycl::group_barrier(group);
33+
sycl::group_barrier(group);
3434
uint32_t total = 0;
3535
for (int i = 0; i < wg_size; i++) {
3636
total += local_mem[i];

‎test/conformance/device_code/saxpy.cpp‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,25 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
int main() {
99
size_t array_size = 16;
1010
std::vector<uint32_t> X(array_size, 1);
1111
std::vector<uint32_t> Y(array_size, 2);
1212
std::vector<uint32_t> Z(array_size, 0);
1313
uint32_t A = 42;
14-
auto x_buff =
15-
cl::sycl::buffer<uint32_t>(X.data(), cl::sycl::range<1>(array_size));
16-
auto y_buff =
17-
cl::sycl::buffer<uint32_t>(Y.data(), cl::sycl::range<1>(array_size));
18-
auto z_buff =
19-
cl::sycl::buffer<uint32_t>(Z.data(), cl::sycl::range<1>(array_size));
14+
auto x_buff = sycl::buffer<uint32_t>(X.data(), sycl::range<1>(array_size));
15+
auto y_buff = sycl::buffer<uint32_t>(Y.data(), sycl::range<1>(array_size));
16+
auto z_buff = sycl::buffer<uint32_t>(Z.data(), sycl::range<1>(array_size));
2017

21-
cl::sycl::queue sycl_queue;
22-
sycl_queue.submit([&](cl::sycl::handler &cgh) {
23-
auto x_acc = x_buff.get_access<cl::sycl::access::mode::read>(cgh);
24-
auto y_acc = y_buff.get_access<cl::sycl::access::mode::read>(cgh);
25-
auto z_acc = z_buff.get_access<cl::sycl::access::mode::write>(cgh);
26-
cgh.parallel_for<class saxpy>(cl::sycl::range<1>{array_size},
27-
[=](cl::sycl::item<1> itemId) {
18+
sycl::queue sycl_queue;
19+
sycl_queue.submit([&](sycl::handler &cgh) {
20+
auto x_acc = x_buff.get_access<sycl::access::mode::read>(cgh);
21+
auto y_acc = y_buff.get_access<sycl::access::mode::read>(cgh);
22+
auto z_acc = z_buff.get_access<sycl::access::mode::write>(cgh);
23+
cgh.parallel_for<class saxpy>(sycl::range<1>{array_size},
24+
[=](sycl::item<1> itemId) {
2825
auto i = itemId.get_id(0);
2926
z_acc[i] = A * x_acc[i] + y_acc[i];
3027
});

0 commit comments

Comments
 (0)