From patchwork Tue Oct 12 11:58:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1539778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=HaeBMlpE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTDhm30Slz9sR4 for ; Tue, 12 Oct 2021 22:58:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 83A99385740A for ; Tue, 12 Oct 2021 11:58:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83A99385740A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634039924; bh=PP2ESXysRoEOcykelJZ/JO2vPwOg9JHUF6K0tEaWe6c=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=HaeBMlpEdRMLPyMwN4KvIyVYbMCqaV+U8lcHLNlMfO8/U3HxTMNf7vRR5I8wqqlba lESXep+DUcLJyUgPDD1EblbIIfgF1Onoc+gUDLAlOBfKZ3JbPtBgWKxCSGx2I2CHN7 FUS0lhjH7vPbdZRNgJrN4JdfWJj8Sqrp8CUyd/lU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id C9A893858430 for ; Tue, 12 Oct 2021 11:58:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C9A893858430 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-out1.suse.de (Postfix) with ESMTPS id 904F62207C for ; Tue, 12 Oct 2021 11:58:23 +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 7EFDD13B2A for ; Tue, 12 Oct 2021 11:58:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id O5f5HV94ZWF8NQAAMHmgww (envelope-from ) for ; Tue, 12 Oct 2021 11:58:23 +0000 Date: Tue, 12 Oct 2021 13:58:23 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/102696 - fix SLP discovery for failed BIT_FIELD_REF Message-ID: <30q5r9o7-o58o-5770-p684-n435s134p67@fhfr.qr> MIME-Version: 1.0 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This fixes a forgotten adjustment of matches[] when we fail SLP discovery. Bootstrap & regtest running on x86_64-unknown-linux-gnu. 2021-10-12 Richard Biener PR tree-optimization/102696 * tree-vect-slp.c (vect_build_slp_tree_2): Properly mark the tree fatally failed when we reject a BIT_FIELD_REF. * g++.dg/vect/pr102696.cc: New testcase. --- gcc/testsuite/g++.dg/vect/pr102696.cc | 16 ++++++++++++++++ gcc/tree-vect-slp.c | 1 + 2 files changed, 17 insertions(+) create mode 100644 gcc/testsuite/g++.dg/vect/pr102696.cc diff --git a/gcc/testsuite/g++.dg/vect/pr102696.cc b/gcc/testsuite/g++.dg/vect/pr102696.cc new file mode 100644 index 00000000000..5560354304a --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr102696.cc @@ -0,0 +1,16 @@ +// { dg-do compile } +// { dg-additional-options "-O3" } +// { dg-additional-options "-march=skylake-avx512" { target x86_64-*-* i?86-*-* } } + +int a; +extern bool b[][14]; +char h; +void f(short g[][14]) +{ + for (short d = h; d < 21; d += 1) + for (unsigned char e = 0; e < 14; e += 1) + { + a = 0; + b[d][e] = g[d][e]; + } +} diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index c70d06e5f20..709bcb63686 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -1761,6 +1761,7 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node, bit_field_size (bfref), &lane)) { lperm.release (); + matches[0] = false; return NULL; } lperm.safe_push (std::make_pair (0, (unsigned)lane));