diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2017-09-27 20:16:53 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@gcc.gnu.org> | 2017-09-27 20:16:53 +0300 |
| commit | ab90c27b6739a096d9afe9472b14057fbc24e392 (patch) | |
| tree | 8d90c0fe01da13a06e1c0ed09b5065c77bf98173 /gcc/haifa-sched.c | |
| parent | d4b7f2ee4bb69d5d3594413d63d077d2f3610141 (diff) | |
haifa-sched: fix autopref_rank_for_schedule qsort comparator
* haifa-sched.c (autopref_rank_for_schedule): Order 'irrelevant' insns
first, always call autopref_rank_data otherwise.
From-SVN: r253235
Diffstat (limited to 'gcc/haifa-sched.c')
| -rw-r--r-- | gcc/haifa-sched.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index d1378d0465f..549e8961411 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -5707,7 +5707,8 @@ autopref_rank_data (autopref_multipass_data_t data1, static int autopref_rank_for_schedule (const rtx_insn *insn1, const rtx_insn *insn2) { - for (int write = 0; write < 2; ++write) + int r = 0; + for (int write = 0; write < 2 && !r; ++write) { autopref_multipass_data_t data1 = &INSN_AUTOPREF_MULTIPASS_DATA (insn1)[write]; @@ -5716,21 +5717,20 @@ autopref_rank_for_schedule (const rtx_insn *insn1, const rtx_insn *insn2) if (data1->status == AUTOPREF_MULTIPASS_DATA_UNINITIALIZED) autopref_multipass_init (insn1, write); - if (data1->status == AUTOPREF_MULTIPASS_DATA_IRRELEVANT) - continue; if (data2->status == AUTOPREF_MULTIPASS_DATA_UNINITIALIZED) autopref_multipass_init (insn2, write); - if (data2->status == AUTOPREF_MULTIPASS_DATA_IRRELEVANT) - continue; - if (!rtx_equal_p (data1->base, data2->base)) - continue; + int irrel1 = data1->status == AUTOPREF_MULTIPASS_DATA_IRRELEVANT; + int irrel2 = data2->status == AUTOPREF_MULTIPASS_DATA_IRRELEVANT; - return autopref_rank_data (data1, data2); + if (!irrel1 && !irrel2) + r = autopref_rank_data (data1, data2); + else + r = irrel2 - irrel1; } - return 0; + return r; } /* True if header of debug dump was printed. */ |