Skip to content

[SYCL][E2E] Fix warnings in KernelParams e2e tests #13954

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 4 commits into from
May 29, 2024
Merged

[SYCL][E2E] Fix warnings in KernelParams e2e tests #13954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e1eba3
Replace printf with cout in KernelParams/union_kernel_param.cpp
ayylol May 29, 2024
3196b49
Fix warnings in KernelParams/array-kernel-param-nested-run.cpp
ayylol May 29, 2024
aa67431
Fix warnings in KernelParams/array-kernel-param-run.cpp
ayylol May 29, 2024
5bc17cd
Merge branch 'sycl' into e2e-KernelParams
ayylol May 29, 2024
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
15 changes: 8 additions & 7 deletions sycl/test-e2e/KernelParams/array-kernel-param-nested-run.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ bool test_accessor_array_in_struct(queue &myQueue) {
return verify_1D("Accessor array in struct", c_num_items, output, ref);
}

template <typename T> struct S { T a[c_num_items]; };
template <typename T> struct S {
T a[c_num_items];
};
bool test_templated_array_in_struct(queue &myQueue) {
std::array<int, c_num_items> output;
std::array<int, c_num_items> ref;
Expand Down Expand Up @@ -119,11 +121,11 @@ bool run_tests() {
for (auto ep : L) {
try {
std::rethrow_exception(ep);
} catch (std::exception &E) {
std::cout << "*** std exception caught:\n";
std::cout << E.what();
} catch (sycl::exception const &E1) {
} catch (sycl::exception const &E) {
std::cout << "*** SYCL exception caught:\n";
std::cout << E.what();
} catch (std::exception const &E1) {
std::cout << "*** std exception caught:\n";
std::cout << E1.what();
}
}
Expand All @@ -147,8 +149,7 @@ bool run_tests() {

int main(int argc, char *argv[]) {
bool passed = true;
default_selector selector{};
auto D = selector.select_device();
device D{default_selector_v};
const char *devType = D.is_cpu() ? "CPU" : "GPU";
std::cout << "Running on device " << devType << " ("
<< D.get_info<sycl::info::device::name>() << ")\n";
Expand Down
11 changes: 5 additions & 6 deletions sycl/test-e2e/KernelParams/array-kernel-param-run.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ bool run_tests() {
for (auto ep : L) {
try {
std::rethrow_exception(ep);
} catch (std::exception &E) {
std::cout << "*** std exception caught:\n";
std::cout << E.what();
} catch (sycl::exception const &E1) {
} catch (sycl::exception const &E) {
std::cout << "*** SYCL exception caught:\n";
std::cout << E.what();
} catch (std::exception const &E1) {
std::cout << "*** std exception caught:\n";
std::cout << E1.what();
}
}
Expand Down Expand Up @@ -207,8 +207,7 @@ bool run_tests() {

int main(int argc, char *argv[]) {
bool passed = true;
default_selector selector{};
auto D = selector.select_device();
device D{default_selector_v};
const char *devType = D.is_cpu() ? "CPU" : "GPU";
std::cout << "Running on device " << devType << " ("
<< D.get_info<sycl::info::device::name>() << ")\n";
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/KernelParams/union_kernel_param.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main(int argc, char **argv) {
}

if (myfloat != 5.0f) {
printf("FAILED\nmyfloat = %d\n", myfloat);
std::cout << "FAILED\nmyfloat = " << myfloat << std::endl;
return 1;
}
return 0;
Expand Down