Skip to content

[SYCL] Remove duplicate FunctionPropertyMetaInfo trait #22741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
againull merged 1 commit into from
Jul 23, 2026
Merged

[SYCL] Remove duplicate FunctionPropertyMetaInfo trait #22741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,6 @@ struct PropertyMetaInfo<
static constexpr unsigned int value = 0;
};

template <unsigned int Size>
struct FunctionPropertyMetaInfo<
sycl::ext::intel::experimental::grf_size_key::value_t<Size>> {
static_assert(Size == 128 || Size == 256 || Size == 512,
"Unsupported GRF size");
static constexpr const char *name = "sycl-grf-size";
static constexpr unsigned int value = Size;
};
template <>
struct FunctionPropertyMetaInfo<
sycl::ext::intel::experimental::grf_size_automatic_key::value_t> {
static constexpr const char *name = "sycl-grf-size";
static constexpr unsigned int value = 0;
};

template <typename Properties>
struct ConflictingProperties<sycl::ext::intel::experimental::grf_size_key,
Properties>
Expand Down
22 changes: 0 additions & 22 deletions sycl/include/sycl/ext/oneapi/experimental/virtual_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,6 @@ struct PropertyMetaInfo<indirectly_callable_key::value_t<Set>> {
#endif
};

template <typename Set>
struct FunctionPropertyMetaInfo<indirectly_callable_key::value_t<Set>> {
static constexpr const char *name = "indirectly-callable";
static constexpr const char *value =
#ifdef __SYCL_DEVICE_ONLY__
__builtin_sycl_unique_stable_name(Set);
#else
"";
#endif
};

#ifdef __SYCL_DEVICE_ONLY__
// Helper to concatenate several lists of characters into a single string.
// Lists are separated from each other with comma within the resulting string.
Expand Down Expand Up @@ -117,17 +106,6 @@ struct PropertyMetaInfo<calls_indirectly_key::value_t<SetIds...>> {
#endif
};

template <typename... SetIds>
struct FunctionPropertyMetaInfo<calls_indirectly_key::value_t<SetIds...>> {
static constexpr const char *name = "calls-indirectly";
static constexpr const char *value =
#ifdef __SYCL_DEVICE_ONLY__
UniqueStableNameListStr<SetIds...>::value;
#else
"";
#endif
};

} // namespace detail

} // namespace ext::oneapi::experimental
Expand Down
124 changes: 12 additions & 112 deletions sycl/include/sycl/ext/oneapi/free_function_kernel_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <stddef.h>
#include <stdint.h>
#include <sycl/ext/oneapi/properties/property_utils.hpp>
#include <sycl/ext/oneapi/properties/property_value.hpp>

#include <type_traits>
Expand All @@ -22,74 +23,6 @@ namespace detail {
template <typename T>
using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;

template <typename PropertyT> struct FunctionPropertyMetaInfo;

template <size_t... Xs> struct FunctionPropertyAllNonZero {
static constexpr bool value = true;
};
template <size_t X, size_t... Xs> struct FunctionPropertyAllNonZero<X, Xs...> {
static constexpr bool value =
X > 0 && FunctionPropertyAllNonZero<Xs...>::value;
};

inline constexpr size_t FunctionPropertyDecimalBase = 10;

template <size_t... Sizes> struct FunctionPropertySizeList {};
template <char... Chars> struct FunctionPropertyCharList {};

template <char... Chars> struct FunctionPropertyCharsToStr {
static constexpr const char value[] = {Chars..., '\0'};
};

template <typename List, typename ParsedList, char... Chars>
struct FunctionPropertySizeListToStrHelper;

template <size_t Value, size_t... Values, char... ParsedChars, char... Chars>
struct FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<Value, Values...>,
FunctionPropertyCharList<ParsedChars...>, Chars...>
: FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<Value / FunctionPropertyDecimalBase,
Values...>,
FunctionPropertyCharList<ParsedChars...>,
'0' + (Value % FunctionPropertyDecimalBase), Chars...> {};

template <size_t... Values, char... ParsedChars, char... Chars>
struct FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<0, Values...>,
FunctionPropertyCharList<ParsedChars...>, Chars...>
: FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<Values...>,
FunctionPropertyCharList<ParsedChars..., Chars..., ','>> {};

template <size_t... Values, char... ParsedChars>
struct FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<0, Values...>,
FunctionPropertyCharList<ParsedChars...>>
: FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<Values...>,
FunctionPropertyCharList<ParsedChars..., '0', ','>> {};

template <char... ParsedChars, char... Chars>
struct FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<0>, FunctionPropertyCharList<ParsedChars...>,
Chars...> : FunctionPropertyCharsToStr<ParsedChars..., Chars...> {};

template <char... ParsedChars>
struct FunctionPropertySizeListToStrHelper<
FunctionPropertySizeList<0>, FunctionPropertyCharList<ParsedChars...>>
: FunctionPropertyCharsToStr<ParsedChars..., '0'> {};

template <>
struct FunctionPropertySizeListToStrHelper<FunctionPropertySizeList<>,
FunctionPropertyCharList<>>
: FunctionPropertyCharsToStr<> {};

template <size_t... Sizes>
struct FunctionPropertySizeListToStr
: FunctionPropertySizeListToStrHelper<FunctionPropertySizeList<Sizes...>,
FunctionPropertyCharList<>> {};

} // namespace detail

struct nd_range_kernel_key
Expand Down Expand Up @@ -175,7 +108,7 @@ struct property_value<work_group_size_key, std::integral_constant<size_t, Dim0>,
static_assert(
sizeof...(Dims) + 1 <= 3,
"work_group_size property currently only supports up to three values.");
static_assert(detail::FunctionPropertyAllNonZero<Dim0, Dims...>::value,
static_assert(detail::AllNonZero<Dim0, Dims...>::value,
"work_group_size property must only contain non-zero values.");

static constexpr size_t dimensions = sizeof...(Dims) + 1;
Expand All @@ -199,7 +132,7 @@ struct property_value<work_group_size_hint_key,
"work_group_size_hint property currently only supports up to "
"three values.");
static_assert(
detail::FunctionPropertyAllNonZero<Dim0, Dims...>::value,
detail::AllNonZero<Dim0, Dims...>::value,
"work_group_size_hint property must only contain non-zero values.");

constexpr size_t operator[](int Dim) const {
Expand Down Expand Up @@ -234,7 +167,7 @@ struct property_value<max_work_group_size_key,
static_assert(
sizeof...(Dims) + 1 <= 3,
"max_work_group_size currently only supports up to three values.");
static_assert(detail::FunctionPropertyAllNonZero<Dim0, Dims...>::value,
static_assert(detail::AllNonZero<Dim0, Dims...>::value,
"max_work_group_size must only contain non-zero values.");

static constexpr size_t dimensions = sizeof...(Dims) + 1;
Expand Down Expand Up @@ -281,12 +214,12 @@ inline constexpr max_linear_work_group_size_key::value_t<Size>
namespace detail {

template <int Dims>
struct FunctionPropertyMetaInfo<nd_range_kernel_key::value_t<Dims>> {
struct PropertyMetaInfo<nd_range_kernel_key::value_t<Dims>> {
static constexpr const char *name = "sycl-nd-range-kernel";
static constexpr int value = Dims;
};

template <> struct FunctionPropertyMetaInfo<single_task_kernel_key::value_t> {
template <> struct PropertyMetaInfo<single_task_kernel_key::value_t> {
static constexpr const char *name = "sycl-single-task-kernel";
static constexpr int value = 0;
};
Expand All @@ -310,65 +243,32 @@ struct HasCompileTimeEffect<max_linear_work_group_size_key::value_t<Size>>
template <size_t Dim0, size_t... Dims>
struct PropertyMetaInfo<work_group_size_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-work-group-size";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
};
template <size_t Dim0, size_t... Dims>
struct FunctionPropertyMetaInfo<work_group_size_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-work-group-size";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
static constexpr const char *value = SizeListToStr<Dim0, Dims...>::value;
};

template <size_t Dim0, size_t... Dims>
struct PropertyMetaInfo<work_group_size_hint_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-work-group-size-hint";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
};
template <size_t Dim0, size_t... Dims>
struct FunctionPropertyMetaInfo<
work_group_size_hint_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-work-group-size-hint";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
static constexpr const char *value = SizeListToStr<Dim0, Dims...>::value;
};

template <uint32_t Size>
struct PropertyMetaInfo<sub_group_size_key::value_t<Size>> {
static constexpr const char *name = "sycl-sub-group-size";
static constexpr uint32_t value = Size;
};
template <uint32_t Size>
struct FunctionPropertyMetaInfo<sub_group_size_key::value_t<Size>> {
static constexpr const char *name = "sycl-sub-group-size";
static constexpr uint32_t value = Size;
};

template <size_t Dim0, size_t... Dims>
struct PropertyMetaInfo<max_work_group_size_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-max-work-group-size";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
};
template <size_t Dim0, size_t... Dims>
struct FunctionPropertyMetaInfo<
max_work_group_size_key::value_t<Dim0, Dims...>> {
static constexpr const char *name = "sycl-max-work-group-size";
static constexpr const char *value =
FunctionPropertySizeListToStr<Dim0, Dims...>::value;
static constexpr const char *value = SizeListToStr<Dim0, Dims...>::value;
};

template <size_t Size>
struct PropertyMetaInfo<max_linear_work_group_size_key::value_t<Size>> {
static constexpr const char *name = "sycl-max-linear-work-group-size";
static constexpr size_t value = Size;
};
template <size_t Size>
struct FunctionPropertyMetaInfo<max_linear_work_group_size_key::value_t<Size>> {
static constexpr const char *name = "sycl-max-linear-work-group-size";
static constexpr size_t value = Size;
};

} // namespace detail
} // namespace ext::oneapi::experimental
Expand All @@ -378,12 +278,12 @@ struct FunctionPropertyMetaInfo<max_linear_work_group_size_key::value_t<Size>> {
#ifdef __SYCL_DEVICE_ONLY__
#define SYCL_EXT_ONEAPI_FUNCTION_PROPERTY(PROP) \
[[__sycl_detail__::add_ir_attributes_function( \
sycl::ext::oneapi::experimental::detail::FunctionPropertyMetaInfo< \
sycl::ext::oneapi::experimental::detail::PropertyMetaInfo< \
sycl::ext::oneapi::experimental::detail::remove_cvref_t< \
decltype(PROP)>>::name, \
sycl::ext::oneapi::experimental::detail::FunctionPropertyMetaInfo< \
sycl::ext::oneapi::experimental::detail::PropertyMetaInfo< \
sycl::ext::oneapi::experimental::detail::remove_cvref_t< \
decltype(PROP)>>::value)]]
#else
#define SYCL_EXT_ONEAPI_FUNCTION_PROPERTY(PROP)
#endif
#endif
6 changes: 0 additions & 6 deletions sycl/include/sycl/ext/oneapi/kernel_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,6 @@ struct PropertyMetaInfo<device_has_key::value_t<Aspects...>> {
static constexpr const char *value =
SizeListToStr<static_cast<size_t>(Aspects)...>::value;
};
template <aspect... Aspects>
struct FunctionPropertyMetaInfo<device_has_key::value_t<Aspects...>> {
static constexpr const char *name = "sycl-device-has";
static constexpr const char *value =
SizeListToStr<static_cast<size_t>(Aspects)...>::value;
};

template <typename T, typename = void>
struct HasKernelPropertiesGetMethod : std::false_type {};
Expand Down
8 changes: 8 additions & 0 deletions sycl/include/sycl/ext/oneapi/properties/property_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ namespace detail {
// Property value tooling
//******************************************************************************

// Trait for checking that all size_t values are non-zero.
template <size_t... Xs> struct AllNonZero {
static constexpr bool value = true;
};
template <size_t X, size_t... Xs> struct AllNonZero<X, Xs...> {
static constexpr bool value = X > 0 && AllNonZero<Xs...>::value;
};

// Simple helpers for containing primitive types as template arguments.
template <size_t... Sizes> struct SizeList {};
template <char... Sizes> struct CharList {};
Expand Down
Loading