diff options
author | Roman Zhuykov <zhroma@ispras.ru> | 2020-03-27 08:02:56 +0300 |
---|---|---|
committer | Roman Zhuykov <zhroma@ispras.ru> | 2020-03-27 08:02:56 +0300 |
commit | 06d5d63d9944691bb4286e5f6b2422cc97148336 (patch) | |
tree | bfa9ad03e474a6bd143e40add3388080049a765e /gcc/modulo-sched.c | |
parent | 71d69548a1b2c85220ac6354564fd272beb9263f (diff) | |
download | gcc-06d5d63d9944691bb4286e5f6b2422cc97148336.zip gcc-06d5d63d9944691bb4286e5f6b2422cc97148336.tar.gz gcc-06d5d63d9944691bb4286e5f6b2422cc97148336.tar.bz2 |
modulo-sched: fix bootstrap compare-debug issue
This patch removes all debug insns from DDG analysis. It fixes bootstrap
comparison failure on powerpc64le when running with -fmodulo-sched enabled.
* ddg.c (create_ddg_dep_from_intra_loop_link): Remove assertions.
(create_ddg_dep_no_link): Likewise.
(add_cross_iteration_register_deps): Move debug instruction check.
Other minor refactoring.
(add_intra_loop_mem_dep): Do not check for debug instructions.
(add_inter_loop_mem_dep): Likewise.
(build_intra_loop_deps): Likewise.
(create_ddg): Do not include debug insns into the graph.
* ddg.h (struct ddg): Remove num_debug field.
* modulo-sched.c (doloop_register_get): Adjust condition.
(res_MII): Remove DDG num_debug field usage.
(sms_schedule_by_order): Use assertion against debug insns.
(ps_has_conflicts): Drop debug insn check.
testsuite:
* gcc.c-torture/execute/pr70127-debug-sms.c: New test.
* gcc.dg/torture/pr87197-debug-sms.c: New test.
Diffstat (limited to 'gcc/modulo-sched.c')
-rw-r--r-- | gcc/modulo-sched.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c index e16e023..77254b3 100644 --- a/gcc/modulo-sched.c +++ b/gcc/modulo-sched.c @@ -369,7 +369,7 @@ doloop_register_get (rtx_insn *head, rtx_insn *tail) : prev_nondebug_insn (tail)); for (insn = head; insn != first_insn_not_to_check; insn = NEXT_INSN (insn)) - if (!DEBUG_INSN_P (insn) && reg_mentioned_p (reg, insn)) + if (NONDEBUG_INSN_P (insn) && reg_mentioned_p (reg, insn)) { if (dump_file) { @@ -428,7 +428,7 @@ res_MII (ddg_ptr g) if (targetm.sched.sms_res_mii) return targetm.sched.sms_res_mii (g); - return ((g->num_nodes - g->num_debug) / issue_rate); + return g->num_nodes / issue_rate; } @@ -2152,11 +2152,7 @@ sms_schedule_by_order (ddg_ptr g, int mii, int maxii, int *nodes_order) ddg_node_ptr u_node = &ps->g->nodes[u]; rtx_insn *insn = u_node->insn; - if (!NONDEBUG_INSN_P (insn)) - { - bitmap_clear_bit (tobe_scheduled, u); - continue; - } + gcc_checking_assert (NONDEBUG_INSN_P (insn)); if (bitmap_bit_p (sched_nodes, u)) continue; @@ -3158,9 +3154,6 @@ ps_has_conflicts (partial_schedule_ptr ps, int from, int to) { rtx_insn *insn = ps_rtl_insn (ps, crr_insn->id); - if (!NONDEBUG_INSN_P (insn)) - continue; - /* Check if there is room for the current insn. */ if (!can_issue_more || state_dead_lock_p (curr_state)) return true; |