From patchwork Tue Jul 26 13:41:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1660807 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=b/cwc0ji; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LsdPc6MfNz9s2R for ; Tue, 26 Jul 2022 23:42:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C3FB3858C62 for ; Tue, 26 Jul 2022 13:42:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C3FB3858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658842926; bh=K2H3ccnEaksV3eMuHFq66GOO/MoZfeO8pMISJJRLses=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=b/cwc0jiEPhpD5smoe0AS44Af9r+xqnSqWBUWvvJIcvFT+b6BacOB9exvW+XxakYa DFqALGPCFfQMOwcpwKe/UMc4WcjA+g2h89rxfJtfG8m2HmJSyfsJUxsehQaHjA3jDR PQnd7IXKKEZ758vagEugXBvs59SREanUmtrBQD5g= 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:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 711B13858D32 for ; Tue, 26 Jul 2022 13:41:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 711B13858D32 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 614351FE66 for ; Tue, 26 Jul 2022 13:41:45 +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 5B9A02C141 for ; Tue, 26 Jul 2022 13:41:45 +0000 (UTC) Date: Tue, 26 Jul 2022 13:41:45 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220726134206.9C3FB3858C62@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 and tested on x86_64-unknown-linux-gnu. 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. Make sure to not expand stmts with not defined overflow. (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 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index a1704784bc9..14640f6952a 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,21 @@ follow_outer_ssa_edges (tree val) && (def_bb == fosa_bb || dominated_by_p (CDI_DOMINATORS, fosa_bb, def_bb)))) return val; - return NULL_TREE; + /* We cannot temporarily rewrite stmts with undefined overflow + behavior, so avoid expanding them. */ + if ((ANY_INTEGRAL_TYPE_P (TREE_TYPE (val)) + || POINTER_TYPE_P (TREE_TYPE (val))) + && !TYPE_OVERFLOW_WRAPS (TREE_TYPE (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 +6973,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 +7002,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; } From patchwork Tue Jul 26 13:41:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1660808 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=ZuAL4MRm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LsdPn6ZJTz9s2R for ; Tue, 26 Jul 2022 23:42:21 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA4EF385802D for ; Tue, 26 Jul 2022 13:42:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA4EF385802D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658842939; bh=mP5qEBopfFNeIJU6DjrnG0UPd3zcw5UDmFBi23Sft/g=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZuAL4MRmC/M9qHh0jocfjP6hQb3Gxo7nE21H3ofWwr3QhBaXjlv59yaBaL9RH5Pi4 wzdQuNqxcl/isgtv6AF97lB2wzUDs8VqAzf7N+BtZZcYFOPPa2sUSjLsDvMgJca3cO 4QkEz9ikzwF/41f0/3kt9zPGHHnLKUBXXhKt8UjI= 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:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 2D8B6385801E for ; Tue, 26 Jul 2022 13:42:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2D8B6385801E Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 6A7561FE66 for ; Tue, 26 Jul 2022 13:41:59 +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 652692C141 for ; Tue, 26 Jul 2022 13:41:59 +0000 (UTC) Date: Tue, 26 Jul 2022 13:41:59 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/2] tree-optimization/105651 - simplify address range overlap check 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220726134219.BA4EF385802D@sourceware.org> The following adds a pattern for ifcombine to match an address overlap check and use alias analysis to decide overlap at compile-time. This happens with code generated from std::string as shown in the PR even if meanwhile the trunk generated code causes the pattern to no longer match. Bootstrapped and tested on x86_64-unknown-linux-gnu. PR tree-optimization/105651 * match.pd: Add pattern optimizing address range overlap. * gcc.dg/tree-ssa/ssa-ifcombine-14.c: New testcase. --- gcc/match.pd | 47 +++++++++++++++++++ .../gcc.dg/tree-ssa/ssa-ifcombine-14.c | 18 +++++++ 2 files changed, 65 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-14.c diff --git a/gcc/match.pd b/gcc/match.pd index 330c1db0c8e..7661317a53f 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -7806,6 +7806,53 @@ and, { swap_p ? @0 : @2; })) { rhs_tree; }))))))))) +/* Similarly handle + + (uint) @A < (uint) @B + @BO & (uint) @B < (uint) @A + @AO + + in particular optimize the case when @A and @B are within distinct + objects and all addresses are invariant as happens with std::string + in PR105651. */ +(for cmp1 (lt le le lt) + cmp2 (lt le lt le) + (simplify + (bit_and (cmp1:c (convert@4 @0) (convert @1)) + (cmp2:c (convert@5 @2) (convert @3))) + (with + { + tree addr0, addr1, addr2, addr3; + /* Instead of multiple matchings see to extract a base from the + conversion operands since all we need to relate is bases. */ + auto get_addr = [] (tree op) -> tree { + if (TREE_CODE (op) == ADDR_EXPR) + return op; + else if (TREE_CODE (op) == SSA_NAME) + if (gassign *ass = dyn_cast (SSA_NAME_DEF_STMT (op))) + if (gimple_assign_rhs_code (ass) == ADDR_EXPR + || gimple_assign_rhs_code (ass) == POINTER_PLUS_EXPR) + return gimple_assign_rhs1 (ass); + return op; + }; + } + (if ((addr0 = get_addr (@0)) + && (addr1 = get_addr (@1)) + && (addr2 = get_addr (@2)) + && (addr3 = get_addr (@3)) + && INTEGRAL_TYPE_P (TREE_TYPE (@4)) + && types_match (TREE_TYPE (@4), TREE_TYPE (@5))) + (with { poly_int64 diff0, diff1; } + (if (ptr_difference_const (addr3, addr0, &diff0) + && known_ge (diff0, 0) + && ptr_difference_const (addr1, addr2, &diff1) + && known_ge (diff1, 0) + /* Since we are in the end just comparing whether two objects may + overlap via alias analysis it isn't really important to exactly + compute the ranges above. ptr_difference_const mainly determines + there is a common base and the known_ge is testing we are comparing + the proper end points. */ + && !ptr_derefs_may_alias_p (addr0, addr1)) + { constant_boolean_node (false, type); })))))) + /* Fold REDUC (@0 & @1) -> @0[I] & @1[I] if element I is the only nonzero element of @1. */ (for reduc (IFN_REDUC_PLUS IFN_REDUC_IOR IFN_REDUC_XOR) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-14.c new file mode 100644 index 00000000000..f058ac04a36 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-14.c @@ -0,0 +1,18 @@ +/* From PR105651 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-ifcombine" } */ + +typedef __UINTPTR_TYPE__ uintptr_t; +void init (char *a); +void oops (); +void foo () +{ + char a[16]; + init (a); + char *p = "foo"; + if ((uintptr_t)a < (uintptr_t)&p[4] && (uintptr_t)p < (uintptr_t)&a[16]) + oops (); +} + +/* { dg-final { scan-tree-dump "optimizing two comparisons to 0" "ifcombine" } } */ +/* { dg-final { scan-tree-dump-not "oops" "ifcombine" } } */