WIP: move cx impl into non-member functions in simd_complex.h

include/ChangeLog:

	* bits/simd_complex.h:
	* bits/simd_vec.h:

Author: mattkretz

include/bits/simd_complex.h

@@ -188,6 +188,42 @@ namespace simd
 	return __builtin_bit_cast(__tree_of_ulong_t<__div_ceil(_Np, size_t(__CHAR_BIT__))>, __b);
     }
 
+  namespace __cx
+  {
+    template <typename _Tp, typename _Ap>
+      [[__gnu__::__always_inline__]]
+      constexpr void
+      __set_real(basic_vec<_Tp, _Ap>& __x,
+			 const __similar_vec<_Tp, _Ap::_S_size / 2, _Ap>& __re) noexcept
+      {
+	static_assert(is_floating_point_v<_Tp>);
+	static_assert((_Ap::_S_size & 1) == 0);
+	if constexpr (_Ap::_S_nreg == 1)
+	  {
+	    using _DataType = typename _Ap::template _DataType<_Tp>;
+	    _DataType& __xv = __x._M_get();
+	    const auto __rv = __re._M_get();
+	    if constexpr (_Ap::_S_size == 2)
+	      __vec_set(__xv, 0, __rv);
+	    else if (__is_const_known(__x, __re))
+	      {
+		constexpr auto [...__is] = _IotaArray<_Ap::_S_size>;
+		__xv = _DataType {((__is & 1) == 0 ? __rv[__is / 2] : __xv[__is])...};
+	      }
+	    else
+	      _VecOps<_DataType>::_S_overwrite_even_elements(__xv, __rv);
+	  }
+	else
+	  {
+	    constexpr int __n0 = __x._M_get_low().size();
+	    const auto& [__lo, __hi] = __re.template _M_chunk<
+					 __similar_vec<_Tp, __n0 / 2, _Ap>>();
+	    __set_real(__x._M_get_low(), __lo);
+	    __set_real(__x._M_get_high(), __hi);
+	  }
+      }
+  }
+
   // complex interleaved (_CxIleav) -------------------------------------------
 
   template <size_t _Bytes, __abi_tag _Ap>
@@ -968,7 +1004,7 @@ namespace simd
       constexpr
       basic_vec(const _RealSimd& __re, const _RealSimd& __im = {}) noexcept
       {
-	_M_data._M_complex_set_real(__re);
+	__cx::__set_real(_M_data, __re);
 	_M_data._M_complex_set_imag(__im);
       }
 
@@ -1191,7 +1227,7 @@ namespace simd
       [[__gnu__::__always_inline__]]
       constexpr void
       real(const _RealSimd& __x) noexcept
-      { _M_data._M_complex_set_real(__x); }
+      { __cx::__set_real(_M_data, __x); }
 
       [[__gnu__::__always_inline__]]
       constexpr void
@@ -1683,14 +1719,24 @@ namespace simd
       using mask_type = _VecBase<_Tp, _Ap>::mask_type;
 
       // internal but public API ----------------------------------------------
+      [[__gnu__::__always_inline__]]
+      constexpr _RealSimd&
+      _M_get_real() noexcept
+      { return _M_real; }
+
       [[__gnu__::__always_inline__]]
       constexpr const _RealSimd&
-      _M_get_real() const
+      _M_get_real() const noexcept
       { return _M_real; }
 
+      [[__gnu__::__always_inline__]]
+      constexpr _RealSimd&
+      _M_get_imag() noexcept
+      { return _M_imag; }
+
       [[__gnu__::__always_inline__]]
       constexpr const _RealSimd&
-      _M_get_imag() const
+      _M_get_imag() const noexcept
       { return _M_imag; }
 
       [[__gnu__::__always_inline__]]

include/bits/simd_vec.h

@@ -341,9 +341,14 @@ namespace simd
 	return __r;
       }
 
+      [[__gnu__::__always_inline__]]
+      constexpr _DataType&
+      _M_get() noexcept
+      { return _M_data; }
+
       [[__gnu__::__always_inline__]]
       constexpr const _DataType&
-      _M_get() const
+      _M_get() const noexcept
       { return _M_data; }
 #if VIR_PATCH_PERMUTE_DYNAMIC
 
@@ -452,22 +457,6 @@ namespace simd
 
       static constexpr bool _SupportCxApi = (_S_size & 1) == 0 && is_floating_point_v<value_type>;
 
-      [[__gnu__::__always_inline__]]
-      constexpr void
-      _M_complex_set_real(const _HalfVec& __x) requires _SupportCxApi
-      {
-	if (__is_const_known(*this, __x))
-	  {
-	    constexpr auto [...__is] = _IotaArray<_S_size>;
-	    _M_data = _DataType { ((__is & 1) == 0 ? __canon_value_type(__x[__is / 2])
-						   : _M_data[__is])...};
-	  }
-	else if constexpr (_S_size == 2)
-	  _M_data[0] = __x[0];
-	else
-	  _VecOps<_DataType>::_S_overwrite_even_elements(_M_data, __x);
-      }
-
       [[__gnu__::__always_inline__]]
       constexpr void
       _M_complex_set_imag(const _HalfVec& __x) requires _SupportCxApi
@@ -2214,14 +2203,24 @@ namespace simd
 	return __r;
       }
 
+      [[__gnu__::__always_inline__]]
+      constexpr _DataType0&
+      _M_get_low() noexcept
+      { return _M_data0; }
+
       [[__gnu__::__always_inline__]]
       constexpr const _DataType0&
-      _M_get_low() const
+      _M_get_low() const noexcept
       { return _M_data0; }
 
+      [[__gnu__::__always_inline__]]
+      constexpr _DataType1&
+      _M_get_high() noexcept
+      { return _M_data1; }
+
       [[__gnu__::__always_inline__]]
       constexpr const _DataType1&
-      _M_get_high() const
+      _M_get_high() const noexcept
       { return _M_data1; }
 #if VIR_PATCH_PERMUTE_DYNAMIC
 
@@ -2272,16 +2271,6 @@ namespace simd
 
       static constexpr bool _SupportCxApi = (_S_size & 1) == 0 && is_floating_point_v<value_type>;
 
-      [[__gnu__::__always_inline__]]
-      constexpr void
-      _M_complex_set_real(const _HalfVec& __x) requires _SupportCxApi
-      {
-	const auto& [__lo, __hi]
-	  = __x.template _M_chunk<__similar_resized_vec<value_type, _N0 / 2, _Ap>>();
-	_M_data0._M_complex_set_real(__lo);
-	_M_data1._M_complex_set_real(__hi);
-      }
-
       [[__gnu__::__always_inline__]]
       constexpr void
       _M_complex_set_imag(const _HalfVec& __x) requires _SupportCxApi