From 8aec463b10bd41bc184305458abfcc657fac4883 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Fri, 24 Oct 2014 08:22:37 +0000 Subject: [PATCH] Remove cached_first_cycle_multipass_dfa_lookahead and cached_issue_rate * haifa-sched.c (cached_first_cycle_multipass_dfa_lookahead,) (cached_issue_rate): Remove. Use dfa_lookahead and issue_rate instead. (max_issue, choose_ready, sched_init): Update. From-SVN: r216622 --- gcc/ChangeLog | 6 ++++++ gcc/haifa-sched.c | 30 +++++------------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 296419bbfe5..ac5f97baeba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-24 Maxim Kuvyrkov + + * haifa-sched.c (cached_first_cycle_multipass_dfa_lookahead,) + (cached_issue_rate): Remove. Use dfa_lookahead and issue_rate instead. + (max_issue, choose_ready, sched_init): Update. + 2014-10-24 Maxim Kuvyrkov * sched-int.h (struct _haifa_insn_data:last_rfs_win): New field. diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index faf2e46940f..b78d6972fe1 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -5471,15 +5471,6 @@ int dfa_lookahead; could achieve DFA_LOOKAHEAD ** N , where N is the queue length. */ static int max_lookahead_tries; -/* The following value is value of hook - `first_cycle_multipass_dfa_lookahead' at the last call of - `max_issue'. */ -static int cached_first_cycle_multipass_dfa_lookahead = 0; - -/* The following value is value of `issue_rate' at the last call of - `sched_init'. */ -static int cached_issue_rate = 0; - /* The following function returns maximal (or close to maximal) number of insns which can be issued on the same cycle and one of which insns is insns with the best rank (the first insn in READY). To @@ -5508,9 +5499,8 @@ max_issue (struct ready_list *ready, int privileged_n, state_t state, && privileged_n <= n_ready); /* Init MAX_LOOKAHEAD_TRIES. */ - if (cached_first_cycle_multipass_dfa_lookahead != dfa_lookahead) + if (max_lookahead_tries == 0) { - cached_first_cycle_multipass_dfa_lookahead = dfa_lookahead; max_lookahead_tries = 100; for (i = 0; i < issue_rate; i++) max_lookahead_tries *= dfa_lookahead; @@ -5673,8 +5663,6 @@ static int choose_ready (struct ready_list *ready, bool first_cycle_insn_p, rtx_insn **insn_ptr) { - int lookahead; - if (dbg_cnt (sched_insn) == false) { if (nonscheduled_insns_begin == NULL_RTX) @@ -5695,11 +5683,7 @@ choose_ready (struct ready_list *ready, bool first_cycle_insn_p, return -1; } - lookahead = 0; - - if (targetm.sched.first_cycle_multipass_dfa_lookahead) - lookahead = targetm.sched.first_cycle_multipass_dfa_lookahead (); - if (lookahead <= 0 || SCHED_GROUP_P (ready_element (ready, 0)) + if (dfa_lookahead <= 0 || SCHED_GROUP_P (ready_element (ready, 0)) || DEBUG_INSN_P (ready_element (ready, 0))) { if (targetm.sched.dispatch (NULL, IS_DISPATCH_ON)) @@ -6879,18 +6863,14 @@ sched_init (void) else issue_rate = 1; - if (cached_issue_rate != issue_rate) - { - cached_issue_rate = issue_rate; - /* To invalidate max_lookahead_tries: */ - cached_first_cycle_multipass_dfa_lookahead = 0; - } - if (targetm.sched.first_cycle_multipass_dfa_lookahead) dfa_lookahead = targetm.sched.first_cycle_multipass_dfa_lookahead (); else dfa_lookahead = 0; + /* Set to "0" so that we recalculate. */ + max_lookahead_tries = 0; + if (targetm.sched.init_dfa_pre_cycle_insn) targetm.sched.init_dfa_pre_cycle_insn (); -- 2.30.2