Skip to content

Commit a16f91a

Browse files
vasilytricbb-sycl
vasilytric
authored and
bb-sycl
committed
[SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (intel#748)
* [SYCL][ESIMD] Split tests into core and fp_extra
1 parent 62aab8b commit a16f91a

File tree

8 files changed

+86
-232
lines changed

8 files changed

+86
-232
lines changed

‎SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
using namespace esimd_test::api::functional;
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
=======
3031
using namespace sycl::ext::intel::experimental::esimd;
3132

@@ -168,13 +169,16 @@ template <typename DataT, typename DimT, typename TestCaseT> class run_test {
168169
}
169170
};
170171
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
172+
=======
173+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
171174

172175
int main(int, char **) {
173176
sycl::queue queue(esimd_test::ESIMDSelector{},
174177
esimd_test::createExceptionHandler());
175178

176179
bool passed = true;
177180

181+
<<<<<<< HEAD
178182
<<<<<<< HEAD
179183
const auto types = get_tested_types<tested_types::core>();
180184
const auto dims = get_all_dimensions();
@@ -194,6 +198,15 @@ int main(int, char **) {
194198

195199
passed &= for_all_combinations<run_test>(types, dims, contexts, queue);
196200
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
201+
=======
202+
const auto types = get_tested_types<tested_types::core>();
203+
const auto dims = get_all_dimensions();
204+
const auto contexts =
205+
unnamed_type_pack<ctors::initializer, ctors::var_decl,
206+
ctors::rval_in_expr, ctors::const_ref>::generate();
207+
208+
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
209+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
197210

198211
std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");
199212
return passed ? 0 : 1;

‎SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
//
88
//===----------------------------------------------------------------------===//
99
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
10+
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
11+
=======
12+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
1013
///
1114
/// \file
1215
/// This file provides functions for tests on simd copy constructor.
1316
///
1417
//===----------------------------------------------------------------------===//
1518

1619
#pragma once
20+
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
1721
=======
1822
// REQUIRES: gpu, level_zero
1923
// XREQUIRES: gpu
@@ -26,6 +30,8 @@
2630
//
2731
// Test for esimd copy constructor.
2832
>>>>>>> 4dd90b8a6 ([SYCL][ESIMD] Enable simd copy constructor tests (#722)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
33+
=======
34+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
2935

3036
#include "common.hpp"
3137

@@ -162,6 +168,7 @@ template <typename DataT, typename DimT, typename TestCaseT> class run_test {
162168
}
163169
};
164170

171+
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
165172
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
166173
} // namespace esimd_test::api::functional::ctors
167174
=======
@@ -182,3 +189,6 @@ int main(int, char **) {
182189
return passed ? 0 : 1;
183190
}
184191
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
192+
=======
193+
} // namespace esimd_test::api::functional::ctors
194+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp

‎SYCL/ESIMD/api/functional/ctors/ctor_default.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ template <typename DataT, typename DimT, typename TestCaseT> struct run_test {
108108
}
109109
};
110110

111+
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_default.hpp
111112
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_default.hpp
112113
} // namespace esimd_test::api::functional::ctors
113114
=======
@@ -128,3 +129,6 @@ int main(int, char **) {
128129
return passed ? 0 : 1;
129130
}
130131
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_default.cpp
132+
=======
133+
} // namespace esimd_test::api::functional::ctors
134+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_default.cpp

‎SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@
2727
#include "ctor_fill.hpp"
2828

2929
using namespace esimd_test::api::functional;
30+
<<<<<<< HEAD
3031
using init_val = ctors::init_val;
32+
=======
33+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
3134

3235
int main(int, char **) {
3336
sycl::queue queue(esimd_test::ESIMDSelector{},
3437
esimd_test::createExceptionHandler());
3538

3639
bool passed = true;
3740

41+
<<<<<<< HEAD
3842
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp
3943
const auto types = get_tested_types<tested_types::fp_extra>();
4044
const auto single_dim = get_dimensions<8>();
@@ -52,37 +56,57 @@ int main(int, char **) {
5256
#ifdef SIMD_RUN_TEST_WITH_DENORM_INIT_VAL_AND_ULP_STEP
5357
{
5458
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp
59+
=======
60+
const auto types = get_tested_types<tested_types::fp_extra>();
61+
const auto single_dim = get_dimensions<8>();
62+
const auto context = unnamed_type_pack<ctors::var_decl>::generate();
63+
// Run for specific combinations of types, base and step values and vector
64+
// length.
65+
// The first init_val value it's a base value and the second init_val value
66+
// it's a step value.
67+
#ifdef SIMD_RUN_TEST_WITH_DENORM_INIT_VAL_AND_ULP_STEP
68+
{
69+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
5570
const auto base_values =
5671
ctors::get_init_values_pack<ctors::init_val::denorm>();
5772
const auto step_values =
5873
ctors::get_init_values_pack<ctors::init_val::ulp>();
5974
passed &= for_all_combinations<ctors::run_test>(
6075
types, single_dim, context, base_values, step_values, queue);
76+
<<<<<<< HEAD
6177
=======
6278
const auto base_values = ctors::get_init_values_pack<init_val::denorm>();
6379
const auto step_values = ctors::get_init_values_pack<init_val::ulp>();
6480
passed &= for_all_combinations<ctors::run_test>(
6581
types, dims, contexts, base_values, step_values, queue);
6682
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_core.cpp
83+
=======
84+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
6785
}
6886
#endif
6987
{
7088
const auto base_values =
89+
<<<<<<< HEAD
7190
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp
91+
=======
92+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
7293
ctors::get_init_values_pack<ctors::init_val::inexact,
7394
ctors::init_val::min>();
7495
const auto step_values =
7596
ctors::get_init_values_pack<ctors::init_val::ulp,
7697
ctors::init_val::ulp_half>();
7798
passed &= for_all_combinations<ctors::run_test>(
7899
types, single_dim, context, base_values, step_values, queue);
100+
<<<<<<< HEAD
79101
=======
80102
ctors::get_init_values_pack<init_val::inexact, init_val::min>();
81103
const auto step_values =
82104
ctors::get_init_values_pack<init_val::ulp, init_val::ulp_half>();
83105
passed &= for_all_combinations<ctors::run_test>(
84106
types, dims, contexts, base_values, step_values, queue);
85107
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_core.cpp
108+
=======
109+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
86110
}
87111

88112
std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");

‎SYCL/ESIMD/api/functional/ctors/ctor_fill_core.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,15 @@ int main(int, char **) {
6464
}
6565
{
6666
// Validate basic functionality works for every type
67+
<<<<<<< HEAD
6768
<<<<<<< HEAD
6869
const auto types = get_tested_types<tested_types::core>();
6970
=======
7071
const auto types = get_tested_types<tested_types::all>();
7172
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
73+
=======
74+
const auto types = get_tested_types<tested_types::core>();
75+
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
7276
const auto dims = get_all_dimensions();
7377
const auto contexts = unnamed_type_pack<ctors::var_decl>::generate();
7478
{

0 commit comments

Comments
 (0)