Skip to content

Commit 8908920

Browse files
sndmitrievbb-sycl
sndmitriev
authored and
bb-sycl
committed
[SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (intel#892)
* [SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace Signed-off-by: Sergey Dmitriev <[email protected]> * Fix failures on precommit testing
1 parent dbf84f3 commit 8908920

28 files changed

+169
-0
lines changed

‎SYCL/ESIMD/api/esimd_merge.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <CL/sycl.hpp>
1919
#include <iostream>
2020
<<<<<<< HEAD
21+
<<<<<<< HEAD
2122
#include <sycl/ext/intel/esimd.hpp>
2223

2324
using namespace sycl::ext::intel::esimd;
@@ -28,6 +29,12 @@ using namespace sycl::ext::intel;
2829
using namespace sycl::ext::intel::experimental::esimd;
2930
using namespace sycl::ext::intel::experimental;
3031
>>>>>>> 52feaa59e ([ESIMD] Add test for esimd::merge (#739))
32+
=======
33+
#include <sycl/ext/intel/esimd.hpp>
34+
35+
using namespace sycl::ext::intel::esimd;
36+
using namespace sycl::ext::intel;
37+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3138
using namespace cl::sycl;
3239

3340
template <class T> void prn(T *arr, int size, const char *title) {

‎SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,30 @@
2626

2727
#include <CL/sycl.hpp>
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
#include <sycl/ext/intel/esimd.hpp>
3031
=======
3132
#include <sycl/ext/intel/experimental/esimd.hpp>
3233
>>>>>>> 3c06ec209 ([ESIMD] Add smoke test for pack_mask/unpack_mask APIs. (#826))
34+
=======
35+
#include <sycl/ext/intel/esimd.hpp>
36+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3337

3438
#include <iostream>
3539

3640
using namespace cl::sycl;
3741
<<<<<<< HEAD
42+
<<<<<<< HEAD
3843
using namespace sycl::ext::intel;
3944
using namespace sycl::ext::intel::esimd;
4045
=======
4146
using namespace sycl::ext::intel::experimental;
4247
using namespace sycl::ext::intel::experimental::esimd;
4348
>>>>>>> 3c06ec209 ([ESIMD] Add smoke test for pack_mask/unpack_mask APIs. (#826))
49+
=======
50+
using namespace sycl::ext::intel;
51+
using namespace sycl::ext::intel::esimd;
52+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4453

4554
template <int, int> struct test_id;
4655
using MaskRawElemT = typename simd_mask<1>::raw_element_type;

‎SYCL/ESIMD/api/esimd_rgba_smoke.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,27 @@
2626

2727
#include <CL/sycl.hpp>
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
#include <sycl/ext/intel/esimd.hpp>
3031
=======
3132
#include <sycl/ext/intel/experimental/esimd.hpp>
3233
>>>>>>> 5ed4bac7d ([ESIMD] Add gather/scatter_rgba smoke test, can be used as an example. (#835))
34+
=======
35+
#include <sycl/ext/intel/esimd.hpp>
36+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3337

3438
#include <iostream>
3539

3640
using namespace cl::sycl;
3741
<<<<<<< HEAD
42+
<<<<<<< HEAD
3843
using namespace sycl::ext::intel::esimd;
3944
=======
4045
using namespace sycl::ext::intel::experimental::esimd;
4146
>>>>>>> 5ed4bac7d ([ESIMD] Add gather/scatter_rgba smoke test, can be used as an example. (#835))
47+
=======
48+
using namespace sycl::ext::intel::esimd;
49+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4250

4351
static constexpr unsigned NAllChs =
4452
get_num_channels_enabled(rgba_channel_mask::ABGR);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "common.hpp"
2121

2222
namespace esimd = sycl::ext::intel::esimd;
23+
<<<<<<< HEAD
2324
=======
2425
=======
2526
#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
@@ -29,6 +30,8 @@ namespace esimd = sycl::ext::intel::esimd;
2930

3031
namespace esimd = sycl::ext::intel::experimental::esimd;
3132
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
33+
=======
34+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3235

3336
namespace esimd_test::api::functional::ctors {
3437

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@
1717
#include "../value_conv.hpp"
1818
#include "common.hpp"
1919

20+
<<<<<<< HEAD
2021
<<<<<<< HEAD
2122
namespace esimd = sycl::ext::intel::esimd;
2223
=======
2324
namespace esimd = sycl::ext::intel::experimental::esimd;
2425
>>>>>>> e737b795e ([SYCL][ESIMD] Add tests for simd broadcast constructor (#690))
26+
=======
27+
namespace esimd = sycl::ext::intel::esimd;
28+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
2529

2630
namespace esimd_test::api::functional::ctors {
2731

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727

2828
#include "ctor_broadcast.hpp"
2929

30+
<<<<<<< HEAD
3031
<<<<<<< HEAD
3132
using namespace sycl::ext::intel::esimd;
3233
=======
3334
using namespace sycl::ext::intel::experimental::esimd;
3435
>>>>>>> e737b795e ([SYCL][ESIMD] Add tests for simd broadcast constructor (#690))
36+
=======
37+
using namespace sycl::ext::intel::esimd;
38+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3539
using namespace esimd_test::api::functional;
3640

3741
int main(int, char **) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727

2828
#include "ctor_broadcast.hpp"
2929

30+
<<<<<<< HEAD
3031
<<<<<<< HEAD
3132
using namespace sycl::ext::intel::esimd;
3233
=======
3334
using namespace sycl::ext::intel::experimental::esimd;
3435
>>>>>>> e737b795e ([SYCL][ESIMD] Add tests for simd broadcast constructor (#690))
36+
=======
37+
using namespace sycl::ext::intel::esimd;
38+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3539
using namespace esimd_test::api::functional;
3640

3741
int main(int, char **) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ namespace esimd = sycl::ext::intel::esimd;
4343

4444
#include "common.hpp"
4545

46+
<<<<<<< HEAD
4647
namespace esimd = sycl::ext::intel::experimental::esimd;
4748
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
49+
=======
50+
namespace esimd = sycl::ext::intel::esimd;
51+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4852

4953
namespace esimd_test::api::functional::ctors {
5054

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "common.hpp"
2121

2222
namespace esimd = sycl::ext::intel::esimd;
23+
<<<<<<< HEAD
2324
=======
2425
=======
2526
#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
@@ -29,6 +30,8 @@ namespace esimd = sycl::ext::intel::esimd;
2930

3031
namespace esimd = sycl::ext::intel::experimental::esimd;
3132
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
33+
=======
34+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3235

3336
namespace esimd_test::api::functional::ctors {
3437

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "common.hpp"
2121

2222
namespace esimd = sycl::ext::intel::esimd;
23+
<<<<<<< HEAD
2324
=======
2425
=======
2526
#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
@@ -29,6 +30,8 @@ namespace esimd = sycl::ext::intel::esimd;
2930

3031
namespace esimd = sycl::ext::intel::experimental::esimd;
3132
>>>>>>> 7ffc560aa ([SYCL][ESIMD] Add test on simd load constructor for fp_extra types (#797))
33+
=======
34+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3235

3336
namespace esimd_test::api::functional::ctors {
3437

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727
#include <algorithm>
2828
#include <cassert>
2929

30+
<<<<<<< HEAD
3031
<<<<<<< HEAD
3132
namespace esimd = sycl::ext::intel::esimd;
3233
=======
3334
namespace esimd = sycl::ext::intel::experimental::esimd;
3435
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
36+
=======
37+
namespace esimd = sycl::ext::intel::esimd;
38+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3539

3640
namespace esimd_test::api::functional::ctors {
3741

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "common.hpp"
2121

2222
namespace esimd = sycl::ext::intel::esimd;
23+
<<<<<<< HEAD
2324
=======
2425
=======
2526
#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
@@ -29,6 +30,8 @@ namespace esimd = sycl::ext::intel::esimd;
2930

3031
namespace esimd = sycl::ext::intel::experimental::esimd;
3132
>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
33+
=======
34+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3235

3336
namespace esimd_test::api::functional::ctors {
3437

‎SYCL/ESIMD/api/functional/operators/operator_assignment_move_and_copy_core.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424

2525
#include "operator_assignment.hpp"
2626

27+
<<<<<<< HEAD
2728
<<<<<<< HEAD
2829
using namespace sycl::ext::intel::esimd;
2930
=======
3031
using namespace sycl::ext::intel::experimental::esimd;
3132
>>>>>>> 1017d075e ([SYCL][ESIMD] Add tests on simd copy and move assignment operators (#762))
33+
=======
34+
using namespace sycl::ext::intel::esimd;
35+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3236
using namespace esimd_test::api::functional;
3337

3438
// Descriptor class for the case of calling move assignment operator.

‎SYCL/ESIMD/api/functional/operators/operator_decrement_and_increment.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@
2626
#include "../mutator.hpp"
2727
#include "common.hpp"
2828

29+
<<<<<<< HEAD
2930
<<<<<<< HEAD
3031
namespace esimd = sycl::ext::intel::esimd;
3132
=======
3233
namespace esimd = sycl::ext::intel::experimental::esimd;
3334
>>>>>>> d6527a558 ([SYCL][ESIMD] Add tests on simd increment and decrement operators (#827))
35+
=======
36+
namespace esimd = sycl::ext::intel::esimd;
37+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3438
namespace esimd_functional = esimd_test::api::functional;
3539

3640
namespace esimd_test::api::functional::operators {

‎SYCL/ESIMD/api/functional/operators/operator_logical_not.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@
2626
#include "../shared_element.hpp"
2727
#include "common.hpp"
2828

29+
<<<<<<< HEAD
2930
<<<<<<< HEAD
3031
using namespace sycl::ext::intel::esimd;
3132
=======
3233
using namespace sycl::ext::intel::experimental::esimd;
3334
>>>>>>> 95fd782fd ([SYCL][ESIMD] Add test on logical not operator (#784))
35+
=======
36+
using namespace sycl::ext::intel::esimd;
37+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3438
using namespace esimd_test::api::functional;
3539

3640
// Descriptor class for the case of calling logical not operator.

‎SYCL/ESIMD/api/replicate_smoke.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <CL/sycl.hpp>
2828
#include <iostream>
2929
<<<<<<< HEAD
30+
<<<<<<< HEAD
3031
#include <sycl/ext/intel/esimd.hpp>
3132

3233
using namespace cl::sycl;
@@ -37,6 +38,12 @@ using namespace sycl::ext::intel::esimd;
3738
using namespace cl::sycl;
3839
using namespace sycl::ext::intel::experimental::esimd;
3940
>>>>>>> 22f86b532 ([ESIMD] Add smoke test for simd::replicate_vs_w_hs. (#799))
41+
=======
42+
#include <sycl/ext/intel/esimd.hpp>
43+
44+
using namespace cl::sycl;
45+
using namespace sycl::ext::intel::esimd;
46+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4047

4148
template <class T> struct char_to_int {
4249
using type = typename std::conditional<

‎SYCL/ESIMD/api/saturation_smoke.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <CL/sycl.hpp>
2828
#include <iostream>
2929
<<<<<<< HEAD
30+
<<<<<<< HEAD
3031
#include <sycl/ext/intel/esimd.hpp>
3132

3233
using namespace cl::sycl;
@@ -37,6 +38,12 @@ using namespace sycl::ext::intel::esimd;
3738
using namespace cl::sycl;
3839
using namespace sycl::ext::intel::experimental::esimd;
3940
>>>>>>> 2206708db ([ESIMD] Add "smoke" test for esimd::saturate (#791))
41+
=======
42+
#include <sycl/ext/intel/esimd.hpp>
43+
44+
using namespace cl::sycl;
45+
using namespace sycl::ext::intel::esimd;
46+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4047

4148
template <class T> struct char_to_int {
4249
using type = typename std::conditional<

‎SYCL/ESIMD/api/simd_any_all.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,30 @@
2626

2727
#include <CL/sycl.hpp>
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
#include <sycl/ext/intel/esimd.hpp>
3031
=======
3132
#include <sycl/ext/intel/experimental/esimd.hpp>
3233
>>>>>>> 38486e7dc ([ESIMD] Add smoke test for simd_obj_impl::any/all. (#802))
34+
=======
35+
#include <sycl/ext/intel/esimd.hpp>
36+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3337

3438
#include <iostream>
3539

3640
using namespace cl::sycl;
3741
<<<<<<< HEAD
42+
<<<<<<< HEAD
3843
using namespace sycl::ext::intel;
3944
using namespace sycl::ext::intel::esimd;
4045
=======
4146
using namespace sycl::ext::intel::experimental;
4247
using namespace sycl::ext::intel::experimental::esimd;
4348
>>>>>>> 38486e7dc ([ESIMD] Add smoke test for simd_obj_impl::any/all. (#802))
49+
=======
50+
using namespace sycl::ext::intel;
51+
using namespace sycl::ext::intel::esimd;
52+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4453

4554
struct bit_op {
4655
enum { any, all, num_ops };

‎SYCL/ESIMD/api/simd_view_select_2d.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,30 @@
2626

2727
#include <CL/sycl.hpp>
2828
<<<<<<< HEAD
29+
<<<<<<< HEAD
2930
#include <sycl/ext/intel/esimd.hpp>
3031
=======
3132
#include <sycl/ext/intel/experimental/esimd.hpp>
3233
>>>>>>> 66029faaf ([ESIMD] Add smoke test for 2D simd_view_impl::select. (#805))
34+
=======
35+
#include <sycl/ext/intel/esimd.hpp>
36+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
3337

3438
#include <iostream>
3539

3640
using namespace cl::sycl;
3741
<<<<<<< HEAD
42+
<<<<<<< HEAD
3843
using namespace sycl::ext::intel;
3944
using namespace sycl::ext::intel::esimd;
4045
=======
4146
using namespace sycl::ext::intel::experimental;
4247
using namespace sycl::ext::intel::experimental::esimd;
4348
>>>>>>> 66029faaf ([ESIMD] Add smoke test for 2D simd_view_impl::select. (#805))
49+
=======
50+
using namespace sycl::ext::intel;
51+
using namespace sycl::ext::intel::esimd;
52+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
4453

4554
template <typename T> struct char_to_int {
4655
using type = typename std::conditional<

‎SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ using namespace cl::sycl;
1717
constexpr int MASKED_LANE_NUM_REV = 1;
1818
constexpr int NUM_RGBA_CHANNELS =
1919
get_num_channels_enabled(sycl::ext::intel::esimd::rgba_channel_mask::ABGR);
20+
<<<<<<< HEAD
2021

2122
template <class T> inline constexpr T marker = (T)0xcafebabe;
23+
=======
24+
>>>>>>> b2897f953 ([SYCL][ESIMD] Move some ESIMD APIs outside of experimental namespace (#892))
2225

2326
template <typename T, unsigned VL, auto CH_MASK> struct Kernel {
2427
T *bufOut;

0 commit comments

Comments
 (0)