From 157310a2f6cd4c190d2d699546692e2619b564df Mon Sep 17 00:00:00 2001 From: David Garcia Orozco Date: Mon, 24 Jun 2024 16:04:58 -0400 Subject: [PATCH] [SYCL][E2E] Remove deprecated warnings in `XPTI` e2e tests (#14257) - Use callable device selector instead of deprecated filter selector in `buffer/multiple_queues.cpp` - Use host accessor constructor instead of deprecated buffer `get_access` call in the rest of changed files --- sycl/test-e2e/XPTI/buffer/accessors.cpp | 12 ++++++------ sycl/test-e2e/XPTI/buffer/in_cycle.cpp | 2 +- sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp | 4 ++-- sycl/test-e2e/XPTI/buffer/multiple_queues.cpp | 5 ++++- sycl/test-e2e/XPTI/buffer/recursion.cpp | 2 +- sycl/test-e2e/XPTI/buffer/sub_buffer.cpp | 4 ++-- sycl/test-e2e/XPTI/kernel/basic.cpp | 4 ++-- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/sycl/test-e2e/XPTI/buffer/accessors.cpp b/sycl/test-e2e/XPTI/buffer/accessors.cpp index 535c6ce79593..65f1b62d6b2b 100644 --- a/sycl/test-e2e/XPTI/buffer/accessors.cpp +++ b/sycl/test-e2e/XPTI/buffer/accessors.cpp @@ -45,12 +45,12 @@ int main() { (void)A6; }); }); - // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID7:.*]]|2018|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:15 - { auto HA = Buf.get_access(); } - // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID8:.*]]|2018|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:15 - { auto HA = Buf.get_access(); } - // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID9:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:15 - { auto HA = Buf.get_access(); } + // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID7:.*]]|2018|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:25 + { sycl::host_accessor HA(Buf, sycl::read_only); } + // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID8:.*]]|2018|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:25 + { sycl::host_accessor HA(Buf, sycl::write_only); } + // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID9:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:25 + { sycl::host_accessor HA(Buf, sycl::read_write); } // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:15 { auto HA = Buf.get_access(); } // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:15 diff --git a/sycl/test-e2e/XPTI/buffer/in_cycle.cpp b/sycl/test-e2e/XPTI/buffer/in_cycle.cpp index 75fd3b3b96e8..7dbd84d33628 100644 --- a/sycl/test-e2e/XPTI/buffer/in_cycle.cpp +++ b/sycl/test-e2e/XPTI/buffer/in_cycle.cpp @@ -32,7 +32,7 @@ bool func(sycl::queue &Queue, int depth = 0) { // Get read only access to the buffer on the host. // This introduces an implicit barrier which blocks execution until the // command group above completes. - const auto HostAccessor = Buffer.get_access(); + const sycl::host_accessor HostAccessor(Buffer, sycl::read_only); // Check the results. for (size_t I = 0; I < Buffer.size(); ++I) { diff --git a/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp b/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp index 874f81c11b48..247a5182413c 100644 --- a/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp +++ b/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp @@ -35,8 +35,8 @@ int main() { }); }); - const auto HostAccessor1 = Buffer1.get_access(); - const auto HostAccessor2 = Buffer2.get_access(); + const sycl::host_accessor HostAccessor1(Buffer1, sycl::read_only); + const sycl::host_accessor HostAccessor2(Buffer2, sycl::read_only); // Check the results. for (size_t I = 0; I < Buffer1.size(); ++I) { diff --git a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp index 4593ca88ae0c..659a982669c6 100644 --- a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp +++ b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp @@ -15,7 +15,10 @@ int main() { bool MismatchFound = false; - sycl::device Device{sycl::ext::oneapi::filter_selector{"cpu,accelerator"}}; + auto selector_v = [](const sycl::device &d) { + return std::max(cpu_selector_v(d), accelerator_selector_v(d)); + }; + sycl::device Device{selector_v}; auto Devices = Device.create_sub_devices< sycl::info::partition_property::partition_equally>(2); diff --git a/sycl/test-e2e/XPTI/buffer/recursion.cpp b/sycl/test-e2e/XPTI/buffer/recursion.cpp index a8a4f4ab65a2..00d90390311a 100644 --- a/sycl/test-e2e/XPTI/buffer/recursion.cpp +++ b/sycl/test-e2e/XPTI/buffer/recursion.cpp @@ -32,7 +32,7 @@ bool func(sycl::queue &Queue, int depth = 0) { // Get read only access to the buffer on the host. // This introduces an implicit barrier which blocks execution until the // command group above completes. - const auto HostAccessor = Buffer.get_access(); + const sycl::host_accessor HostAccessor(Buffer, sycl::read_only); // Check the results. for (size_t I = 0; I < Buffer.size(); ++I) { diff --git a/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp b/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp index 7bc46f33baa8..ea45c2fab6aa 100644 --- a/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp +++ b/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp @@ -33,8 +33,8 @@ int main() { Accessor1[WIid] = static_cast(WIid.get(0)); }); }); - // CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2018|1024|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:22 - auto Accessor1 = Buffer1.get_access(); + // CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2018|1024|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:25 + sycl::host_accessor Accessor1(Buffer1, sycl::read_only); for (size_t I = 32; I < 64; ++I) { if (Accessor1[I] != I - 32) { std::cout << "The result is incorrect for element: " << I diff --git a/sycl/test-e2e/XPTI/kernel/basic.cpp b/sycl/test-e2e/XPTI/kernel/basic.cpp index f4066ae6245c..59bafe844625 100644 --- a/sycl/test-e2e/XPTI/kernel/basic.cpp +++ b/sycl/test-e2e/XPTI/kernel/basic.cpp @@ -82,8 +82,8 @@ int main() { // CHECK: Wait end|{{.*}}.cpp:[[# @LINE + 1]]:3 Queue.wait(); - // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID3:.*]]|2018|1024|{{.*}}.cpp:[[# @LINE + 1]]:15 - { auto HA = Buf.get_access(); } + // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID3:.*]]|2018|1024|{{.*}}.cpp:[[# @LINE + 1]]:25 + { sycl::host_accessor HA(Buf, sycl::read_only); } Queue.submit([&](sycl::handler &cgh) { // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:16