|
yann@552
|
1 |
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
|
|
yann@552
|
2 |
http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
|
|
yann@552
|
3 |
|
|
yann@552
|
4 |
Hi,
|
|
yann@552
|
5 |
|
|
yann@552
|
6 |
The attached patch makes sure that we create smaller object code for
|
|
yann@552
|
7 |
simple switch statements. We just make sure to flatten the switch
|
|
yann@552
|
8 |
statement into an if-else chain, basically.
|
|
yann@552
|
9 |
|
|
yann@552
|
10 |
This fixes a size-regression as compared to gcc-3.4, as can be seen
|
|
yann@552
|
11 |
below.
|
|
yann@552
|
12 |
|
|
yann@552
|
13 |
2007-04-15 Bernhard Fischer <..>
|
|
yann@552
|
14 |
|
|
yann@552
|
15 |
* stmt.c (expand_case): Do not create a complex binary tree when
|
|
yann@552
|
16 |
optimizing for size but rather use the simple ordered list.
|
|
yann@552
|
17 |
(emit_case_nodes): do not emit jumps to the default_label when
|
|
yann@552
|
18 |
optimizing for size.
|
|
yann@552
|
19 |
|
|
yann@552
|
20 |
Not regtested so far.
|
|
yann@552
|
21 |
Comments?
|
|
yann@552
|
22 |
|
|
yann@552
|
23 |
Attached is the test switch.c mentioned below.
|
|
yann@552
|
24 |
|
|
yann@552
|
25 |
$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
|
|
yann@552
|
26 |
gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
|
|
yann@552
|
27 |
$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
|
|
yann@552
|
28 |
gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
|
|
yann@552
|
29 |
|
|
yann@552
|
30 |
$ size switch-*.o
|
|
yann@552
|
31 |
text data bss dec hex filename
|
|
yann@552
|
32 |
169 0 0 169 a9 switch-2.95.o
|
|
yann@552
|
33 |
115 0 0 115 73 switch-3.3.o
|
|
yann@552
|
34 |
103 0 0 103 67 switch-3.4.o
|
|
yann@552
|
35 |
124 0 0 124 7c switch-4.0.o
|
|
yann@552
|
36 |
124 0 0 124 7c switch-4.1.o
|
|
yann@552
|
37 |
124 0 0 124 7c switch-4.2.orig-HEAD.o
|
|
yann@552
|
38 |
95 0 0 95 5f switch-4.3-HEAD.o
|
|
yann@552
|
39 |
124 0 0 124 7c switch-4.3.orig-HEAD.o
|
|
yann@552
|
40 |
166 0 0 166 a6 switch-CHAIN-2.95.o
|
|
yann@552
|
41 |
111 0 0 111 6f switch-CHAIN-3.3.o
|
|
yann@552
|
42 |
95 0 0 95 5f switch-CHAIN-3.4.o
|
|
yann@552
|
43 |
95 0 0 95 5f switch-CHAIN-4.0.o
|
|
yann@552
|
44 |
95 0 0 95 5f switch-CHAIN-4.1.o
|
|
yann@552
|
45 |
95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
|
|
yann@552
|
46 |
95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
|
|
yann@552
|
47 |
95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
|
|
yann@552
|
48 |
|
|
yann@552
|
49 |
|
|
yann@552
|
50 |
Content-Type: text/x-diff; charset=us-ascii
|
|
yann@552
|
51 |
Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
|
|
yann@552
|
52 |
|
|
yann@552
|
53 |
diff -durN gcc-4.3.1.orig/gcc/stmt.c gcc-4.3.1/gcc/stmt.c
|
|
yann@552
|
54 |
--- gcc-4.3.1.orig/gcc/stmt.c 2008-05-09 20:12:13.000000000 +0200
|
|
yann@552
|
55 |
+++ gcc-4.3.1/gcc/stmt.c 2008-06-10 14:57:58.000000000 +0200
|
|
yann@552
|
56 |
@@ -2509,7 +2509,11 @@
|
|
yann@552
|
57 |
use_cost_table
|
|
yann@552
|
58 |
= (TREE_CODE (orig_type) != ENUMERAL_TYPE
|
|
yann@552
|
59 |
&& estimate_case_costs (case_list));
|
|
yann@552
|
60 |
- balance_case_nodes (&case_list, NULL);
|
|
yann@552
|
61 |
+ /* When optimizing for size, we want a straight list to avoid
|
|
yann@552
|
62 |
+ jumps as much as possible. This basically creates an if-else
|
|
yann@552
|
63 |
+ chain. */
|
|
yann@552
|
64 |
+ if (!optimize_size)
|
|
yann@552
|
65 |
+ balance_case_nodes (&case_list, NULL);
|
|
yann@552
|
66 |
emit_case_nodes (index, case_list, default_label, index_type);
|
|
yann@552
|
67 |
emit_jump (default_label);
|
|
yann@552
|
68 |
}
|
|
yann@552
|
69 |
@@ -3067,6 +3071,7 @@
|
|
yann@552
|
70 |
{
|
|
yann@552
|
71 |
if (!node_has_low_bound (node, index_type))
|
|
yann@552
|
72 |
{
|
|
yann@552
|
73 |
+ if (!optimize_size) /* don't jl to the .default_label. */
|
|
yann@552
|
74 |
emit_cmp_and_jump_insns (index,
|
|
yann@552
|
75 |
convert_modes
|
|
yann@552
|
76 |
(mode, imode,
|