patches/gcc/4.3.0/250-904-flatten-switch-stmt-00.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 10 22:10:40 2008 +0000 (2008-06-10)
changeset 552 4edbcdb17e3d
permissions -rw-r--r--
Vampirise patches for gcc-4.3.{0,1} from gentoo. Absolutely untested...

/trunk/patches/gcc/4.3.0/275-gcc-x86-emit-cld.patch | 156 156 0 0 +
/trunk/patches/gcc/4.3.0/450-gcc4-noteGNUstack.patch | 198 198 0 0 +
/trunk/patches/gcc/4.3.0/550-gcc43-pr25343.patch | 21 21 0 0 +
/trunk/patches/gcc/4.3.0/375-gcc43-pr35440.patch | 59 59 0 0 +
/trunk/patches/gcc/4.3.0/125-gcc-trampolinewarn.patch | 35 35 0 0 +
/trunk/patches/gcc/4.3.0/475-gcc43-pr35705.patch | 21 21 0 0 +
/trunk/patches/gcc/4.3.0/700-204-uclibc-locale-wchar_fix.patch | 51 51 0 0 +
/trunk/patches/gcc/4.3.0/775-303-c99-complex-ugly-hack.patch | 14 14 0 0 +
/trunk/patches/gcc/4.3.0/575-sh-pr24836.patch | 28 28 0 0 +
/trunk/patches/gcc/4.3.0/675-203-uclibc-locale-no__x.patch | 224 224 0 0 +
/trunk/patches/gcc/4.3.0/400-gcc43-pr24170.patch | 61 61 0 0 +
/trunk/patches/gcc/4.3.0/100-gcc-4.1-alpha-mieee-default.patch | 34 34 0 0 +
/trunk/patches/gcc/4.3.0/825-305-libmudflap-susv3-legacy.patch | 49 49 0 0 +
/trunk/patches/gcc/4.3.0/175-gcc-4.1-cross-compile.patch | 44 44 0 0 +
/trunk/patches/gcc/4.3.0/850-306-libstdc++-namespace.patch | 38 38 0 0 +
/trunk/patches/gcc/4.3.0/200-gcc-netbsd-symbolic.patch | 14 14 0 0 +
/trunk/patches/gcc/4.3.0/750-301-missing-execinfo_h.patch | 13 13 0 0 +
/trunk/patches/gcc/4.3.0/225-gcc-sparc64-bsd.patch | 30 30 0 0 +
/trunk/patches/gcc/4.3.0/350-300-libstdc++-pic.patch | 56 56 0 0 +
/trunk/patches/gcc/4.3.0/500-gcc43-pr34571.patch | 35 35 0 0 +
/trunk/patches/gcc/4.3.0/300-gcc-3.4-libiberty-pic.patch | 12 12 0 0 +
/trunk/patches/gcc/4.3.0/625-103-uclibc-conf-noupstream.patch | 13 13 0 0 +
/trunk/patches/gcc/4.3.0/425-gcc4-ia64-noteGNUstack.patch | 96 96 0 0 +
/trunk/patches/gcc/4.3.0/325-gcc4-superh-default-multilib.patch | 25 25 0 0 +
/trunk/patches/gcc/4.3.0/725-205-uclibc-locale-update.patch | 355 355 0 0 ++
/trunk/patches/gcc/4.3.0/800-304-index_macro.patch | 27 27 0 0 +
/trunk/patches/gcc/4.3.0/600-gcc-ca-translation-typo.patch | 19 19 0 0 +
/trunk/patches/gcc/4.3.0/650-200-uclibc-locale.patch | 2794 2794 0 0 +++++++++++++++
/trunk/patches/gcc/4.3.0/525-gcc43-pr35982.patch | 23 23 0 0 +
/trunk/patches/gcc/4.3.0/150-gcc43-java-nomulti.patch | 47 47 0 0 +
/trunk/patches/gcc/4.3.0/250-904-flatten-switch-stmt-00.patch | 76 76 0 0 +
/trunk/patches/gcc/4.3.1/100-gcc-4.1-alpha-mieee-default.patch | 34 34 0 0 +
/trunk/patches/gcc/4.3.1/500-103-uclibc-conf-noupstream.patch | 13 13 0 0 +
/trunk/patches/gcc/4.3.1/175-gcc-4.1-cross-compile.patch | 44 44 0 0 +
/trunk/patches/gcc/4.3.1/400-gcc4-noteGNUstack.patch | 198 198 0 0 +
/trunk/patches/gcc/4.3.1/600-205-uclibc-locale-update.patch | 355 355 0 0 ++
/trunk/patches/gcc/4.3.1/725-306-libstdc++-namespace.patch | 38 38 0 0 +
/trunk/patches/gcc/4.3.1/350-gcc43-pr24170.patch | 61 61 0 0 +
/trunk/patches/gcc/4.3.1/300-gcc4-superh-default-multilib.patch | 25 25 0 0 +
/trunk/patches/gcc/4.3.1/575-204-uclibc-locale-wchar_fix.patch | 51 51 0 0 +
/trunk/patches/gcc/4.3.1/200-gcc-netbsd-symbolic.patch | 14 14 0 0 +
/trunk/patches/gcc/4.3.1/225-gcc-sparc64-bsd.patch | 30 30 0 0 +
/trunk/patches/gcc/4.3.1/450-gcc43-pr25343.patch | 21 21 0 0 +
/trunk/patches/gcc/4.3.1/625-301-missing-execinfo_h.patch | 13 13 0 0 +
/trunk/patches/gcc/4.3.1/325-300-libstdc++-pic.patch | 56 56 0 0 +
/trunk/patches/gcc/4.3.1/425-gcc43-pr34571.patch | 35 35 0 0 +
/trunk/patches/gcc/4.3.1/375-gcc4-ia64-noteGNUstack.patch | 96 96 0 0 +
/trunk/patches/gcc/4.3.1/125-gcc-trampolinewarn.patch | 35 35 0 0 +
/trunk/patches/gcc/4.3.1/275-gcc-3.4-libiberty-pic.patch | 12 12 0 0 +
/trunk/patches/gcc/4.3.1/650-303-c99-complex-ugly-hack.patch | 14 14 0 0 +
/trunk/patches/gcc/4.3.1/525-200-uclibc-locale.patch | 2794 2794 0 0 +++++++++++++++
/trunk/patches/gcc/4.3.1/550-203-uclibc-locale-no__x.patch | 224 224 0 0 +
/trunk/patches/gcc/4.3.1/150-gcc43-java-nomulti.patch | 47 47 0 0 +
/trunk/patches/gcc/4.3.1/700-305-libmudflap-susv3-legacy.patch | 49 49 0 0 +
/trunk/patches/gcc/4.3.1/675-304-index_macro.patch | 27 27 0 0 +
/trunk/patches/gcc/4.3.1/250-904-flatten-switch-stmt-00.patch | 76 76 0 0 +
/trunk/patches/gcc/4.3.1/475-sh-pr24836.patch | 28 28 0 0 +
57 files changed, 9058 insertions(+)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/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.0.orig/gcc/stmt.c gcc-4.3.0/gcc/stmt.c
yann@552
    54
--- gcc-4.3.0.orig/gcc/stmt.c	2007-12-04 22:55:32.000000000 +0100
yann@552
    55
+++ gcc-4.3.0/gcc/stmt.c	2008-06-10 14:44:33.000000000 +0200
yann@552
    56
@@ -2508,7 +2508,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
@@ -3066,6 +3070,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,