From c4b4c467becde12bc9d21e496406bc1a4dff3fff Mon Sep 17 00:00:00 2001 From: Anuya Welling Date: Mon, 11 Mar 2024 11:42:54 -0500 Subject: [PATCH 1/3] Skipping tests with default device as fpga --- .../sycl/test_auto_tune_policy_sycl.pass.cpp | 4 +++- test/support/utils_sycl.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp index f5294f2e382..98f1d6f0c3e 100644 --- a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp +++ b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp @@ -164,7 +164,7 @@ test_auto_submit_wait_on_event(UniverseContainer u, int best_resource) } int count = ecount.load(); - EXPECT_EQ(i * (i + 1) / 2, count, "ERROR: scheduler did not execute all tasks exactly once\n"); + //EXPECT_EQ(i * (i + 1) / 2, count, "ERROR: scheduler did not execute all tasks exactly once\n"); } EXPECT_TRUE(pass, "ERROR: did not select expected resources\n"); if constexpr (call_select_before_submit) @@ -492,6 +492,7 @@ main() bool bProcessed = false; #if TEST_DYNAMIC_SELECTION_AVAILABLE +#if ONEDPL_CPU_DEVICE || ONEDPL_GPU_DEVICE using policy_t = oneapi::dpl::experimental::auto_tune_policy; std::vector u; build_auto_tune_universe(u); @@ -542,6 +543,7 @@ main() bProcessed = true; } +#endif // Devices available are CPU and GPU #endif // TEST_DYNAMIC_SELECTION_AVAILABLE return TestUtils::done(bProcessed); diff --git a/test/support/utils_sycl.h b/test/support/utils_sycl.h index d88eee142fa..b2f351d716b 100644 --- a/test/support/utils_sycl.h +++ b/test/support/utils_sycl.h @@ -106,7 +106,7 @@ make_new_policy(_Policy&& __policy) #if ONEDPL_FPGA_DEVICE inline auto default_selector = # if ONEDPL_FPGA_EMULATOR - sycl::ext::intel::fpga_emulator_selector{}; + sycl::ext::intel::fpga_emulator_selector_v; # else sycl::ext::intel::fpga_selector{}; # endif // ONEDPL_FPGA_EMULATOR From 8ad424a3ff30d239e481c4dd3d5bf25d4e3e6211 Mon Sep 17 00:00:00 2001 From: Anuya Welling Date: Mon, 11 Mar 2024 12:47:34 -0500 Subject: [PATCH 2/3] ignoring FPGA for dynamic load policy --- .../dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp | 2 +- .../sycl/test_dynamic_load_policy_sycl.pass.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp index 98f1d6f0c3e..6c28e8b13f4 100644 --- a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp +++ b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp @@ -492,7 +492,7 @@ main() bool bProcessed = false; #if TEST_DYNAMIC_SELECTION_AVAILABLE -#if ONEDPL_CPU_DEVICE || ONEDPL_GPU_DEVICE +#if !ONEDPL_FPGA_DEVICE || !ONEDPL_FPGA_EMULATOR using policy_t = oneapi::dpl::experimental::auto_tune_policy; std::vector u; build_auto_tune_universe(u); diff --git a/test/parallel_api/dynamic_selection/sycl/test_dynamic_load_policy_sycl.pass.cpp b/test/parallel_api/dynamic_selection/sycl/test_dynamic_load_policy_sycl.pass.cpp index 17d6de6aa4f..b473892af19 100644 --- a/test/parallel_api/dynamic_selection/sycl/test_dynamic_load_policy_sycl.pass.cpp +++ b/test/parallel_api/dynamic_selection/sycl/test_dynamic_load_policy_sycl.pass.cpp @@ -47,6 +47,7 @@ main() bool bProcessed = false; #if TEST_DYNAMIC_SELECTION_AVAILABLE +#if !ONEDPL_FPGA_DEVICE || !ONEDPL_FPGA_EMULATOR using policy_t = oneapi::dpl::experimental::dynamic_load_policy; std::vector u; build_dl_universe(u); @@ -76,6 +77,7 @@ main() bProcessed = true; } +#endif // Devices available are CPU and GPU #endif // TEST_DYNAMIC_SELECTION_AVAILABLE return TestUtils::done(bProcessed); From fd661a0e077a1927a5b46511a4b965d72fc19771 Mon Sep 17 00:00:00 2001 From: Anuya Welling Date: Mon, 11 Mar 2024 15:05:11 -0500 Subject: [PATCH 3/3] Removed commented code --- .../dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp index 6c28e8b13f4..e24c4c00522 100644 --- a/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp +++ b/test/parallel_api/dynamic_selection/sycl/test_auto_tune_policy_sycl.pass.cpp @@ -164,7 +164,7 @@ test_auto_submit_wait_on_event(UniverseContainer u, int best_resource) } int count = ecount.load(); - //EXPECT_EQ(i * (i + 1) / 2, count, "ERROR: scheduler did not execute all tasks exactly once\n"); + EXPECT_EQ(i * (i + 1) / 2, count, "ERROR: scheduler did not execute all tasks exactly once\n"); } EXPECT_TRUE(pass, "ERROR: did not select expected resources\n"); if constexpr (call_select_before_submit)