From c59f969b023a86cbee2863c9b2cd0cb5754cc833 Mon Sep 17 00:00:00 2001
From: Steffen Larsen <steffen.larsen@intel.com>
Date: Wed, 19 Oct 2022 17:53:04 +0100
Subject: [PATCH] [SYCL] Fix properties_kernel_negative for Windows (#7110)

Windows uses long long for uint62_t while the expected notes in
properties_kernel_negative assumed long was the corresponding type. This
commit makes the notes assume either long or long long.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
---
 .../properties/properties_kernel_negative.cpp | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/sycl/test/extensions/properties/properties_kernel_negative.cpp b/sycl/test/extensions/properties/properties_kernel_negative.cpp
index 6fd9a135399f1..4b2f722bdd7f0 100644
--- a/sycl/test/extensions/properties/properties_kernel_negative.cpp
+++ b/sycl/test/extensions/properties/properties_kernel_negative.cpp
@@ -84,77 +84,77 @@ void check_work_group_size() {
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
   // expected-error-re@sycl/handler.hpp:* {{static assertion failed due to requirement {{.+}}: Template type is not a property list.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1>},
       KernelFunctorWithWGSize<2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1>},
       KernelFunctorWithWGSize<1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1>},
       KernelFunctorWithWGSize<2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1>},
       KernelFunctorWithWGSize<2, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<1, 1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<1, 2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<2, 1, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<1, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<1, 2, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<2, 2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
       KernelFunctorWithWGSize<2, 1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSize<2, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size<1, 1, 1>},
@@ -221,77 +221,77 @@ void check_work_group_size_hint() {
   sycl::queue Q;
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1>},
       KernelFunctorWithWGSizeHint<2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1>},
       KernelFunctorWithWGSizeHint<1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1>},
       KernelFunctorWithWGSizeHint<2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1>},
       KernelFunctorWithWGSizeHint<2, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<1, 1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<1, 2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<2, 1, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<1, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<1, 2, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2, 1>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<2, 2, 1>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 1, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},
       KernelFunctorWithWGSizeHint<2, 1, 2>{});
 
   // expected-error-re@sycl/ext/oneapi/properties/property_utils.hpp:* {{static assertion failed due to requirement {{.+}}: Failed to merge property lists due to conflicting properties.}}
-  // expected-note@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>, std::integral_constant<unsigned long, 1>>>>>' requested here}}
+  // expected-note-re@+1 {{in instantiation of function template specialization 'sycl::queue::single_task<sycl::detail::auto_name, KernelFunctorWithWGSizeHint<2, 2, 2>, sycl::ext::oneapi::experimental::properties<std::tuple<sycl::ext::oneapi::experimental::property_value<sycl::ext::oneapi::experimental::work_group_size_hint_key, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>, std::integral_constant<unsigned long{{( long)?}}, 1>>>>>' requested here}}
   Q.single_task(
       sycl::ext::oneapi::experimental::properties{
           sycl::ext::oneapi::experimental::work_group_size_hint<1, 1, 1>},