From patchwork Tue Mar 26 09:37:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1916021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mAIO2h8e; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2iORWknt; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mAIO2h8e; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2iORWknt; dkim-atps=neutral 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 4V3l921KjNz1yXq for ; Tue, 26 Mar 2024 20:38:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FA9F3858419 for ; Tue, 26 Mar 2024 09:38:12 +0000 (GMT) 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.223.131]) by sourceware.org (Postfix) with ESMTPS id A83463858D38 for ; Tue, 26 Mar 2024 09:37:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A83463858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A83463858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711445872; cv=none; b=f0eTxyKQ+F2FL9PFLHVoll4fBmB0/BxAHW+fJdOT4lIirfbp0ARthm+1L5RKjhx1rC1hMJGgGEHz82OQSVtQehQvUmieZ/ZQ4rRKI+DCHKOYQym2v4kLouAcDxeyGRBoH3E/gtdz/inMoZkU3NY8q/s3JPtwg9NgG60WnG5VpPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711445872; c=relaxed/simple; bh=R5IA/c74cQ/i8RlOpew4IDeNSbL5m01TQvK71wd1emQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=MTDaahOeiJ7Ro8DjHfHbqswdc7UsW6tLJw1xZwVTuIusTZQ9++uu37c6umT0WXaqOob/2k8mYZSyQuvgzWJOJuuN2LVaB3xEqxArn+usS/tuMZkItVxgu4itDzq+5RsBaATgkrQbqqVqQb3xXL+cHdEJ97P6FZHZJYXap4BjwFc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (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 smtp-out2.suse.de (Postfix) with ESMTPS id 10A615CB64 for ; Tue, 26 Mar 2024 09:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711445869; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ZpTVDfXlF18iyIv+p210Odr3xHTgpc4qRjotzU6NO78=; b=mAIO2h8eWyPjG2N/qhAlYQlefAiT7hGAOoCi4JJDq5TQ4caVL+GQZOyF71ysEMilVRnrf8 rxUrDHhnBTAbmKDpN0rgs916p+YAuY2sVjvXv4uzkUvZNqArU/HPWqWhpK1Uvbn/7aSYEb nrHNt6pBODCx5VSIRdtC/H7PpxMlwMw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711445869; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ZpTVDfXlF18iyIv+p210Odr3xHTgpc4qRjotzU6NO78=; b=2iORWkntRiQJsdOzvqnzv8OIe2fBaH38picNKXY6pKisBfhg06eyubOafJJV46JMX7EhFw FkCDtgWhhc/UcxAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711445869; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ZpTVDfXlF18iyIv+p210Odr3xHTgpc4qRjotzU6NO78=; b=mAIO2h8eWyPjG2N/qhAlYQlefAiT7hGAOoCi4JJDq5TQ4caVL+GQZOyF71ysEMilVRnrf8 rxUrDHhnBTAbmKDpN0rgs916p+YAuY2sVjvXv4uzkUvZNqArU/HPWqWhpK1Uvbn/7aSYEb nrHNt6pBODCx5VSIRdtC/H7PpxMlwMw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711445869; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ZpTVDfXlF18iyIv+p210Odr3xHTgpc4qRjotzU6NO78=; b=2iORWkntRiQJsdOzvqnzv8OIe2fBaH38picNKXY6pKisBfhg06eyubOafJJV46JMX7EhFw FkCDtgWhhc/UcxAA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id EA84C13587 for ; Tue, 26 Mar 2024 09:37:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id 8MCQN2yXAmavBwAAn2gu4w (envelope-from ) for ; Tue, 26 Mar 2024 09:37:48 +0000 Date: Tue, 26 Mar 2024 10:37:44 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/114464 - verify types in recurrence vectorization MIME-Version: 1.0 Message-Id: <20240326093748.EA84C13587@imap2.dmz-prg2.suse.org> X-Spam-Score: -1.42 X-Spamd-Result: default: False [-1.42 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.27)[0.089]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-0.995]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.59)[81.61%] X-Spam-Level: Authentication-Results: smtp-out2.suse.de; none X-Spam-Status: No, score=-11.0 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.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 The following adds missing verification of vector type compatibility to recurrence vectorization. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/114464 * tree-vect-loop.cc (vectorizable_recurr): Verify the latch vector type is compatible with what we chose for the recurrence. * g++.dg/vect/pr114464.cc: New testcase. --- gcc/testsuite/g++.dg/vect/pr114464.cc | 11 +++++++++++ gcc/tree-vect-loop.cc | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 gcc/testsuite/g++.dg/vect/pr114464.cc diff --git a/gcc/testsuite/g++.dg/vect/pr114464.cc b/gcc/testsuite/g++.dg/vect/pr114464.cc new file mode 100644 index 00000000000..0d872aae9d4 --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr114464.cc @@ -0,0 +1,11 @@ +// { dg-do compile } + +void h(unsigned char *scratch, bool carry) +{ + for (int i = 0; i < 16; i++) { + bool b = scratch[i] <<= 1; + if (carry) + scratch[i] |= 1; + carry = b; + } +} diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 302c92e6f31..42e78cc9c32 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -9212,6 +9212,28 @@ vectorizable_recurr (loop_vec_info loop_vinfo, stmt_vec_info stmt_info, return false; } } + + /* Verify we have set up compatible types. */ + edge le = loop_latch_edge (LOOP_VINFO_LOOP (loop_vinfo)); + tree latch_vectype = NULL_TREE; + if (slp_node) + { + slp_tree latch_def = SLP_TREE_CHILDREN (slp_node)[le->dest_idx]; + latch_vectype = SLP_TREE_VECTYPE (latch_def); + } + else + { + tree latch_def = PHI_ARG_DEF_FROM_EDGE (phi, le); + if (TREE_CODE (latch_def) == SSA_NAME) + { + stmt_vec_info latch_def_info = loop_vinfo->lookup_def (latch_def); + latch_def_info = vect_stmt_to_vectorize (latch_def_info); + latch_vectype = STMT_VINFO_VECTYPE (latch_def_info); + } + } + if (!types_compatible_p (latch_vectype, vectype)) + return false; + /* The recurrence costs the initialization vector and one permute for each copy. */ unsigned prologue_cost = record_stmt_cost (cost_vec, 1, scalar_to_vec,