Skip to content

Commit e455c33

Browse files
Cleanup test a bit
1 parent b449892 commit e455c33

File tree

1 file changed

+3
-60
lines changed

1 file changed

+3
-60
lines changed

sycl/test/extensions/properties/new_properties.cpp

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using namespace sycl::ext::oneapi::experimental::new_properties;
66

7-
using mock_property_sort_key_t = int;
8-
97
template <typename property_key_t> constexpr auto generate_property_key_name() {
108
#if defined(__clang__) || defined(__GNUC__)
119
return __PRETTY_FUNCTION__;
@@ -73,69 +71,14 @@ template <int... N> void test(std::integer_sequence<int, N...>) {
7371
}
7472
} // namespace bench
7573

76-
namespace test_group_load_store {
77-
struct naive : named_property_base<naive> {};
78-
struct full_group : named_property_base<full_group> {};
79-
constexpr properties pl1{full_group{}};
80-
constexpr properties pl2{pl1, naive{}};
81-
static_assert(pl1.template has_property<full_group>());
82-
static_assert(!pl1.template has_property<naive>());
83-
static_assert(pl2.template has_property<full_group>());
84-
static_assert(pl2.template has_property<naive>());
85-
86-
enum class data_placement { blocked, striped };
87-
template <data_placement placement>
88-
struct data_placement_property
89-
: named_property_base<data_placement_property<placement>,
90-
struct data_placement_property_key> {
91-
static constexpr bool is_blocked() {
92-
return placement == data_placement::blocked;
93-
}
94-
};
95-
inline constexpr data_placement_property<data_placement::blocked> blocked;
96-
inline constexpr data_placement_property<data_placement::striped> striped;
97-
98-
static_assert(properties{naive{}, blocked}
99-
.get_property<struct data_placement_property_key>()
100-
.is_blocked());
101-
static_assert(!properties{naive{}, striped}
102-
.get_property<struct data_placement_property_key>()
103-
.is_blocked());
104-
static_assert(
105-
properties{naive{}, blocked}
106-
.get_property_or_default_to<struct data_placement_property_key>(blocked)
107-
.is_blocked());
108-
static_assert(
109-
!properties{naive{}, data_placement_property<data_placement::striped>{}}
110-
.get_property_or_default_to<struct data_placement_property_key>(
111-
blocked)
112-
.is_blocked());
113-
static_assert(
114-
properties{naive{}}
115-
.get_property_or_default_to<struct data_placement_property_key>(blocked)
116-
.is_blocked());
117-
static_assert(
118-
!properties{naive{}}
119-
.get_property_or_default_to<struct data_placement_property_key>(
120-
striped)
121-
.is_blocked());
122-
123-
constexpr properties pl3{full_group{}, blocked};
124-
// constexpr properties pl4{pl3, naive{}};
125-
template <typename... other_property_list_tys, typename... other_property_tys>
126-
constexpr auto merge_properties(
127-
properties<detail::properties_type_list<other_property_list_tys...>>,
128-
other_property_tys...) {
129-
return 42;
130-
}
131-
static_assert(merge_properties(pl3, naive{}) == 42);
132-
} // namespace test_group_load_store
133-
13474
namespace test_merge_ctor {
13575
template <int N> struct property : named_property_base<property<N>> {};
13676

13777
constexpr properties pl1{property<1>{}, property<2>{}, property<3>{}};
13878
constexpr properties pl2{pl1, property<4>{}};
79+
static_assert(!pl1.has_property<property<4>>());
80+
static_assert(pl2.has_property<property<2>>());
81+
static_assert(pl2.has_property<property<4>>());
13982
} // namespace test_merge_ctor
14083

14184
namespace test_compile_prop_in_runtime_list {

0 commit comments

Comments
 (0)