Skip to content

Commit 404f812

Browse files
authored
[SYCL][ESIMD] Remove simd move test cases (#15062)
This PR to remove tests requiring simd move constructor/assignment as it was decided not to implement it. Closes: #14542
1 parent b8615ff commit 404f812

File tree

7 files changed

+18
-471
lines changed

7 files changed

+18
-471
lines changed

sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <sycl/ext/intel/esimd/detail/intrin.hpp>
1616
#include <sycl/ext/intel/esimd/detail/memory_intrin.hpp>
1717
#include <sycl/ext/intel/esimd/detail/sycl_util.hpp>
18-
#include <sycl/ext/intel/esimd/detail/test_proxy.hpp>
1918
#include <sycl/ext/intel/esimd/detail/type_format.hpp>
2019
#include <sycl/ext/intel/esimd/simd_view.hpp>
2120

@@ -1038,8 +1037,8 @@ class [[__sycl_detail__::__uses_aspects__(
10381037
/** @tparam SimdT The argument object type(auto-deduced). */ \
10391038
/** @param RHS The argument object. */ \
10401039
template <class T1, class SimdT, \
1041-
class = std::enable_if_t<(is_simd_type_v<Derived> == \
1042-
is_simd_type_v<SimdT>)&&COND>> \
1040+
class = std::enable_if_t< \
1041+
(is_simd_type_v<Derived> == is_simd_type_v<SimdT>) && COND>> \
10431042
Derived &operator OPASSIGN( \
10441043
const __ESIMD_DNS::simd_obj_impl<T1, N, SimdT> &RHS) { \
10451044
auto Res = *this BINOP RHS; \
@@ -1056,10 +1055,9 @@ class [[__sycl_detail__::__uses_aspects__(
10561055
/** @param RHS The argument object. */ \
10571056
template <class SimdT1, class RegionT1, \
10581057
class T1 = typename RegionT1::element_type, \
1059-
class = std::enable_if_t< \
1060-
(is_simd_type_v<Derived> == \
1061-
is_simd_type_v<SimdT1>)&&(RegionT1::length == length) && \
1062-
COND>> \
1058+
class = std::enable_if_t<(is_simd_type_v<Derived> == \
1059+
is_simd_type_v<SimdT1>) && \
1060+
(RegionT1::length == length) && COND>> \
10631061
Derived &operator OPASSIGN( \
10641062
const __ESIMD_NS::simd_view<SimdT1, RegionT1> &RHS) { \
10651063
auto Res = *this BINOP RHS.read(); \
@@ -1132,9 +1130,6 @@ class [[__sycl_detail__::__uses_aspects__(
11321130
#undef __ESIMD_ARITH_OP_FILTER
11331131
#undef __ESIMD_DEF_SIMD_OBJ_IMPL_OPASSIGN
11341132

1135-
// Getter for the test proxy member, if enabled
1136-
__ESIMD_DECLARE_TEST_PROXY_ACCESS
1137-
11381133
private:
11391134
// The underlying data for this vector.
11401135
raw_vector_type M_data;
@@ -1159,9 +1154,6 @@ class [[__sycl_detail__::__uses_aspects__(
11591154
PropertyListT = {}) SYCL_ESIMD_FUNCTION;
11601155

11611156
protected:
1162-
// The test proxy if enabled
1163-
__ESIMD_DECLARE_TEST_PROXY
1164-
11651157
void set(const raw_vector_type &Val) {
11661158
#ifndef __SYCL_DEVICE_ONLY__
11671159
M_data = Val;

sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include <sycl/aspects.hpp>
1414
#include <sycl/ext/intel/esimd/detail/intrin.hpp>
15-
#include <sycl/ext/intel/esimd/detail/test_proxy.hpp>
1615
#include <sycl/ext/intel/esimd/detail/type_format.hpp>
1716

1817
namespace sycl {
@@ -300,10 +299,9 @@ class [[__sycl_detail__::__uses_aspects__(
300299
/* OPASSIGN simd_obj_impl */ \
301300
template <class T1, int N1, class SimdT1, class T = element_type, \
302301
class SimdT = BaseTy, \
303-
class = \
304-
std::enable_if_t<(is_simd_type_v<SimdT> == \
305-
is_simd_type_v<SimdT1>)&&(N1 == length) && \
306-
COND>> \
302+
class = std::enable_if_t<(is_simd_type_v<SimdT> == \
303+
is_simd_type_v<SimdT1>) && \
304+
(N1 == length) && COND>> \
307305
Derived &operator OPASSIGN(const simd_obj_impl<T1, N1, SimdT1> &RHS) { \
308306
auto Res = read() BINOP RHS; \
309307
write(Res); \
@@ -316,9 +314,8 @@ class [[__sycl_detail__::__uses_aspects__(
316314
typename __ESIMD_NS::shape_type<RegionT1>::element_type, \
317315
class T = element_type, class SimdT = BaseTy, \
318316
class = std::enable_if_t< \
319-
(is_simd_type_v<SimdT> == is_simd_type_v<SimdT1>)&&( \
320-
length == __ESIMD_NS::shape_type<RegionT1>::length) && \
321-
COND>> \
317+
(is_simd_type_v<SimdT> == is_simd_type_v<SimdT1>) && \
318+
(length == __ESIMD_NS::shape_type<RegionT1>::length) && COND>> \
322319
Derived &operator OPASSIGN(const simd_view_impl<SimdT1, RegionT1> &RHS) { \
323320
*this OPASSIGN RHS.read(); \
324321
return cast_this_to_derived(); \
@@ -404,14 +401,10 @@ class [[__sycl_detail__::__uses_aspects__(
404401
/// region viewed by this object.
405402
/// @param Other The source rvalue object.
406403
/// @return This object cast to the derived class.
407-
Derived &operator=(Derived &&Other) {
408-
__esimd_move_test_proxy(Other);
409-
return write(Other.read());
410-
}
404+
Derived &operator=(Derived &&Other) { return write(Other.read()); }
411405

412406
/// Move assignment operator. Updates the target region viewed by this object.
413407
simd_view_impl &operator=(simd_view_impl &&Other) {
414-
__esimd_move_test_proxy(Other);
415408
return write(Other.read());
416409
}
417410

@@ -425,8 +418,8 @@ class [[__sycl_detail__::__uses_aspects__(
425418
/// @return This object cast to the derived class.
426419
template <class T, int N, class SimdT,
427420
class = std::enable_if_t<(is_simd_type_v<SimdT> ==
428-
is_simd_type_v<BaseTy>)&&(length ==
429-
SimdT::length)>>
421+
is_simd_type_v<BaseTy>) &&
422+
(length == SimdT::length)>>
430423
Derived &operator=(const simd_obj_impl<T, N, SimdT> &Other) {
431424
return write(convert_vector<element_type, typename SimdT::element_type, N>(
432425
Other.data()));
@@ -587,16 +580,10 @@ class [[__sycl_detail__::__uses_aspects__(
587580

588581
/// @cond EXCLUDE
589582
public:
590-
// Getter for the test proxy member, if enabled
591-
__ESIMD_DECLARE_TEST_PROXY_ACCESS
592-
593583
protected:
594584
// The reference to the base object, which must be a simd object
595585
BaseTy &M_base;
596586

597-
// The test proxy if enabled
598-
__ESIMD_DECLARE_TEST_PROXY
599-
600587
// The region applied on the base object. Its type could be
601588
// - region1d_t
602589
// - region2d_t

sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)