group: avoid duplication between int8_t / cl_char

KhronosGroup · Sep 11, 2024 · de83de0 · de83de0
1 parent 5136993
commit de83de0
Showing 1 changed file with 39 additions and 8 deletions.
diff --git a/tests/group/group_async_work_group_copy.cpp b/tests/group/group_async_work_group_copy.cpp
@@ -93,28 +93,59 @@ class TEST_NAME : public util::test_base {
 #endif
 
 #ifdef INT8_MAX
-    for_type_and_vectors<check_type, std::int8_t>(log, "std::int8_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_char, std::int8_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::int8_t>(log, "std::int8_t");
 #endif
+
 #ifdef INT16_MAX
-    for_type_and_vectors<check_type, std::int16_t>(log, "std::int16_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_short, std::int16_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::int16_t>(log, "std::int16_t");
 #endif
+
 #ifdef INT32_MAX
-    for_type_and_vectors<check_type, std::int32_t>(log, "std::int32_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_int, std::int32_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::int32_t>(log, "std::int32_t");
 #endif
+
 #ifdef INT64_MAX
-    for_type_and_vectors<check_type, std::int64_t>(log, "std::int64_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_long, std::int64_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::int64_t>(log, "std::int64_t");
 #endif
+
 #ifdef UINT8_MAX
-    for_type_and_vectors<check_type, std::uint8_t>(log, "std::uint8_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_uchar, std::uint8_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::uint8_t>(log, "std::uint8_t");
 #endif
+
 #ifdef UINT16_MAX
-    for_type_and_vectors<check_type, std::uint16_t>(log, "std::uint16_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_ushort, std::uint16_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::uint16_t>(log, "std::uint16_t");
 #endif
+
 #ifdef UINT32_MAX
-    for_type_and_vectors<check_type, std::uint32_t>(log, "std::uint32_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_uint, std::uint32_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::uint32_t>(log, "std::uint32_t");
 #endif
+
 #ifdef UINT64_MAX
-    for_type_and_vectors<check_type, std::uint64_t>(log, "std::uint64_t");
+#if SYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS
+    if (!std::is_same<sycl::cl_ulong, std::uint64_t>::value)
+#endif
+      for_type_and_vectors<check_type, std::uint64_t>(log, "std::uint64_t");
 #endif
   }
 };