From 2cb45ccb99334030825b3df3a4792325bcac0bdc Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Tue, 3 Dec 2024 13:45:47 -0800 Subject: [PATCH] [SYCL][E2E] Fix namespace conflicts --- sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/accessor_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp | 3 ++- sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp | 3 ++- sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp | 3 ++- sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp | 3 ++- sycl/test-e2e/ESIMD/slm_init_no_inline.cpp | 4 ++-- 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp index eac20e6c4cb02..049a762499add 100644 --- a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp @@ -35,7 +35,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; try { q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp b/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp index c4c106696971d..e5037b42c934f 100644 --- a/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp @@ -30,7 +30,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; try { q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp b/sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp index 7fc3ef78fd1ca..5ba14f718f359 100644 --- a/sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp @@ -30,7 +30,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; try { q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/accessor_stateless_64.cpp b/sycl/test-e2e/ESIMD/accessor_stateless_64.cpp index 205fc948128d6..1345d5bdb72ee 100644 --- a/sycl/test-e2e/ESIMD/accessor_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/accessor_stateless_64.cpp @@ -32,7 +32,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp b/sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp index 10f7dd9ffaea4..5598318e9ae9e 100644 --- a/sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp +++ b/sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp @@ -32,7 +32,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp b/sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp index e51e34bb49c81..2cab78e902e95 100644 --- a/sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp +++ b/sycl/test-e2e/ESIMD/dpas/dpas_tf32.cpp @@ -16,7 +16,8 @@ int main(int argc, const char *argv[]) { queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); - std::cout << "Running on " << Dev.get_info() << std::endl; + std::cout << "Running on " << Dev.get_info() + << std::endl; bool Print = argc > 1 && std::string(argv[1]) == "-debug"; bool Passed = true; diff --git a/sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp b/sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp index 2d1cd1da77d23..b1f590fcfa0b3 100644 --- a/sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/lsc/lsc_block_load_store_stateless_64.cpp @@ -31,7 +31,8 @@ int main(void) { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; try { q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp b/sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp index cac309859741a..1bd973a278fe4 100644 --- a/sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp +++ b/sycl/test-e2e/ESIMD/lsc/lsc_gather_scatter_stateless_64.cpp @@ -31,7 +31,8 @@ int main() { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; try { q.submit([&](handler &cgh) { auto PA = bufa.get_access(cgh); diff --git a/sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp b/sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp index 79572559679ff..95cb878dfff55 100644 --- a/sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp +++ b/sycl/test-e2e/ESIMD/lsc/lsc_load_store_2d_compare.cpp @@ -36,7 +36,8 @@ template bool test() { queue q; auto dev = q.get_device(); - std::cout << "Running on " << dev.get_info() << "\n"; + std::cout << "Running on " << dev.get_info() + << "\n"; auto *A = malloc_shared(Size, q); auto *B = malloc_shared(Size, q); auto *C = malloc_shared(Size, q); diff --git a/sycl/test-e2e/ESIMD/slm_init_no_inline.cpp b/sycl/test-e2e/ESIMD/slm_init_no_inline.cpp index 9d01bcdbb3f09..97a1c4f55f0f8 100644 --- a/sycl/test-e2e/ESIMD/slm_init_no_inline.cpp +++ b/sycl/test-e2e/ESIMD/slm_init_no_inline.cpp @@ -20,8 +20,8 @@ int main() { queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto D = Q.get_device(); - std::cout << "Running on " << D.get_info() - << ", driver=" << D.get_info() + std::cout << "Running on " << D.get_info() + << ", driver=" << D.get_info() << std::endl; constexpr int Size = VL * 2;