[NFC][SYCL] Substitute is_valid_size_v with check_value_in_v (#16913)

That would match with pre-existing `check_type_in_v`.

Author: aelovikov-intel

sycl/include/sycl/builtins_utils_scalar.hpp

@@ -32,19 +32,6 @@ template <typename> struct use_fast_math : std::false_type {};
 #endif
 template <typename T> constexpr bool use_fast_math_v = use_fast_math<T>::value;
 
-template <size_t N, size_t... Ns> constexpr bool CheckSizeIn() {
-  constexpr bool SameSize[] = {(N == Ns)...};
-  // Replace with std::any_of with C++20.
-  for (size_t I = 0; I < sizeof...(Ns); ++I)
-    if (SameSize[I])
-      return true;
-  return false;
-}
-
-// NOTE: We need a constexpr variable definition for the constexpr functions
-//       as MSVC thinks function definitions are the same otherwise.
-template <size_t... Ns> constexpr bool check_size_in_v = CheckSizeIn<Ns...>();
-
 // Utility for converting a swizzle to a vector or preserve the type if it isn't
 // a swizzle.
 template <typename T> struct simplify_if_swizzle {

sycl/include/sycl/builtins_utils_vec.hpp

@@ -20,15 +20,6 @@
 namespace sycl {
 inline namespace _V1 {
 namespace detail {
-
-// Utilty trait for checking that the number of elements in T is in Ns.
-template <typename T, size_t... Ns>
-struct is_valid_size
-    : std::bool_constant<check_size_in_v<num_elements<T>::value, Ns...>> {};
-
-template <typename T, int... Ns>
-constexpr bool is_valid_size_v = is_valid_size<T, Ns...>::value;
-
 // Utility for converting a swizzle to a vector or preserve the type if it isn't
 // a swizzle.
 template <typename VecT, typename OperationLeftT, typename OperationRightT,

sycl/include/sycl/detail/builtins/geometric_functions.inc

@@ -14,10 +14,12 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 template <typename T>
-struct shape_geo : std::bool_constant<is_valid_size_v<T, 2, 3, 4> ||
-                                      is_scalar_arithmetic_v<T>> {};
+struct shape_geo
+    : std::bool_constant<check_value_in_v<num_elements_v<T>, 2, 3, 4> ||
+                         is_scalar_arithmetic_v<T>> {};
 template <typename T>
-struct shape_geo3or4 : std::bool_constant<is_valid_size_v<T, 3, 4>> {};
+struct shape_geo3or4
+    : std::bool_constant<check_value_in_v<num_elements_v<T>, 3, 4>> {};
 } // namespace detail
 
 BUILTIN_CREATE_ENABLER(builtin_enable_geo, default_ret_type, fp_elem_type,

sycl/include/sycl/detail/type_traits.hpp

@@ -383,6 +383,9 @@ struct map_type<T, From, To, Rest...> {
 template <typename T, typename... Ts>
 constexpr bool check_type_in_v = ((std::is_same_v<T, Ts> || ...));
 
+template <auto V, auto... Vs>
+constexpr bool check_value_in_v = (((V == Vs) || ...));
+
 #if __has_builtin(__type_pack_element)
 template <int N, typename... Ts>
 using nth_type_t = __type_pack_element<N, Ts...>;