[tree-ssa]: Committed option renaming

Daniel Berlin dberlin@dberlin.org
Thu Sep 19 09:32:00 GMT 2002


I'll rename the -ftree-* flags in a sec.

2002-09-19  Daniel Berlin <dberlin@dberlin.org>

	* flags.h: flag_tree_ssa_* -> flag_tree_*.

	* toplev.c: Ditto.

	* tree-optimize.c: Ditto.

	* tree-dump.c: dump-tree-ssa-* -> dump-tree-*.
	TDI_ssa_* -> TDI_*.

	* tree.h: Ditto

	* tree-ssa-dce.c (tree_ssa_eliminate_dead_code): Fix dump handling.

Index: flags.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/flags.h,v
retrieving revision 1.86.2.8
diff -c -3 -p -w -B -b -r1.86.2.8 flags.h
*** flags.h	17 Sep 2002 22:04:24 -0000	1.86.2.8
--- flags.h	19 Sep 2002 16:18:46 -0000
*************** extern int flag_disable_simple;
*** 674,689 ****
  extern int flag_tree_ssa;
  
  /* Enable the SSA-PRE on trees.  */
! extern int flag_tree_ssa_pre;
  
  /* Enable Steengaard's points-to analysis for trees. */
  extern int flag_tree_points_to;
  
  /* Enable SSA-CCP on trees.  */
! extern int flag_tree_ssa_ccp;
  
  /* Enable SSA-DCE on trees.  */
! extern int flag_tree_ssa_dce;
  
  /* Enable all SSA-related tree dumps.  */
  extern int flag_dump_tree_all_ssa;
--- 674,689 ----
  extern int flag_tree_ssa;
  
  /* Enable the SSA-PRE on trees.  */
! extern int flag_tree_pre;
  
  /* Enable Steengaard's points-to analysis for trees. */
  extern int flag_tree_points_to;
  
  /* Enable SSA-CCP on trees.  */
! extern int flag_tree_ccp;
  
  /* Enable SSA-DCE on trees.  */
! extern int flag_tree_dce;
  
  /* Enable all SSA-related tree dumps.  */
  extern int flag_dump_tree_all_ssa;
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.654.2.16
diff -c -3 -p -w -B -b -r1.654.2.16 toplev.c
*** toplev.c	17 Sep 2002 22:04:24 -0000	1.654.2.16
--- toplev.c	19 Sep 2002 16:18:48 -0000
*************** int flag_disable_simple = 0;
*** 900,915 ****
  int flag_tree_ssa = 0;
  
  /* Enable the SSA-PRE tree optimization.  */
! int flag_tree_ssa_pre = 0;
  
  /* Enable Steensgaard's points-to analysis on trees. */
  int flag_tree_points_to = 0;
  
  /* Enable SSA-CCP on trees.  */
! int flag_tree_ssa_ccp = 0;
  
  /* Enable SSA-DCE on trees.  */
! int flag_tree_ssa_dce = 0;
  
  /* Enable all SSA-related dumps.  */
  int flag_dump_tree_all_ssa = 0;
--- 900,915 ----
  int flag_tree_ssa = 0;
  
  /* Enable the SSA-PRE tree optimization.  */
! int flag_tree_pre = 0;
  
  /* Enable Steensgaard's points-to analysis on trees. */
  int flag_tree_points_to = 0;
  
  /* Enable SSA-CCP on trees.  */
! int flag_tree_ccp = 0;
  
  /* Enable SSA-DCE on trees.  */
! int flag_tree_dce = 0;
  
  /* Enable all SSA-related dumps.  */
  int flag_dump_tree_all_ssa = 0;
*************** static const lang_independent_options f_
*** 1228,1240 ****
     N_("Do not re-write trees into SIMPLE form") },
    { "tree-ssa", &flag_tree_ssa, 1,
     N_("Enable SSA optimizations on trees") },
!   { "tree-ssa-pre", &flag_tree_ssa_pre, 1,
     N_("Enable SSA-PRE optimization on trees") },
    { "tree-points-to", &flag_tree_points_to, 1,
     N_("Enable Steensgaard's points-to analysis on trees") },
!   { "tree-ssa-ccp", &flag_tree_ssa_ccp, 1,
     N_("Enable SSA-CCP optimization on trees") },
!   { "tree-ssa-dce", &flag_tree_ssa_dce, 1,
     N_("Enable SSA dead code elimination optimization on trees") },
    { "dump-tree-all-ssa", &flag_dump_tree_all_ssa, 1,
     N_("Enable all SSA-related tree dumps") },
--- 1228,1240 ----
     N_("Do not re-write trees into SIMPLE form") },
    { "tree-ssa", &flag_tree_ssa, 1,
     N_("Enable SSA optimizations on trees") },
!   { "tree-ssa-pre", &flag_tree_pre, 1,
     N_("Enable SSA-PRE optimization on trees") },
    { "tree-points-to", &flag_tree_points_to, 1,
     N_("Enable Steensgaard's points-to analysis on trees") },
!   { "tree-ssa-ccp", &flag_tree_ccp, 1,
     N_("Enable SSA-CCP optimization on trees") },
!   { "tree-ssa-dce", &flag_tree_dce, 1,
     N_("Enable SSA dead code elimination optimization on trees") },
    { "dump-tree-all-ssa", &flag_dump_tree_all_ssa, 1,
     N_("Enable all SSA-related tree dumps") },
*************** parse_options_and_default_flags (argc, a
*** 4846,4852 ****
        flag_if_conversion = 1;
        flag_if_conversion2 = 1;
        flag_tree_ssa = 1;
!       /*flag_tree_ssa_ccp = 1;*/
      }
  
    if (optimize >= 2)
--- 4846,4852 ----
        flag_if_conversion = 1;
        flag_if_conversion2 = 1;
        flag_tree_ssa = 1;
!       /*flag_tree_ccp = 1;*/
      }
  
    if (optimize >= 2)
Index: tree-dump.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dump.c,v
retrieving revision 1.6.2.10
diff -c -3 -p -w -B -b -r1.6.2.10 tree-dump.c
*** tree-dump.c	18 Sep 2002 22:50:48 -0000	1.6.2.10
--- tree-dump.c	19 Sep 2002 16:18:48 -0000
*************** static struct dump_file_info dump_files[
*** 665,671 ****
    {".dot", "dump-tree-dot", 0, 0},
    {".ssa", "dump-tree-ssa", 0, 0},
    {".ccp", "dump-tree-ccp", 0, 0},
!   {".ssapre", "dump-tree-ssapre", 0, 0},
    {".dce", "dump-tree-dce", 0, 0},
    {".optimized", "dump-tree-optimized", 0, 0},
    {".xml", "dump-call-graph", 0, 0},
--- 665,671 ----
    {".dot", "dump-tree-dot", 0, 0},
    {".ssa", "dump-tree-ssa", 0, 0},
    {".ccp", "dump-tree-ccp", 0, 0},
!   {".pre", "dump-tree-pre", 0, 0},
    {".dce", "dump-tree-dce", 0, 0},
    {".optimized", "dump-tree-optimized", 0, 0},
    {".xml", "dump-call-graph", 0, 0},
*************** dump_enable_all_ssa ()
*** 763,769 ****
    dump_files[TDI_optimized].state = -1;
    dump_files[TDI_cfg].state = -1;
    dump_files[TDI_dot].state = -1;
!   dump_files[TDI_ssa_pre].state = -1;
    dump_files[TDI_ccp].state = -1;
    dump_files[TDI_dce].state = -1;
    dump_files[TDI_ssa].state = -1;
--- 763,769 ----
    dump_files[TDI_optimized].state = -1;
    dump_files[TDI_cfg].state = -1;
    dump_files[TDI_dot].state = -1;
!   dump_files[TDI_pre].state = -1;
    dump_files[TDI_ccp].state = -1;
    dump_files[TDI_dce].state = -1;
    dump_files[TDI_ssa].state = -1;
Index: tree-ssa-pre.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Attic/tree-ssa-pre.c,v
retrieving revision 1.1.4.17
diff -c -3 -p -w -B -b -r1.1.4.17 tree-ssa-pre.c
*** tree-ssa-pre.c	18 Sep 2002 22:50:47 -0000	1.1.4.17
--- tree-ssa-pre.c	19 Sep 2002 16:18:49 -0000
*************** tree_perform_ssapre ()
*** 2161,2167 ****
    sbitmap_vector_zero (pre_dfs, last_basic_block);
    compute_dominance_frontiers (pre_dfs, pre_idom);
  
!   dump_file = dump_begin (TDI_ssa_pre, &dump_flags);
    calculate_preorder ();
    FOR_EACH_BB (bb)
      {    
--- 2161,2167 ----
    sbitmap_vector_zero (pre_dfs, last_basic_block);
    compute_dominance_frontiers (pre_dfs, pre_idom);
  
!   dump_file = dump_begin (TDI_pre, &dump_flags);
    calculate_preorder ();
    FOR_EACH_BB (bb)
      {    
*************** tree_perform_ssapre ()
*** 2257,2263 ****
        else
          print_c_tree (dump_file, fn);
  
!       dump_end (TDI_ssa_pre, dump_file);
      }
    
    for (j = 0; j < VARRAY_ACTIVE_SIZE (bexprs); j++)
--- 2257,2263 ----
        else
          print_c_tree (dump_file, fn);
  
!       dump_end (TDI_pre, dump_file);
      }
    
    for (j = 0; j < VARRAY_ACTIVE_SIZE (bexprs); j++)
Index: tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree.h,v
retrieving revision 1.342.2.13
diff -c -3 -p -w -B -b -r1.342.2.13 tree.h
*** tree.h	17 Sep 2002 22:04:26 -0000	1.342.2.13
--- tree.h	19 Sep 2002 16:18:50 -0000
*************** enum tree_dump_index
*** 3082,3088 ****
    TDI_ssa,                      /* dump SSA information for each function.  */
    TDI_ccp,			/* dump SSA CCP information for each
  				   function.  */
!   TDI_ssa_pre,                  /* dump SSA PRE information for each
  				   function.  */
    TDI_dce,                      /* dump SSA DCE information for each
  				   function.  */
--- 3082,3088 ----
    TDI_ssa,                      /* dump SSA information for each function.  */
    TDI_ccp,			/* dump SSA CCP information for each
  				   function.  */
!   TDI_pre,                      /* dump SSA PRE information for each
  				   function.  */
    TDI_dce,                      /* dump SSA DCE information for each
  				   function.  */
Index: tree-optimize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Attic/tree-optimize.c,v
retrieving revision 1.1.4.9
diff -c -3 -p -w -B -b -r1.1.4.9 tree-optimize.c
*** tree-optimize.c	17 Sep 2002 22:04:25 -0000	1.1.4.9
--- tree-optimize.c	19 Sep 2002 16:25:29 -0000
*************** optimize_function_tree (fndecl)
*** 77,89 ****
    /* Begin optimization passes.  */
    if (n_basic_blocks > 0 && ! (errorcount || sorrycount))
      {
!       if (flag_tree_ssa_pre)
  	tree_perform_ssapre ();
  
!       if (flag_tree_ssa_ccp)
  	tree_ssa_ccp (fndecl);
  
!       if (flag_tree_ssa_dce)
  	tree_ssa_eliminate_dead_code (fndecl);
      }
  
--- 77,89 ----
    /* Begin optimization passes.  */
    if (n_basic_blocks > 0 && ! (errorcount || sorrycount))
      {
!       if (flag_tree_pre)
  	tree_perform_ssapre ();
  
!       if (flag_tree_ccp)
  	tree_ssa_ccp (fndecl);
  
!       if (flag_tree_dce)
  	tree_ssa_eliminate_dead_code (fndecl);
      }
  
~



More information about the Gcc-patches mailing list