]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix call signature of builtins from masked ++/--
authorMatthias Kretz <m.kretz@gsi.de>
Wed, 27 Mar 2024 07:49:43 +0000 (08:49 +0100)
committerMatthias Kretz <m.kretz@gsi.de>
Wed, 8 May 2024 12:22:17 +0000 (14:22 +0200)
This resolves failures in the "expensive" where-* test of check-simd
when targeting AVX-512.

Signed-off-by: Matthias Kretz <m.kretz@gsi.de>
libstdc++-v3/ChangeLog:

* include/experimental/bits/simd_x86.h (_S_masked_unary): Call
the 4- and 8-byte variants of __builtin_ia32_subp[ds] without
rounding direction argument.

(cherry picked from commit 0ac2c0f0687b321ab54de271d788b4e0a287b4e2)

libstdc++-v3/include/experimental/bits/simd_x86.h

index 03febe7044c99a8e02fd1f58b6d9b331fcabf12a..90b7fca26e2b65b7c978bf19d8d97697456b1fe7 100644 (file)
@@ -3538,17 +3538,23 @@ template <typename _Abi, typename>
              }
            else
              {
-#define _GLIBCXX_SIMD_MASK_SUB(_Sizeof, _Width, _Instr)                        \
+#define _GLIBCXX_SIMD_MASK_SUB_512(_Sizeof, _Width, _Instr)                    \
   if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__v) == _Width)               \
     return __builtin_ia32_##_Instr##_mask(                                     \
             __v._M_data, __vector_broadcast<_Np>(_Tp(__pm_one)), __v._M_data, \
             __k._M_data, _MM_FROUND_CUR_DIRECTION)
-               _GLIBCXX_SIMD_MASK_SUB(4, 64, subps512);
+#define _GLIBCXX_SIMD_MASK_SUB(_Sizeof, _Width, _Instr)                        \
+  if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__v) == _Width)               \
+    return __builtin_ia32_##_Instr##_mask(                                     \
+            __v._M_data, __vector_broadcast<_Np>(_Tp(__pm_one)), __v._M_data, \
+            __k._M_data)
+               _GLIBCXX_SIMD_MASK_SUB_512(4, 64, subps512);
                _GLIBCXX_SIMD_MASK_SUB(4, 32, subps256);
                _GLIBCXX_SIMD_MASK_SUB(4, 16, subps128);
-               _GLIBCXX_SIMD_MASK_SUB(8, 64, subpd512);
+               _GLIBCXX_SIMD_MASK_SUB_512(8, 64, subpd512);
                _GLIBCXX_SIMD_MASK_SUB(8, 32, subpd256);
                _GLIBCXX_SIMD_MASK_SUB(8, 16, subpd128);
+#undef _GLIBCXX_SIMD_MASK_SUB_512
 #undef _GLIBCXX_SIMD_MASK_SUB
              }
 #endif // __clang__