13
13
#include < random>
14
14
#include < vector>
15
15
16
- namespace my_sycl = sycl::ext::oneapi;
16
+ namespace my_sycl = sycl::ext::oneapi::experimental ;
17
17
18
18
auto async_handler_ = [](sycl::exception_list ex_list) {
19
19
for (auto &ex : ex_list) {
@@ -105,9 +105,8 @@ int test_sort_over_group(sycl::queue &q, std::size_t local,
105
105
106
106
sycl::range<dim> local_range = get_range<dim>(local);
107
107
108
- std::size_t local_memory_size =
109
- my_sycl::experimental::default_sorter<>::memory_required<T>(
110
- sycl::memory_scope::work_group, local_range);
108
+ std::size_t local_memory_size = my_sycl::default_sorter<>::memory_required<T>(
109
+ sycl::memory_scope::work_group, local_range);
111
110
112
111
if (local_memory_size >
113
112
q.get_device ().template get_info <sycl::info::device::local_mem_size>())
@@ -131,22 +130,22 @@ int test_sort_over_group(sycl::queue &q, std::size_t local,
131
130
if constexpr (std::is_same_v<Compare, std::less<T>> &&
132
131
!std::is_same_v<T, CustomType>)
133
132
aI1[local_id] = my_sycl::sort_over_group (
134
- my_sycl::experimental:: group_with_scratchpad (
133
+ my_sycl::group_with_scratchpad (
135
134
id.get_group (),
136
135
sycl::span{&scratch[0 ], local_memory_size}),
137
136
aI1[local_id]);
138
137
break ;
139
138
case 1 :
140
139
aI1[local_id] = my_sycl::sort_over_group (
141
- my_sycl::experimental:: group_with_scratchpad (
140
+ my_sycl::group_with_scratchpad (
142
141
id.get_group (),
143
142
sycl::span{&scratch[0 ], local_memory_size}),
144
143
aI1[local_id], comp);
145
144
break ;
146
145
case 2 :
147
146
aI1[local_id] = my_sycl::sort_over_group (
148
147
id.get_group (), aI1[local_id],
149
- my_sycl::experimental:: default_sorter<Compare>(
148
+ my_sycl::default_sorter<Compare>(
150
149
sycl::span{&scratch[0 ], local_memory_size}));
151
150
break ;
152
151
}
@@ -161,9 +160,8 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
161
160
auto n = bufI1.size ();
162
161
auto n_groups = (n - 1 ) / n_items + 1 ;
163
162
164
- std::size_t local_memory_size =
165
- my_sycl::experimental::default_sorter<>::memory_required<T>(
166
- sycl::memory_scope::work_group, n);
163
+ std::size_t local_memory_size = my_sycl::default_sorter<>::memory_required<T>(
164
+ sycl::memory_scope::work_group, n);
167
165
if (local_memory_size >
168
166
q.get_device ().template get_info <sycl::info::device::local_mem_size>())
169
167
std::cout << " local_memory_size = " << local_memory_size << " , available = "
@@ -190,15 +188,15 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
190
188
if constexpr (std::is_same_v<Compare, std::less<T>> &&
191
189
!std::is_same_v<T, CustomType>)
192
190
my_sycl::joint_sort (
193
- my_sycl::experimental:: group_with_scratchpad (
191
+ my_sycl::group_with_scratchpad (
194
192
id.get_group (),
195
193
sycl::span{&scratch[0 ], local_memory_size}),
196
194
ptr_keys,
197
195
ptr_keys + sycl::min (n_items, n - group_id * n_items));
198
196
break ;
199
197
case 1 :
200
198
my_sycl::joint_sort (
201
- my_sycl::experimental:: group_with_scratchpad (
199
+ my_sycl::group_with_scratchpad (
202
200
id.get_group (),
203
201
sycl::span{&scratch[0 ], local_memory_size}),
204
202
ptr_keys,
@@ -208,7 +206,7 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
208
206
my_sycl::joint_sort (
209
207
id.get_group (), ptr_keys,
210
208
ptr_keys + sycl::min (n_items, n - group_id * n_items),
211
- my_sycl::experimental:: default_sorter<Compare>(
209
+ my_sycl::default_sorter<Compare>(
212
210
sycl::span{&scratch[0 ], local_memory_size}));
213
211
break ;
214
212
}
0 commit comments