[SYCL] Revert changes to E2E tests

HPS-1 · HPS-1 · commit f68f4568644d · 2024-12-16T13:34:31.000-08:00
Signed-off-by: Hu, Peisen &lt;peisen.hu@intel.com&gt;
diff --git a/sycl/test-e2e/Basic/max_linear_work_group_size_props.cpp b/sycl/test-e2e/Basic/max_linear_work_group_size_props.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // This property is not yet supported by all UR adapters
diff --git a/sycl/test-e2e/Basic/max_work_group_size_props.cpp b/sycl/test-e2e/Basic/max_work_group_size_props.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // This property is not yet supported by all UR adapters
diff --git a/sycl/test-e2e/Basic/work_group_size_prop.cpp b/sycl/test-e2e/Basic/work_group_size_prop.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp b/sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
diff --git a/sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp b/sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 // Extra run to check for leaks in Level Zero using UR_L0_LEAKS_DEBUG
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
diff --git a/sycl/test-e2e/GroupAlgorithm/root_group.cpp b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
@@ -1,6 +1,8 @@
 // Fails with opencl non-cpu, enable when fixed.
 // XFAIL: (opencl && !cpu && !accelerator)
-// RUN: %{build} -I . -o %t.out %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %} -Wno-deprecated-declarations
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/14641
+
+// RUN: %{build} -I . -o %t.out %if any-device-is-cuda %{ -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_70 %}
 // RUN: %{run} %t.out
 
 // Disabled temporarily while investigation into the failure is ongoing.
@@ -14,6 +16,7 @@
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/root_group.hpp>
 #include <sycl/group_barrier.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 static constexpr int WorkGroupSize = 32;
 
@@ -27,13 +30,18 @@ void testQueriesAndProperties() {
   const auto bundle =
       sycl::get_kernel_bundle<sycl::bundle_state::executable>(q.get_context());
   const auto kernel = bundle.get_kernel<class QueryKernel>();
-  const auto maxWGs = kernel.ext_oneapi_get_info<
-      sycl::ext::oneapi::experimental::info::kernel_queue_specific::
-          max_num_work_group_sync>(q);
-  const auto wgRange = sycl::range{WorkGroupSize, 1, 1};
-  const auto maxWGsWithLimits = kernel.ext_oneapi_get_info<
-      sycl::ext::oneapi::experimental::info::kernel_queue_specific::
-          max_num_work_group_sync>(q, wgRange, wgRange.size() * sizeof(int));
+  const auto local_range = sycl::range<1>(1);
+  const auto maxWGs =
+      kernel
+          .ext_oneapi_get_info<sycl::ext::oneapi::experimental::info::
+                                   kernel_queue_specific::max_num_work_groups>(
+              q, local_range, 0);
+  const auto wgRange = sycl::range<3>{WorkGroupSize, 1, 1};
+  const auto maxWGsWithLimits =
+      kernel
+          .ext_oneapi_get_info<sycl::ext::oneapi::experimental::info::
+                                   kernel_queue_specific::max_num_work_groups>(
+              q, wgRange, wgRange.size() * sizeof(int));
   const auto props = sycl::ext::oneapi::experimental::properties{
       sycl::ext::oneapi::experimental::use_root_sync};
   q.single_task<class QueryKernel>(props, []() {});
@@ -52,9 +60,11 @@ void testRootGroup() {
   const auto bundle =
       sycl::get_kernel_bundle<sycl::bundle_state::executable>(q.get_context());
   const auto kernel = bundle.get_kernel<class RootGroupKernel>();
-  const auto maxWGs = kernel.ext_oneapi_get_info<
-      sycl::ext::oneapi::experimental::info::kernel_queue_specific::
-          max_num_work_group_sync>(q);
+  const auto maxWGs =
+      kernel
+          .ext_oneapi_get_info<sycl::ext::oneapi::experimental::info::
+                                   kernel_queue_specific::max_num_work_groups>(
+              q, WorkGroupSize, 0);
   const auto props = sycl::ext::oneapi::experimental::properties{
       sycl::ext::oneapi::experimental::use_root_sync};
   sycl::buffer<int> dataBuf{sycl::range{maxWGs * WorkGroupSize}};
@@ -94,9 +104,11 @@ void testRootGroupFunctions() {
   const auto bundle =
       sycl::get_kernel_bundle<sycl::bundle_state::executable>(q.get_context());
   const auto kernel = bundle.get_kernel<class RootGroupFunctionsKernel>();
-  const auto maxWGs = kernel.ext_oneapi_get_info<
-      sycl::ext::oneapi::experimental::info::kernel_queue_specific::
-          max_num_work_group_sync>(q);
+  const auto maxWGs =
+      kernel
+          .ext_oneapi_get_info<sycl::ext::oneapi::experimental::info::
+                                   kernel_queue_specific::max_num_work_groups>(
+              q, WorkGroupSize, 0);
   const auto props = sycl::ext::oneapi::experimental::properties{
       sycl::ext::oneapi::experimental::use_root_sync};
 
diff --git a/sycl/test-e2e/Properties/cache_config.cpp b/sycl/test-e2e/Properties/cache_config.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: gpu, level_zero
 
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: env UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s
 
 #include <numeric>
diff --git a/sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp b/sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out %helper-includes
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/VirtualFunctions/2/1/1/more-complex-hierarchy.cpp b/sycl/test-e2e/VirtualFunctions/2/1/1/more-complex-hierarchy.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out %helper-includes
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp b/sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out %helper-includes
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/VirtualFunctions/2/2/single-construct-single-use.cpp b/sycl/test-e2e/VirtualFunctions/2/2/single-construct-single-use.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out %helper-includes
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/VirtualFunctions/misc/math.cpp b/sycl/test-e2e/VirtualFunctions/misc/math.cpp
@@ -3,7 +3,7 @@
 // This test checks that SYCL math built-in functions work correctly
 // inside virtual functions.
 //
-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out %helper-includes
 // RUN: %{run} %t.out
 
 #include <sycl/builtins.hpp>
diff --git a/sycl/test-e2e/forward_progress/forward_progress_kernel_param_L0_gpu.cpp b/sycl/test-e2e/forward_progress/forward_progress_kernel_param_L0_gpu.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: level_zero, gpu
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // The purpose of this test is to check that the forward_progress_guarantee
diff --git a/sycl/test-e2e/forward_progress/forward_progress_kernel_param_ocl_cpu.cpp b/sycl/test-e2e/forward_progress/forward_progress_kernel_param_ocl_cpu.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: opencl, cpu
-// RUN: %{build} -o %t.out -Wno-deprecated-declarations
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // The purpose of this test is to check that the forward_progress_guarantee

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %{build} -o %t.out -Wno-deprecated-declarations`
	`1`	`+// RUN: %{build} -o %t.out`
`2`	`2`	`// RUN: %{run} %t.out`
`3`	`3`
`4`	`4`	`// This property is not yet supported by all UR adapters`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations`
	`1`	`+// RUN: %{build} -o %t.out %helper-includes`
`2`	`2`	`// RUN: %{run} %t.out`
`3`	`3`
`4`	`4`	`#include <sycl/detail/core.hpp>`