Skip to content

Commit ad2b6bd

Browse files
author
Alberto Cabrera
committed
Recommiting and disabling commit-hook
Signed-off-by: Alberto Cabrera <[email protected]>
1 parent 62c9e29 commit ad2b6bd

File tree

2 files changed

+68
-76
lines changed

2 files changed

+68
-76
lines changed

‎sycl/test-e2e/syclcompat/math/math_compare.cpp‎

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,15 @@ void compare_not_equal_vec_kernel(Container *a, Container *b, Container *r) {
9696
*r = syclcompat::compare(*a, *b, std::not_equal_to<>());
9797
}
9898

99-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
100-
void test_compare_vec() {
99+
template <template <typename T, int Dim> typename ContainerT,
100+
typename ValueT> void test_compare_vec() {
101101
std::cout << __PRETTY_FUNCTION__ << std::endl;
102102
using Container = ContainerT<ValueT, 2>;
103103

104104
constexpr syclcompat::dim3 grid{1};
105105
constexpr syclcompat::dim3 threads{1};
106-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
106+
const Container op1 = {static_cast<ValueT>(1.0),
107+
static_cast<ValueT>(2.0)};
107108
Container op2 = {static_cast<ValueT>(1.0),
108109
sycl::nan(static_cast<unsigned int>(0))};
109110

@@ -177,14 +178,15 @@ void unordered_compare_not_equal_vec_kernel(Container *a, Container *b,
177178
*r = syclcompat::unordered_compare(*a, *b, std::not_equal_to<>());
178179
}
179180

180-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
181-
void test_unordered_compare_vec() {
181+
template <template <typename T, int Dim> typename ContainerT,
182+
typename ValueT> void test_unordered_compare_vec() {
182183
std::cout << __PRETTY_FUNCTION__ << std::endl;
183184
using Container = ContainerT<ValueT, 2>;
184185

185186
constexpr syclcompat::dim3 grid{1};
186187
constexpr syclcompat::dim3 threads{1};
187-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
188+
const Container op1 = {static_cast<ValueT>(1.0),
189+
static_cast<ValueT>(2.0)};
188190
Container op2 = {static_cast<ValueT>(1.0),
189191
sycl::nan(static_cast<unsigned int>(0))};
190192

@@ -207,14 +209,15 @@ void compare_both_kernel(Container *a, Container *b, bool *r) {
207209
*r = syclcompat::compare_both(*a, *b, std::equal_to<>());
208210
}
209211

210-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
211-
void test_compare_both() {
212+
template <template <typename T, int Dim> typename ContainerT,
213+
typename ValueT> void test_compare_both() {
212214
std::cout << __PRETTY_FUNCTION__ << std::endl;
213215
using Container = ContainerT<ValueT, 2>;
214216

215217
constexpr syclcompat::dim3 grid{1};
216218
constexpr syclcompat::dim3 threads{1};
217-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
219+
const Container op1 = {static_cast<ValueT>(1.0),
220+
static_cast<ValueT>(2.0)};
218221
Container op2 = {static_cast<ValueT>(1.0),
219222
sycl::nan(static_cast<unsigned int>(0))};
220223

@@ -236,14 +239,15 @@ void unordered_compare_both_kernel(Container *a, Container *b, bool *r) {
236239
*r = syclcompat::unordered_compare_both(*a, *b, std::equal_to<>());
237240
}
238241

239-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
240-
void test_unordered_compare_both() {
242+
template <template <typename T, int Dim> typename ContainerT,
243+
typename ValueT> void test_unordered_compare_both() {
241244
std::cout << __PRETTY_FUNCTION__ << std::endl;
242245
using Container = ContainerT<ValueT, 2>;
243246

244247
constexpr syclcompat::dim3 grid{1};
245248
constexpr syclcompat::dim3 threads{1};
246-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
249+
const Container op1 = {static_cast<ValueT>(1.0),
250+
static_cast<ValueT>(2.0)};
247251
Container op2 = {static_cast<ValueT>(1.0),
248252
sycl::nan(static_cast<unsigned int>(0))};
249253

@@ -266,17 +270,21 @@ void compare_mask_kernel(Container *a, Container *b, unsigned *r) {
266270
*r = syclcompat::compare_mask(*a, *b, std::equal_to<>());
267271
}
268272

269-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
270-
void test_compare_mask() {
273+
template <template <typename T, int Dim> typename ContainerT,
274+
typename ValueT> void test_compare_mask() {
271275
std::cout << __PRETTY_FUNCTION__ << std::endl;
272276
using Container = ContainerT<ValueT, 2>;
273277

274278
constexpr syclcompat::dim3 grid{1};
275279
constexpr syclcompat::dim3 threads{1};
276-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
277-
const Container op2 = {static_cast<ValueT>(2.0), static_cast<ValueT>(1.0)};
278-
const Container op3 = {static_cast<ValueT>(1.0), static_cast<ValueT>(3.0)};
279-
const Container op4 = {static_cast<ValueT>(3.0), static_cast<ValueT>(2.0)};
280+
const Container op1 = {static_cast<ValueT>(1.0),
281+
static_cast<ValueT>(2.0)};
282+
const Container op2 = {static_cast<ValueT>(2.0),
283+
static_cast<ValueT>(1.0)};
284+
const Container op3 = {static_cast<ValueT>(1.0),
285+
static_cast<ValueT>(3.0)};
286+
const Container op4 = {static_cast<ValueT>(3.0),
287+
static_cast<ValueT>(2.0)};
280288
Container op5 = {sycl::nan(static_cast<unsigned int>(0)),
281289
sycl::nan(static_cast<unsigned int>(0))};
282290

@@ -311,17 +319,21 @@ void unordered_compare_mask_kernel(Container *a, Container *b, unsigned *r) {
311319
*r = syclcompat::unordered_compare_mask(*a, *b, std::equal_to<>());
312320
}
313321

314-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
315-
void test_unordered_compare_mask() {
322+
template <template <typename T, int Dim> typename ContainerT,
323+
typename ValueT> void test_unordered_compare_mask() {
316324
std::cout << __PRETTY_FUNCTION__ << std::endl;
317325
using Container = ContainerT<ValueT, 2>;
318326

319327
constexpr syclcompat::dim3 grid{1};
320328
constexpr syclcompat::dim3 threads{1};
321-
const Container op1 = {static_cast<ValueT>(1.0), static_cast<ValueT>(2.0)};
322-
const Container op2 = {static_cast<ValueT>(2.0), static_cast<ValueT>(1.0)};
323-
const Container op3 = {static_cast<ValueT>(1.0), static_cast<ValueT>(3.0)};
324-
const Container op4 = {static_cast<ValueT>(3.0), static_cast<ValueT>(2.0)};
329+
const Container op1 = {static_cast<ValueT>(1.0),
330+
static_cast<ValueT>(2.0)};
331+
const Container op2 = {static_cast<ValueT>(2.0),
332+
static_cast<ValueT>(1.0)};
333+
const Container op3 = {static_cast<ValueT>(1.0),
334+
static_cast<ValueT>(3.0)};
335+
const Container op4 = {static_cast<ValueT>(3.0),
336+
static_cast<ValueT>(2.0)};
325337
Container op5 = {sycl::nan(static_cast<unsigned int>(0)),
326338
sycl::nan(static_cast<unsigned int>(0))};
327339

@@ -356,24 +368,16 @@ int main() {
356368
INSTANTIATE_ALL_TYPES(fp_type_list, test_unordered_compare);
357369
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_compare_vec);
358370
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_compare_vec);
359-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec,
360-
test_unordered_compare_vec);
361-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
362-
test_unordered_compare_vec);
371+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_unordered_compare_vec);
372+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_unordered_compare_vec);
363373
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_compare_both);
364-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
365-
test_compare_both);
366-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec,
367-
test_unordered_compare_both);
368-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
369-
test_unordered_compare_both);
374+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_compare_both);
375+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_unordered_compare_both);
376+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_unordered_compare_both);
370377
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_compare_mask);
371-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
372-
test_compare_mask);
373-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec,
374-
test_unordered_compare_mask);
375-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
376-
test_unordered_compare_mask);
378+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_compare_mask);
379+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_unordered_compare_mask);
380+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_unordered_compare_mask);
377381

378382
return 0;
379383
}

‎sycl/test-e2e/syclcompat/math/math_ops.cpp‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void test_syclcompat_max() {
5454
template <typename ValueT, typename ValueU>
5555
inline void min_kernel(ValueT *a, ValueU *b,
5656
std::common_type_t<ValueT, ValueU> *r) {
57-
*r = syclcompat::min<ValueT, ValueU>(*a, *b);
57+
*r = syclcompat::min<ValueT,ValueU>(*a, *b);
5858
}
5959

6060
template <typename ValueT, typename ValueU = ValueT>
@@ -90,7 +90,8 @@ void test_syclcompat_fmin_nan() {
9090
const ValueU op2 = static_cast<ValueU>(10);
9191
ValueU op3 = sycl::nan(static_cast<unsigned int>(0));
9292

93-
const ValueTU res = static_cast<ValueTU>(5);
93+
const ValueTU res =
94+
static_cast<ValueTU>(5);
9495

9596
BinaryOpTestLauncher<ValueT, ValueU>(grid, threads)
9697
.template launch_test<fmin_nan_kernel<ValueT, ValueU>>(op1, op2, res);
@@ -99,9 +100,8 @@ void test_syclcompat_fmin_nan() {
99100
.template launch_test<fmin_nan_kernel<ValueT, ValueU>>(op1, op3, op3);
100101
}
101102

102-
template <template <typename T, int Dim> typename ContainerT, typename ValueT,
103-
typename ValueU = ValueT>
104-
void test_container_syclcompat_fmin_nan() {
103+
template <template <typename T, int Dim> typename ContainerT, typename ValueT, typename ValueU = ValueT>
104+
void test_container_syclcompat_fmin_nan(){
105105
std::cout << __PRETTY_FUNCTION__ << std::endl;
106106

107107
constexpr syclcompat::dim3 grid{1};
@@ -114,10 +114,8 @@ void test_container_syclcompat_fmin_nan() {
114114

115115
const ContT op4 = {static_cast<ValueT>(5), static_cast<ValueT>(10)};
116116
const ContU op5 = {static_cast<ValueU>(10), static_cast<ValueU>(5)};
117-
const ContU op6 = {sycl::nan(static_cast<unsigned int>(0)),
118-
sycl::nan(static_cast<unsigned int>(0))};
119-
const ContTU op6_res = {sycl::nan(static_cast<unsigned int>(0)),
120-
sycl::nan(static_cast<unsigned int>(0))};
117+
const ContU op6 = {sycl::nan(static_cast<unsigned int>(0)), sycl::nan(static_cast<unsigned int>(0))};
118+
const ContTU op6_res = {sycl::nan(static_cast<unsigned int>(0)), sycl::nan(static_cast<unsigned int>(0))};
121119

122120
const ContTU res2{static_cast<ValueTU>(5), static_cast<ValueTU>(5)};
123121

@@ -146,7 +144,8 @@ void test_syclcompat_fmax_nan() {
146144
const ValueU op2 = static_cast<ValueU>(10);
147145
ValueU op3 = sycl::nan(static_cast<unsigned int>(0));
148146

149-
const ValueTU res = static_cast<ValueTU>(10);
147+
const ValueTU res =
148+
static_cast<ValueTU>(10);
150149

151150
BinaryOpTestLauncher<ValueT, ValueU>(grid, threads)
152151
.template launch_test<fmax_nan_kernel<ValueT, ValueU>>(op1, op2, res);
@@ -155,9 +154,8 @@ void test_syclcompat_fmax_nan() {
155154
.template launch_test<fmax_nan_kernel<ValueT, ValueU>>(op1, op3, op3);
156155
}
157156

158-
template <template <typename T, int Dim> typename ContainerT, typename ValueT,
159-
typename ValueU = ValueT>
160-
void test_container_syclcompat_fmax_nan() {
157+
template <template <typename T, int Dim> typename ContainerT, typename ValueT, typename ValueU = ValueT>
158+
void test_container_syclcompat_fmax_nan(){
161159
std::cout << __PRETTY_FUNCTION__ << std::endl;
162160

163161
constexpr syclcompat::dim3 grid{1};
@@ -170,10 +168,8 @@ void test_container_syclcompat_fmax_nan() {
170168

171169
const ContT op4 = {static_cast<ValueT>(5), static_cast<ValueT>(10)};
172170
const ContU op5 = {static_cast<ValueU>(10), static_cast<ValueU>(5)};
173-
const ContU op6 = {sycl::nan(static_cast<unsigned int>(0)),
174-
sycl::nan(static_cast<unsigned int>(0))};
175-
const ContTU op6_res = {sycl::nan(static_cast<unsigned int>(0)),
176-
sycl::nan(static_cast<unsigned int>(0))};
171+
const ContU op6 = {sycl::nan(static_cast<unsigned int>(0)), sycl::nan(static_cast<unsigned int>(0))};
172+
const ContTU op6_res = {sycl::nan(static_cast<unsigned int>(0)), sycl::nan(static_cast<unsigned int>(0))};
177173

178174
const ContTU res2{static_cast<ValueTU>(10), static_cast<ValueTU>(10)};
179175

@@ -271,7 +267,8 @@ template <typename ValueT> void test_syclcompat_cbrt() {
271267
.template launch_test<cbrt_kernel<ValueT>>(op2, res2);
272268
}
273269

274-
template <typename T> void isnan_kernel(T *a, T *r) {
270+
template <typename T>
271+
void isnan_kernel(T *a, T *r) {
275272
*r = syclcompat::isnan(*a);
276273
}
277274

@@ -322,8 +319,7 @@ template <typename ValueT> void test_clamp() {
322319
.template launch_test<clamp_kernel<ValueT>>(op3, expect3);
323320
}
324321

325-
template <template <typename T, int Dim> typename ContainerT, typename ValueT>
326-
void test_container_clamp() {
322+
template <template <typename T, int Dim> typename ContainerT, typename ValueT> void test_container_clamp() {
327323
std::cout << __PRETTY_FUNCTION__ << std::endl;
328324

329325
constexpr syclcompat::dim3 grid{1};
@@ -359,27 +355,21 @@ int main() {
359355
#endif
360356

361357
INSTANTIATE_ALL_TYPES(fp_type_list, test_syclcompat_fmin_nan);
362-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec,
363-
test_container_syclcompat_fmin_nan);
364-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
365-
test_container_syclcompat_fmin_nan);
358+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_container_syclcompat_fmin_nan);
359+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_container_syclcompat_fmin_nan);
366360
test_syclcompat_fmin_nan<double, float>();
367361
test_container_syclcompat_fmin_nan<sycl::vec, float, double>();
368362
#ifdef SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS
369-
test_container_syclcompat_fmin_nan<sycl::vec, sycl::ext::oneapi::bfloat16,
370-
double>();
363+
test_container_syclcompat_fmin_nan<sycl::vec, sycl::ext::oneapi::bfloat16, double>();
371364
#endif
372365

373366
INSTANTIATE_ALL_TYPES(fp_type_list, test_syclcompat_fmax_nan);
374-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec,
375-
test_container_syclcompat_fmax_nan);
376-
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray,
377-
test_container_syclcompat_fmax_nan);
367+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::vec, test_container_syclcompat_fmax_nan);
368+
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_container_syclcompat_fmax_nan);
378369
test_syclcompat_fmax_nan<double, float>();
379370
test_container_syclcompat_fmax_nan<sycl::vec, float, double>();
380371
#ifdef SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS
381-
test_container_syclcompat_fmax_nan<sycl::vec, sycl::ext::oneapi::bfloat16,
382-
double>();
372+
test_container_syclcompat_fmax_nan<sycl::vec, sycl::ext::oneapi::bfloat16, double>();
383373
#endif
384374

385375
INSTANTIATE_ALL_TYPES(value_type_list, test_syclcompat_pow);
@@ -393,10 +383,8 @@ int main() {
393383
INSTANTIATE_ALL_CONTAINER_TYPES(fp_type_list, sycl::marray, test_isnan);
394384

395385
INSTANTIATE_ALL_TYPES(value_type_list, test_clamp);
396-
INSTANTIATE_ALL_CONTAINER_TYPES(vec_type_list, sycl::vec,
397-
test_container_clamp);
398-
INSTANTIATE_ALL_CONTAINER_TYPES(marray_type_list, sycl::marray,
399-
test_container_clamp);
386+
INSTANTIATE_ALL_CONTAINER_TYPES(vec_type_list, sycl::vec, test_container_clamp);
387+
INSTANTIATE_ALL_CONTAINER_TYPES(marray_type_list, sycl::marray, test_container_clamp);
400388

401389
return 0;
402390
}

0 commit comments

Comments
 (0)