Skip to content

Commit b51ebb8

Browse files
authored
[SYCL][E2E] Fix deprecated warnings in Regression e2e tests (#14168)
1 parent c9842c1 commit b51ebb8

File tree

5 files changed

+14
-33
lines changed

5 files changed

+14
-33
lines changed

sycl/test-e2e/Regression/commandlist/Inputs/main.cpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ int main(int argc, char *argv[]) {
4444
int nthreadsGPU = 8;
4545
int arr_size = 20;
4646
int iter_gpu = 200;
47-
unsigned int gpu_dev = 999;
4847
unsigned int nitems = 0;
4948
bool passed = true;
5049

@@ -73,21 +72,7 @@ int main(int argc, char *argv[]) {
7372
cout << " iter GPU: " << iter_gpu << "\n";
7473
#endif
7574

76-
std::vector<sycl::device> dlist;
77-
if (gpu_dev == 999) {
78-
try {
79-
auto sel = sycl::gpu_selector();
80-
sel_dev = sel.select_device();
81-
} catch (...) {
82-
cout << "no gpu device found\n";
83-
}
84-
} else {
85-
if (gpu_dev > dlist.size() - 1) {
86-
cout << "ERROR: selected device index [" << gpu_dev << "] is too large\n";
87-
exit(1);
88-
}
89-
sel_dev = dlist[gpu_dev];
90-
}
75+
sel_dev = sycl::device(sycl::default_selector_v);
9176
std::cout << "selected dev: " << sel_dev.get_info<sycl::info::device::name>()
9277
<< "\n";
9378

sycl/test-e2e/Regression/device_num.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,37 +175,33 @@ int main() {
175175
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::all);
176176
assert(targetDevIndex >= 0 &&
177177
"Failed to find target device for default selector.");
178-
default_selector ds;
179-
device d = ds.select_device();
180-
std::cout << "default_selector selected ";
178+
device d(default_selector_v);
179+
std::cout << "default_selector_v selected ";
181180
printDeviceType(d);
182181
assert(devices[targetDevIndex] == d &&
183182
"The selected device is not the target device specified.");
184183
}
185184
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::gpu);
186185
if (targetDevIndex >= 0) {
187-
gpu_selector gs;
188-
device d = gs.select_device();
189-
std::cout << "gpu_selector selected ";
186+
device d(gpu_selector_v);
187+
std::cout << "gpu_selector_v selected ";
190188
printDeviceType(d);
191189
assert(devices[targetDevIndex] == d &&
192190
"The selected device is not the target device specified.");
193191
}
194192
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::cpu);
195193
if (targetDevIndex >= 0) {
196-
cpu_selector cs;
197-
device d = cs.select_device();
198-
std::cout << "cpu_selector selected ";
194+
device d(cpu_selector_v);
195+
std::cout << "cpu_selector_v selected ";
199196
printDeviceType(d);
200197
assert(devices[targetDevIndex] == d &&
201198
"The selected device is not the target device specified.");
202199
}
203200
targetDevIndex =
204201
GetPreferredDeviceIndex(devices, info::device_type::accelerator);
205202
if (targetDevIndex >= 0) {
206-
accelerator_selector as;
207-
device d = as.select_device();
208-
std::cout << "accelerator_selector selected ";
203+
device d(accelerator_selector_v);
204+
std::cout << "accelerator_selector_v selected ";
209205
printDeviceType(d);
210206
assert(devices[targetDevIndex] == d &&
211207
"The selected device is not the target device specified.");

sycl/test-e2e/Regression/device_pci_address_bdf_format.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
4040
continue;
4141

4242
std::string PCIAddress =
43-
dev.get_info<info::device::ext_intel_pci_address>();
43+
dev.get_info<ext::intel::info::device::pci_address>();
4444
std::cout << "PCI address = " << PCIAddress << std::endl;
4545
assert(std::regex_match(PCIAddress, ExpectedBDFFormat));
4646
}

sycl/test-e2e/Regression/group.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ bool group__get_linear_id() {
111111
cgh.parallel_for<class group__get_linear_id>(
112112
nd_range<3>{GlobalRange, LocalRange}, [=](nd_item<DIMS> I) {
113113
const auto Off = I.get_global_linear_id() * 3;
114-
const auto LI = I.get_group().get_linear_id();
114+
const auto LI = I.get_group().get_group_linear_id();
115115
Ptr[Off + 0] = LI;
116116
Ptr[Off + 1] = LI;
117117
Ptr[Off + 2] = LI;

sycl/test-e2e/Regression/image_access.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
int main() {
2222
try {
2323
sycl::range<1> Range(32);
24-
std::vector<cl_float> Data(Range.size() * 4, 0.0f);
24+
std::vector<float> Data(Range.size() * 4, 0.0f);
2525
sycl::image<1> Image(Data.data(), sycl::image_channel_order::rgba,
2626
sycl::image_channel_type::fp32, Range);
2727
sycl::queue Queue;
2828

2929
Queue.submit([&](sycl::handler &CGH) {
30-
sycl::accessor<sycl::cl_int4, 1, sycl::access::mode::read,
30+
sycl::accessor<sycl::int4, 1, sycl::access::mode::read,
3131
sycl::access::target::image,
3232
sycl::access::placeholder::false_t>
3333
A(Image, CGH);
3434
CGH.single_task<class MyKernel>([=]() {});
3535
});
3636
Queue.wait_and_throw();
3737

38-
sycl::accessor<sycl::cl_int4, 1, sycl::access::mode::read,
38+
sycl::accessor<sycl::int4, 1, sycl::access::mode::read,
3939
sycl::access::target::host_image,
4040
sycl::access::placeholder::false_t>
4141
A(Image);

0 commit comments

Comments
 (0)