Skip to content

Commit e5e77d4

Browse files
authored
[SYCL][ESIMD][E2E] Fix ambiguity in device descriptor usages in ESIMD tests (#16254)
Follow-up after #15905 These tests use `using` directive for both `sycl` and `esimd` namespaces and `info` is available in both, so we have to explicitly specify namespace in this case to avoid ambiguity. Hasn't been noticed before because tests run only on pvc.
1 parent 1c2e79c commit e5e77d4

10 files changed

+20
-11
lines changed

sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ int main(void) {
3535
queue q;
3636

3737
auto dev = q.get_device();
38-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
38+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
39+
<< "\n";
3940
try {
4041
q.submit([&](handler &cgh) {
4142
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ int main(void) {
3030
queue q;
3131

3232
auto dev = q.get_device();
33-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
33+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
34+
<< "\n";
3435
try {
3536
q.submit([&](handler &cgh) {
3637
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ int main(void) {
3030
queue q;
3131

3232
auto dev = q.get_device();
33-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
33+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
34+
<< "\n";
3435
try {
3536
q.submit([&](handler &cgh) {
3637
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/accessor_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ int main(void) {
3232
queue q;
3333

3434
auto dev = q.get_device();
35-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
35+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
36+
<< "\n";
3637

3738
q.submit([&](handler &cgh) {
3839
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ int main(void) {
3232
queue q;
3333

3434
auto dev = q.get_device();
35-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
35+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
36+
<< "\n";
3637

3738
q.submit([&](handler &cgh) {
3839
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
int main(int argc, const char *argv[]) {
1717
queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler());
1818
auto Dev = Q.get_device();
19-
std::cout << "Running on " << Dev.get_info<info::device::name>() << std::endl;
19+
std::cout << "Running on " << Dev.get_info<sycl::info::device::name>()
20+
<< std::endl;
2021

2122
bool Print = argc > 1 && std::string(argv[1]) == "-debug";
2223
bool Passed = true;

sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ int main(void) {
3131
queue q;
3232

3333
auto dev = q.get_device();
34-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
34+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
35+
<< "\n";
3536
try {
3637
q.submit([&](handler &cgh) {
3738
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ int main() {
3131
queue q;
3232

3333
auto dev = q.get_device();
34-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
34+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
35+
<< "\n";
3536
try {
3637
q.submit([&](handler &cgh) {
3738
auto PA = bufa.get_access<access::mode::read_write>(cgh);

sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ template <typename T> bool test() {
3636

3737
queue q;
3838
auto dev = q.get_device();
39-
std::cout << "Running on " << dev.get_info<info::device::name>() << "\n";
39+
std::cout << "Running on " << dev.get_info<sycl::info::device::name>()
40+
<< "\n";
4041
auto *A = malloc_shared<T>(Size, q);
4142
auto *B = malloc_shared<T>(Size, q);
4243
auto *C = malloc_shared<T>(Size, q);

sycl/test-e2e/ESIMD/slm_init_no_inline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ int main() {
2020

2121
queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler());
2222
auto D = Q.get_device();
23-
std::cout << "Running on " << D.get_info<info::device::name>()
24-
<< ", driver=" << D.get_info<info::device::driver_version>()
23+
std::cout << "Running on " << D.get_info<sycl::info::device::name>()
24+
<< ", driver=" << D.get_info<sycl::info::device::driver_version>()
2525
<< std::endl;
2626

2727
constexpr int Size = VL * 2;

0 commit comments

Comments
 (0)