From patchwork Mon Apr 11 06:30:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 608657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qk0ZJ63JBz9t42 for ; Mon, 11 Apr 2016 16:31:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=ewwMz3X/; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=OKZo4gLdG9+cHzXiZ+8LRGB4Nc77/I+AyyzsVbB1Q2YyVg4Etg 53TuoovTNjsd+lc7mP5c/kLG2wn/kb5aQkUs7EOeLHBY2vS6CJVhrmG0kXCdgkJ1 ViAE5SC40Gu0Rj8mx0ozTHyihVGmaDabN0hsKUFJvuP8HHKKvVr9uyRFc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=uiVPbo2U/uDgDc8oB5bcw+lWp/k=; b=ewwMz3X/3HtUniENxXvX 6z3moQyd6pIuUqsj354ASlsEzTngnAUz81xqo/QDNQzqPrm+++ZiHcDKU0pEhQsS +aduJZQxF8eOnSuaD2UknxPIi86Q9yewYr/qaHwSebsqlNEhd5gF8xpbh1ziO2e9 YHBAUynkOeIgA2AtUonVJVw= Received: (qmail 39821 invoked by alias); 11 Apr 2016 06:30:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 39799 invoked by uid 89); 11 Apr 2016 06:30:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.4 required=5.0 tests=AWL, BAYES_40, RCVD_IN_DNSWL_NONE, SPF_PASS, UNSUBSCRIBE_BODY, UNWANTED_LANGUAGE_BODY autolearn=no version=3.3.2 spammy=2016-04-11, STATE, UD:y, inter X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 11 Apr 2016 06:30:32 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1apVMg-0004Vq-LA from Tom_deVries@mentor.com for gcc-patches@gcc.gnu.org; Sun, 10 Apr 2016 23:30:28 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Mon, 11 Apr 2016 07:30:24 +0100 To: GCC Patches CC: Thomas Schwinge From: Tom de Vries Subject: [gomp4] Remove superfluous passes in kernels pass list Message-ID: <570B4471.1000608@mentor.com> Date: Mon, 11 Apr 2016 08:30:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Hi, this patch removes passes from the kernels pass list on gomp-4_0-branch, that are not present in the kernels pass list on trunk. Bootstrapped and reg-tested on x86-64. Committed to trunk. Thanks, - Tom Remove superfluous passes in kernels pass list 2016-04-11 Tom de Vries * passes.def: Remove superfluous passes from kernels pass list. * tree-ssa-loop.c (pass_scev_cprop::clone, pass_tree_loop_init::clone) (pass_tree_loop_done::clone): Remove function. * g++.dg/tree-ssa/pr19637.C: Update for removing dominator passes. * g++.dg/tree-ssa/pr61009.C: Same. * g++.dg/tree-ssa/ssa-dom.C: Same. * gcc.dg/pr20115-1.c: Same. * gcc.dg/tree-prof/20050826-2.c: Same. * gcc.dg/tree-prof/cmpsf-1.c: Same. * gcc.dg/tree-ssa/20030530-2.c: Same. * gcc.dg/tree-ssa/20030611-1.c: Same. * gcc.dg/tree-ssa/20030703-1.c: Same. * gcc.dg/tree-ssa/20030703-2.c: Same. * gcc.dg/tree-ssa/20030708-1.c: Same. * gcc.dg/tree-ssa/20030709-3.c: Same. * gcc.dg/tree-ssa/20030710-1.c: Same. * gcc.dg/tree-ssa/20030711-1.c: Same. * gcc.dg/tree-ssa/20030711-2.c: Same. * gcc.dg/tree-ssa/20030711-3.c: Same. * gcc.dg/tree-ssa/20030714-1.c: Same. * gcc.dg/tree-ssa/20030714-2.c: Same. * gcc.dg/tree-ssa/20030729-1.c: Same. * gcc.dg/tree-ssa/20030730-1.c: Same. * gcc.dg/tree-ssa/20030730-2.c: Same. * gcc.dg/tree-ssa/20030731-1.c: Same. * gcc.dg/tree-ssa/20030807-1.c: Same. * gcc.dg/tree-ssa/20030807-11.c: Same. * gcc.dg/tree-ssa/20030807-2.c: Same. * gcc.dg/tree-ssa/20030807-3.c: Same. * gcc.dg/tree-ssa/20030807-5.c: Same. * gcc.dg/tree-ssa/20030807-8.c: Same. * gcc.dg/tree-ssa/20030807-9.c: Same. * gcc.dg/tree-ssa/20030814-1.c: Same. * gcc.dg/tree-ssa/20030814-2.c: Same. * gcc.dg/tree-ssa/20030814-3.c: Same. * gcc.dg/tree-ssa/20030814-4.c: Same. * gcc.dg/tree-ssa/20030814-5.c: Same. * gcc.dg/tree-ssa/20030814-6.c: Same. * gcc.dg/tree-ssa/20030814-7.c: Same. * gcc.dg/tree-ssa/20030821-1.c: Same. * gcc.dg/tree-ssa/20030922-1.c: Same. * gcc.dg/tree-ssa/20030922-2.c: Same. * gcc.dg/tree-ssa/20031022-1.c: Same. * gcc.dg/tree-ssa/20040513-2.c: Same. * gcc.dg/tree-ssa/20040615-1.c: Same. * gcc.dg/tree-ssa/20040624-1.c: Same. * gcc.dg/tree-ssa/20040703-1.c: Same. * gcc.dg/tree-ssa/pr21417.c: Same. * gcc.dg/tree-ssa/pr61607.c: Same. * gcc.dg/tree-ssa/pr67755.c: Same. * gcc.dg/tree-ssa/pr68619-2.c: Same. * gcc.dg/tree-ssa/pr69270-2.c: Same. * gcc.dg/tree-ssa/pr69270.c: Same. * gcc.dg/tree-ssa/pr70232.c: Same. * gcc.dg/tree-ssa/slsr-27.c: Same. * gcc.dg/tree-ssa/slsr-28.c: Same. * gcc.dg/tree-ssa/slsr-29.c: Same. * gcc.dg/tree-ssa/slsr-30.c: Same. * gcc.dg/tree-ssa/ssa-dom-branch-1.c: Same. * gcc.dg/tree-ssa/ssa-dom-cse-3.c: Same. * gcc.dg/tree-ssa/ssa-dom-cse-5.c: Same. * gcc.dg/tree-ssa/ssa-dom-cse-6.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-1.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2a.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2b.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2c.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2d.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2e.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2f.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2g.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-2h.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-4.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-5.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-6.c: Same. * gcc.dg/tree-ssa/ssa-dom-thread-7.c: Same. * gcc.dg/tree-ssa/ssa-thread-12.c: Same. * gcc.dg/tree-ssa/vrp47.c: Same. * gfortran.dg/unconstrained_commons.f: Same. * gcc.dg/pr41488.c: Update for removing sccp pass. * gcc.dg/tree-ssa/loop-17.c: Same. * gcc.dg/tree-ssa/loop-39.c: Same. * gcc.dg/tree-ssa/scev-7.c: Same. * c-c++-common/restrict-2.c: Update for removing lim pass. * c-c++-common/restrict-4.c: Same. * g++.dg/tree-ssa/pr33615.C: Same. * g++.dg/tree-ssa/restrict1.C: Same. * gcc.dg/tm/pub-safety-1.c: Same. * gcc.dg/tm/reg-promotion.c: Same. * gcc.dg/tree-ssa/20050314-1.c: Same. * gcc.dg/tree-ssa/loop-32.c: Same. * gcc.dg/tree-ssa/loop-33.c: Same. * gcc.dg/tree-ssa/loop-34.c: Same. * gcc.dg/tree-ssa/loop-35.c: Same. * gcc.dg/tree-ssa/loop-7.c: Same. * gcc.dg/tree-ssa/pr23109.c: Same. * gcc.dg/tree-ssa/restrict-3.c: Same. * gcc.dg/tree-ssa/restrict-5.c: Same. * gcc.dg/tree-ssa/ssa-lim-1.c: Same. * gcc.dg/tree-ssa/ssa-lim-10.c: Same. * gcc.dg/tree-ssa/ssa-lim-11.c: Same. * gcc.dg/tree-ssa/ssa-lim-12.c: Same. * gcc.dg/tree-ssa/ssa-lim-2.c: Same. * gcc.dg/tree-ssa/ssa-lim-3.c: Same. * gcc.dg/tree-ssa/ssa-lim-6.c: Same. * gcc.dg/tree-ssa/ssa-lim-7.c: Same. * gcc.dg/tree-ssa/ssa-lim-8.c: Same. * gcc.dg/tree-ssa/ssa-lim-9.c: Same. * gcc.dg/tree-ssa/structopt-1.c: Same. * gfortran.dg/pr32921.f: Same. --- gcc/passes.def | 8 -------- gcc/testsuite/c-c++-common/restrict-2.c | 4 ++-- gcc/testsuite/c-c++-common/restrict-4.c | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/pr19637.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/pr33615.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/pr61009.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/restrict1.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/ssa-dom.C | 4 ++-- gcc/testsuite/gcc.dg/pr20115-1.c | 4 ++-- gcc/testsuite/gcc.dg/pr41488.c | 4 ++-- gcc/testsuite/gcc.dg/tm/pub-safety-1.c | 4 ++-- gcc/testsuite/gcc.dg/tm/reg-promotion.c | 4 ++-- gcc/testsuite/gcc.dg/tree-prof/20050826-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c | 8 ++++---- gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c | 8 ++++---- gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c | 14 +++++++------- gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c | 12 ++++++------ gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-17.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-32.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-33.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-34.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-35.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/loop-39.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr21417.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr23109.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr61607.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr67755.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr68619-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr69270-2.c | 8 ++++---- gcc/testsuite/gcc.dg/tree-ssa/pr69270.c | 12 ++++++------ gcc/testsuite/gcc.dg/tree-ssa/pr70232.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/scev-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-5.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-6.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2a.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2b.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2c.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2d.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2e.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2f.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2g.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2h.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-12.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/vrp47.c | 2 +- gcc/testsuite/gfortran.dg/pr32921.f | 4 ++-- gcc/testsuite/gfortran.dg/unconstrained_commons.f | 8 ++++---- gcc/tree-ssa-loop.c | 3 --- 108 files changed, 259 insertions(+), 270 deletions(-) diff --git a/gcc/passes.def b/gcc/passes.def index 3357097..7aed144 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -118,19 +118,11 @@ along with GCC; see the file COPYING3. If not see PUSH_INSERT_PASSES_WITHIN (pass_ipa_oacc_kernels) NEXT_PASS (pass_oacc_kernels); PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels) - NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */); NEXT_PASS (pass_ch); - NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */); NEXT_PASS (pass_fre); /* We use pass_lim to rewrite in-memory iteration and reduction variable accesses in loops into local variables accesses. */ - NEXT_PASS (pass_tree_loop_init); NEXT_PASS (pass_lim); - NEXT_PASS (pass_copy_prop); - NEXT_PASS (pass_lim); - NEXT_PASS (pass_copy_prop); - NEXT_PASS (pass_scev_cprop); - NEXT_PASS (pass_tree_loop_done); NEXT_PASS (pass_dominator, false /* may_peel_loop_headers_p */); NEXT_PASS (pass_dce); NEXT_PASS (pass_parallelize_loops, true /* oacc_kernels_p */); diff --git a/gcc/testsuite/c-c++-common/restrict-2.c b/gcc/testsuite/c-c++-common/restrict-2.c index 183a0de..ad19fb3 100644 --- a/gcc/testsuite/c-c++-common/restrict-2.c +++ b/gcc/testsuite/c-c++-common/restrict-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim2-details" } */ void foo (float * __restrict__ a, float * __restrict__ b, int n, int j) { @@ -10,4 +10,4 @@ void foo (float * __restrict__ a, float * __restrict__ b, int n, int j) /* We should move the RHS of the store out of the loop. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 11 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 11 "lim2" } } */ diff --git a/gcc/testsuite/c-c++-common/restrict-4.c b/gcc/testsuite/c-c++-common/restrict-4.c index 8dd597c..5806a2a 100644 --- a/gcc/testsuite/c-c++-common/restrict-4.c +++ b/gcc/testsuite/c-c++-common/restrict-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ struct Foo { @@ -15,4 +15,4 @@ void bar(struct Foo f, int * __restrict__ q) } } -/* { dg-final { scan-tree-dump "Executing store motion" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion" "lim2" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr19637.C b/gcc/testsuite/g++.dg/tree-ssa/pr19637.C index e50a428..8172ea8 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr19637.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr19637.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-ipa-icf -fdump-tree-dom4" } */ +/* { dg-options "-O2 -fno-ipa-icf -fdump-tree-dom2" } */ #include @@ -29,4 +29,4 @@ int foo_void_offset(void) return reinterpret_cast(&i[0])->i[0]; } -/* { dg-final { scan-tree-dump-times "return 1;" 3 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "return 1;" 3 "dom2" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr33615.C b/gcc/testsuite/g++.dg/tree-ssa/pr33615.C index dd2bbb2..13e20e0 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr33615.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr33615.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fnon-call-exceptions -fdump-tree-lim3-details -w" } */ +/* { dg-options "-O -fnon-call-exceptions -fdump-tree-lim2-details -w" } */ extern volatile int y; @@ -16,4 +16,4 @@ foo (double a, int x) // The expression 1.0 / 0.0 should not be treated as a loop invariant // if it may throw an exception. -// { dg-final { scan-tree-dump-times "invariant up to" 0 "lim3" } } +// { dg-final { scan-tree-dump-times "invariant up to" 0 "lim2" } } diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr61009.C b/gcc/testsuite/g++.dg/tree-ssa/pr61009.C index 66d89bc..e07d29c 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr61009.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr61009.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-tree-vrp -std=c++11 -fno-strict-aliasing -fdump-tree-dom4" } */ +/* { dg-options "-O2 -fno-tree-vrp -std=c++11 -fno-strict-aliasing -fdump-tree-dom2" } */ #include struct Field { @@ -49,4 +49,4 @@ bool Test(void) { // The block ending with cmp == 0 should not be threaded. ie, // there should be a single == 0 comparison in the dump file. -// { dg-final { scan-tree-dump-times "== 0" 1 "dom4" } } +// { dg-final { scan-tree-dump-times "== 0" 1 "dom2" } } diff --git a/gcc/testsuite/g++.dg/tree-ssa/restrict1.C b/gcc/testsuite/g++.dg/tree-ssa/restrict1.C index 718d1ec..3228321 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/restrict1.C +++ b/gcc/testsuite/g++.dg/tree-ssa/restrict1.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ struct Foo { @@ -16,4 +16,4 @@ void bar(Foo f, int * __restrict__ q) } } -/* { dg-final { scan-tree-dump "Executing store motion" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion" "lim2" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/ssa-dom.C b/gcc/testsuite/g++.dg/tree-ssa/ssa-dom.C index a7b24b3..30c8485 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/ssa-dom.C +++ b/gcc/testsuite/g++.dg/tree-ssa/ssa-dom.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4" } */ +/* { dg-options "-O2 -fdump-tree-dom2" } */ typedef long unsigned int size_t; extern void abort (void) __attribute__ ((__noreturn__)); @@ -99,5 +99,5 @@ gimple_return_set_retval (gimple gs, tree retval) abort (); gimple_set_op (gs, 0, retval); } -/* { dg-final { scan-tree-dump-times "gss_for_code_.10." 1 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "gss_for_code_.10." 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/pr20115-1.c b/gcc/testsuite/gcc.dg/pr20115-1.c index 266c2ed..1be99a5 100644 --- a/gcc/testsuite/gcc.dg/pr20115-1.c +++ b/gcc/testsuite/gcc.dg/pr20115-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4" } */ +/* { dg-options "-O2 -fdump-tree-dom2" } */ extern int foo (void) __attribute__((pure)); @@ -11,4 +11,4 @@ int bar() } /* Check that we only have one call to foo. */ -/* { dg-final { scan-tree-dump-times "foo" 1 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "foo" 1 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/pr41488.c b/gcc/testsuite/gcc.dg/pr41488.c index 6c7686b..b9bc718 100644 --- a/gcc/testsuite/gcc.dg/pr41488.c +++ b/gcc/testsuite/gcc.dg/pr41488.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp2-scev" } */ +/* { dg-options "-O2 -fdump-tree-sccp-scev" } */ struct struct_t { @@ -14,4 +14,4 @@ void foo (struct struct_t* sp, int start, int end) sp->data[i+start] = 0; } -/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp2" } } */ +/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c index 3841c08..59fb43e 100644 --- a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c +++ b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fgnu-tm -O1 -fdump-tree-lim3" } */ +/* { dg-options "-fgnu-tm -O1 -fdump-tree-lim2" } */ /* Test that thread visible loads do not get hoisted out of loops if the load would not have occurred on each path out of the loop. */ @@ -20,4 +20,4 @@ void reader() } } -/* { dg-final { scan-tree-dump-times "Cannot hoist.*DATA_DATA because it is in a transaction" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Cannot hoist.*DATA_DATA because it is in a transaction" 1 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/reg-promotion.c b/gcc/testsuite/gcc.dg/tm/reg-promotion.c index e0e5f62..47400ef 100644 --- a/gcc/testsuite/gcc.dg/tm/reg-promotion.c +++ b/gcc/testsuite/gcc.dg/tm/reg-promotion.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fgnu-tm -O2 -fdump-tree-lim3" } */ +/* { dg-options "-fgnu-tm -O2 -fdump-tree-lim2" } */ /* Test that `count' is not written to unless p->data>0. */ @@ -20,4 +20,4 @@ void func() } } -/* { dg-final { scan-tree-dump-times "Cannot hoist conditional load of count because it is in a transaction" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Cannot hoist conditional load of count because it is in a transaction" 1 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c index d7cc2eb..bdaef3d 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c +++ b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c @@ -1,6 +1,6 @@ /* Testcase derived from gcc.c-torture/execute 20050826-2.c which showed jump threading profile insanities. */ -/* { dg-options "-Ofast -fdump-tree-dom4-all" } */ +/* { dg-options "-Ofast -fdump-tree-dom2-all" } */ struct rtattr { @@ -72,4 +72,4 @@ main (void) return 0; } -/* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom4"} } */ +/* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c b/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c index b294d58..49102df 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c +++ b/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c @@ -1,6 +1,6 @@ /* Testcase derived from gcc.c-torture/execute cmpsf-1.c which showed jump threading profile insanities. */ -/* { dg-options "-Ofast -fdump-tree-dom4-all" } */ +/* { dg-options "-Ofast -fdump-tree-dom2-all" } */ #include @@ -181,4 +181,4 @@ main (void) exit (0); } -/* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom4"} } */ +/* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c index 69c9eb9..f03a2cf 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ typedef struct rs6000_stack { @@ -17,11 +17,11 @@ rs6000_emit_prologue (int i, rs6000_stack_t *info) /* There should be precisely one load of first_gp_reg_save. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "first_gp_reg_save" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "first_gp_reg_save" 1 "dom2"} } */ /* There should be precisely one addition. If there is more than one, then the dominator optimizations failed, most likely due to not handling commutative operands correctly. */ -/* { dg-final { scan-tree-dump-times "\\+" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\+" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c index f6eaa40..9250ab3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern int square (int) __attribute__ ((__const__)); int @@ -11,4 +11,4 @@ shit(int a) /* There should be precisely one call to square. If there is more than one, then the dominator optimizations failed to remove the redundant call. */ -/* { dg-final { scan-tree-dump-times "square" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "square" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c index c13f9b3..5d274c1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern int blah[]; @@ -15,8 +15,8 @@ foo(int index) /* There should be precisely one load of blah. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "blah" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "blah" 1 "dom2"} } */ /* There should be exactly one IF conditional. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c index d27a92a..ce50af2 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); @@ -29,15 +29,15 @@ get_alias_set (t) /* There should be precisely one load of {t,__t}->code. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "->code" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "->code" 1 "dom2"} } */ /* There should be precisely one load of tree_code_type. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "tree_code_type" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "tree_code_type" 1 "dom2"} } */ /* There should be one IF conditional. If 'tree_code_type[t->code]' is zero, then the third if() conditional is unnecessary. That should cause the call to abort() to be removed, which in turn causes the whole second if() to disappear. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c index 1cff56d..8b7ab98 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); struct rtx_def; typedef struct rtx_def *rtx; @@ -37,8 +37,8 @@ nonlocal_mentioned_p (x) /* There should be no casts to a short unsigned int since the entire set of conditionals should optimize away. */ -/* { dg-final { scan-tree-dump-times "\\(short unsigned int\\)" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\(short unsigned int\\)" 0 "dom2"} } */ /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c index 5c74300..838317d 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); @@ -36,12 +36,12 @@ record_component_aliases (type) /* There should be precisely one load of type.binfo. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "type\\.binfo" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "type\\.binfo" 1 "dom2"} } */ /* There should be precisely one load of common.code. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "common\\.code" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "common\\.code" 1 "dom2"} } */ /* There should be one IF conditional. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c index 00f82d4..eba41e9 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern void blah (void); @@ -42,14 +42,14 @@ record_component_aliases (type) /* The call to blah should have been eliminated. If the call is not eliminated, then dominator optimizations failed and it'll be impossible to delete other unnecessary code. */ -/* { dg-final { scan-tree-dump-not "blah \\(\\)" "dom5" } } */ +/* { dg-final { scan-tree-dump-not "blah \\(\\)" "dom2" } } */ /* There should be two IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */ /* There should be a single load of type.binfo. */ -/* { dg-final { scan-tree-dump-times "type\\.binfo" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "type\\.binfo" 1 "dom2"} } */ /* There should be two loads of vec.length. */ -/* { dg-final { scan-tree-dump-times "vec.length" 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "vec.length" 2 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c index 2f9d433..5ad2f11 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern void blah (void); @@ -42,14 +42,14 @@ record_component_aliases (type) } /* The call to blah can not be eliminated. */ -/* { dg-final { scan-tree-dump-times "blah \\(\\)" 1 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "blah \\(\\)" 1 "dom2" } } */ /* There should be four IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 4 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 4 "dom2"} } */ /* There should be two loads of type.binfo. */ -/* { dg-final { scan-tree-dump-times "type\\.binfo" 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "type\\.binfo" 2 "dom2"} } */ /* There should be four loads of vec.length. */ -/* { dg-final { scan-tree-dump-times "vec.length" 4 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "vec.length" 4 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c index 54a78fc..7fce5ab 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5" } */ +/* { dg-options "-O2 -fdump-tree-dom2" } */ struct rtx_def; @@ -50,20 +50,20 @@ get_alias_set (t,z) } /* The calls to make_decl_rtl should be eliminated -/* { dg-final { scan-tree-dump-not "make_decl_rtl \\(\\)" "dom5" } } */ +/* { dg-final { scan-tree-dump-not "make_decl_rtl \\(\\)" "dom2" } } */ /* There should be three IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 3 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 3 "dom2"} } */ /* There should be one loads of decl.rtl. */ -/* { dg-final { scan-tree-dump-times "decl\\.rtl" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "decl\\.rtl" 1 "dom2"} } */ /* There should be one load of code. */ -/* { dg-final { scan-tree-dump-times "code" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "code" 1 "dom2"} } */ /* There should be one load of rtmem. */ -/* { dg-final { scan-tree-dump-times "rtmem" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "rtmem" 1 "dom2"} } */ /* There should be one load of alias. */ -/* { dg-final { scan-tree-dump-times "->alias" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "->alias" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c index 7e7d4d0..15d7e97 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ struct rtx_def; @@ -45,17 +45,17 @@ get_alias_set (t) } /* The calls to make_decl_rtl should be eliminated. */ -/* { dg-final { scan-tree-dump-not "make_decl_rtl \\(\\)" "dom5" } } */ +/* { dg-final { scan-tree-dump-not "make_decl_rtl \\(\\)" "dom2" } } */ /* There should be two IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */ /* There should be one load of decl.rtl. */ -/* { dg-final { scan-tree-dump-times "decl\\.rtl" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "decl\\.rtl" 1 "dom2"} } */ /* There should be two loads of rtmem. */ -/* { dg-final { scan-tree-dump-times "rtmem" 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "rtmem" 2 "dom2"} } */ /* There should be one load of alias. */ -/* { dg-final { scan-tree-dump-times "->alias" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "->alias" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c index a8f96ea..9f0daac 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ struct rtx_def; typedef struct rtx_def *rtx; @@ -41,5 +41,5 @@ find_base_value_wrapper (src) } /* There should be no casts to short unsigned int. */ -/* { dg-final { scan-tree-dump-times "\\(short unsigned int\\)" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\(short unsigned int\\)" 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c index 84db2ad..eb663f2 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ union tree_node; @@ -34,5 +34,5 @@ get_alias_set (t) /* There should be exactly three IF conditionals if we thread jumps properly. */ -/* { dg-final { scan-tree-dump-times "if " 3 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 3 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c index 91fea55..59d3a1b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5 -std=gnu89" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -std=gnu89" } */ extern void abort (void); union tree_node; @@ -45,9 +45,9 @@ readonly_fields_p (type) /* A good optimizer would realize that the cast to (unsigned int) is useless as the earlier cast of the same value of (unsigned char) will always produce the same result. */ -/* { dg-final { scan-tree-dump-times "\\(unsigned int\\)" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\(unsigned int\\)" 0 "dom2"} } */ /* There should be one load of ->common.code. We currently fail this because we load from ->common.code using different types. */ -/* { dg-final { scan-tree-dump-times "common\.code" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "common\.code" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c index 44dd02f..0b27938 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5 -fdelete-null-pointer-checks" } */ +/* { dg-options "-O2 -fdump-tree-dom2 -fdelete-null-pointer-checks" } */ extern void exit (int); extern void *ggc_alloc (__SIZE_TYPE__); @@ -19,6 +19,6 @@ foo (int attr_kind, unsigned long offset) } /* There should be no IF conditionals, unless target disables -fdelete-null-pointer-checks */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5" { target { ! keeps_null_pointer_checks } } } } */ -/* { dg-final { scan-tree-dump "if " "dom5" { target { keeps_null_pointer_checks } } } } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2" { target { ! keeps_null_pointer_checks } } } } */ +/* { dg-final { scan-tree-dump "if " "dom2" { target { keeps_null_pointer_checks } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c index 009f3d2..699f080 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5 -fdelete-null-pointer-checks" } */ +/* { dg-options "-O2 -fdump-tree-dom2 -fdelete-null-pointer-checks" } */ extern void exit (int); extern void *ggc_alloc (__SIZE_TYPE__); @@ -19,6 +19,6 @@ foo (int attr_kind, unsigned long offset) } /* There should be no IF conditionals, unless target disables -fdelete-null-pointer-checks */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5" { target { ! keeps_null_pointer_checks } } } } */ -/* { dg-final { scan-tree-dump "if " "dom5" { target { keeps_null_pointer_checks } } } } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2" { target { ! keeps_null_pointer_checks } } } } */ +/* { dg-final { scan-tree-dump "if " "dom2" { target { keeps_null_pointer_checks } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c index 07a99e1..3605586 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5 -std=gnu89" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -std=gnu89" } */ extern void abort (void); @@ -63,4 +63,4 @@ store_expr (exp, target, want_value) (B) only looks at immediate dominators, and only queued_subexp_p immediately dominates the comparison in question. We need something stronger. */ -/* { dg-final { scan-tree-dump-times "target.*!= 0" 0 "dom5" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "target.*!= 0" 0 "dom2" { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c index 5380233..5f1f2dc 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ struct rtx_def; typedef struct rtx_def *rtx; @@ -42,4 +42,4 @@ bar (rtx r) are threaded to the return 0. Which in turn means the path which combines the result of those two tests into a new test must always be true and it is optimized appropriately. */ -/* { dg-final { scan-tree-dump-times "if " 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c index 88f887f..6effbb7 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); struct rtx_def; @@ -18,4 +18,4 @@ foo (reg) } /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c index aa88c7b..0712922 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -ftree-vrp -fdump-tree-dom5" } */ +/* { dg-options "-O1 -ftree-vrp -fdump-tree-dom2" } */ /* { dg-require-effective-target alloca } */ extern void abort (void); @@ -29,4 +29,4 @@ foo(int n) /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c index c03c006..bba3569 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ typedef unsigned int cppchar_t; void foo (void); @@ -25,4 +25,4 @@ cpp_parse_escape (pstr, limit, wide) /* There should be precisely three IF statements. If there is more than two, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "if " 3 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 3 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c index e6ff92a..41f8dd9 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); struct rtx_def; @@ -30,9 +30,9 @@ foo () /* There should be precisely one load of ->code. If there is more than, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "->code" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "->code" 1 "dom2"} } */ /* There should be two IF statements. One for 'current_sym_addr->code == 42'. The other one for '(EXPR)->unchanging'. */ -/* { dg-final { scan-tree-dump-times "if " 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c index 0b3b3f8..83ec728 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5 -std=gnu89" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -std=gnu89" } */ struct die_struct; typedef struct die_struct *dw_die_ref; @@ -51,4 +51,4 @@ output_location_lists (die) } /* There should be exactly one IF conditional, in output_location_lists. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c index 8863420..274b5a5 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ void oof (const char *); void foo (void); @@ -19,4 +19,4 @@ ooof () } /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c index a62f664..451dc3b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern void oof (int); @@ -18,5 +18,5 @@ com(int *blah) /* There should be precisely one load of blah. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "\\*blah" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\*blah" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c index 2e83371..a99abf4 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern void blah (void); @@ -18,5 +18,5 @@ foo (int value) } /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c index 1f88e9b..149da1b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); extern void blah (void); @@ -19,5 +19,5 @@ foo (int value) } /* There should be one IF conditional. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c index 3438ce2..e59b3e3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5 -fdump-tree-optimized" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -fdump-tree-optimized" } */ extern void abort (void); union tree_node; @@ -35,7 +35,7 @@ blah (decl, set) /* There should be precisely one reference to pointer_alias_set. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom2"} } */ /* The assignment set = -1 in the ELSE clause of the last IF statement should be removed by the final cleanup phase. */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c index ae816d8..1b0bef1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5 -fdump-tree-optimized" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -fdump-tree-optimized" } */ extern void abort (void); union tree_node; @@ -36,7 +36,7 @@ blah (decl, set) /* There should be precisely one reference to pointer_alias_set. If there is more than one, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom2"} } */ /* The assignment set = -1 in the ELSE clause of the last IF statement should be removed by the final cleanup phase. */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c index 9f75ab2..e84c958 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); union tree_node; @@ -41,4 +41,4 @@ foo (t, set) more than one, then the dominator optimizations failed. */ /* ??? Will fail until we properly distinguish member stores. At present the write to type.alias_set kills the previous load. */ -/* { dg-final { scan-tree-dump-times "common.code" 1 "dom5" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "common.code" 1 "dom2" { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c index cd1f07b..7aef97a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); struct rtx_def; @@ -38,4 +38,4 @@ mark_constant_function (void) and the temporary used as the argument to cgraph_rtl_info. This if we find current_function_decl used as an argument, then we have failed. */ -/* { dg-final { scan-tree-dump-times "\\(current_function_decl\\)" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "\\(current_function_decl\\)" 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c index faa77de..131472e 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4 -fdump-tree-optimized" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -fdump-tree-optimized" } */ void dont_remove (void); diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c index 47be3ee..7c1981a8 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ extern void abort (void); @@ -30,4 +30,4 @@ voidify_wrapper_expr (tree wrapper) /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c index a7887a3..16c79da 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4 -fdisable-tree-ifcombine" } */ +/* { dg-options "-O1 -fdump-tree-dom2 -fdisable-tree-ifcombine" } */ struct rtx_def; typedef struct rtx_def *rtx; @@ -20,4 +20,4 @@ rgn_rank (rtx insn1, rtx insn2) } /* There should be two IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 2 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "if " 2 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c index 617c22e..25f9144 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ typedef struct edge_def { @@ -26,4 +26,4 @@ blah (int arf) } /* There should be one load from entry_exit_blocks[1].pred. */ -/* { dg-final { scan-tree-dump-times "entry_exit_blocks.1..pred" 1 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "entry_exit_blocks.1..pred" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c index ba87abf..acd6c68 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom5" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ int link_error(void); int s(void); @@ -21,4 +21,4 @@ int t(int i) /* There should be no link_error calls, if there is any, the optimization has failed */ -/* { dg-final { scan-tree-dump-times "link_error" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "link_error" 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c index 903ccdb..de7fa11 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ void bar1 (void); void bar2 (void); @@ -13,4 +13,4 @@ foo (unsigned int a, unsigned int b) bar2 (); } -/* { dg-final { scan-tree-dump-times "bar2" 0 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "bar2" 0 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c index fbc43bb..d95c782 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4" } */ +/* { dg-options "-O1 -fdump-tree-dom2" } */ void bar1 (void); void bar2 (void); @@ -17,4 +17,4 @@ foo (unsigned int a, unsigned int b) true (to reach the second condition we know a < b via the first conditional. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c index aa15f9b..25e470a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5" } */ +/* { dg-options "-O2 -fdump-tree-dom2" } */ float foo(float x) { @@ -9,4 +9,4 @@ float foo(float x) } /* We should *not* fold the arithmetic. */ -/* { dg-final { scan-tree-dump-times "0\\.0" 0 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "0\\.0" 0 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c index 1ad61f1..fd9895b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-lim3-details --param allow-store-data-races=1" } */ +/* { dg-options "-O1 -fdump-tree-lim2-details --param allow-store-data-races=1" } */ float a[100]; @@ -17,4 +17,4 @@ void xxx (void) /* Store motion may be applied to the assignment to a[k], since sinf cannot read nor write the memory. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c index 4cb1438..588cf4c 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-sccp2-details" } */ +/* { dg-options "-O -fdump-tree-sccp-details" } */ /* To determine the number of iterations in this loop we need to fold p_4 + 4B > p_4 + 8B to false. This transformation has caused @@ -15,4 +15,4 @@ int foo (int *p) return i; } -/* { dg-final { scan-tree-dump "# of iterations 1, bounded by 1" "sccp2" } } */ +/* { dg-final { scan-tree-dump "# of iterations 1, bounded by 1" "sccp" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c index 9b69c73..e06a1e4 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int x; int a[100]; @@ -42,4 +42,4 @@ void test3(struct a *A) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of" 3 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 3 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c index 98a16fb..57fd06d 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int x; int a[100]; @@ -36,4 +36,4 @@ void test5(struct a *A, unsigned b) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of" 4 "lim3" { xfail { lp64 || llp64 } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 4 "lim2" { xfail { lp64 || llp64 } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c index 26fb281..4a7b082 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int r[6]; @@ -17,4 +17,4 @@ void f (int n) } -/* { dg-final { scan-tree-dump-times "Executing store motion of r" 6 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of r" 6 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c index 87d105a..4e9d03a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int x; int a[100]; @@ -67,5 +67,5 @@ void test4(struct a *A, unsigned LONG b) } } /* long index not hoisted for avr target PR 36561 */ -/* { dg-final { scan-tree-dump-times "Executing store motion of" 8 "lim3" { xfail { "avr-*-*" } } } } */ -/* { dg-final { scan-tree-dump-times "Executing store motion of" 6 "lim3" { target { "avr-*-*" } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 8 "lim2" { xfail { "avr-*-*" } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 6 "lim2" { target { "avr-*-*" } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c index d1edbd5..53680dd 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp2-details" } */ +/* { dg-options "-O2 -fdump-tree-sccp-details" } */ int foo (unsigned int n) @@ -22,4 +22,4 @@ foo (unsigned int n) return r + n; } -/* { dg-final { scan-tree-dump "# of iterations \[^\n\r]*, bounded by 8" "sccp2" } } */ +/* { dg-final { scan-tree-dump "# of iterations \[^\n\r]*, bounded by 8" "sccp" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c index e28e4c9..08a4935 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c @@ -1,6 +1,6 @@ /* PR tree-optimization/19828 */ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-lim3-details" } */ +/* { dg-options "-O1 -fdump-tree-lim2-details" } */ int cst_fun1 (int) __attribute__((__const__)); int cst_fun2 (int) __attribute__((__const__)); @@ -31,4 +31,4 @@ int xxx (void) Calls to cst_fun2 and pure_fun2 should not be, since calling with k = 0 may be invalid. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 2 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 2 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c index 6d8c715..c865ee3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5-details" } */ +/* { dg-options "-O2 -fdump-tree-dom3-details" } */ struct tree_common { @@ -49,5 +49,5 @@ L23: /* We should thread the backedge to the top of the loop; ie we only execute the if (expr->common.code != 142) test once per loop iteration. */ -/* { dg-final { scan-tree-dump-times "FSM jump thread" 1 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "FSM jump thread" 1 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c index 62eecba..3ee6b7f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -funsafe-math-optimizations -ftrapping-math -fdump-tree-recip -fdump-tree-lim3" } */ +/* { dg-options "-O2 -funsafe-math-optimizations -ftrapping-math -fdump-tree-recip -fdump-tree-lim2" } */ /* { dg-warning "-fassociative-math disabled" "" { target *-*-* } 0 } */ double F[2] = { 0., 0. }, e = 0.; @@ -29,6 +29,6 @@ int main() /* LIM only performs the transformation in the no-trapping-math case. In the future we will do it for trapping-math as well in recip, check that this is not wrongly optimized. */ -/* { dg-final { scan-tree-dump-not "reciptmp" "lim3" } } */ +/* { dg-final { scan-tree-dump-not "reciptmp" "lim2" } } */ /* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c index 96c0b80..0868a44 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-Os -fno-tree-fre -fdump-tree-dom4" } */ +/* { dg-options "-Os -fno-tree-fre -fdump-tree-dom2" } */ void foo(int *); void f2(int dst[3], int R) @@ -23,6 +23,6 @@ void f2(int dst[3], int R) /* There should be precisely two conditionals. One for the loop condition and one for the test after the loop. Previously we failed to eliminate the second conditional after the loop. */ -/* { dg-final { scan-tree-dump-times "if" 2 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "if" 2 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr67755.c b/gcc/testsuite/gcc.dg/tree-ssa/pr67755.c index 9acced4..64ffd0b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr67755.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr67755.c @@ -1,8 +1,8 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dom4-details-blocks" } */ +/* { dg-options "-O1 -fdump-tree-dom2-details-blocks" } */ /* We want to verify no outgoing edge from a conditional has a probability of 100%. */ -/* { dg-final { scan-tree-dump-not "succ:\[ \]+. .100.0%. .\(TRUE|FALSE\)_VALUE" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "succ:\[ \]+. .100.0%. .\(TRUE|FALSE\)_VALUE" "dom2"} } */ void (*zend_block_interruptions) (void); diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr68619-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr68619-2.c index 0b15819..cca706e 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr68619-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr68619-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4-details -w" } */ +/* { dg-options "-O2 -fdump-tree-dom2-details -w" } */ typedef union tree_node *tree; struct gcc_options @@ -88,5 +88,5 @@ omp_reduction_init (tree clause, tree type) } } -/* { dg-final { scan-tree-dump "Marking all outgoing edges of unreachable" "dom4"} } */ +/* { dg-final { scan-tree-dump "Marking all outgoing edges of unreachable" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr69270-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr69270-2.c index 45703de..15c7bdd 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr69270-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr69270-2.c @@ -1,16 +1,16 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5-details -w" } */ +/* { dg-options "-O2 -fdump-tree-dom3-details -w" } */ /* There should be a reference to usecount that turn into constants. */ -/* { dg-final { scan-tree-dump-times "Replaced .usecount_\[0-9\]+. with constant .1." 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "Replaced .usecount_\[0-9\]+. with constant .1." 1 "dom3"} } */ /* And an assignment using usecount ought to fold down to constants. */ -/* { dg-final { scan-tree-dump-times "Folded to: usecount_\[0-9\]+ = 2;" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "Folded to: usecount_\[0-9\]+ = 2;" 1 "dom3"} } */ /* The arithmetic using usecount should be gone, except for the one in the details debugging. */ -/* { dg-final { scan-tree-dump-times "usecount_\[0-9\]+ = usecount_\[0-9\]+ . 1;" 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "usecount_\[0-9\]+ = usecount_\[0-9\]+ . 1;" 1 "dom3"} } */ typedef union tree_node *tree; typedef union gimple_statement_d *gimple; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr69270.c b/gcc/testsuite/gcc.dg/tree-ssa/pr69270.c index 9cdfa9a..529b521 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr69270.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr69270.c @@ -1,17 +1,17 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fsplit-paths -fdump-tree-dom5-details" } */ +/* { dg-options "-O2 -fsplit-paths -fdump-tree-dom3-details" } */ /* There should be two references to bufferstep that turn into constants. */ -/* { dg-final { scan-tree-dump-times "Replaced .bufferstep_\[0-9\]+. with constant .0." 1 "dom5"} } */ -/* { dg-final { scan-tree-dump-times "Replaced .bufferstep_\[0-9\]+. with constant .1." 1 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "Replaced .bufferstep_\[0-9\]+. with constant .0." 1 "dom3"} } */ +/* { dg-final { scan-tree-dump-times "Replaced .bufferstep_\[0-9\]+. with constant .1." 1 "dom3"} } */ /* And some assignments ought to fold down to constants. */ -/* { dg-final { scan-tree-dump-times "Folded to: _\[0-9\]+ = 1;" 2 "dom5"} } */ -/* { dg-final { scan-tree-dump-times "Folded to: _\[0-9\]+ = 0;" 2 "dom5"} } */ +/* { dg-final { scan-tree-dump-times "Folded to: _\[0-9\]+ = 1;" 2 "dom3"} } */ +/* { dg-final { scan-tree-dump-times "Folded to: _\[0-9\]+ = 0;" 2 "dom3"} } */ /* The XOR operations should have been optimized to constants. */ -/* { dg-final { scan-tree-dump-not "bit_xor" "dom5"} } */ +/* { dg-final { scan-tree-dump-not "bit_xor" "dom3"} } */ extern int *stepsizeTable; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr70232.c b/gcc/testsuite/gcc.dg/tree-ssa/pr70232.c index 31d4afb..6cc987a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr70232.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr70232.c @@ -1,10 +1,10 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -w -fdump-tree-vrp1-details -fdump-tree-vrp2-details -fdump-tree-dom4-details -fdump-tree-dom5-details" } */ +/* { dg-options "-O2 -w -fdump-tree-vrp1-details -fdump-tree-vrp2-details -fdump-tree-dom2-details -fdump-tree-dom3-details" } */ /* All the threads found by the FSM threader should have too many statements to be profitable. */ -/* { dg-final { scan-tree-dump-not "Registering FSM " "dom4"} } */ -/* { dg-final { scan-tree-dump-not "Registering FSM " "dom5"} } */ +/* { dg-final { scan-tree-dump-not "Registering FSM " "dom2"} } */ +/* { dg-final { scan-tree-dump-not "Registering FSM " "dom3"} } */ /* { dg-final { scan-tree-dump-not "Registering FSM " "vrp1"} } */ /* { dg-final { scan-tree-dump-not "Registering FSM " "vrp2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c index a352129..90b9b55 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim2-details" } */ void f(int * __restrict__ r, int a[__restrict__ 16][16], @@ -14,4 +14,4 @@ void f(int * __restrict__ r, /* We should apply store motion to the store to *r. */ -/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c index 2e0edab..fc03c1e 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim2-details" } */ static inline __attribute__((always_inline)) void f(int * __restrict__ r, @@ -20,4 +20,4 @@ void g(int *r, int a[16][16], int b[16][16], int i, int j) /* We should apply store motion to the store to *r. */ -/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c index ead68d0..5dfc7b1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp2-scev" } */ +/* { dg-options "-O2 -fdump-tree-sccp-scev" } */ struct struct_t { @@ -14,4 +14,4 @@ void foo (struct struct_t* sp, int start, int end) sp->data[i+start] = 0; } -/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp2" } } */ +/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c index 88a90b8..35b3d00 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5" } */ +/* { dg-options "-O2 -fdump-tree-dom3" } */ struct x { @@ -16,7 +16,7 @@ f (struct x *p, unsigned int n) foo (p->a[n], p->c[n], p->b[n]); } -/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom5" { target { int32 } } } } */ -/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom5" { target { int16 } } } } */ -/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+;" 1 "dom5" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ +/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ +/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+;" 1 "dom3" } } */ +/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c index 751d2b7..732d232 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5" } */ +/* { dg-options "-O2 -fdump-tree-dom3" } */ struct x { @@ -20,7 +20,7 @@ f (struct x *p, unsigned int n) foo (p->b[n], p->a[n], p->c[n]); } -/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom5" { target { int32 } } } } */ -/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom5" { target { int16 } } } } */ -/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom5" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ +/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ +/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom3" } } */ +/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c index 3c4ba34..a22cc79 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom5" } */ +/* { dg-options "-O2 -fdump-tree-dom3" } */ struct x { @@ -22,7 +22,7 @@ f (struct x *p, unsigned int n) } } -/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom5" { target { int32 } } } } */ -/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom5" { target { int16 } } } } */ -/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom5" } } */ -/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom5" } } */ +/* { dg-final { scan-tree-dump-times "\\* 4;" 1 "dom3" { target { int32 } } } } */ +/* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom3" { target { int16 } } } } */ +/* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom3" } } */ +/* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c index 7bd09d6..a357239 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c @@ -2,7 +2,7 @@ with casts thrown in when -fwrapv is used. */ /* { dg-do compile { target { long_neq_int } } } */ -/* { dg-options "-O3 -fdump-tree-dom5 -fwrapv" } */ +/* { dg-options "-O3 -fdump-tree-dom2 -fwrapv" } */ long f (int s, long c) @@ -20,4 +20,4 @@ f (int s, long c) return x; } -/* { dg-final { scan-tree-dump-times " \\* " 3 "dom5" } } */ +/* { dg-final { scan-tree-dump-times " \\* " 3 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c index ab59039..18f9041 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -w -fdump-tree-dom4-details" } */ +/* { dg-options "-O2 -w -fdump-tree-dom2-details" } */ typedef struct rtx_def *rtx; struct rtx_def @@ -21,9 +21,9 @@ try_combine (rtx i1, rtx newpat) /* There should be three tests against i1. Two from the hash table dumps, one in the code itself. */ -/* { dg-final { scan-tree-dump-times "if .i1_" 3 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "if .i1_" 3 "dom2"} } */ /* There should be no actual jump threads realized by DOM. The legitimize jump threads are handled in VRP and those discovered by DOM are subsumed by collapsing a conditional. */ -/* { dg-final { scan-tree-dump-not "Threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c index ed6ccd9..04637c2 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O -fno-tree-fre -fdump-tree-dom4" } */ +/* { dg-options "-O -fno-tree-fre -fdump-tree-dom2" } */ extern void abort (void); @@ -27,4 +27,4 @@ main() return 0; } -/* { dg-final { scan-tree-dump "= PHI <\[01\]\\\(.\\\), \[01\]\\\(.\\\)>" "dom4" } } */ +/* { dg-final { scan-tree-dump "= PHI <\[01\]\\\(.\\\), \[01\]\\\(.\\\)>" "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-5.c index bd5c01a..cd38d3e 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-5.c @@ -1,6 +1,6 @@ /* Test normalization of ARRAY_REF expressions to MEM_REFs in dom. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-tree-fre -fdump-tree-dom4" } */ +/* { dg-options "-O2 -fno-tree-fre -fdump-tree-dom2" } */ #define N 8 @@ -15,4 +15,4 @@ main (int argc, char **argv) return *(++p); } -/* { dg-final { scan-tree-dump-times "return 3;" 1 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "return 3;" 1 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-6.c index 76a9882..002fd81 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-6.c @@ -1,6 +1,6 @@ /* Test normalization of ARRAY_REF expressions to MEM_REFs in dom. */ /* { dg-do compile } */ -/* { dg-options "-O1 -fno-tree-fre -fdump-tree-dom4" } */ +/* { dg-options "-O1 -fno-tree-fre -fdump-tree-dom2" } */ int main (int argc, char **argv) @@ -17,4 +17,4 @@ main (int argc, char **argv) return u.b[1]; } -/* { dg-final { scan-tree-dump-times "return 42;" 1 "dom4" } } */ +/* { dg-final { scan-tree-dump-times "return 42;" 1 "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c index 1cfe82b..759d9ab 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-tree-vrp -fdump-tree-dom4-details" } */ +/* { dg-options "-O2 -fno-tree-vrp -fdump-tree-dom2-details" } */ void t(void); void q(void); void q1(void); @@ -14,4 +14,4 @@ threading(int a,int b) q1(); } /* We should thread the jump twice and elliminate it. */ -/* { dg-final { scan-tree-dump-times "Threaded" 2 "dom4"} } */ +/* { dg-final { scan-tree-dump-times "Threaded" 2 "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2a.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2a.c index 066aacf..b972f64 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2a.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void bla(); @@ -18,4 +18,4 @@ void thread_entry_through_header (void) jump threading pass. */ /* { dg-final { scan-tree-dump-times "Jumps threaded: 1" 1 "vrp1"} } */ /* { dg-final { scan-tree-dump-times "Jumps threaded: 2" 0 "vrp1"} } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2b.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2b.c index a2190db..0d40254 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2b.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2b.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -25,5 +25,5 @@ void thread_latch_through_header (void) /* Threading the latch to a later point in the loop is safe in this case. And we want to thread through the header as well. These are both caught by threading in DOM. */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ /* { dg-final { scan-tree-dump-times "Jumps threaded: 2" 1 "vrp1"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2c.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2c.c index 3062d52..f914676 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2c.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2c.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -32,4 +32,4 @@ void dont_thread_1 (void) header and around the latch. If one is done without the other, then we create an irreducible CFG. */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp1"} } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2d.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2d.c index dd29157..a04aabf 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2d.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2d.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -29,4 +29,4 @@ void dont_thread_2 (int first) /* Peeling off the first iteration would make threading through the loop latch safe, but we don't do that currently. */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp1"} } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2e.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2e.c index a9edd74..78e64c4 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2e.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2e.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -25,4 +25,4 @@ void dont_thread_3 (int nfirst) /* Threading through the loop header is not safe here. Peeling off the first iteration then unswitching the loop would be safe. */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp1"} } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2f.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2f.c index c66724e..e5c9f88 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2f.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2f.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -31,4 +31,4 @@ void dont_thread_4 (int a, int nfirst) } /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp1"} } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom4"} } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2g.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2g.c index b0f163e..6d1ff5d 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2g.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2g.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -23,4 +23,4 @@ void dont_thread_1 (void) } /* { dg-final { scan-tree-dump "Jumps threaded: 2" "vrp1"} } */ -/* { dg-final { scan-tree-dump "Jumps threaded: 1" "dom4"} } */ +/* { dg-final { scan-tree-dump "Jumps threaded: 1" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2h.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2h.c index 1f80466..61705e1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2h.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2h.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats" } */ void foo(); void bla(); @@ -26,4 +26,4 @@ void dont_thread_2 (int first) /* Peeling off the first iteration would make threading through the loop latch safe, but we don't do that currently. */ /* { dg-final { scan-tree-dump "Jumps threaded: 1" "vrp1"} } */ -/* { dg-final { scan-tree-dump "Jumps threaded: 1" "dom4"} } */ +/* { dg-final { scan-tree-dump "Jumps threaded: 1" "dom2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c index 652b489..4258fb5 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4-details -std=gnu89" } */ +/* { dg-options "-O2 -fdump-tree-dom2-details -std=gnu89" } */ struct bitmap_head_def; typedef struct bitmap_head_def *bitmap; typedef const struct bitmap_head_def *const_bitmap; @@ -58,7 +58,7 @@ bitmap_ior_and_compl (bitmap dst, const_bitmap a, const_bitmap b, code we missed the edge when the first conditional is false (b_elt is zero, which means the second conditional is always zero. */ -/* { dg-final { scan-tree-dump-times "Threaded" 3 "dom4" { target { ! logical_op_short_circuit } } } } */ +/* { dg-final { scan-tree-dump-times "Threaded" 3 "dom2" { target { ! logical_op_short_circuit } } } } */ /* On targets that define LOGICAL_OP_NON_SHORT_CIRCUIT to 0, we split both "a_elt || b_elt" and "b_elt && kill_elt" into two conditions each, rather than using "(var1 != 0) op (var2 != 0)". Also, as on other targets, @@ -79,5 +79,5 @@ bitmap_ior_and_compl (bitmap dst, const_bitmap a, const_bitmap b, However, 3 of those 4 opportunities are ultimately eliminated by DOM optimizing away conditionals. So there's only one jump threading opportunity left. */ -/* { dg-final { scan-tree-dump-times "Threaded" 1 "dom4" { target logical_op_short_circuit } } } */ +/* { dg-final { scan-tree-dump-times "Threaded" 1 "dom2" { target logical_op_short_circuit } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c index 9c34032..1c42c27 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-Os -fno-tree-fre -fdump-tree-dom4-details" } */ +/* { dg-options "-Os -fno-tree-fre -fdump-tree-dom2-details" } */ void foo(int *); void f2(int dst[3], int R) @@ -19,4 +19,4 @@ void f2(int dst[3], int R) foo(inter); } -/* { dg-final { scan-tree-dump "Threaded jump" "dom4" } } */ +/* { dg-final { scan-tree-dump "Threaded jump" "dom2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c index 0956b61..ab6b6eb 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4-details" } */ -/* { dg-final { scan-tree-dump-times "FSM" 6 "dom4" } } */ +/* { dg-options "-O2 -fdump-tree-dom2-details" } */ +/* { dg-final { scan-tree-dump-times "FSM" 6 "dom2" } } */ int sum0, sum1, sum2, sum3; int foo (char *s, char **ret) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c index b6855cd..a7a737b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c @@ -1,8 +1,8 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom4-stats -fdump-tree-dom5-stats -fdump-tree-vrp2-stats" } */ +/* { dg-options "-O2 -fdump-tree-vrp1-stats -fdump-tree-dom2-stats -fdump-tree-dom3-stats -fdump-tree-vrp2-stats" } */ /* { dg-final { scan-tree-dump "Jumps threaded: 19" "vrp1" } } */ -/* { dg-final { scan-tree-dump "Jumps threaded: 12" "dom4" } } */ -/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom5" } } */ +/* { dg-final { scan-tree-dump "Jumps threaded: 12" "dom2" } } */ +/* { dg-final { scan-tree-dump-not "Jumps threaded" "dom3" } } */ /* { dg-final { scan-tree-dump-not "Jumps threaded" "vrp2" } } */ enum STATE { diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c index 6a4b819..4ee7049 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3" } */ +/* { dg-options "-O -fdump-tree-lim2" } */ /* This is a variant that does cause fold to place a cast to int before testing bit 1. */ @@ -18,4 +18,4 @@ quantum_toffoli (int control1, int control2, int target, } } -/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c index afa547c..ec609d8 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int *l, *r; int test_func(void) @@ -27,4 +27,4 @@ int test_func(void) return i; } -/* { dg-final { scan-tree-dump "Executing store motion of pos" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of pos" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c index d55f644..e4c11aa 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-arcs -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fprofile-arcs -fdump-tree-lim2-details" } */ /* { dg-require-profiling "-fprofile-generate" } */ struct thread_param @@ -22,4 +22,4 @@ void access_buf(struct thread_param* p) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of __gcov0.access_buf\\\[\[01\]\\\] from loop 1" 2 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of __gcov0.access_buf\\\[\[01\]\\\] from loop 1" 2 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c index 18b055f..016ff22 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3" } */ +/* { dg-options "-O -fdump-tree-lim2" } */ int a[1024]; @@ -23,4 +23,4 @@ void bar (int x, int z) } } -/* { dg-final { scan-tree-dump-times "!= 0 ? " 2 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "!= 0 ? " 2 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c index 9ef7bae..37639cd 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3" } */ +/* { dg-options "-O -fdump-tree-lim2" } */ /* This is a variant that doesn't cause fold to place a cast to int before testing bit 1. */ @@ -18,4 +18,4 @@ int size) } } -/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c index dc7f41a..f059d5a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fdump-tree-lim2-details" } */ struct { int x; int y; } global; void foo(int n) @@ -9,5 +9,5 @@ void foo(int n) global.y += global.x*global.x; } -/* { dg-final { scan-tree-dump "Executing store motion of global.y" "lim3" } } */ -/* { dg-final { scan-tree-dump "Moving statement.*global.x.*out of loop 1" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of global.y" "lim2" } } */ +/* { dg-final { scan-tree-dump "Moving statement.*global.x.*out of loop 1" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c index 535d627..21edcd0 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ double a[16][64], y[64], x[16]; void foo(void) @@ -10,4 +10,4 @@ void foo(void) y[j] = y[j] + a[i][j] * x[i]; } -/* { dg-final { scan-tree-dump "Executing store motion of y" "lim3" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of y" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c index bf4e8ec..7612e75 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fdump-tree-lim2-details" } */ extern const int srcshift; @@ -11,4 +11,4 @@ void foo (int *srcdata, int *dstdata) dstdata[i] = srcdata[i] << srcshift; } -/* { dg-final { scan-tree-dump "Moving statement" "lim3" } } */ +/* { dg-final { scan-tree-dump "Moving statement" "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c index fb69af3..9256b39 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fdump-tree-lim2-details" } */ void bar (int); void foo (int n, int m) @@ -16,4 +16,4 @@ void foo (int n, int m) } } -/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c index 9d2e817..a65656f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim3-details" } */ +/* { dg-options "-O -fdump-tree-lim2-details" } */ void bar (int); void foo (int n, int m) @@ -16,4 +16,4 @@ void foo (int n, int m) } } -/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-12.c index 5073343..f250d22 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-12.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-thread-12.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dom4-details" } */ -/* { dg-final { scan-tree-dump "FSM" "dom4" } } */ +/* { dg-options "-O2 -fdump-tree-dom2-details" } */ +/* { dg-final { scan-tree-dump "FSM" "dom2" } } */ typedef struct bitmap_head_def *bitmap; typedef const struct bitmap_head_def *const_bitmap; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c index 6abcb6c..94bdd4a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim3-details" } */ +/* { dg-options "-O2 -fdump-tree-lim2-details" } */ int x; int y; struct { int x; int y; } global; int foo() { @@ -10,5 +10,5 @@ int foo() { global.y += global.x*global.x; } -/* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim3" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim2" } } */ /* XXX: We should also check for the load motion of global.x, but there is no easy way to do this. */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c index f89232a..beca5fa 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c @@ -4,7 +4,7 @@ jumps when evaluating an && condition. VRP is not able to optimize this. */ /* { dg-do compile { target { ! { logical_op_short_circuit || { s390*-*-* mn10300-*-* hppa*-*-* } } } } } */ -/* { dg-options "-O2 -fdump-tree-vrp1 -fdump-tree-dom4 -fdump-tree-vrp2" } */ +/* { dg-options "-O2 -fdump-tree-vrp1 -fdump-tree-dom2 -fdump-tree-vrp2" } */ /* { dg-additional-options "-march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ int h(int x, int y) diff --git a/gcc/testsuite/gfortran.dg/pr32921.f b/gcc/testsuite/gfortran.dg/pr32921.f index e7264b7..0661208 100644 --- a/gcc/testsuite/gfortran.dg/pr32921.f +++ b/gcc/testsuite/gfortran.dg/pr32921.f @@ -1,5 +1,5 @@ ! { dg-do compile } -! { dg-options "-O2 -fdump-tree-lim3" } +! { dg-options "-O2 -fdump-tree-lim2" } ! gfortran -c -m32 -O2 -S junk.f ! MODULE LES3D_DATA @@ -45,4 +45,4 @@ RETURN END -! { dg-final { scan-tree-dump-times "stride" 4 "lim3" } } +! { dg-final { scan-tree-dump-times "stride" 4 "lim2" } } diff --git a/gcc/testsuite/gfortran.dg/unconstrained_commons.f b/gcc/testsuite/gfortran.dg/unconstrained_commons.f index 9c9c44c..bee67ab 100644 --- a/gcc/testsuite/gfortran.dg/unconstrained_commons.f +++ b/gcc/testsuite/gfortran.dg/unconstrained_commons.f @@ -1,5 +1,5 @@ ! { dg-do compile } -! { dg-options "-O3 -funconstrained-commons -fdump-tree-dom4-details" } +! { dg-options "-O3 -funconstrained-commons -fdump-tree-dom2-details" } ! Test for PR69368: a single-element array in a common block, which will be ! overridden with a larger size at link time (contrary to language spec). @@ -14,7 +14,7 @@ 10 CONTINUE RETURN END -! { dg-final { scan-tree-dump-not "FIND" "dom4" } } +! { dg-final { scan-tree-dump-not "FIND" "dom2" } } ! We should retain both a read and write of mycommon.x. -! { dg-final { scan-tree-dump-times " _\[0-9\]+ = mycommon\\.x\\\[_\[0-9\]+\\\];" 1 "dom4" } } -! { dg-final { scan-tree-dump-times " mycommon\\.x\\\[j?_\[0-9\]+\\\] = _\[0-9\]+;" 1 "dom4" } } +! { dg-final { scan-tree-dump-times " _\[0-9\]+ = mycommon\\.x\\\[_\[0-9\]+\\\];" 1 "dom2" } } +! { dg-final { scan-tree-dump-times " mycommon\\.x\\\[j?_\[0-9\]+\\\] = _\[0-9\]+;" 1 "dom2" } } diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c index 2e571a6..06354e3 100644 --- a/gcc/tree-ssa-loop.c +++ b/gcc/tree-ssa-loop.c @@ -343,7 +343,6 @@ public: /* opt_pass methods: */ virtual unsigned int execute (function *); - opt_pass * clone () { return new pass_tree_loop_init (m_ctxt); } }; // class pass_tree_loop_init @@ -451,7 +450,6 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { return flag_tree_scev_cprop; } virtual unsigned int execute (function *) { return scev_const_prop (); } - opt_pass * clone () { return new pass_scev_cprop (m_ctxt); } }; // class pass_scev_cprop @@ -594,7 +592,6 @@ public: /* opt_pass methods: */ virtual unsigned int execute (function *) { return tree_ssa_loop_done (); } - opt_pass * clone () { return new pass_tree_loop_done (m_ctxt); } }; // class pass_tree_loop_done