From 9e1bfc65fd9163e9a4e8271b1eb1aca41c0fbed4 Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Wed, 20 Nov 2024 22:10:31 -0800 Subject: [PATCH 1/6] [SYCL] Deprecate parallel_for and single_task overloads in the sycl_ext_oneapi_kernel_properties extension Signed-off-by: Hu, Peisen --- sycl/include/sycl/handler.hpp | 71 +++++++++++++++++++++++------------ sycl/include/sycl/queue.hpp | 43 +++++++++++++-------- 2 files changed, 76 insertions(+), 38 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index d0a9867ec4c40..092eea6bd1411 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -2314,9 +2314,12 @@ class __SYCL_EXPORT handler { template - std::enable_if_t< - ext::oneapi::experimental::is_property_list::value> - single_task(PropertiesT Props, _KERNELFUNCPARAM(KernelFunc)) { + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::single_task (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") + std::enable_if_t::value> single_task(PropertiesT Props, + _KERNELFUNCPARAM(KernelFunc)) { single_task_lambda_impl(Props, KernelFunc); } @@ -2364,11 +2367,15 @@ class __SYCL_EXPORT handler { template - std::enable_if_t< - (sizeof...(RestT) > 1) && - detail::AreAllButLastReductions::value && - ext::oneapi::experimental::is_property_list::value> - parallel_for(range<1> Range, PropertiesT Properties, RestT &&...Rest) { + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") + std::enable_if_t<(sizeof...(RestT) > 1) && + detail::AreAllButLastReductions::value && + ext::oneapi::experimental::is_property_list< + PropertiesT>::value> parallel_for(range<1> Range, + PropertiesT Properties, + RestT &&...Rest) { #ifndef __SYCL_DEVICE_ONLY__ throwIfGraphAssociated(); @@ -2379,11 +2386,15 @@ class __SYCL_EXPORT handler { template - std::enable_if_t< - (sizeof...(RestT) > 1) && - detail::AreAllButLastReductions::value && - ext::oneapi::experimental::is_property_list::value> - parallel_for(range<2> Range, PropertiesT Properties, RestT &&...Rest) { + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") + std::enable_if_t<(sizeof...(RestT) > 1) && + detail::AreAllButLastReductions::value && + ext::oneapi::experimental::is_property_list< + PropertiesT>::value> parallel_for(range<2> Range, + PropertiesT Properties, + RestT &&...Rest) { #ifndef __SYCL_DEVICE_ONLY__ throwIfGraphAssociated(); @@ -2394,11 +2405,15 @@ class __SYCL_EXPORT handler { template - std::enable_if_t< - (sizeof...(RestT) > 1) && - detail::AreAllButLastReductions::value && - ext::oneapi::experimental::is_property_list::value> - parallel_for(range<3> Range, PropertiesT Properties, RestT &&...Rest) { + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") + std::enable_if_t<(sizeof...(RestT) > 1) && + detail::AreAllButLastReductions::value && + ext::oneapi::experimental::is_property_list< + PropertiesT>::value> parallel_for(range<3> Range, + PropertiesT Properties, + RestT &&...Rest) { #ifndef __SYCL_DEVICE_ONLY__ throwIfGraphAssociated(); @@ -2433,11 +2448,15 @@ class __SYCL_EXPORT handler { template - std::enable_if_t< - (sizeof...(RestT) > 1) && - detail::AreAllButLastReductions::value && - ext::oneapi::experimental::is_property_list::value> - parallel_for(nd_range Range, PropertiesT Properties, RestT &&...Rest) { + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") + std::enable_if_t<(sizeof...(RestT) > 1) && + detail::AreAllButLastReductions::value && + ext::oneapi::experimental::is_property_list< + PropertiesT>::value> parallel_for(nd_range Range, + PropertiesT Properties, + RestT &&...Rest) { #ifndef __SYCL_DEVICE_ONLY__ throwIfGraphAssociated(); @@ -2459,6 +2478,9 @@ class __SYCL_EXPORT handler { template + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") void parallel_for_work_group(range NumWorkGroups, PropertiesT Props, _KERNELFUNCPARAM(KernelFunc)) { parallel_for_work_group_lambda_impl + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") void parallel_for_work_group(range NumWorkGroups, range WorkGroupSize, PropertiesT Props, _KERNELFUNCPARAM(KernelFunc)) { diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 9e530604ce84e..0d10160b07fb4 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -2089,11 +2089,14 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::single_task (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< - ext::oneapi::experimental::is_property_list::value, event> - single_task( - PropertiesT Properties, _KERNELFUNCPARAM(KernelFunc), - const detail::code_location &CodeLoc = detail::code_location::current()) { + ext::oneapi::experimental::is_property_list::value, + event> single_task(PropertiesT Properties, _KERNELFUNCPARAM(KernelFunc), + const detail::code_location &CodeLoc = + detail::code_location::current()) { static_assert( (detail::check_fn_signature, void()>::value || @@ -2131,11 +2134,15 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::single_task (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< - ext::oneapi::experimental::is_property_list::value, event> - single_task( - event DepEvent, PropertiesT Properties, _KERNELFUNCPARAM(KernelFunc), - const detail::code_location &CodeLoc = detail::code_location::current()) { + ext::oneapi::experimental::is_property_list::value, + event> single_task(event DepEvent, PropertiesT Properties, + _KERNELFUNCPARAM(KernelFunc), + const detail::code_location &CodeLoc = + detail::code_location::current()) { static_assert( (detail::check_fn_signature, void()>::value || @@ -2177,12 +2184,15 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::single_task (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< - ext::oneapi::experimental::is_property_list::value, event> - single_task( - const std::vector &DepEvents, PropertiesT Properties, - _KERNELFUNCPARAM(KernelFunc), - const detail::code_location &CodeLoc = detail::code_location::current()) { + ext::oneapi::experimental::is_property_list::value, + event> single_task(const std::vector &DepEvents, + PropertiesT Properties, _KERNELFUNCPARAM(KernelFunc), + const detail::code_location &CodeLoc = + detail::code_location::current()) { static_assert( (detail::check_fn_signature, void()>::value || @@ -2428,11 +2438,14 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// const KernelType &KernelFunc". template + __SYCL2020_DEPRECATED( + "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " + "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< detail::AreAllButLastReductions::value && ext::oneapi::experimental::is_property_list::value, - event> - parallel_for(nd_range Range, PropertiesT Properties, RestT &&...Rest) { + event> parallel_for(nd_range Range, PropertiesT Properties, + RestT &&...Rest) { constexpr detail::code_location CodeLoc = getCodeLocation(); detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc); return submit( From 21fd2d9fa4b51634a5305666f2c41fff0dd82c91 Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Thu, 21 Nov 2024 16:10:53 -0800 Subject: [PATCH 2/6] [SYCL] Update affected llvm-lit test cases to ignore deprecation warnings Signed-off-by: Hu, Peisen --- .../extensions/properties/properties_kernel_device_has.cpp | 4 ++-- .../extensions/properties/properties_kernel_launch_bounds.cpp | 4 ++-- .../properties/properties_kernel_max_work_group_size.cpp | 4 ++-- .../properties/properties_kernel_sub_group_size.cpp | 4 ++-- .../properties/properties_kernel_work_group_size.cpp | 4 ++-- .../properties/properties_kernel_work_group_size_hint.cpp | 4 ++-- .../properties/properties_kernel_device_has_warning.cpp | 2 +- .../properties/properties_kernel_negative_device.cpp | 2 +- sycl/test/virtual-functions/diagnostics-positive.cpp | 2 +- sycl/test/virtual-functions/properties-positive.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_device_has.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_device_has.cpp index 055b25b920b8b..5e263326113b4 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_device_has.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_device_has.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm -Xclang -disable-llvm-passes %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm -Xclang -disable-llvm-passes %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_launch_bounds.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_launch_bounds.cpp index 96ac3da42a504..1b85f1b6fed55 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_launch_bounds.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_launch_bounds.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_max_work_group_size.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_max_work_group_size.cpp index 924270bb6cafe..87eab697d2405 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_max_work_group_size.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_max_work_group_size.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_sub_group_size.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_sub_group_size.cpp index a179c134749e9..5878f5c5d80fd 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_sub_group_size.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_sub_group_size.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size.cpp index 932b92fab9009..f3912f28c87ed 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size_hint.cpp b/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size_hint.cpp index a844b484b8b51..6ed9f6b9b1feb 100644 --- a/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size_hint.cpp +++ b/sycl/test/check_device_code/extensions/properties/properties_kernel_work_group_size_hint.cpp @@ -1,5 +1,5 @@ -// RUN: %clangxx -fsycl-device-only -S -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl-device-only -S -Wno-deprecated-declarations -Xclang -emit-llvm %s -o - | FileCheck %s --check-prefix CHECK-IR +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // expected-no-diagnostics #include diff --git a/sycl/test/extensions/properties/properties_kernel_device_has_warning.cpp b/sycl/test/extensions/properties/properties_kernel_device_has_warning.cpp index f24e089bed4b1..267f19a2aad9e 100644 --- a/sycl/test/extensions/properties/properties_kernel_device_has_warning.cpp +++ b/sycl/test/extensions/properties/properties_kernel_device_has_warning.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl-device-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s +// RUN: %clangxx -fsycl-device-only -Wno-deprecated-declarations -Xclang -verify -Xclang -verify-ignore-unexpected=note %s // Tests for warnings when propagated aspects do not match the aspects available // in a function, as specified through the 'sycl::device_has' property. diff --git a/sycl/test/extensions/properties/properties_kernel_negative_device.cpp b/sycl/test/extensions/properties/properties_kernel_negative_device.cpp index d451e319a2670..5990fe96c2ced 100644 --- a/sycl/test/extensions/properties/properties_kernel_negative_device.cpp +++ b/sycl/test/extensions/properties/properties_kernel_negative_device.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl-device-only -Xclang -fsycl-is-device -ferror-limit=0 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s +// RUN: %clangxx -fsycl-device-only -Wno-deprecated-declarations -Xclang -fsycl-is-device -ferror-limit=0 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s #include diff --git a/sycl/test/virtual-functions/diagnostics-positive.cpp b/sycl/test/virtual-functions/diagnostics-positive.cpp index 1b1e346678e8f..a0a9de1f819aa 100644 --- a/sycl/test/virtual-functions/diagnostics-positive.cpp +++ b/sycl/test/virtual-functions/diagnostics-positive.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -c -Xclang -verify %s -o %t.ignored +// RUN: %clangxx -fsycl -c -Wno-deprecated-declarations -Xclang -verify %s -o %t.ignored // // This test is intended to check that no diagnostics are emitted when a kernel // performing virtual function calls is submitted with the right properties. diff --git a/sycl/test/virtual-functions/properties-positive.cpp b/sycl/test/virtual-functions/properties-positive.cpp index 970e348457388..f4b66f322968d 100644 --- a/sycl/test/virtual-functions/properties-positive.cpp +++ b/sycl/test/virtual-functions/properties-positive.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations -Xclang -verify %s // // This test is intended to check that we can successfully compile code that // uses new properties from the virtual functions extension. From ed7dec29b5409011560e0d8a7306a71915f3eab4 Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Thu, 21 Nov 2024 17:30:12 -0800 Subject: [PATCH 3/6] [SYCL] Fix affected e2e test cases Signed-off-by: Hu, Peisen --- sycl/test-e2e/Basic/work_group_size_prop.cpp | 2 +- sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp | 2 +- sycl/test-e2e/GroupAlgorithm/root_group.cpp | 2 +- sycl/test-e2e/Properties/cache_config.cpp | 2 +- sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp | 2 +- sycl/test-e2e/VirtualFunctions/2/1/1/more-complex-hierarchy.cpp | 2 +- sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp | 2 +- .../VirtualFunctions/2/2/single-construct-single-use.cpp | 2 +- sycl/test-e2e/VirtualFunctions/misc/math.cpp | 2 +- .../forward_progress/forward_progress_kernel_param_L0_gpu.cpp | 2 +- .../forward_progress/forward_progress_kernel_param_ocl_cpu.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sycl/test-e2e/Basic/work_group_size_prop.cpp b/sycl/test-e2e/Basic/work_group_size_prop.cpp index ac8400dcc31b8..a373a6c5477ef 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp b/sycl/test-e2e/Graph/RecordReplay/work_group_size_prop.cpp index 3a0f21f4f94a7..8f0e53a24305e 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // 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 index 92e5d69ffcab4..63bb9f523661d 100644 --- a/sycl/test-e2e/GroupAlgorithm/root_group.cpp +++ b/sycl/test-e2e/GroupAlgorithm/root_group.cpp @@ -1,6 +1,6 @@ // 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 %} +// 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 // RUN: %{run} %t.out // Disabled temporarily while investigation into the failure is ongoing. diff --git a/sycl/test-e2e/Properties/cache_config.cpp b/sycl/test-e2e/Properties/cache_config.cpp index 0cda3e97a5d1f..b62c50094584b 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // RUN: env UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp b/sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp index f198bc94f855f..fb8b1f305fba3 100644 --- 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 +// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations // RUN: %{run} %t.out #include 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 index bb334972c3f77..46d407ff81074 100644 --- 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 +// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations // RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp b/sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp index 2bfb3dd0f010d..7919a18f09785 100644 --- 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 +// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations // RUN: %{run} %t.out #include 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 index ccf0c77036085..23561a96c9abe 100644 --- 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 +// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations // RUN: %{run} %t.out #include diff --git a/sycl/test-e2e/VirtualFunctions/misc/math.cpp b/sycl/test-e2e/VirtualFunctions/misc/math.cpp index 71b34c23cef1f..1d3482f671243 100644 --- 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 +// RUN: %{build} -o %t.out %helper-includes -Wno-deprecated-declarations // RUN: %{run} %t.out #include 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 index 003840a8c1299..4f9a7eaf79fbc 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // 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 index ffdd99184d233..364517f3ac411 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // RUN: %{run} %t.out // The purpose of this test is to check that the forward_progress_guarantee From e9e77e1f2b79b491f0e87e18ddec054e3369900a Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Thu, 21 Nov 2024 18:52:43 -0800 Subject: [PATCH 4/6] [SYCL] Fix affected CUDA e2e test cases Signed-off-by: Hu, Peisen --- sycl/test-e2e/Basic/max_linear_work_group_size_props.cpp | 2 +- sycl/test-e2e/Basic/max_work_group_size_props.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 7009ca367d8e9..b6f584da3896c 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // 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 index 96439971d904a..7946aef87c659 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // RUN: %{run} %t.out // This property is not yet supported by all UR adapters From 22ae374169ca539a258b579147534e4c3a6daa42 Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Fri, 22 Nov 2024 07:42:52 -0800 Subject: [PATCH 5/6] [SYCL] Update Graph/Explicit/work_group_size_prop.cpp Signed-off-by: Hu, Peisen --- sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp b/sycl/test-e2e/Graph/Explicit/work_group_size_prop.cpp index 3c97c3c351516..dc42a1360541e 100644 --- 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 +// RUN: %{build} -o %t.out -Wno-deprecated-declarations // 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 %} From 241d2712fa5989cfe115d7045169bd8016713819 Mon Sep 17 00:00:00 2001 From: "Hu, Peisen" Date: Mon, 25 Nov 2024 22:20:02 -0800 Subject: [PATCH 6/6] [SYCL] Use proper deprecation warning type Signed-off-by: Hu, Peisen --- sycl/include/sycl/handler.hpp | 14 +++++++------- sycl/include/sycl/queue.hpp | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 092eea6bd1411..6b59cb5c497c7 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -2314,7 +2314,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::single_task (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t<(sizeof...(RestT) > 1) && @@ -2386,7 +2386,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t<(sizeof...(RestT) > 1) && @@ -2405,7 +2405,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t<(sizeof...(RestT) > 1) && @@ -2448,7 +2448,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t<(sizeof...(RestT) > 1) && @@ -2478,7 +2478,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") void parallel_for_work_group(range NumWorkGroups, PropertiesT Props, @@ -2490,7 +2490,7 @@ class __SYCL_EXPORT handler { template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") void parallel_for_work_group(range NumWorkGroups, diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 0d10160b07fb4..8193e53a60e44 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -2089,7 +2089,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::single_task (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< @@ -2134,7 +2134,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::single_task (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< @@ -2184,7 +2184,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// \param CodeLoc contains the code location of user code template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::single_task (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t< @@ -2438,7 +2438,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase { /// const KernelType &KernelFunc". template - __SYCL2020_DEPRECATED( + __SYCL_DEPRECATED( "Use sycl::ext::oneapi::experimental::parallel_for (provided in the " "sycl_ext_oneapi_enqueue_functions extension) instead.") std::enable_if_t<