Skip to content

[SYCL][E2E] Improve bindless image copy tests #20000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
Merged

[SYCL][E2E] Improve bindless image copy tests #20000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 45 additions & 21 deletions sycl/test-e2e/bindless_images/copies/copy_subregion_1D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,10 +507,11 @@ bool check_test(const std::vector<float> &out,
}

if (mismatch) {
#ifdef VERBOSE_PRINT
std::cout << "Result mismatch! Expected: " << expected[i]
<< ", Actual: " << out[i] << std::endl;
#else
std::cout << "Result mismatch at index " << i
<< "! Expected: " << expected[i] << ", Actual: " << out[i]
<< std::endl;
#ifndef VERBOSE_PRINT
// In CI, only display the first mismatched index
break;
#endif
}
Expand Down Expand Up @@ -544,42 +545,65 @@ bool run_copy_test(sycl::device &dev, sycl::queue &q, sycl::range<1> dims) {
// Perform copy checks
copy_image_mem_handle_to_image_mem_handle(dataInDesc, outDesc, dataIn1,
dataIn2, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_image_mem_handle_to_image_mem_handle test failed"
<< std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_image_mem_handle_to_usm(dataInDesc, outDesc, dataIn1, dataIn2, dev, q,
out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_image_mem_handle_to_usm test failed" << std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_usm_to_image_mem_handle(dataInDesc, outDesc, dataIn1, dataIn2, dev, q,
out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_usm_to_image_mem_handle test failed" << std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_usm_to_usm(dataInDesc, outDesc, dataIn1, dataIn2, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_usm_to_usm test failed" << std::endl;
validated = false;
}

// Perform out of bounds copy checks
validated =
validated && image_mem_handle_to_image_mem_handle_out_of_bounds_copy(
dataInDesc, outDesc, dataIn1, dev, q);
if (!image_mem_handle_to_image_mem_handle_out_of_bounds_copy(
dataInDesc, outDesc, dataIn1, dev, q)) {
std::cout
<< "image_mem_handle_to_image_mem_handle_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated && image_mem_handle_to_usm_out_of_bounds_copy(
dataInDesc, outDesc, dataIn1, dev, q);
if (!image_mem_handle_to_usm_out_of_bounds_copy(dataInDesc, outDesc, dataIn1,
dev, q)) {
std::cout << "image_mem_handle_to_usm_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated && usm_to_image_mem_handle_out_of_bounds_copy(
dataInDesc, outDesc, dataIn1, dev, q);
if (!usm_to_image_mem_handle_out_of_bounds_copy(dataInDesc, outDesc, dataIn1,
dev, q)) {
std::cout << "usm_to_image_mem_handle_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated && usm_to_usm_out_of_bounds_copy(dataInDesc, outDesc,
dataIn1, dev, q);
if (!usm_to_usm_out_of_bounds_copy(dataInDesc, outDesc, dataIn1, dev, q)) {
std::cout << "usm_to_usm_out_of_bounds_copy test failed" << std::endl;
validated = false;
}

return validated;
Copy link
Contributor

@steffenlarsen steffenlarsen Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, we could make validated an int, increment it on failure and return it. That could be the value returned by the main function too. Effectively also lets us count the number of failures. It is minor though.

}
Expand Down
63 changes: 43 additions & 20 deletions sycl/test-e2e/bindless_images/copies/copy_subregion_2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,11 @@ bool check_test(const std::vector<float> &out,
}

if (mismatch) {
#ifdef VERBOSE_PRINT
std::cout << "Result mismatch! Expected: " << expected[i]
<< ", Actual: " << out[i] << std::endl;
#else
std::cout << "Result mismatch at index " << i
<< "! Expected: " << expected[i] << ", Actual: " << out[i]
<< std::endl;
#ifndef VERBOSE_PRINT
// In CI, only display the first mismatched index
break;
#endif
}
Expand All @@ -477,39 +478,61 @@ bool run_copy_test(sycl::device &dev, sycl::queue &q, sycl::range<2> dims) {

// Perform copy checks
copy_image_mem_handle_to_image_mem_handle(desc, dataIn, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_image_mem_handle_to_image_mem_handle test failed"
<< std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_image_mem_handle_to_usm(desc, dataIn, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_image_mem_handle_to_usm test failed" << std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_usm_to_image_mem_handle(desc, dataIn, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_usm_to_image_mem_handle test failed" << std::endl;
validated = false;
}

std::fill(out.begin(), out.end(), 0);

copy_usm_to_usm(desc, dataIn, dev, q, out);

validated = validated && check_test(out, expected);
if (!check_test(out, expected)) {
std::cout << "copy_usm_to_usm test failed" << std::endl;
validated = false;
}

// Perform out of bounds copy checks
validated =
validated && image_mem_handle_to_image_mem_handle_out_of_bounds_copy(
desc, dataIn, dev, q);
if (!image_mem_handle_to_image_mem_handle_out_of_bounds_copy(desc, dataIn,
dev, q)) {
std::cout
<< "image_mem_handle_to_image_mem_handle_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated &&
image_mem_handle_to_usm_out_of_bounds_copy(desc, dataIn, dev, q);
if (!image_mem_handle_to_usm_out_of_bounds_copy(desc, dataIn, dev, q)) {
std::cout << "image_mem_handle_to_usm_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated &&
usm_to_image_mem_handle_out_of_bounds_copy(desc, dataIn, dev, q);
if (!usm_to_image_mem_handle_out_of_bounds_copy(desc, dataIn, dev, q)) {
std::cout << "usm_to_image_mem_handle_out_of_bounds_copy test failed"
<< std::endl;
validated = false;
}

validated = validated && usm_to_usm_out_of_bounds_copy(desc, dataIn, dev, q);
if (!usm_to_usm_out_of_bounds_copy(desc, dataIn, dev, q)) {
std::cout << "usm_to_usm_out_of_bounds_copy test failed" << std::endl;
validated = false;
}

return validated;
}
Expand Down