From patchwork Thu Nov 30 12:30:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 81027 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2AF2D3857C69 for ; Thu, 30 Nov 2023 12:34:27 +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 770163857C41 for ; Thu, 30 Nov 2023 12:34:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 770163857C41 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 770163857C41 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=1701347642; cv=none; b=Xd0Y6eyQzSgZDpbTQQgpUBZPXg/5bCH7pkBRiGzG92DT+UKevKGhpOnH0c6FxU4wEuQpuCDFeQTTT43jkxOZOYNlC5NO1v/bRV/bjZ84wBj249yJnEYjoZKiYMTYoeGGj6+CIeKu7k4mn+1cEUVY8jcEqIUkJWwKOqsOPetKMjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701347642; c=relaxed/simple; bh=Ac66n93xBbIb7EHFeSxxaf48mw0uZ4fP+prMjmzesI0=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version; b=L5LN3i+m7Y5BqvHvrM4vC8iz6imrD8DyADLZ1EQZI9z3rAvi0+BA53m3kwRkLRDeAdbTrB6/U+fdo8i7u0opFc++K4wah1O6gIHloWMn75lkaylURHQxHrz4B8bl9MklwA35oy2eZiRw0x0WKu/vrYxRDACHHrZzRoRkPEe2Gpo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (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 4A2861FB3F for ; Thu, 30 Nov 2023 12:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701347640; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=c7bF8HE2D3hw/petBeECYdywD+reDMdCfFHvJF5ZChs=; b=DLmfYFsXDIT43Nec2mCYzY2Ciydkq9yF38u4dzYIugZuXCJ12X3CrZjuykutjS7XZn15YH KEBZRUpo6bLMUVcwkOgkjGUx4oX/cR8BH5MvfgfASV/MkXpAViT1MGd2LwoJZQACZ01k92 +GTMu98m3UB3vMgpOydS2OuCndH327U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701347640; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=c7bF8HE2D3hw/petBeECYdywD+reDMdCfFHvJF5ZChs=; b=kI1/22mPLJ35Kf4mA0rSWh4IEhFTS2G1bYIP1VqmbGcyCOld33XhZ7nOIXEWrltaWcJH1e 64lQGj87sJ4RD0CQ== Date: Thu, 30 Nov 2023 13:30:21 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/112767 - spurious diagnostic after sccp/loop-split swap MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 2.90 X-Spamd-Result: default: False [2.90 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_SPAM_LONG(3.50)[1.000]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-11.1 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+patchwork=sourceware.org@gcc.gnu.org Message-Id: <20231130123427.2AF2D3857C69@sourceware.org> We are diagnosing an unreachable loop which we only manage to elide after the copyprop pass after sccp which leaves the code open for diagnosing by the intermittent ivcanon pass. The following makes sure to clean things up a bit earlier, propagating constant final values to uses immediately. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/112767 * tree-scalar-evolution.cc (final_value_replacement_loop): Propagate constants to immediate uses immediately. * gcc.dg/tree-ssa/pr112767.c: New testcase. * gcc.dg/graphite/pr83255.c: Disable SCCP. --- gcc/testsuite/gcc.dg/graphite/pr83255.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/pr112767.c | 18 ++++++++++++++++++ gcc/tree-scalar-evolution.cc | 11 ++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr112767.c diff --git a/gcc/testsuite/gcc.dg/graphite/pr83255.c b/gcc/testsuite/gcc.dg/graphite/pr83255.c index cb376fa61be..07532632787 100644 --- a/gcc/testsuite/gcc.dg/graphite/pr83255.c +++ b/gcc/testsuite/gcc.dg/graphite/pr83255.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O -floop-nest-optimize -fdump-tree-graphite-details" } */ +/* { dg-options "-O -floop-nest-optimize -fno-tree-scev-cprop -fdump-tree-graphite-details" } */ int rx, in; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr112767.c b/gcc/testsuite/gcc.dg/tree-ssa/pr112767.c new file mode 100644 index 00000000000..3f9bc061ee1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr112767.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +double reg_dict[32]; + +void foo(int); + +void initialize() +{ + int i=8; + for (int phi=0; phi<8; ++phi) { + reg_dict[i]=0; /* { dg-bogus "undefined behavior" } */ + int sn = 0; + if (i < 16) sn = 20; + foo(sn); + ++i; + } +} diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc index f61277c32df..065bcd0743d 100644 --- a/gcc/tree-scalar-evolution.cc +++ b/gcc/tree-scalar-evolution.cc @@ -3841,11 +3841,20 @@ final_value_replacement_loop (class loop *loop) print_gimple_stmt (dump_file, phi, 0); fprintf (dump_file, " with expr: "); print_generic_expr (dump_file, def); + fprintf (dump_file, "\n"); } any = true; def = unshare_expr (def); remove_phi_node (&psi, false); + /* Propagate constants immediately. */ + if (CONSTANT_CLASS_P (def)) + { + replace_uses_by (rslt, def); + release_ssa_name (rslt); + continue; + } + /* Create the replacement statements. */ gimple_seq stmts; def = force_gimple_operand (def, &stmts, false, NULL_TREE); @@ -3877,7 +3886,7 @@ final_value_replacement_loop (class loop *loop) gsi_insert_seq_before (&gsi, stmts, GSI_SAME_STMT); if (dump_file) { - fprintf (dump_file, "\n final stmt:\n "); + fprintf (dump_file, " final stmt:\n "); print_gimple_stmt (dump_file, SSA_NAME_DEF_STMT (rslt), 0); fprintf (dump_file, "\n"); }