From patchwork Tue Nov 22 07:05:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 24170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2047536wrr; Mon, 21 Nov 2022 23:06:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf43f17ZslfPNx1GJHnK9DqAqVCvO0SWFPThmyd12Ic8dWvRVOMQioG8IO43KtDB5aCGVtXO X-Received: by 2002:a17:906:e289:b0:7ae:c460:c65f with SMTP id gg9-20020a170906e28900b007aec460c65fmr18691142ejb.226.1669100791051; Mon, 21 Nov 2022 23:06:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669100791; cv=none; d=google.com; s=arc-20160816; b=sl3NYQT23ITxRFNf6vOv7SpMa1CSYrBDE/X0wpvuYWayGw4W54gK3fEpQid1duX9KV pAaX3j20Y27grQNaSWzsNjdLYHlb8LhNbcEKC3BJC7YaTrw6CHHLdbVVNsJCk4X4Jn0u m+oSLDOjdXXqy5KUMMKtNlAzDgpx2w1DZfZXRizivbVk4NT2KUzlZQloaxEJSF9yx2Mi L7OI+K/5UNLfjIbPts8yJ95IDnyydQYWLOF3h3j9lGm13WrL5c34eIdG1bOgFfsidCiT R983r0LkxW/RJHViiz4QnJ1/N+eQtzKkgEDT6eLIt/+H718cD1hpfId32rBxLzFbsbuL Bj+A== 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=EHKJA/KpaV5ZZmjCrJZwoChXgQnkJTHSJqPJi/RMuGA=; b=gSlSUzeZAfoNxEHRjVxujXsd0h5ulXnvTl1dunyEsguhBRssg1yEax4odcuCKOyYyU KG03nuySLkD1YgyRQboOOvPHvrg7GcERnJReU6wIpXxwi37YhNzOj2fxIGNtvuC10qBv eY6UtdvmT8feqciWATkPBYELUEK/6SmMLi+6iuCq7bwJCZILClNiLdZI7lv/T8nhgROx 2J/MomrvkJHPysZuIigBRMbNK1uLh/sx2KXl9cl2HaaG5qZgXVuDqEDT99iREQIdUtmE 6FyxtaHf9Wgtq09ukHXSs6ie0Z5jPGqJJPgS3bQBQxGADHGuK1mjeWB4dOzy3v6C5REr yS8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Lkevq8jQ; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id hr25-20020a1709073f9900b007b4d76f5b17si6934807ejc.82.2022.11.21.23.06.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 23:06:31 -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=Lkevq8jQ; 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 130EB3858031 for ; Tue, 22 Nov 2022 07:06:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 130EB3858031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669100790; bh=EHKJA/KpaV5ZZmjCrJZwoChXgQnkJTHSJqPJi/RMuGA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Lkevq8jQ6XRK0ftr8aOTObjFMgcp4sK7OWcRiGXWbPp1GK9EbXKOsY+cs6N448PBR kFKdiH2Gqq+uTlPP9bpL5rq1LPqVArg1Yj668GVs3U/O+xw0HT2WiB89afuG9xHHiI KRCq2I1nS3Gi9Bdsv2T3TMrCvD8GM4KeFE+6aTDw= 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 [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 3D6CD3858C20 for ; Tue, 22 Nov 2022 07:05:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3D6CD3858C20 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 127FD1F86C for ; Tue, 22 Nov 2022 07:05:41 +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 F235B13AA1 for ; Tue, 22 Nov 2022 07:05:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id jxX/OcR0fGMVbwAAMHmgww (envelope-from ) for ; Tue, 22 Nov 2022 07:05:40 +0000 Date: Tue, 22 Nov 2022 08:05:40 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/107766 - ICE with recent -ffp-contract=off fix MIME-Version: 1.0 Message-Id: <20221122070540.F235B13AA1@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, 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?1750179031311494401?= X-GMAIL-MSGID: =?utf-8?q?1750179031311494401?= The following uses *node to check for FP types rather than the child nodes which could be constant leafs and thus without a vector type. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/107766 * tree-vect-slp-patterns.cc (complex_mul_pattern::matches): Use *node to check for FP vector types. * g++.dg/vect/pr107766.cc: New testcase. --- gcc/testsuite/g++.dg/vect/pr107766.cc | 23 +++++++++++++++++++++++ gcc/tree-vect-slp-patterns.cc | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/vect/pr107766.cc diff --git a/gcc/testsuite/g++.dg/vect/pr107766.cc b/gcc/testsuite/g++.dg/vect/pr107766.cc new file mode 100644 index 00000000000..744bcc900b0 --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr107766.cc @@ -0,0 +1,23 @@ +// { dg-do compile } +// { dg-additional-options "-ffp-contract=off" } + +typedef double btScalar; +struct btVector3 { + operator btScalar *() const; +}; +double m_vec[2]; +struct btShapeMatrix { + double &operator[](int i) { return m_vec[i]; } +}; +btScalar shape_function___1pxt1pz, shape_function__fac; +struct btMiniSDF { + void shape_function_(btVector3 const &) const; +}; +void btMiniSDF::shape_function_(btVector3 const &xi) const { + btShapeMatrix res; + btScalar _1m3y = 1.0 - 3.0 * xi[1], _1p3y = 1.0 + 3.0 * xi[1], + fact1m3y = shape_function__fac * _1m3y, + fact1p3y = shape_function__fac * _1p3y; + res[22] = fact1m3y * shape_function___1pxt1pz; + res[23] = fact1p3y * shape_function___1pxt1pz; +} diff --git a/gcc/tree-vect-slp-patterns.cc b/gcc/tree-vect-slp-patterns.cc index 122d697a809..93735008bd1 100644 --- a/gcc/tree-vect-slp-patterns.cc +++ b/gcc/tree-vect-slp-patterns.cc @@ -1039,7 +1039,7 @@ complex_mul_pattern::matches (complex_operation_t op, with -ffp-contract=fast. */ if (!mul0 && (flag_fp_contract_mode == FP_CONTRACT_FAST - || !FLOAT_TYPE_P (SLP_TREE_VECTYPE (l0node[0]))) + || !FLOAT_TYPE_P (SLP_TREE_VECTYPE (*node))) && vect_match_expression_p (l0node[0], PLUS_EXPR)) { auto vals = SLP_TREE_CHILDREN (l0node[0]);