diff options
author | Martin Liska <mliska@suse.cz> | 2020-09-24 13:34:13 +0200 |
---|---|---|
committer | Martin Liska <mliska@suse.cz> | 2020-09-29 09:26:07 +0200 |
commit | e46858e4eeee45d35ca4a7df1996186fe884879b (patch) | |
tree | 4a6167125770535ea2e0c7d1ff4bb527890ef671 /gcc/tree-switch-conversion.c | |
parent | 37ffe56c01e4a9e80a3b3c4f5beb86d80a0663db (diff) | |
download | gcc-e46858e4eeee45d35ca4a7df1996186fe884879b.zip gcc-e46858e4eeee45d35ca4a7df1996186fe884879b.tar.gz gcc-e46858e4eeee45d35ca4a7df1996186fe884879b.tar.bz2 |
switch conversion: make a rapid speed up
gcc/ChangeLog:
PR tree-optimization/96979
* tree-switch-conversion.c (jump_table_cluster::can_be_handled):
Make a fast bail out.
(bit_test_cluster::can_be_handled): Likewise here.
* tree-switch-conversion.h (get_range): Use wi::to_wide instead
of a folding.
gcc/testsuite/ChangeLog:
PR tree-optimization/96979
* g++.dg/tree-ssa/pr96979.C: New test.
Diffstat (limited to 'gcc/tree-switch-conversion.c')
-rw-r--r-- | gcc/tree-switch-conversion.c | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index 186411f..03a1fe6 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -1268,6 +1268,18 @@ jump_table_cluster::can_be_handled (const vec<cluster *> &clusters, if (range == 0) return false; + if (range > HOST_WIDE_INT_M1U / 100) + return false; + + unsigned HOST_WIDE_INT lhs = 100 * range; + if (lhs < range) + return false; + + /* First make quick guess as each cluster + can add at maximum 2 to the comparison_count. */ + if (lhs > 2 * max_ratio * (end - start + 1)) + return false; + unsigned HOST_WIDE_INT comparison_count = 0; for (unsigned i = start; i <= end; i++) { @@ -1275,10 +1287,6 @@ jump_table_cluster::can_be_handled (const vec<cluster *> &clusters, comparison_count += sc->m_range_p ? 2 : 1; } - unsigned HOST_WIDE_INT lhs = 100 * range; - if (lhs < range) - return false; - return lhs <= max_ratio * comparison_count; } @@ -1364,12 +1372,12 @@ bit_test_cluster::can_be_handled (unsigned HOST_WIDE_INT range, { /* Check overflow. */ if (range == 0) - return 0; + return false; if (range >= GET_MODE_BITSIZE (word_mode)) return false; - return uniq <= 3; + return uniq <= m_max_case_bit_tests; } /* Return true when cluster starting at START and ending at END (inclusive) @@ -1379,6 +1387,7 @@ bool bit_test_cluster::can_be_handled (const vec<cluster *> &clusters, unsigned start, unsigned end) { + auto_vec<int, m_max_case_bit_tests> dest_bbs; /* For algorithm correctness, bit test for a single case must return true. We bail out in is_beneficial if it's called just for a single case. */ @@ -1387,15 +1396,25 @@ bit_test_cluster::can_be_handled (const vec<cluster *> &clusters, unsigned HOST_WIDE_INT range = get_range (clusters[start]->get_low (), clusters[end]->get_high ()); - auto_bitmap dest_bbs; + + /* Make a guess first. */ + if (!can_be_handled (range, m_max_case_bit_tests)) + return false; for (unsigned i = start; i <= end; i++) { simple_cluster *sc = static_cast<simple_cluster *> (clusters[i]); - bitmap_set_bit (dest_bbs, sc->m_case_bb->index); + /* m_max_case_bit_tests is very small integer, thus the operation + is constant. */ + if (!dest_bbs.contains (sc->m_case_bb->index)) + { + if (dest_bbs.length () >= m_max_case_bit_tests) + return false; + dest_bbs.quick_push (sc->m_case_bb->index); + } } - return can_be_handled (range, bitmap_count_bits (dest_bbs)); + return true; } /* Return true when COUNT of cases of UNIQ labels is beneficial for bit test |