From 1aabb71d1331430965794be43f01d0e42e1351e3 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 28 Jun 2018 09:15:55 +0200 Subject: [PATCH] Come up with jump_table ratio constants used in jump_table_cluster. 2018-06-28 Martin Liska * tree-switch-conversion.c (jump_table_cluster::can_be_handled): Use newly introduced constants. * tree-switch-conversion.h (struct jump_table_cluster): Define max_ratio_for_size and max_ratio_for_speed. From-SVN: r262212 --- gcc/ChangeLog | 7 +++++++ gcc/tree-switch-conversion.c | 3 ++- gcc/tree-switch-conversion.h | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 926f8bcac39..8902e4ac366 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-06-28 Martin Liska + + * tree-switch-conversion.c (jump_table_cluster::can_be_handled): + Use newly introduced constants. + * tree-switch-conversion.h (struct jump_table_cluster): + Define max_ratio_for_size and max_ratio_for_speed. + 2018-06-28 Martin Liska * tree-switch-conversion.c (jump_table_cluster::find_jump_tables): diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index ddd8cba7b98..b79f2fdb6e6 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -1180,7 +1180,8 @@ jump_table_cluster::can_be_handled (const vec &clusters, if (start == end) return true; - unsigned HOST_WIDE_INT max_ratio = optimize_insn_for_size_p () ? 3 : 8; + unsigned HOST_WIDE_INT max_ratio + = optimize_insn_for_size_p () ? max_ratio_for_size : max_ratio_for_speed; unsigned HOST_WIDE_INT range = get_range (clusters[start]->get_low (), clusters[end]->get_high ()); /* Check overflow. */ diff --git a/gcc/tree-switch-conversion.h b/gcc/tree-switch-conversion.h index 79a1320c448..4beac785f05 100644 --- a/gcc/tree-switch-conversion.h +++ b/gcc/tree-switch-conversion.h @@ -257,6 +257,12 @@ struct jump_table_cluster: public group_cluster /* Return whether jump table expansion is allowed. */ static bool is_enabled (void); + + /* Max growth ratio for code that is optimized for size. */ + static const unsigned HOST_WIDE_INT max_ratio_for_size = 3; + + /* Max growth ratio for code that is optimized for speed. */ + static const unsigned HOST_WIDE_INT max_ratio_for_speed = 8; }; /* A GIMPLE switch statement can be expanded to a short sequence of bit-wise -- 2.30.2