From patchwork Tue Jul 26 11:18:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 56332 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 5B9A03858430 for ; Tue, 26 Jul 2022 11:18:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B9A03858430 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658834325; bh=hLB9VzpGVc5IPpNKGJsLrikm51c6iBKhJxoXUvNCjSw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=LAqt4rN+F9D4qNjLFjqOHcSHLJJxuRbkXDFsCnTNfDAcqDi1TTfUMCN0JmSNjl3m1 o6D3+2aWgwLvbvMlO0NyJvuNVjFeeXDh4gV8+ARL6LepSHhra9CScR3MqXmXY5IiOB RpPbOuIjzyGP9MOMc4hO1+Ws+AC8WQ3WYABQWqFE= 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.220.29]) by sourceware.org (Postfix) with ESMTPS id C8D963858C62 for ; Tue, 26 Jul 2022 11:18:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C8D963858C62 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id CE6671FBAE for ; Tue, 26 Jul 2022 11:18:14 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id C5A222C15D for ; Tue, 26 Jul 2022 11:18:14 +0000 (UTC) Date: Tue, 26 Jul 2022 11:18:14 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/105142 - improve maybe_fold_comparisons_from_match_pd fix User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 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 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220726111845.5B9A03858430@sourceware.org> The following improves on the fix for PR105142 which restricted the expression lookup used for maybe_fold_comparisons_from_match_pd to avoid picking up flow-sensitive info for use in places where guarding conditions do not hold. Instead of not allowing to expand SSA definitions there the following temporarily clears flow-sensitive info on the SSA names and restores it when finished matching. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. PR tree-optimization/105142 * gimple-fold.cc (fosa_unwind): New global. (follow_outer_ssa_edges): When the SSA definition to follow is does not dominate fosa_bb, temporarily clear flow-sensitive info. (maybe_fold_comparisons_from_match_pd): Set up unwind stack for follow_outer_ssa_edges and unwind flow-sensitive info clearing after matching. --- gcc/gimple-fold.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index a1704784bc9..876ef45434e 100644 --- a/gcc/gimple-fold.cc +++ b/gcc/gimple-fold.cc @@ -6886,6 +6886,7 @@ and_comparisons_1 (tree type, enum tree_code code1, tree op1a, tree op1b, } static basic_block fosa_bb; +static vec > *fosa_unwind; static tree follow_outer_ssa_edges (tree val) { @@ -6899,7 +6900,15 @@ follow_outer_ssa_edges (tree val) && (def_bb == fosa_bb || dominated_by_p (CDI_DOMINATORS, fosa_bb, def_bb)))) return val; - return NULL_TREE; + /* If the definition does not dominate fosa_bb temporarily reset + flow-sensitive info. */ + if (val->ssa_name.info.range_info) + { + fosa_unwind->safe_push (std::make_pair + (val, val->ssa_name.info.range_info)); + val->ssa_name.info.range_info = NULL; + } + return val; } return val; } @@ -6958,9 +6967,14 @@ maybe_fold_comparisons_from_match_pd (tree type, enum tree_code code, type, gimple_assign_lhs (stmt1), gimple_assign_lhs (stmt2)); fosa_bb = outer_cond_bb; + auto_vec, 8> unwind_stack; + fosa_unwind = &unwind_stack; if (op.resimplify (NULL, (!outer_cond_bb ? follow_all_ssa_edges : follow_outer_ssa_edges))) { + fosa_unwind = NULL; + for (auto p : unwind_stack) + p.first->ssa_name.info.range_info = p.second; if (gimple_simplified_result_is_gimple_val (&op)) { tree res = op.ops[0]; @@ -6982,6 +6996,9 @@ maybe_fold_comparisons_from_match_pd (tree type, enum tree_code code, return build2 ((enum tree_code)op.code, op.type, op0, op1); } } + fosa_unwind = NULL; + for (auto p : unwind_stack) + p.first->ssa_name.info.range_info = p.second; return NULL_TREE; }