From patchwork Thu Apr 7 17:34:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Monakov X-Patchwork-Id: 90216 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]) by ozlabs.org (Postfix) with SMTP id 28130B6F14 for ; Fri, 8 Apr 2011 03:34:44 +1000 (EST) Received: (qmail 4644 invoked by alias); 7 Apr 2011 17:34:43 -0000 Received: (qmail 4530 invoked by uid 22791); 7 Apr 2011 17:34:42 -0000 X-SWARE-Spam-Status: No, hits=-0.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_JMF_BL, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.ispras.ru (HELO smtp.ispras.ru) (83.149.198.202) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Apr 2011 17:34:37 +0000 Received: from ispserv.ispras.ru (ispserv.ispras.ru [83.149.198.72]) by smtp.ispras.ru (Postfix) with ESMTP id 4064B5D404A; Thu, 7 Apr 2011 21:34:07 +0400 (MSD) Received: from monoid.intra.ispras.ru (winnie.ispras.ru [83.149.198.236]) by ispserv.ispras.ru (Postfix) with ESMTP id 512833FC48; Thu, 7 Apr 2011 21:34:36 +0400 (MSD) Date: Thu, 7 Apr 2011 21:34:36 +0400 (MSD) From: Alexander Monakov To: gcc-patches@gcc.gnu.org cc: "Vladimir N. Makarov" Subject: [PATCH] sel-sched: Fix adding of preheader blocks from inner loops (PR48302) Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 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 Hello, (quoting myself from the PR audit trail) We call sched_scan for preheader blocks from inner regions twice: first during sel_add_loop_preheaders, and then during the subsequent call to sel_init_bbs in setup_current_loop_nest. As a result, we also call remove_notes for those blocks twice, and after the second call incorrectly record that the block has no notes. The solution is to call sel_add_loop_preheaders after sel_init_bbs. We need to add new preheader blocks into 'bbs' vector in setup_current_loop_nest, so we pass the pointer to the vector to sel_add_loop_preheaders. PR rtl-optimization/48302 * sel-sched-ir.h (sel_add_loop_preheaders): Update prototype. * sel-sched-ir.c (sel_add_loop_preheaders): Add 'bbs' argument. Use it to record added preheader blocks. (setup_current_loop_nest): Add 'bbs' argument. Pass it on to sel_add_loop_preheaders. (sel_region_init): Move call to setup_current_loop_nest after sel_init_bbs. testsuite: g++.dg/opt/pr48302.C: New. diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 95c1431..a6daa58 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -6094,11 +6094,11 @@ sel_find_rgns (void) bbs_in_loop_rgns = NULL; } -/* Adds the preheader blocks from previous loop to current region taking - it from LOOP_PREHEADER_BLOCKS (current_loop_nest). +/* Add the preheader blocks from previous loop to current region taking + it from LOOP_PREHEADER_BLOCKS (current_loop_nest) and record them in *BBS. This function is only used with -fsel-sched-pipelining-outer-loops. */ void -sel_add_loop_preheaders (void) +sel_add_loop_preheaders (bb_vec_t *bbs) { int i; basic_block bb; @@ -6109,6 +6109,7 @@ sel_add_loop_preheaders (void) VEC_iterate (basic_block, preheader_blocks, i, bb); i++) { + VEC_safe_push (basic_block, heap, *bbs, bb); VEC_safe_push (basic_block, heap, last_added_blocks, bb); sel_add_bb (bb); } diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index 5516da9..b0c52eb 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -1628,7 +1628,7 @@ extern void sel_sched_region (int); extern loop_p get_loop_nest_for_rgn (unsigned int); extern bool considered_for_pipelining_p (struct loop *); extern void make_region_from_loop_preheader (VEC(basic_block, heap) **); -extern void sel_add_loop_preheaders (void); +extern void sel_add_loop_preheaders (bb_vec_t *); extern bool sel_is_loop_preheader_p (basic_block); extern void clear_outdated_rtx_info (basic_block); extern void free_data_sets (basic_block); diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index fb1a026..48fb2e0 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -6801,7 +6801,7 @@ current_region_empty_p (void) /* Prepare and verify loop nest for pipelining. */ static void -setup_current_loop_nest (int rgn) +setup_current_loop_nest (int rgn, bb_vec_t *bbs) { current_loop_nest = get_loop_nest_for_rgn (rgn); @@ -6810,7 +6810,7 @@ setup_current_loop_nest (int rgn) /* If this loop has any saved loop preheaders from nested loops, add these basic blocks to the current region. */ - sel_add_loop_preheaders (); + sel_add_loop_preheaders (bbs); /* Check that we're starting with a valid information. */ gcc_assert (loop_latch_edge (current_loop_nest)); @@ -6849,9 +6849,6 @@ sel_region_init (int rgn) if (current_region_empty_p ()) return true; - if (flag_sel_sched_pipelining) - setup_current_loop_nest (rgn); - sel_setup_region_sched_flags (); bbs = VEC_alloc (basic_block, heap, current_nr_blocks); @@ -6861,6 +6858,9 @@ sel_region_init (int rgn) sel_init_bbs (bbs, NULL); + if (flag_sel_sched_pipelining) + setup_current_loop_nest (rgn, &bbs); + /* Initialize luids and dependence analysis which both sel-sched and haifa need. */ sched_init_luids (bbs, NULL, NULL, NULL); diff --git a/gcc/testsuite/g++.dg/opt/pr48302.C b/gcc/testsuite/g++.dg/opt/pr48302.C new file mode 100644 index 0000000..fd51ba4 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr48302.C @@ -0,0 +1,21 @@ +// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } +// { dg-options "-O -fcrossjumping -fgcse -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param lim-expensive=320 --param min-crossjump-insns=1" } + +struct S +{ + int i, j; + S *s; + ~S(); +}; + +S *gs; + +void foo () +{ +restart: + for (S *s = gs; s; s = s->s) + if (s->j && s->j != (s->i & 1)) { + delete s; + goto restart; + } +}