This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH 170/236] Eliminate BB_NOTE_LIST scaffolding
- From: David Malcolm <dmalcolm at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: David Malcolm <dmalcolm at redhat dot com>
- Date: Wed, 6 Aug 2014 13:22:29 -0400
- Subject: [PATCH 170/236] Eliminate BB_NOTE_LIST scaffolding
- Authentication-results: sourceware.org; auth=none
- References: <1407345815-14551-1-git-send-email-dmalcolm at redhat dot com>
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: Remove SET_BB_NOTE_LIST.
---
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 -
6 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 256c198..132d9a2 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -3953,9 +3953,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 2e52722..9f2a3e4 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 5d4c12c..8493481 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -4628,7 +4628,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
@@ -4663,7 +4663,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))
@@ -5271,8 +5271,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;
}
@@ -6461,17 +6461,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 as_a_nullable <rtx_insn *> (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 as_a_nullable <rtx_insn *> (bnd->to);
diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index d2bf7e2..2af7f03 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_def> 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 fe82a78..9cd23ef 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -4593,8 +4593,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 d26dd89..84d53ba 100644
--- a/rtx-classes-status.txt
+++ b/rtx-classes-status.txt
@@ -12,7 +12,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
--
1.8.5.3