From: Matthias Kretz <m.kretz@gsi.de>
To: <gcc-patches@gcc.gnu.org>, <libstdc++@gcc.gnu.org>
Subject: [PATCH] libstdc++: Fix call signature of builtins from masked ++/--
Date: Wed, 27 Mar 2024 09:50:41 +0100 [thread overview]
Message-ID: <6675252.LvFx2qVVIh@excalibur> (raw)
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
This is broken on GCC 13 and 14 (https://compiler-explorer.com/z/GPKGPGs6T)
Tested on x86_64-linux-gnu.
OK for trunk and 13?
----------------------- 8< ---------------------
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.
---
libstdc++-v3/include/experimental/bits/simd_x86.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
--
──────────────────────────────────────────────────────────────────────────
Dr. Matthias Kretz https://mattkretz.github.io
GSI Helmholtz Centre for Heavy Ion Research https://gsi.de
stdₓ::simd
──────────────────────────────────────────────────────────────────────────
[-- Attachment #2: 0001-libstdc-Fix-call-signature-of-builtins-from-masked.patch --]
[-- Type: text/x-patch, Size: 1648 bytes --]
diff --git a/libstdc++-v3/include/experimental/bits/simd_x86.h b/libstdc++-v3/include/experimental/bits/simd_x86.h
index 16b207be2a3..6b414486fee 100644
--- a/libstdc++-v3/include/experimental/bits/simd_x86.h
+++ b/libstdc++-v3/include/experimental/bits/simd_x86.h
@@ -3538,17 +3538,23 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __
}
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__
next reply other threads:[~2024-03-27 8:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 8:50 Matthias Kretz [this message]
2024-03-27 9:32 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6675252.LvFx2qVVIh@excalibur \
--to=m.kretz@gsi.de \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).