Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 9debe19

Browse files
authored
[SYCL] Move the group sorting extension to experimental namespace (#633)
Spec changes: intel/llvm#4666 Implementation changes: intel/llvm#5169 Signed-off-by: Fedorov, Andrey <[email protected]>
1 parent cabb936 commit 9debe19

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

SYCL/GroupAlgorithm/SYCL2020/sort.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <random>
1414
#include <vector>
1515

16-
namespace my_sycl = sycl::ext::oneapi;
16+
namespace my_sycl = sycl::ext::oneapi::experimental;
1717

1818
auto async_handler_ = [](sycl::exception_list ex_list) {
1919
for (auto &ex : ex_list) {
@@ -105,9 +105,8 @@ int test_sort_over_group(sycl::queue &q, std::size_t local,
105105

106106
sycl::range<dim> local_range = get_range<dim>(local);
107107

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);
111110

112111
if (local_memory_size >
113112
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,
131130
if constexpr (std::is_same_v<Compare, std::less<T>> &&
132131
!std::is_same_v<T, CustomType>)
133132
aI1[local_id] = my_sycl::sort_over_group(
134-
my_sycl::experimental::group_with_scratchpad(
133+
my_sycl::group_with_scratchpad(
135134
id.get_group(),
136135
sycl::span{&scratch[0], local_memory_size}),
137136
aI1[local_id]);
138137
break;
139138
case 1:
140139
aI1[local_id] = my_sycl::sort_over_group(
141-
my_sycl::experimental::group_with_scratchpad(
140+
my_sycl::group_with_scratchpad(
142141
id.get_group(),
143142
sycl::span{&scratch[0], local_memory_size}),
144143
aI1[local_id], comp);
145144
break;
146145
case 2:
147146
aI1[local_id] = my_sycl::sort_over_group(
148147
id.get_group(), aI1[local_id],
149-
my_sycl::experimental::default_sorter<Compare>(
148+
my_sycl::default_sorter<Compare>(
150149
sycl::span{&scratch[0], local_memory_size}));
151150
break;
152151
}
@@ -161,9 +160,8 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
161160
auto n = bufI1.size();
162161
auto n_groups = (n - 1) / n_items + 1;
163162

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);
167165
if (local_memory_size >
168166
q.get_device().template get_info<sycl::info::device::local_mem_size>())
169167
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,
190188
if constexpr (std::is_same_v<Compare, std::less<T>> &&
191189
!std::is_same_v<T, CustomType>)
192190
my_sycl::joint_sort(
193-
my_sycl::experimental::group_with_scratchpad(
191+
my_sycl::group_with_scratchpad(
194192
id.get_group(),
195193
sycl::span{&scratch[0], local_memory_size}),
196194
ptr_keys,
197195
ptr_keys + sycl::min(n_items, n - group_id * n_items));
198196
break;
199197
case 1:
200198
my_sycl::joint_sort(
201-
my_sycl::experimental::group_with_scratchpad(
199+
my_sycl::group_with_scratchpad(
202200
id.get_group(),
203201
sycl::span{&scratch[0], local_memory_size}),
204202
ptr_keys,
@@ -208,7 +206,7 @@ int test_joint_sort(sycl::queue &q, std::size_t n_items, std::size_t local,
208206
my_sycl::joint_sort(
209207
id.get_group(), ptr_keys,
210208
ptr_keys + sycl::min(n_items, n - group_id * n_items),
211-
my_sycl::experimental::default_sorter<Compare>(
209+
my_sycl::default_sorter<Compare>(
212210
sycl::span{&scratch[0], local_memory_size}));
213211
break;
214212
}

0 commit comments

Comments
 (0)