From b311fd0f70cb3687dd0c2fd01beb358aba3fdb79 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 25 Aug 2014 21:22:02 +0000 Subject: [PATCH] Eliminate BB_NOTE_LIST scaffolding gcc/ * sel-sched-ir.h (struct sel_region_bb_info_def): Strengthen field "note_list" from rtx to rtx_insn *. (BB_NOTE_LIST): Replace this function and... (SET_BB_NOTE_LIST): ...this function with... (BB_NOTE_LIST): ...the former macro implementation. * sched-int.h (concat_note_lists): Strengthen param "from_end" and local "from_start" from rtx to rtx_insn *. Strengthen param "to_endp" from rtx * to rtx_insn **. * haifa-sched.c (concat_note_lists): Likewise. * sel-sched-ir.c (init_bb): Eliminate SET_BB_NOTE_LIST in favor of BB_NOTE_LIST. (sel_restore_notes): Likewise. (move_bb_info): Likewise. (BB_NOTE_LIST): Delete this function. (SET_BB_NOTE_LIST): Delete this function. * sel-sched.c (create_block_for_bookkeeping): Eliminate SET_BB_NOTE_LIST in favor of BB_NOTE_LIST. / * rtx-classes-status.txt (TODO): Remove SET_BB_NOTE_LIST. From-SVN: r214482 --- ChangeLog | 4 ++++ gcc/ChangeLog | 22 ++++++++++++++++++++++ gcc/haifa-sched.c | 4 ++-- gcc/sched-int.h | 2 +- gcc/sel-sched-ir.c | 19 ++++--------------- gcc/sel-sched-ir.h | 5 ++--- gcc/sel-sched.c | 4 ++-- rtx-classes-status.txt | 1 - 8 files changed, 37 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8363862f3cf..1cf31c41155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-25 David Malcolm + + * rtx-classes-status.txt (TODO): Remove SET_BB_NOTE_LIST. + 2014-08-25 David Malcolm * rtx-classes-status.txt (TODO): Remove SET_BB_FOOTER. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 665e2d77cf1..0dc27a053a0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,25 @@ +2014-08-25 David Malcolm + + * sel-sched-ir.h (struct sel_region_bb_info_def): Strengthen field + "note_list" from rtx to rtx_insn *. + (BB_NOTE_LIST): Replace this function and... + (SET_BB_NOTE_LIST): ...this function with... + (BB_NOTE_LIST): ...the former macro implementation. + + * sched-int.h (concat_note_lists): Strengthen param "from_end" and + local "from_start" from rtx to rtx_insn *. Strengthen param + "to_endp" from rtx * to rtx_insn **. + + * haifa-sched.c (concat_note_lists): Likewise. + * sel-sched-ir.c (init_bb): Eliminate SET_BB_NOTE_LIST in favor of + BB_NOTE_LIST. + (sel_restore_notes): Likewise. + (move_bb_info): Likewise. + (BB_NOTE_LIST): Delete this function. + (SET_BB_NOTE_LIST): Delete this function. + * sel-sched.c (create_block_for_bookkeeping): Eliminate + SET_BB_NOTE_LIST in favor of BB_NOTE_LIST. + 2014-08-25 David Malcolm * target.def (reorder): Strengthen param "ready" of this DEFHOOK diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 18f5726903a..45938bd6e96 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -4005,9 +4005,9 @@ schedule_insn (rtx_insn *insn) /* Add note list that ends on FROM_END to the end of TO_ENDP. */ void -concat_note_lists (rtx from_end, rtx *to_endp) +concat_note_lists (rtx_insn *from_end, rtx_insn **to_endp) { - rtx from_start; + rtx_insn *from_start; /* It's easy when have nothing to concat. */ if (from_end == NULL) diff --git a/gcc/sched-int.h b/gcc/sched-int.h index 2e527221ac0..9f2a3e4ef50 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -1370,7 +1370,7 @@ extern int sched_speculate_insn (rtx, ds_t, rtx *); extern void unlink_bb_notes (basic_block, basic_block); extern void add_block (basic_block, basic_block); extern rtx_note *bb_note (basic_block); -extern void concat_note_lists (rtx, rtx *); +extern void concat_note_lists (rtx_insn *, rtx_insn **); extern rtx_insn *sched_emit_insn (rtx); extern rtx get_ready_element (int); extern int number_in_ready (void); diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 0531b2863a4..c36658f15c4 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -4623,7 +4623,7 @@ static void init_bb (basic_block bb) { remove_notes (bb_note (bb), BB_END (bb)); - SET_BB_NOTE_LIST (bb) = note_list; + BB_NOTE_LIST (bb) = note_list; } void @@ -4658,7 +4658,7 @@ sel_restore_notes (void) { note_list = BB_NOTE_LIST (first); restore_other_notes (NULL, first); - SET_BB_NOTE_LIST (first) = NULL_RTX; + BB_NOTE_LIST (first) = NULL; FOR_BB_INSNS (first, insn) if (NONDEBUG_INSN_P (insn)) @@ -5266,8 +5266,8 @@ move_bb_info (basic_block merge_bb, basic_block empty_bb) { if (in_current_region_p (merge_bb)) concat_note_lists (BB_NOTE_LIST (empty_bb), - &SET_BB_NOTE_LIST (merge_bb)); - SET_BB_NOTE_LIST (empty_bb) = NULL_RTX; + &BB_NOTE_LIST (merge_bb)); + BB_NOTE_LIST (empty_bb) = NULL; } @@ -6456,17 +6456,6 @@ rtx& SET_VINSN_INSN_RTX (vinsn_t vi) return vi->insn_rtx; } -rtx_insn *BB_NOTE_LIST (basic_block bb) -{ - rtx note_list = SEL_REGION_BB_INFO (bb)->note_list; - return safe_as_a (note_list); -} - -rtx& SET_BB_NOTE_LIST (basic_block bb) -{ - return SEL_REGION_BB_INFO (bb)->note_list; -} - rtx_insn *BND_TO (bnd_t bnd) { return safe_as_a (bnd->to); diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index d2bf7e27343..2af7f03b961 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -898,7 +898,7 @@ struct sel_region_bb_info_def { /* This insn stream is constructed in such a way that it should be traversed by PREV_INSN field - (*not* NEXT_INSN). */ - rtx note_list; + rtx_insn *note_list; /* Cached availability set at the beginning of a block. See also AV_LEVEL () for conditions when this av_set can be used. */ @@ -921,8 +921,7 @@ extern vec sel_region_bb_info; A note_list is a list of various notes that was scattered across BB before scheduling, and will be appended at the beginning of BB after scheduling is finished. */ -extern rtx_insn *BB_NOTE_LIST (basic_block); -extern rtx& SET_BB_NOTE_LIST (basic_block); +#define BB_NOTE_LIST(BB) (SEL_REGION_BB_INFO (BB)->note_list) #define BB_AV_SET(BB) (SEL_REGION_BB_INFO (BB)->av_set) #define BB_AV_LEVEL(BB) (SEL_REGION_BB_INFO (BB)->av_level) diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 91d194a5650..15c375ca34c 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -4586,8 +4586,8 @@ create_block_for_bookkeeping (edge e1, edge e2) /* Move note_list from the upper bb. */ gcc_assert (BB_NOTE_LIST (new_bb) == NULL_RTX); - SET_BB_NOTE_LIST (new_bb) = BB_NOTE_LIST (bb); - SET_BB_NOTE_LIST (bb) = NULL_RTX; + BB_NOTE_LIST (new_bb) = BB_NOTE_LIST (bb); + BB_NOTE_LIST (bb) = NULL; gcc_assert (e2->dest == bb); diff --git a/rtx-classes-status.txt b/rtx-classes-status.txt index 85ce4748b8c..dd44bbffb36 100644 --- a/rtx-classes-status.txt +++ b/rtx-classes-status.txt @@ -16,7 +16,6 @@ TODO: "Scaffolding" to be removed ================================= * DF_REF_INSN * SET_BB_HEAD, SET_BB_END, SET_BB_HEADER -* SET_BB_NOTE_LIST * SET_BND_TO * SET_DEP_PRO, SET_DEP_CON * SET_NEXT_INSN, SET_PREV_INSN -- 2.30.2