From patchwork Wed Mar 27 12:47:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Kretz X-Patchwork-Id: 1916745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4RLv0nn1z1yXq for ; Wed, 27 Mar 2024 23:49:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E97EC3861876 for ; Wed, 27 Mar 2024 12:49:07 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from lxmtout1.gsi.de (lxmtout1.gsi.de [140.181.3.111]) by sourceware.org (Postfix) with ESMTPS id 5F3F73860760; Wed, 27 Mar 2024 12:47:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F3F73860760 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gsi.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gsi.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5F3F73860760 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.181.3.111 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711543679; cv=none; b=dk/6yNNTUnIVq4K1IX408v8PcGMpr32ja+0U5G/+7Q5g7td3bITv6xXC5lEC89HtrVhVD/uvkZgxqXpvzvsLRZARQ1MHFzrbdHFRSf+zKdlgUZKVr4N8Jw8W/F73DUHuJEwKT6H3jOxFxDcMQTM9pw23a5C2KlRZ6O8u9rKyJx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711543679; c=relaxed/simple; bh=Nu6uVTcD1q5bBnaVysbAM9Wwf6yYXwmoKeYOzcBu1M8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=pc9dCkTpCXrfekO2Ut5vBUeAef8HEtRhARtZ7M/3mab42cjaYmQEQue0vFJyUhQ6NzyIGitL5OeC6JXy6XiXBOIbuC9maPHslY7adQBBekmvlaqo47wlzSu05RIqkxz75RjwN0G/xZvkRRsRRAyH3kArkSpWP3iHwTYhwKECOVA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by lxmtout1.gsi.de (Postfix) with ESMTP id 74AA9205104B; Wed, 27 Mar 2024 13:47:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lxmtout1.gsi.de Received: from lxmtout1.gsi.de ([127.0.0.1]) by localhost (lxmtout1.gsi.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id t-jFlBvY6puC; Wed, 27 Mar 2024 13:47:56 +0100 (CET) Received: from srvEX6.campus.gsi.de (unknown [10.10.4.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lxmtout1.gsi.de (Postfix) with ESMTPS id 5B1642051040; Wed, 27 Mar 2024 13:47:56 +0100 (CET) Received: from excalibur.localnet (140.181.3.12) by srvEX6.campus.gsi.de (10.10.4.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 27 Mar 2024 13:47:56 +0100 From: Matthias Kretz To: , Subject: [PATCH] libstdc++: Add masked ++/-- implementation for sizeof < 16 Date: Wed, 27 Mar 2024 13:47:55 +0100 Message-ID: <4048557.taCxCBeP46@excalibur> Organization: GSI Helmholtz Center for Heavy Ion Research MIME-Version: 1.0 X-Originating-IP: [140.181.3.12] X-ClientProxiedBy: srvEX6.Campus.gsi.de (10.10.4.96) To srvEX6.campus.gsi.de (10.10.4.96) X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, BODY_8BITS, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org And one more to fix follow-up / remaining failures. Tested on x86_64-linux- gnu. OK for trunk and 13? ------------ 8< -------------- This resolves further failures (-Wreturn-type warnings) and test failures for where-* tests targeting AVX-512. Signed-off-by: Matthias Kretz libstdc++-v3/ChangeLog: * include/experimental/bits/simd_x86.h (_S_masked_unary): Cast inputs < 16 bytes to 16 byte vectors before calling the right subtraction builtin. Before returning, truncate to the return vector type. --- .../include/experimental/bits/simd_x86.h | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) -- ────────────────────────────────────────────────────────────────────────── Dr. Matthias Kretz https://mattkretz.github.io GSI Helmholtz Centre for Heavy Ion Research https://gsi.de stdₓ::simd ────────────────────────────────────────────────────────────────────────── diff --git a/libstdc++-v3/include/experimental/bits/simd_x86.h b/libstdc++-v3/include/experimental/bits/simd_x86.h index 6b414486fee..517c4b4a5be 100644 --- a/libstdc++-v3/include/experimental/bits/simd_x86.h +++ b/libstdc++-v3/include/experimental/bits/simd_x86.h @@ -3508,6 +3508,9 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __ #ifdef __clang__ return __movm<_Np, _Tp>(__k._M_data) ? __v._M_data - __pm_one : __v._M_data; #else // __clang__ + using _TV = __vector_type_t<_Tp, _Np>; + constexpr size_t __bytes = sizeof(__v) < 16 ? 16 : sizeof(__v); + constexpr size_t __width = __bytes / sizeof(_Tp); if constexpr (is_integral_v<_Tp>) { constexpr bool __lp64 = sizeof(long) == sizeof(long long); @@ -3517,11 +3520,11 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __ std::conditional_t<__lp64, long long, int>, std::conditional_t< std::is_same_v<_Ip, signed char>, char, _Ip>>; - const auto __value = __vector_bitcast<_Up>(__v._M_data); + const auto __value = __intrin_bitcast<__vector_type_t<_Up, __width>>(__v._M_data); #define _GLIBCXX_SIMD_MASK_SUB(_Sizeof, _Width, _Instr) \ - if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__v) == _Width) \ - return __vector_bitcast<_Tp>(__builtin_ia32_##_Instr##_mask(__value, \ - __vector_broadcast<_Np>(_Up(__pm_one)), __value, __k._M_data)) + if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__value) == _Width) \ + return __intrin_bitcast<_TV>(__builtin_ia32_##_Instr##_mask(__value, \ + __vector_broadcast<__width>(_Up(__pm_one)), __value, __k._M_data)) _GLIBCXX_SIMD_MASK_SUB(1, 64, psubb512); _GLIBCXX_SIMD_MASK_SUB(1, 32, psubb256); _GLIBCXX_SIMD_MASK_SUB(1, 16, psubb128); @@ -3538,16 +3541,17 @@ _S_masked_unary(const _SimdWrapper<_K, _Np> __k, const _SimdWrapper<_Tp, _Np> __ } else { + const auto __value = __intrin_bitcast<__vector_type_t<_Tp, __width>>(__v._M_data); #define _GLIBCXX_SIMD_MASK_SUB_512(_Sizeof, _Width, _Instr) \ - if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__v) == _Width) \ + if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__value) == _Width) \ return __builtin_ia32_##_Instr##_mask( \ - __v._M_data, __vector_broadcast<_Np>(_Tp(__pm_one)), __v._M_data, \ + __value, __vector_broadcast<__width>(_Tp(__pm_one)), __value, \ __k._M_data, _MM_FROUND_CUR_DIRECTION) #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) + if constexpr (sizeof(_Tp) == _Sizeof && sizeof(__value) == _Width) \ + return __intrin_bitcast<_TV>(__builtin_ia32_##_Instr##_mask( \ + __value, __vector_broadcast<__width>(_Tp(__pm_one)), __value, \ + __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);