toolchain/gcc/patches/llvm/904-flatten-switch-stmt-00.patch

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