Skip to content

Commit c8c3336

Browse files
vasilytricbb-sycl
vasilytric
authored and
bb-sycl
committed
[SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (intel#803)
1 parent 9e774f5 commit c8c3336

22 files changed

+268
-9
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class const_ref {
100100
// The main test routine.
101101
// Using functor class to be able to iterate over the pre-defined data types.
102102
<<<<<<< HEAD
103+
<<<<<<< HEAD
103104
template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
104105
static constexpr int NumElems = SizeT::value;
105106
using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
@@ -116,6 +117,10 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
116117
=======
117118
template <typename DataT, typename DimT, typename TestCaseT> class run_test {
118119
static constexpr int NumElems = DimT::value;
120+
=======
121+
template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
122+
static constexpr int NumElems = SizeT::value;
123+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
119124

120125
public:
121126
bool operator()(sycl::queue &queue, const std::string &data_type) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,18 @@ int main(int, char **) {
201201
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
202202
=======
203203
const auto types = get_tested_types<tested_types::core>();
204-
const auto dims = get_all_dimensions();
204+
const auto sizes = get_all_sizes();
205205
const auto contexts =
206206
unnamed_type_pack<ctors::initializer, ctors::var_decl,
207207
ctors::rval_in_expr, ctors::const_ref>::generate();
208208

209+
<<<<<<< HEAD
209210
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
210211
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
212+
=======
213+
passed &=
214+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
215+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
211216

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

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
//
1717
// Test for simd constructor from an array.
1818
<<<<<<< HEAD
19+
<<<<<<< HEAD
1920
// This test uses extra fp data types, sizes and different simd constructor
2021
// invocation contexts.
2122
=======
2223
// This test uses extra fp data types, dimensionality and different simd
2324
// constructor invocation contexts.
2425
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
26+
=======
27+
// This test uses extra fp data types, sizes and different simd constructor
28+
// invocation contexts.
29+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
2530
// The test does the following actions:
2631
// - construct fixed-size array that filled with reference values
2732
// - use std::move() to provide it to simd constructor
@@ -38,21 +43,30 @@ int main(int, char **) {
3843
bool passed = true;
3944

4045
const auto types = get_tested_types<tested_types::fp_extra>();
46+
<<<<<<< HEAD
4147
<<<<<<< HEAD
4248
const auto sizes = get_all_sizes();
4349
=======
4450
const auto dims = get_all_dimensions();
4551
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
52+
=======
53+
const auto sizes = get_all_sizes();
54+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4655
const auto contexts =
4756
unnamed_type_pack<ctors::initializer, ctors::var_decl,
4857
ctors::rval_in_expr, ctors::const_ref>::generate();
4958

59+
<<<<<<< HEAD
5060
<<<<<<< HEAD
5161
passed &=
5262
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
5363
=======
5464
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
5565
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
66+
=======
67+
passed &=
68+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
69+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
5670

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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class const_ref {
112112

113113
// The main test routine.
114114
// Using functor class to be able to iterate over the pre-defined data types.
115+
<<<<<<< HEAD
115116
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
116117
template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
117118
static constexpr int NumElems = SizeT::value;
@@ -120,6 +121,10 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
120121
template <typename DataT, typename DimT, typename TestCaseT> class run_test {
121122
static constexpr int NumElems = DimT::value;
122123
>>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
124+
=======
125+
template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
126+
static constexpr int NumElems = SizeT::value;
127+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
123128

124129
public:
125130
bool operator()(sycl::queue &queue, const std::string &data_type) {

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
//
1717
// Test for simd copy constructor.
1818
<<<<<<< HEAD
19+
<<<<<<< HEAD
1920
// This test uses different data types, sizes and different simd constructor
2021
// invocation contexts.
2122
=======
2223
// This test uses different data types, dimensionality and different simd
2324
// constructor invocation contexts.
2425
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
26+
=======
27+
// This test uses different data types, sizes and different simd constructor
28+
// invocation contexts.
29+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
2530
// The test do the following actions:
2631
// - construct simd object with golden values calls copy constructor from
2732
// constructed simd object
@@ -38,21 +43,30 @@ int main(int, char **) {
3843
bool passed = true;
3944

4045
const auto types = get_tested_types<tested_types::core>();
46+
<<<<<<< HEAD
4147
<<<<<<< HEAD
4248
const auto sizes = get_all_sizes();
4349
=======
4450
const auto dims = get_all_dimensions();
4551
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
52+
=======
53+
const auto sizes = get_all_sizes();
54+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4655
const auto contexts =
4756
unnamed_type_pack<ctors::initializer, ctors::var_decl,
4857
ctors::rval_in_expr, ctors::const_ref>::generate();
4958

59+
<<<<<<< HEAD
5060
<<<<<<< HEAD
5161
passed &=
5262
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
5363
=======
5464
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
5565
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
66+
=======
67+
passed &=
68+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
69+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
5670

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

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
//
1717
// Test for simd copy constructor.
1818
<<<<<<< HEAD
19+
<<<<<<< HEAD
1920
// This test uses different data types, sizes and different simd constructor
2021
// invocation contexts.
2122
=======
2223
// This test uses extra fp data types, dimensionality and different simd
2324
// constructor invocation contexts.
2425
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
26+
=======
27+
// This test uses different data types, sizes and different simd constructor
28+
// invocation contexts.
29+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
2530
// The test do the following actions:
2631
// - construct simd object with golden values calls copy constructor from
2732
// constructed simd object
@@ -38,21 +43,30 @@ int main(int, char **) {
3843
bool passed = true;
3944

4045
const auto types = get_tested_types<tested_types::fp_extra>();
46+
<<<<<<< HEAD
4147
<<<<<<< HEAD
4248
const auto sizes = get_all_sizes();
4349
=======
4450
const auto dims = get_all_dimensions();
4551
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
52+
=======
53+
const auto sizes = get_all_sizes();
54+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4655
const auto contexts =
4756
unnamed_type_pack<ctors::initializer, ctors::var_decl,
4857
ctors::rval_in_expr, ctors::const_ref>::generate();
4958

59+
<<<<<<< HEAD
5060
<<<<<<< HEAD
5161
passed &=
5262
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
5363
=======
5464
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
5565
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
66+
=======
67+
passed &=
68+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
69+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
5670

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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ struct const_ref {
8585

8686
// Struct that calls simd in provided context and then verifies obtained result.
8787
<<<<<<< HEAD
88+
<<<<<<< HEAD
8889
template <typename DataT, typename SizeT, typename TestCaseT> struct run_test {
8990
static constexpr int NumElems = SizeT::value;
9091
using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
@@ -119,6 +120,10 @@ template <typename DataT, typename SizeT, typename TestCaseT> struct run_test {
119120
=======
120121
template <typename DataT, typename DimT, typename TestCaseT> struct run_test {
121122
static constexpr int NumElems = DimT::value;
123+
=======
124+
template <typename DataT, typename SizeT, typename TestCaseT> struct run_test {
125+
static constexpr int NumElems = SizeT::value;
126+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
122127

123128
bool operator()(sycl::queue &queue, const std::string &data_type) {
124129
bool passed = true;

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
//
1717
// Test for simd default constructor.
1818
<<<<<<< HEAD
19+
<<<<<<< HEAD
1920
// This test uses different data types, sizes and different simd constructor
2021
// invocation contexts.
2122
=======
2223
// This test uses different data types, dimensionality and different simd
2324
// constructor invocation contexts.
2425
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
26+
=======
27+
// This test uses different data types, sizes and different simd constructor
28+
// invocation contexts.
29+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
2530
// The test do the following actions:
2631
// - call simd default constructor
2732
// - verify that values from simd is equal to default value of provided
@@ -38,21 +43,30 @@ int main(int, char **) {
3843
bool passed = true;
3944

4045
const auto types = get_tested_types<tested_types::core>();
46+
<<<<<<< HEAD
4147
<<<<<<< HEAD
4248
const auto sizes = get_all_sizes();
4349
=======
4450
const auto dims = get_all_dimensions();
4551
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
52+
=======
53+
const auto sizes = get_all_sizes();
54+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4655
const auto contexts =
4756
unnamed_type_pack<ctors::initializer, ctors::var_decl,
4857
ctors::rval_in_expr, ctors::const_ref>::generate();
4958

59+
<<<<<<< HEAD
5060
<<<<<<< HEAD
5161
passed &=
5262
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
5363
=======
5464
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
5565
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
66+
=======
67+
passed &=
68+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
69+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
5670

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

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
//
1717
// Test for simd default constructor.
1818
<<<<<<< HEAD
19+
<<<<<<< HEAD
1920
// This test uses different data types, sizes and different simd constructor
2021
// invocation contexts.
2122
=======
2223
// This test uses extra fp data types, dimensionality and different simd
2324
// constructor invocation contexts.
2425
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
26+
=======
27+
// This test uses different data types, sizes and different simd constructor
28+
// invocation contexts.
29+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
2530
// The test do the following actions:
2631
// - call simd default constructor
2732
// - verify that values from simd is equal to default value of provided
@@ -38,21 +43,30 @@ int main(int, char **) {
3843
bool passed = true;
3944

4045
const auto types = get_tested_types<tested_types::fp_extra>();
46+
<<<<<<< HEAD
4147
<<<<<<< HEAD
4248
const auto sizes = get_all_sizes();
4349
=======
4450
const auto dims = get_all_dimensions();
4551
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
52+
=======
53+
const auto sizes = get_all_sizes();
54+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4655
const auto contexts =
4756
unnamed_type_pack<ctors::initializer, ctors::var_decl,
4857
ctors::rval_in_expr, ctors::const_ref>::generate();
4958

59+
<<<<<<< HEAD
5060
<<<<<<< HEAD
5161
passed &=
5262
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
5363
=======
5464
passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
5565
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
66+
=======
67+
passed &=
68+
for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
69+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
5670

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

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ template <init_val... Values> auto get_init_values_pack() {
229229
return value_pack<init_val, Values...>::generate_unnamed();
230230
}
231231

232+
<<<<<<< HEAD
232233
<<<<<<< HEAD
233234
template <typename DataT, typename SizeT, typename TestCaseT, typename BaseValT,
234235
typename StepT>
@@ -250,9 +251,12 @@ class run_test {
250251

251252
=======
252253
template <typename DataT, typename DimT, typename TestCaseT, typename BaseValT,
254+
=======
255+
template <typename DataT, typename SizeT, typename TestCaseT, typename BaseValT,
256+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
253257
typename StepT>
254258
class run_test {
255-
static constexpr int NumElems = DimT::value;
259+
static constexpr int NumElems = SizeT::value;
256260
static constexpr init_val BaseVal = BaseValT::value;
257261
static constexpr init_val Step = StepT::value;
258262
using KernelT = kernel_for_fill<DataT, NumElems, TestCaseT, BaseVal, Step>;

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ int main(int, char **) {
3838
// Using single size and context to verify the accuracy of operations
3939
// with floating point data types
4040
const auto types = get_tested_types<tested_types::fp>();
41+
<<<<<<< HEAD
4142
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp
4243
const auto single_size = get_sizes<8>();
4344
=======
4445
const auto single_dim = get_dimensions<8>();
4546
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_core.cpp
47+
=======
48+
const auto single_size = get_sizes<8>();
49+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
4650
const auto context = unnamed_type_pack<ctors::var_decl>::generate();
4751

4852
// Run for specific combinations of types, base and step values and vector
@@ -52,11 +56,15 @@ int main(int, char **) {
5256
const auto base_values = ctors::get_init_values_pack<init_val::denorm>();
5357
const auto step_values = ctors::get_init_values_pack<init_val::ulp>();
5458
passed &= for_all_combinations<ctors::run_test>(
59+
<<<<<<< HEAD
5560
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp
5661
types, single_size, context, base_values, step_values, queue);
5762
=======
5863
types, single_dim, context, base_values, step_values, queue);
5964
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_core.cpp
65+
=======
66+
types, single_size, context, base_values, step_values, queue);
67+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
6068
}
6169
#endif
6270
{
@@ -65,11 +73,15 @@ int main(int, char **) {
6573
const auto step_values =
6674
ctors::get_init_values_pack<init_val::ulp, init_val::ulp_half>();
6775
passed &= for_all_combinations<ctors::run_test>(
76+
<<<<<<< HEAD
6877
<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp
6978
types, single_size, context, base_values, step_values, queue);
7079
=======
7180
types, single_dim, context, base_values, step_values, queue);
7281
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_core.cpp
82+
=======
83+
types, single_size, context, base_values, step_values, queue);
84+
>>>>>>> e37c07509 ([SYCL][ESIMD] Replace "dim", "dimensions" with "size", "sizes", etc. (#803))
7385
}
7486

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

0 commit comments

Comments
 (0)