From patchwork Thu Sep 22 07:10: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: 57882 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 1CA6D3857B8E for ; Thu, 22 Sep 2022 07:10:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CA6D3857B8E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663830647; bh=Kp2K7I1M3MYWQJzDQ4akijUYzbuhFfVPmpeT9h2Rfz0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Udbzy/rxozHvF2sY5CngeGyNTbNFBWo0wDIxEUGvPnqd18qeheEbcbwewQDJOyM10 UGiWmg+jQJkdue8u02n30YxbxJtcbP5/3fXYooFCaQE8+9ee31OthkijlYz3xCyaIp adLvI/YWXQ+jXbyI5fEFH7G29z2cMhAmG9sPVTkE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id D66CB3858028 for ; Thu, 22 Sep 2022 07:10:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D66CB3858028 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E7614219CF for ; Thu, 22 Sep 2022 07:10:14 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D15181346B for ; Thu, 22 Sep 2022 07:10:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ft6HL1YKLGPjQQAAMHmgww (envelope-from ) for ; Thu, 22 Sep 2022 07:10:14 +0000 Date: Thu, 22 Sep 2022 09:10:14 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Some VN TLC MIME-Version: 1.0 Message-Id: <20220922071014.D15181346B@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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" The following was prompted by review of the patch introducing equivalences to VN. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. * tree-ssa-sccvn.cc (can_track_predicate_on_edge): New function split out from ... (vn_nary_op_insert_pieces_predicated): ... here. --- gcc/tree-ssa-sccvn.cc | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 74b8d8d18ef..85a7698f694 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -4460,28 +4460,39 @@ vn_nary_op_insert_pieces (unsigned int length, enum tree_code code, return vn_nary_op_insert_into (vno1, valid_info->nary); } +/* Return whether we can track a predicate valid when PRED_E is executed. */ + +static bool +can_track_predicate_on_edge (edge pred_e) +{ + /* ??? As we are currently recording a basic-block index in + vn_pval.valid_dominated_by_p and using dominance for the + validity check we cannot track predicates on all edges. */ + if (single_pred_p (pred_e->dest)) + return true; + /* Never record for backedges. */ + if (pred_e->flags & EDGE_DFS_BACK) + return false; + /* When there's more than one predecessor we cannot track + predicate validity based on the destination block. The + exception is when all other incoming edges are backedges. */ + edge_iterator ei; + edge e; + int cnt = 0; + FOR_EACH_EDGE (e, ei, pred_e->dest->preds) + if (! dominated_by_p (CDI_DOMINATORS, e->src, e->dest)) + cnt++; + return cnt == 1; +} + static vn_nary_op_t vn_nary_op_insert_pieces_predicated (unsigned int length, enum tree_code code, tree type, tree *ops, tree result, unsigned int value_id, edge pred_e) { - /* ??? Currently tracking BBs. */ - if (! single_pred_p (pred_e->dest)) - { - /* Never record for backedges. */ - if (pred_e->flags & EDGE_DFS_BACK) - return NULL; - edge_iterator ei; - edge e; - int cnt = 0; - /* Ignore backedges. */ - FOR_EACH_EDGE (e, ei, pred_e->dest->preds) - if (! dominated_by_p (CDI_DOMINATORS, e->src, e->dest)) - cnt++; - if (cnt != 1) - return NULL; - } + if (!can_track_predicate_on_edge (pred_e)) + return NULL; if (dump_file && (dump_flags & TDF_DETAILS) /* ??? Fix dumping, but currently we only get comparisons. */ && TREE_CODE_CLASS (code) == tcc_comparison)