From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id B2A9C385AC3F for ; Mon, 5 Sep 2022 12:47:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2A9C385AC3F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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-out2.suse.de (Postfix) with ESMTPS id 9350D5FD9A for ; Mon, 5 Sep 2022 12:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1662382033; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=h7OlwApEFKv9W5swU/TjzTLin5UH6IEOyRXydMNqmIY=; b=ra00HUbcXf9O3EbQIj6Eg6WwGbMclM3aEnNVO1VUXIFuIWfodofIvQkYEcsHN3jAL4sfkm sh7iQdGnQS4Pi25DbSWVsocxOa8gpVNAVLsDXPGU3wYrTf7JNfKZhjynwb2fIFrE6cO6VB lO7tYNvq7nw34QuMqZQ9lYAdU6FDCy8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1662382033; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=h7OlwApEFKv9W5swU/TjzTLin5UH6IEOyRXydMNqmIY=; b=Hz8Uc6Gg1/1DExbXk9eBSRB5sU2ifEubqCJkeL/Gl4Yd+eItfJ9rNbb+elNCNoCrUStcrM 3xkC7c26m5etZwCg== 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 8432013A66 for ; Mon, 5 Sep 2022 12:47:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UgpnH9HvFWNWDAAAMHmgww (envelope-from ) for ; Mon, 05 Sep 2022 12:47:13 +0000 Date: Mon, 5 Sep 2022 14:47:13 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Unify MAX_POSTDOM_CHECK and --param uninit-control-dep-attempts MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Message-Id: <20220905124713.8432013A66@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: The following unifies both limits, in particular the MAX_POSTDOM_CHECK tends to be too low and is not user-controllable. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. Richard. * gimple-predicate-analysis.cc (MAX_POSTDOM_CHECK): Remove. (compute_control_dep_chain): Move uninit-control-dep-attempts checking where it also counts the post-dominator check invocations. --- gcc/gimple-predicate-analysis.cc | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/gcc/gimple-predicate-analysis.cc b/gcc/gimple-predicate-analysis.cc index 5629a6dc277..6684aa6c179 100644 --- a/gcc/gimple-predicate-analysis.cc +++ b/gcc/gimple-predicate-analysis.cc @@ -52,10 +52,6 @@ #define MAX_NUM_CHAINS 8 #define MAX_CHAIN_LEN 5 -/* When enumerating paths between two blocks this limits the number of - post-dominator skips between two edges possibly defining a predicate. */ -#define MAX_POSTDOM_CHECK 8 - /* The limit for the number of switch cases when we do the linear search for the case corresponding to an edge. */ #define MAX_SWITCH_CASES 40 @@ -1010,15 +1006,6 @@ compute_control_dep_chain (basic_block dom_bb, const_basic_block dep_bb, if (single_succ_p (dom_bb)) return false; - if (*num_calls > (unsigned)param_uninit_control_dep_attempts) - { - if (dump_file) - fprintf (dump_file, "param_uninit_control_dep_attempts exceeded: %u\n", - *num_calls); - return false; - } - ++*num_calls; - /* FIXME: Use a set instead. */ unsigned cur_chain_len = cur_cd_chain.length (); if (cur_chain_len > MAX_CHAIN_LEN) @@ -1048,7 +1035,6 @@ compute_control_dep_chain (basic_block dom_bb, const_basic_block dep_bb, edge_iterator ei; FOR_EACH_EDGE (e, ei, dom_bb->succs) { - int post_dom_check = 0; if (e->flags & (EDGE_FAKE | EDGE_ABNORMAL | EDGE_DFS_BACK)) continue; @@ -1088,6 +1074,17 @@ compute_control_dep_chain (basic_block dom_bb, const_basic_block dep_bb, if (in_region != 0 && !(cd_bb->flags & in_region)) break; + /* Count the number of steps we perform to limit compile-time. + This should cover both recursion and the post-dominator walk. */ + if (*num_calls > (unsigned)param_uninit_control_dep_attempts) + { + if (dump_file) + fprintf (dump_file, "param_uninit_control_dep_attempts " + "exceeded: %u\n", *num_calls); + return false; + } + ++*num_calls; + /* Check if DEP_BB is indirectly control-dependent on DOM_BB. */ if (!single_succ_p (cd_bb) && compute_control_dep_chain (cd_bb, dep_bb, cd_chains, @@ -1105,9 +1102,7 @@ compute_control_dep_chain (basic_block dom_bb, const_basic_block dep_bb, && single_succ_edge (cd_bb)->flags & EDGE_DFS_BACK) break; cd_bb = get_immediate_dominator (CDI_POST_DOMINATORS, cd_bb); - post_dom_check++; - if (cd_bb == EXIT_BLOCK_PTR_FOR_FN (cfun) - || post_dom_check > MAX_POSTDOM_CHECK) + if (cd_bb == EXIT_BLOCK_PTR_FOR_FN (cfun)) break; } cur_cd_chain.pop (); -- 2.35.3