From patchwork Mon Jun 10 09:37:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1945827 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=s75x+6EV; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jSH2UJ1H; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=s75x+6EV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=jSH2UJ1H; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VyRYq3M1Rz20V0 for ; Mon, 10 Jun 2024 19:38:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 940753858402 for ; Mon, 10 Jun 2024 09:38:05 +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 [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 81B173858D28 for ; Mon, 10 Jun 2024 09:37:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 81B173858D28 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 81B173858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718012265; cv=none; b=ndT+MiCIjEGSHYYQ7QcZg789KEpIo+mDgQ737lJjx4SVMLRN1sTgX/Hmik52nRHxsIfnbK0lEq51bgckKrFNoCwvgt8fsFzQAbd8WPMsnZ0Uy1kDKH/igeviuxoNyKtkK5uSsC4Dm8XUluHImO8ucDzHUWnCXnASSWnBTuGptyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718012265; c=relaxed/simple; bh=v/gR3wSsqFdxDs1aXcS2RGOt+u/DSwn75zAVvB2kJhQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=OGTPXJgK1kdpfSubNKGcRR9GHybiQExIJeL93qGMm6x0CaW34WgEI+CEDqql6YXjTbbcfQ01F7FrM561jEQGYRntN/H2eNPnaAx5/VsKoaKtQzDYua+BoRI2eP6ICRTYcxuRTsu+URir8CUaMbQ/t8eSCMG+StoPqNbP2ij+e24= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from murzim.nue2.suse.org (unknown [10.168.4.243]) (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 695AC1F7BE for ; Mon, 10 Jun 2024 09:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718012262; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=IOm7GRx0C3x9Pin+oIkp9nGnsZypNIK+/9wy1tHEemk=; b=s75x+6EVclEtGaPXkP1t1M+wwHSw9MVlU26UceErGWUMOWcZIb9ou1qTSpB8oPseb1M2GV qmp/jr8b0ugPW9kX/tj7o1jzLkEKIAfbdebhZauseVG1bP+WcOqWJqpDxqRw3Qwa/12jsc xnNTayEAZOGzGBwAZ3Q7pdc3qLxImjU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718012262; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=IOm7GRx0C3x9Pin+oIkp9nGnsZypNIK+/9wy1tHEemk=; b=jSH2UJ1HjnO0DpxaBBnOgnr3tbD6SNyRGFhqviJoAhmJgG+S/Kt459F8nNpY/ofNOORILz hEFg9cK7RhWXcLDA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718012262; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=IOm7GRx0C3x9Pin+oIkp9nGnsZypNIK+/9wy1tHEemk=; b=s75x+6EVclEtGaPXkP1t1M+wwHSw9MVlU26UceErGWUMOWcZIb9ou1qTSpB8oPseb1M2GV qmp/jr8b0ugPW9kX/tj7o1jzLkEKIAfbdebhZauseVG1bP+WcOqWJqpDxqRw3Qwa/12jsc xnNTayEAZOGzGBwAZ3Q7pdc3qLxImjU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718012262; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=IOm7GRx0C3x9Pin+oIkp9nGnsZypNIK+/9wy1tHEemk=; b=jSH2UJ1HjnO0DpxaBBnOgnr3tbD6SNyRGFhqviJoAhmJgG+S/Kt459F8nNpY/ofNOORILz hEFg9cK7RhWXcLDA== Date: Mon, 10 Jun 2024 11:37:42 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/115395 - wrong-code with SLP reduction in epilog MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-1.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-1.00)[-0.995]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; 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:+]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[] X-Spam-Score: -1.80 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 Message-Id: <20240610093805.940753858402@sourceware.org> When we continue a non-SLP reduction from the main loop in the epilog with a SLP reduction we currently fail to handle an adjustment by the initial value because that's not a thing with SLP. As long as we have the possibility to mix SLP and non-SLP we have to handle it though. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/115395 * tree-vect-loop.cc (vect_create_epilog_for_reduction): Handle STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT also for SLP reductions of group_size one. * gcc.dg/vect/pr115395.c: New testcase. --- gcc/testsuite/gcc.dg/vect/pr115395.c | 27 +++++++++++++++++++++++++++ gcc/tree-vect-loop.cc | 27 ++++++++------------------- 2 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/vect/pr115395.c diff --git a/gcc/testsuite/gcc.dg/vect/pr115395.c b/gcc/testsuite/gcc.dg/vect/pr115395.c new file mode 100644 index 00000000000..cd1cee9f3df --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr115395.c @@ -0,0 +1,27 @@ +/* { dg-additional-options "-mavx2" { target avx2_runtime } } */ + +#include "tree-vect.h" + +struct { + long header_size; + long start_offset; + long end_offset; +} myrar_dbo[5] = {{0, 87, 6980}, {0, 7087, 13980}, {0, 14087, 0}}; + +int i; +long offset; + +int main() +{ + check_vect (); + + offset += myrar_dbo[0].start_offset; + while (i < 2) { + i++; + offset += myrar_dbo[i].start_offset - myrar_dbo[i - 1].end_offset; + } + if (offset != 301) + abort(); + + return 0; +} diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index f598403df46..d894ac1c067 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -6047,25 +6047,14 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, tree induc_val = NULL_TREE; tree adjustment_def = NULL; - if (slp_node) - { - /* Optimize: for induction condition reduction, if we can't use zero - for induc_val, use initial_def. */ - if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) - induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); - /* ??? Coverage for 'else' isn't clear. */ - } + /* Optimize: for induction condition reduction, if we can't use zero + for induc_val, use initial_def. */ + if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) + induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); + else if (double_reduc) + ; else - { - /* Optimize: for induction condition reduction, if we can't use zero - for induc_val, use initial_def. */ - if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) - induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); - else if (double_reduc) - ; - else - adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info); - } + adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info); stmt_vec_info single_live_out_stmt[] = { stmt_info }; array_slice live_out_stmts = single_live_out_stmt; @@ -6890,7 +6879,7 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, if (adjustment_def) { - gcc_assert (!slp_reduc); + gcc_assert (!slp_reduc || group_size == 1); gimple_seq stmts = NULL; if (double_reduc) {