Skip to content

Commit 68ef4a5

Browse files
committed
Fix warnings in e2e Regression tests
1 parent d90a9af commit 68ef4a5

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

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/get_subgroup_sizes.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12+
#include "sycl/info/info_desc.hpp"
1213
#include <algorithm>
1314
#include <sycl/detail/core.hpp>
1415

@@ -17,9 +18,7 @@ using namespace sycl;
1718
int main() {
1819
queue Q;
1920
auto Dev = Q.get_device();
20-
auto Vec = Dev.get_info<info::device::extensions>();
21-
if (std::find(Vec.begin(), Vec.end(), "cl_intel_required_subgroup_size") !=
22-
std::end(Vec)) {
21+
if (Dev.get_info<info::device::max_num_sub_groups>()>1) {
2322
std::vector<size_t> SubGroupSizes =
2423
Dev.get_info<sycl::info::device::sub_group_sizes>();
2524
std::vector<size_t>::const_iterator MaxIter =

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)