From patchwork Fri Nov 18 07:36:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 22162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp47600wrr; Thu, 17 Nov 2022 23:37:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf5yLA1J5EuQBHxGAPup+CKnnBjmvQ6jySevdjgZzzINFNgzs7czLdjdNttAmLSATL6kiQUv X-Received: by 2002:a17:906:f48:b0:78d:9bcf:4d9f with SMTP id h8-20020a1709060f4800b0078d9bcf4d9fmr4927306ejj.749.1668757066040; Thu, 17 Nov 2022 23:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668757066; cv=none; d=google.com; s=arc-20160816; b=GsptETj86+x2si7+SOFMcXfycgD1L5TRShde7geNK992hbvF8c0RqhSzNPFsIsZBb+ K3Y6QKta4x2ecXEw3IaCtznH5TrF7ZnjdVwzdU3nRfmd0eM7s13NjM+5PK2MRcp4OLOO FeoMQpHC6PsTsWmmN/FnXHKwB7KPoSC3O1oKi4ZC1O1zvyMHYj8ZwyWomSfcJxjYwvx6 9hyYHaXVVrKCB2oRRTOucwC9lJHLbi+YsnO8yU//gHaEnheJMaJfnXF/Gr4EbVvZBINY 0mFz2dIQ7778qYfS/9schcUh2wpGx4SSrT54rFpn8oZAv6NwZtLIZh1Mh0vyUzU5OXta lQ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :mime-version:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=LOkl1RcRJ2G3SmiB4W0M1+lGIzrYClpO91vfLzSlT6s=; b=IdvFMcM4iMoaG73c3G+B6Zkq2lG5RWdjBzNtgEiRKu3pvo8BT90BSSH+sp1GVRZRz6 PMNyQDSuT9KZMbExc58M8AO5PC5xjRLDtkur1dXv823sZzxqriqJ2ShO3PDeXOR4Ug4F M3ItlOxVyRjsRskhRBbOJitTHmdF0xApNKMEI0o6M2LCSACtlzcP7nTEKjj1uLlV8lZ4 E10K7qPu/A08sVLORMWmL1Pv1/+nNNBG+JlPuAQ0GTO5z6mfo5iSckXhiW/Tn+ivFObA /Itcxg0U+k8ucrB1mL+wE9c2HEE7sqNdpJl2IMGbnl9yh29olYe+K5seQ48/40T6Bpnz aOSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rHeTIIf+; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id c11-20020aa7c98b000000b00452697eda4csi2521097edt.58.2022.11.17.23.37.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 23:37:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rHeTIIf+; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 15FA83860744 for ; Fri, 18 Nov 2022 07:37:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15FA83860744 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668757065; bh=LOkl1RcRJ2G3SmiB4W0M1+lGIzrYClpO91vfLzSlT6s=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rHeTIIf+vncJo/zOb1A3p8ep3YcTeUELPqpntNrRm9/7KA9OnFTpjOoAar0PGLmWS J4fSrRsMR/RrnpwWu7Mq7dQDIyphocmsJRNwScaUAkLgrTV00FDrA2oTrZyE48r/7K 4iI9n/3rLE/cwVIpPyNEClGbmiAJCKlJgnzlUEJs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 9E47E3853D7F for ; Fri, 18 Nov 2022 07:37:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9E47E3853D7F Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 27A151F893 for ; Fri, 18 Nov 2022 07:37:00 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 151791345B for ; Fri, 18 Nov 2022 07:37:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id /R3/Axw2d2NzZgAAMHmgww (envelope-from ) for ; Fri, 18 Nov 2022 07:37:00 +0000 Date: Fri, 18 Nov 2022 08:36:59 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/107647 - avoid FMA from SLP with -ffp-contract=off MIME-Version: 1.0 Message-Id: <20221118073700.151791345B@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749818609292375245?= X-GMAIL-MSGID: =?utf-8?q?1749818609292375245?= Only with -ffp-contract=fast we can synthesize FMA operations like vfmaddsub231ps, so properly guard the transform in SLP pattern detection. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/107647 * tree-vect-slp-patterns.cc (addsub_pattern::recognize): Only allow FMA generation with -ffp-contract=fast for FP types. (complex_mul_pattern::matches): Likewise. * gcc.target/i386/pr107647.c: New testcase. --- gcc/testsuite/gcc.target/i386/pr107647.c | 17 +++++++++++++++++ gcc/tree-vect-slp-patterns.cc | 15 +++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr107647.c diff --git a/gcc/testsuite/gcc.target/i386/pr107647.c b/gcc/testsuite/gcc.target/i386/pr107647.c new file mode 100644 index 00000000000..45fcb55d698 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr107647.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ffp-contract=off -mavx2 -mfma" } */ + +void cscal(int n, float da_r, float *x) +{ + for (int i = 0; i < n; i += 4) + { + float temp0 = da_r * x[i] - x[i+1]; + float temp1 = da_r * x[i+2] - x[i+3]; + x[i+1] = da_r * x[i+1] + x[i]; + x[i+3] = da_r * x[i+3] + x[i+2]; + x[i] = temp0; + x[i+2] = temp1; + } +} + +/* { dg-final { scan-assembler-not "fma" } } */ diff --git a/gcc/tree-vect-slp-patterns.cc b/gcc/tree-vect-slp-patterns.cc index dc694b8e531..122d697a809 100644 --- a/gcc/tree-vect-slp-patterns.cc +++ b/gcc/tree-vect-slp-patterns.cc @@ -1035,8 +1035,11 @@ complex_mul_pattern::matches (complex_operation_t op, auto_vec left_op, right_op; slp_tree add0 = NULL; - /* Check if we may be a multiply add. */ + /* Check if we may be a multiply add. It's only valid to form FMAs + with -ffp-contract=fast. */ if (!mul0 + && (flag_fp_contract_mode == FP_CONTRACT_FAST + || !FLOAT_TYPE_P (SLP_TREE_VECTYPE (l0node[0]))) && vect_match_expression_p (l0node[0], PLUS_EXPR)) { auto vals = SLP_TREE_CHILDREN (l0node[0]); @@ -1501,9 +1504,13 @@ addsub_pattern::recognize (slp_tree_to_load_perm_map_t *, } /* Now we have either { -, +, -, + ... } (!l0add_p) or { +, -, +, - ... } - (l0add_p), see whether we have FMA variants. */ - if (!l0add_p - && vect_match_expression_p (SLP_TREE_CHILDREN (l0node)[0], MULT_EXPR)) + (l0add_p), see whether we have FMA variants. We can only form FMAs + if allowed via -ffp-contract=fast. */ + if (flag_fp_contract_mode != FP_CONTRACT_FAST + && FLOAT_TYPE_P (SLP_TREE_VECTYPE (l0node))) + ; + else if (!l0add_p + && vect_match_expression_p (SLP_TREE_CHILDREN (l0node)[0], MULT_EXPR)) { /* (c * d) -+ a */ if (vect_pattern_validate_optab (IFN_VEC_FMADDSUB, node))