[libc++] <experimental/simd> Add binary operators for class simd

libcxx/docs/Status/ParallelismProjects.csv

@@ -31,6 +31,7 @@ Section,Description,Dependencies,Assignee,Complete
 | `[parallel.simd.class] <https://wg21.link/N4808>`_, "`simd unary operators <https://github.com/llvm/llvm-project/pull/104764>`_", None, Yin Zhang, |Complete|
 | `[parallel.simd.class] <https://wg21.link/N4808>`_, "Class template simd implementation", None, Yin Zhang, |In Progress|
 | `[parallel.simd.nonmembers] <https://wg21.link/N4808>`_, "simd non-member operations", None, Yin Zhang, |In Progress|
+| `[parallel.simd.nonmembers] <https://wg21.link/N4808>`_, "`simd non-member binary operations <https://github.com/llvm/llvm-project/pull/118744>`_", None, Yin Zhang, |Complete|
 | `[parallel.simd.mask.class] <https://wg21.link/N4808>`_, "`Class template simd_mask declaration and alias <https://reviews.llvm.org/D144362>`_", [parallel.simd.abi], Yin Zhang, |Complete|
 | `[parallel.simd.mask.class] <https://wg21.link/N4808>`_, "`simd_mask<>::size() <https://reviews.llvm.org/D144363>`_", [parallel.simd.class] simd<>::size(), Yin Zhang, |Complete|
 | `[parallel.simd.mask.class] <https://wg21.link/N4808>`_, "`simd_mask default constructor <https://github.com/llvm/llvm-project/pull/70424>`_", None, Yin Zhang, |Complete|

libcxx/include/experimental/__simd/scalar.h

@@ -82,6 +82,54 @@ struct __simd_operations<_Tp, simd_abi::__scalar> {
   static _LIBCPP_HIDE_FROM_ABI _SimdStorage __unary_minus(_SimdStorage __s) noexcept {
     return {static_cast<_Tp>(-__s.__data)};
   }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __plus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data + __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __minus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data - __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __multiplies(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data * __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __divides(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data / __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __modulus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data % __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_and(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data & __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_or(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data | __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_xor(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data ^ __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_left(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data << __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_right(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data >> __rhs.__data)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_left(_SimdStorage __lhs, int __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data << __rhs)};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_right(_SimdStorage __lhs, int __rhs) noexcept {
+    return {static_cast<_Tp>(__lhs.__data >> __rhs)};
+  }
 };
 
 template <class _Tp>

libcxx/include/experimental/__simd/simd.h

@@ -37,6 +37,39 @@ class __simd_int_operators<_Simd, _Impl, true> {
   _LIBCPP_HIDE_FROM_ABI _Simd operator~() const noexcept {
     return _Simd(_Impl::__bitwise_not((*static_cast<const _Simd*>(this)).__s_), _Simd::__storage_tag);
   }
+
+  // binary operators for integral _Tp
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator%(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__modulus(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator&(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__bitwise_and(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator|(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__bitwise_or(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator^(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__bitwise_xor(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator<<(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__shift_left(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator>>(const _Simd& __lhs, const _Simd& __rhs) noexcept {
+    return _Simd(_Impl::__shift_right(__lhs.__s_, __rhs.__s_), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator<<(const _Simd& __lhs, int __rhs) noexcept {
+    return _Simd(_Impl::__shift_left(__lhs.__s_, __rhs), _Simd::__storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI _Simd operator>>(const _Simd& __lhs, int __rhs) noexcept {
+    return _Simd(_Impl::__shift_right(__lhs.__s_, __rhs), _Simd::__storage_tag);
+  }
 };
 
 // class template simd [simd.class]
@@ -137,6 +170,23 @@ class simd : public __simd_int_operators<simd<_Tp, _Abi>, __simd_operations<_Tp,
   _LIBCPP_HIDE_FROM_ABI simd operator+() const noexcept { return *this; }
 
   _LIBCPP_HIDE_FROM_ABI simd operator-() const noexcept { return simd(_Impl::__unary_minus(__s_), __storage_tag); }
+
+  // binary operators
+  friend _LIBCPP_HIDE_FROM_ABI simd operator+(const simd& __lhs, const simd& __rhs) noexcept {
+    return simd(_Impl::__plus(__lhs.__s_, __rhs.__s_), __storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI simd operator-(const simd& __lhs, const simd& __rhs) noexcept {
+    return simd(_Impl::__minus(__lhs.__s_, __rhs.__s_), __storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI simd operator*(const simd& __lhs, const simd& __rhs) noexcept {
+    return simd(_Impl::__multiplies(__lhs.__s_, __rhs.__s_), __storage_tag);
+  }
+
+  friend _LIBCPP_HIDE_FROM_ABI simd operator/(const simd& __lhs, const simd& __rhs) noexcept {
+    return simd(_Impl::__divides(__lhs.__s_, __rhs.__s_), __storage_tag);
+  }
 };
 
 template <class _Tp, class _Abi>

libcxx/include/experimental/__simd/vec_ext.h

@@ -39,6 +39,8 @@ template <class _Tp, int _Np>
 struct __simd_storage<_Tp, simd_abi::__vec_ext<_Np>> {
   _Tp __data __attribute__((__vector_size__(std::__bit_ceil((sizeof(_Tp) * _Np)))));
 
+  static constexpr bool __is_partial_v = (_Np < (sizeof(__data) / sizeof(_Tp)));
+
   _LIBCPP_HIDE_FROM_ABI _Tp __get(size_t __idx) const noexcept {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__idx < _Np, "Index is out of bounds");
     return __data[__idx];
@@ -47,6 +49,17 @@ struct __simd_storage<_Tp, simd_abi::__vec_ext<_Np>> {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__idx < _Np, "Index is out of bounds");
     __data[__idx] = __v;
   }
+
+  _LIBCPP_HIDE_FROM_ABI __simd_storage __make_padding_nonzero() const noexcept {
+    __simd_storage __result = *this;
+    if constexpr (__is_partial_v) {
+      constexpr size_t __full_size = sizeof(__data) / sizeof(_Tp);
+      for (size_t __i = _Np; __i < __full_size; ++__i) {
+        __result.__data[__i] = _Tp(1);
+      }
+    }
+    return __result;
+  }
 };
 
 template <class _Tp, int _Np>
@@ -97,6 +110,60 @@ struct __simd_operations<_Tp, simd_abi::__vec_ext<_Np>> {
   static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_not(_SimdStorage __s) noexcept { return {~__s.__data}; }
 
   static _LIBCPP_HIDE_FROM_ABI _SimdStorage __unary_minus(_SimdStorage __s) noexcept { return {-__s.__data}; }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __plus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data + __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __minus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data - __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __multiplies(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data * __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __divides(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    if constexpr (!_SimdStorage::__is_partial_v)
+      return {__lhs.__data / __rhs.__data};
+    else
+      return {__lhs.__data / __rhs.__make_padding_nonzero().__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __modulus(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    if constexpr (!_SimdStorage::__is_partial_v)
+      return {__lhs.__data % __rhs.__data};
+    else
+      return {__lhs.__data % __rhs.__make_padding_nonzero().__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_and(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data & __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_or(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data | __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __bitwise_xor(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data ^ __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_left(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data << __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_right(_SimdStorage __lhs, _SimdStorage __rhs) noexcept {
+    return {__lhs.__data >> __rhs.__data};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_left(_SimdStorage __lhs, int __rhs) noexcept {
+    return {__lhs.__data << __rhs};
+  }
+
+  static _LIBCPP_HIDE_FROM_ABI _SimdStorage __shift_right(_SimdStorage __lhs, int __rhs) noexcept {
+    return {__lhs.__data >> __rhs};
+  }
 };
 
 template <class _Tp, int _Np>