[ESIMD] Fix negation operator to return a mask (#4353)

intel · Aug 19, 2021 · 4cb8561 · 4cb8561
1 parent b3db5e5
commit 4cb8561
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/detail/simd_view_impl.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/detail/simd_view_impl.hpp
@@ -289,7 +289,6 @@ template <typename BaseTy, typename RegionTy> class simd_view_impl {
     auto V = UNARY_OP(read().data());                                          \
     return simd<element_type, length>(V);                                      \
   }
-  DEF_UNARY_OP(!)
   DEF_UNARY_OP(~)
   DEF_UNARY_OP(+)
   DEF_UNARY_OP(-)

diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/simd.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/simd.hpp
@@ -352,13 +352,15 @@ template <typename Ty, int N> class simd {
     auto V = UNARY_OP(data());                                                 \
     return simd(V);                                                            \
   }
-  DEF_UNARY_OP(!)
   DEF_UNARY_OP(~)
   DEF_UNARY_OP(+)
   DEF_UNARY_OP(-)
 
 #undef DEF_UNARY_OP
 
+  // negation operator
+  auto operator!() { return *this == 0; }
+
   /// \name Replicate
   /// Replicate simd instance given a region.
   /// @{

diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/simd_view.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/simd_view.hpp
@@ -90,6 +90,9 @@ class simd_view : public detail::simd_view_impl<BaseTy, RegionTy> {
   DEF_RELOP(!=)
 
 #undef DEF_RELOP
+
+  // negation operator
+  auto operator!() { return *this == 0; }
 };
 
 /// This is a specialization of simd_view class with a single element.
@@ -142,6 +145,9 @@ class simd_view<BaseTy, region_base_1<typename BaseTy::element_type>>
   DEF_RELOP(!=)
 
 #undef DEF_RELOP
+
+  // negation operator
+  auto operator!() { return *this == 0; }
 };
 
 } // namespace esimd

diff --git a/sycl/test/esimd/simd_view.cpp b/sycl/test/esimd/simd_view.cpp
@@ -31,7 +31,7 @@ SYCL_ESIMD_FUNCTION bool test_simd_view_unary_ops() {
   ref0 <<= ref1;
   ref1 = -ref0;
   ref0 = ~ref1;
-  ref1 = !ref0;
+  auto mask = !ref0;
   return v1[0] == 1;
 }