arm supervector explicit constructor

diff --git a/src/util/supervector/arch/arm/impl.cpp b/src/util/supervector/arch/arm/impl.cpp
index 55f6c55c1660737c7b0c73aaf87d7b5063adff45..64c75bdd0fb130c4ed2cf58a8c604da8e426f26e 100644 (file)
--- a/src/util/supervector/arch/arm/impl.cpp
+++ b/src/util/supervector/arch/arm/impl.cpp
@@ -159,13 +159,13 @@ really_inline SuperVector<16>::SuperVector(uint64_t const other)
 template<>
 really_inline SuperVector<16> SuperVector<16>::Ones(void)
 {
-    return {vdupq_n_u8(0xFF)};
+    return SuperVector<16>(vdupq_n_u8(0xFF));
 }
 
 template<>
 really_inline SuperVector<16> SuperVector<16>::Zeroes(void)
 {
-    return {vdupq_n_u8(0)};
+    return SuperVector<16>(vdupq_n_u8(0));
 }
 
 // Methods
@@ -179,37 +179,37 @@ really_inline void SuperVector<16>::operator=(SuperVector<16> const &other)
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator&(SuperVector<16> const &b) const
 {
-    return {vandq_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(vandq_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator|(SuperVector<16> const &b) const
 {
-    return {vorrq_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(vorrq_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator^(SuperVector<16> const &b) const
 {
-    return {veorq_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(veorq_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator!() const
 {
-    return {vmvnq_u8(u.u8x16[0])};
+    return SuperVector<16>(vmvnq_u8(u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::opandnot(SuperVector<16> const &b) const
 {
-    return {vandq_u8(vmvnq_u8(u.u8x16[0]), b.u.u8x16[0])};
+    return SuperVector<16>(vandq_u8(vmvnq_u8(u.u8x16[0]), b.u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator==(SuperVector<16> const &b) const
 {
-    return {vceqq_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(vceqq_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template <>
@@ -221,25 +221,25 @@ really_inline SuperVector<16> SuperVector<16>::operator!=(SuperVector<16> const
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator>(SuperVector<16> const &b) const
 {
-    return {vcgtq_s8(u.s8x16[0], b.u.s8x16[0])};
+    return SuperVector<16>(vcgtq_s8(u.s8x16[0], b.u.s8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator>=(SuperVector<16> const &b) const
 {
-    return {vcgeq_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(vcgeq_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator<(SuperVector<16> const &b) const
 {
-    return {vcltq_s8(u.s8x16[0], b.u.s8x16[0])};
+    return SuperVector<16>(vcltq_s8(u.s8x16[0], b.u.s8x16[0]));
 }
 
 template <>
 really_inline SuperVector<16> SuperVector<16>::operator<=(SuperVector<16> const &b) const
 {
-    return {vcgeq_s8(u.s8x16[0], b.u.s8x16[0])};
+    return SuperVector<16>(vcgeq_s8(u.s8x16[0], b.u.s8x16[0]));
 }
 
 template <>
@@ -274,35 +274,35 @@ template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshl_8_imm() const
 {
-    return {vshlq_n_u8(u.u8x16[0], N)};
+    return SuperVector<16>(vshlq_n_u8(u.u8x16[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshl_16_imm() const
 {
-    return {vshlq_n_u16(u.u16x8[0], N)};
+    return SuperVector<16>(vshlq_n_u16(u.u16x8[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshl_32_imm() const
 {
-    return {vshlq_n_u32(u.u32x4[0], N)};
+    return SuperVector<16>(vshlq_n_u32(u.u32x4[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshl_64_imm() const
 {
-    return {vshlq_n_u64(u.u64x2[0], N)};
+    return SuperVector<16>(vshlq_n_u64(u.u64x2[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshl_128_imm() const
 {
-    return {vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N)};
+    return SuperVector<16>(vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N));
 }
 
 template <>
@@ -316,35 +316,35 @@ template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshr_8_imm() const
 {
-    return {vshrq_n_u8(u.u8x16[0], N)};
+    return SuperVector<16>(vshrq_n_u8(u.u8x16[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshr_16_imm() const
 {
-    return {vshrq_n_u16(u.u16x8[0], N)};
+    return SuperVector<16>(vshrq_n_u16(u.u16x8[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshr_32_imm() const
 {
-    return {vshrq_n_u32(u.u32x4[0], N)};
+    return SuperVector<16>(vshrq_n_u32(u.u32x4[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshr_64_imm() const
 {
-    return {vshrq_n_u64(u.u64x2[0], N)};
+    return SuperVector<16>(vshrq_n_u64(u.u64x2[0], N));
 }
 
 template <>
 template<uint8_t N>
 really_inline SuperVector<16> SuperVector<16>::vshr_128_imm() const
 {
-    return {vextq_u8(u.u8x16[0], vdupq_n_u8(0), N)};
+    return SuperVector<16>(vextq_u8(u.u8x16[0], vdupq_n_u8(0), N));
 }
 
 template <>
@@ -376,7 +376,7 @@ really_inline SuperVector<16> SuperVector<16>::vshl_8  (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 8) return Zeroes();
     int8x16_t shift_indices = vdupq_n_s8(N);
-    return { vshlq_s8(u.s8x16[0], shift_indices) };
+    return SuperVector<16>(vshlq_s8(u.s8x16[0], shift_indices));
 }
 
 template <>
@@ -385,7 +385,7 @@ really_inline SuperVector<16> SuperVector<16>::vshl_16 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 16) return Zeroes();
     int16x8_t shift_indices = vdupq_n_s16(N);
-    return { vshlq_s16(u.s16x8[0], shift_indices) };
+    return SuperVector<16>(vshlq_s16(u.s16x8[0], shift_indices));
 }
 
 template <>
@@ -394,7 +394,7 @@ really_inline SuperVector<16> SuperVector<16>::vshl_32 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 32) return Zeroes();
     int32x4_t shift_indices = vdupq_n_s32(N);
-    return { vshlq_s32(u.s32x4[0], shift_indices) };
+    return SuperVector<16>(vshlq_s32(u.s32x4[0], shift_indices));
 }
 
 template <>
@@ -403,7 +403,7 @@ really_inline SuperVector<16> SuperVector<16>::vshl_64 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 64) return Zeroes();
     int64x2_t shift_indices = vdupq_n_s64(N);
-    return { vshlq_s64(u.s64x2[0], shift_indices) };
+    return SuperVector<16>(vshlq_s64(u.s64x2[0], shift_indices));
 }
 
 template <>
@@ -413,11 +413,11 @@ really_inline SuperVector<16> SuperVector<16>::vshl_128(uint8_t const N) const
     if (N == 16) return Zeroes();
 #if defined(HAVE__BUILTIN_CONSTANT_P)
     if (__builtin_constant_p(N)) {
-        return {vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N)};
+        return SuperVector<16>(vextq_u8(vdupq_n_u8(0), u.u8x16[0], 16 - N));
     }
 #endif
     SuperVector result;
-    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (N == n) result = {vextq_u8(vdupq_n_u8(0), v->u.u8x16[0], 16 - n)}; });
+    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (N == n) result = SuperVector<16>(vextq_u8(vdupq_n_u8(0), v->u.u8x16[0], 16 - n)); });
     return result;
 }
 
@@ -433,7 +433,7 @@ really_inline SuperVector<16> SuperVector<16>::vshr_8  (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 8) return Zeroes();
     int8x16_t shift_indices = vdupq_n_s8(-N);
-    return { vshlq_s8(u.s8x16[0], shift_indices) };
+    return SuperVector<16>(vshlq_s8(u.s8x16[0], shift_indices));
 }
 
 template <>
@@ -442,7 +442,7 @@ really_inline SuperVector<16> SuperVector<16>::vshr_16 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 16) return Zeroes();
     int16x8_t shift_indices = vdupq_n_s16(-N);
-    return { vshlq_s16(u.s16x8[0], shift_indices) };
+    return SuperVector<16>(vshlq_s16(u.s16x8[0], shift_indices));
 }
 
 template <>
@@ -451,7 +451,7 @@ really_inline SuperVector<16> SuperVector<16>::vshr_32 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 32) return Zeroes();
     int32x4_t shift_indices = vdupq_n_s32(-N);
-    return { vshlq_s32(u.s32x4[0], shift_indices) };
+    return SuperVector<16>(vshlq_s32(u.s32x4[0], shift_indices));
 }
 
 template <>
@@ -460,7 +460,7 @@ really_inline SuperVector<16> SuperVector<16>::vshr_64 (uint8_t const N) const
     if (N == 0) return *this;
     if (N == 64) return Zeroes();
     int64x2_t shift_indices = vdupq_n_s64(-N);
-    return { vshlq_s64(u.s64x2[0], shift_indices) };
+    return SuperVector<16>(vshlq_s64(u.s64x2[0], shift_indices));
 }
 
 template <>
@@ -470,11 +470,11 @@ really_inline SuperVector<16> SuperVector<16>::vshr_128(uint8_t const N) const
     if (N == 16) return Zeroes();
 #if defined(HAVE__BUILTIN_CONSTANT_P)
     if (__builtin_constant_p(N)) {
-         return {vextq_u8(u.u8x16[0], vdupq_n_u8(0), N)};
+         return SuperVector<16>(vextq_u8(u.u8x16[0], vdupq_n_u8(0), N));
     }
 #endif
     SuperVector result;
-    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (N == n) result = {vextq_u8(v->u.u8x16[0], vdupq_n_u8(0), n)}; });
+    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (N == n) result = SuperVector<16>(vextq_u8(v->u.u8x16[0], vdupq_n_u8(0), n)); });
     return result;
 }
 
@@ -537,11 +537,11 @@ really_inline SuperVector<16> SuperVector<16>::alignr(SuperVector<16> &other, in
     if (offset == 16) return *this;
 #if defined(HAVE__BUILTIN_CONSTANT_P)
     if (__builtin_constant_p(offset)) {
-        return {vextq_u8(other.u.u8x16[0], u.u8x16[0], offset)};
+        return SuperVector<16>(vextq_u8(other.u.u8x16[0], u.u8x16[0], offset));
     }
 #endif
     SuperVector result;
-    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (offset == n) result = {vextq_u8(other.u.u8x16[0], v->u.u8x16[0], n)}; });
+    Unroller<1, 16>::iterator([&,v=this](auto const i) { constexpr uint8_t n = i.value; if (offset == n) result = SuperVector<16>(vextq_u8(other.u.u8x16[0], v->u.u8x16[0], n)); });
     return result;
 }
 
@@ -549,7 +549,7 @@ template<>
 template<>
 really_inline SuperVector<16> SuperVector<16>::pshufb<false>(SuperVector<16> b)
 {
-    return {vqtbl1q_u8(u.u8x16[0], b.u.u8x16[0])};
+    return SuperVector<16>(vqtbl1q_u8(u.u8x16[0], b.u.u8x16[0]));
 }
 
 template<>

diff --git a/src/util/supervector/supervector.hpp b/src/util/supervector/supervector.hpp
index 8414fa60a21ec007cae09bfe8947b7df97a7d1c9..da9f7747ca6679c57c32b2ad553407bf4c005f85 100644 (file)
--- a/src/util/supervector/supervector.hpp
+++ b/src/util/supervector/supervector.hpp
@@ -214,7 +214,7 @@ public:
   SuperVector(previous_type const lo, previous_type const hi);
 
   static SuperVector dup_u8 (uint8_t  other) { return {SuperVector(other)}; };
-  static SuperVector dup_s8 (int8_t   other) { return {other}; };
+  static SuperVector dup_s8 (int8_t   other) { return {SuperVector(other)}; };
   static SuperVector dup_u16(uint16_t other) { return {other}; };
   static SuperVector dup_s16(int16_t  other) { return {other}; };
   static SuperVector dup_u32(uint32_t other) { return {other}; };