Skip to content

R
riscv-gcc-1
Commit 812dbce5 by Jan Hubicka Committed by Jan Hubicka
Options

Backport from LTO branch: 

	2008-05-05  Kenneth Zadeck <zadeck@naturalbridge.com>
		    Jan Hubicka  <jh@suse.cz>
	
	* ipa-pure-const.c
	(init_state, finish_state, set_function_state, generate_summary):
	New functions.
	(scan_stmt): Renamed from scan_function.  Changed to keep state in
	local static vars rather than cgraph aux field.
	(propagate): Renamed from static_execute. Changed to keep state in
	local static vars rather than cgraph aux field.
	(pass_ipa_pure_const): Changed from SIMPLE_IPA_PASS to IPA_PASS.
	* tree-pass.h (pass_ipa_pure_const): Turn into IPA_PASS.

	2008-07-15  Kenneth Zadeck <zadeck@naturalbridge.com>

	* tree-pass.h (pass_ipa_reference): Make into ipa_opt_pass.
	* ipa-reference.c (init_function_info, generate_summary, 
	propagate): New functions.
	(analyze_function):  Call init_function_info.
	(static_execute): Stripped into generate_summary and propagate.
	(pass_ipa_reference): Made into ipa_opt_pass.

From-SVN: r139378
parent 0ac7d78a
Showing with 193 additions and 74 deletions
gcc/ChangeLog
2008-08-21 Jan Hubicka <jh@suse.cz>
Backport from LTO branch:
2008-05-05 Kenneth Zadeck <zadeck@naturalbridge.com>
Jan Hubicka <jh@suse.cz>
* ipa-pure-const.c
(init_state, finish_state, set_function_state, generate_summary):
New functions.
(scan_stmt): Renamed from scan_function. Changed to keep state in
local static vars rather than cgraph aux field.
(propagate): Renamed from static_execute. Changed to keep state in
local static vars rather than cgraph aux field.
(pass_ipa_pure_const): Changed from SIMPLE_IPA_PASS to IPA_PASS.
* tree-pass.h (pass_ipa_pure_const): Turn into IPA_PASS.
2008-07-15 Kenneth Zadeck <zadeck@naturalbridge.com>
* tree-pass.h (pass_ipa_reference): Make into ipa_opt_pass.
* ipa-reference.c (init_function_info, generate_summary,
propagate): New functions.
(analyze_function): Call init_function_info.
(static_execute): Stripped into generate_summary and propagate.
(pass_ipa_reference): Made into ipa_opt_pass.
2008-08-21 Richard Guenther <rguenther@suse.de> 2008-08-21 Richard Guenther <rguenther@suse.de>
PR tree-optimization/37181 PR tree-optimization/37181
......
gcc/ipa-pure-const.c
...@@ -65,24 +65,70 @@ enum pure_const_state_e ...@@ -65,24 +65,70 @@ enum pure_const_state_e
IPA_NEITHER IPA_NEITHER
}; };
/* Holder inserted into the ipa_dfs_info aux field to hold the /* Holder for the const_state. There is one of these per function
const_state. */ decl. */
struct funct_state_d struct funct_state_d
{ {
/* See above. */
enum pure_const_state_e pure_const_state; enum pure_const_state_e pure_const_state;
/* True if the function could possibly infinite loop. There are a
lot of ways that this could be determined. We are pretty
conservative here. While it is possible to cse pure and const
calls, it is not legal to have dce get rid of the call if there
is a possibility that the call could infinite loop since this is
a behavioral change. */
bool looping; bool looping;
/* If the state of the function was set in the source, then assume
that it was done properly even if the analysis we do would be
more pessimestic. */
bool state_set_in_source; bool state_set_in_source;
}; };
typedef struct funct_state_d * funct_state; typedef struct funct_state_d * funct_state;
/* The storage of the funct_state is abstracted because there is the
possibility that it may be desirable to move this to the cgraph
local info. */
/* Array, indexed by cgraph node uid, of function states. */
static funct_state *funct_state_vec;
/* Init the function state. */
static void
init_state (void)
{
funct_state_vec = XCNEWVEC (funct_state, cgraph_max_uid);
}
/* Init the function state. */
static void
finish_state (void)
{
free (funct_state_vec);
}
/* Return the function state from NODE. */ /* Return the function state from NODE. */
static inline funct_state static inline funct_state
get_function_state (struct cgraph_node *node) get_function_state (struct cgraph_node *node)
{ {
struct ipa_dfs_info * info = (struct ipa_dfs_info *) node->aux; return funct_state_vec[node->uid];
return (funct_state) info->aux; }
/* Set the function state S for NODE. */
static inline void
set_function_state (struct cgraph_node *node, funct_state s)
{
funct_state_vec[node->uid] = s;
} }
/* Check to see if the use (or definition when CHECKING_WRITE is true) /* Check to see if the use (or definition when CHECKING_WRITE is true)
...@@ -527,17 +573,17 @@ scan_function_stmt (gimple_stmt_iterator *gsi_p, ...@@ -527,17 +573,17 @@ scan_function_stmt (gimple_stmt_iterator *gsi_p,
return NULL; return NULL;
} }
/* This is the main routine for finding the reference patterns for /* This is the main routine for finding the reference patterns for
global variables within a function FN. */ global variables within a function FN. */
static void static void
analyze_function (struct cgraph_node *fn) analyze_function (struct cgraph_node *fn)
{ {
funct_state l = XCNEW (struct funct_state_d);
tree decl = fn->decl; tree decl = fn->decl;
struct ipa_dfs_info * w_info = (struct ipa_dfs_info *) fn->aux; funct_state l = XCNEW (struct funct_state_d);
w_info->aux = l; set_function_state (fn, l);
l->pure_const_state = IPA_CONST; l->pure_const_state = IPA_CONST;
l->state_set_in_source = false; l->state_set_in_source = false;
...@@ -632,24 +678,15 @@ end: ...@@ -632,24 +678,15 @@ end:
} }
/* Produce the global information by preforming a transitive closure /* Analyze each function in the cgraph to see if it is locally PURE or
on the local information that was produced by ipa_analyze_function CONST. */
and ipa_analyze_variable. */
static unsigned int static void
static_execute (void) generate_summary (void)
{ {
struct cgraph_node *node; struct cgraph_node *node;
struct cgraph_node *w;
struct cgraph_node **order =
XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
int order_pos = ipa_utils_reduced_inorder (order, true, false);
int i;
struct ipa_dfs_info * w_info;
if (!memory_identifier_string)
memory_identifier_string = build_string(7, "memory");
init_state ();
/* There are some shared nodes, in particular the initializers on /* There are some shared nodes, in particular the initializers on
static declarations. We do not need to scan them more than once static declarations. We do not need to scan them more than once
since all we would be interested in are the addressof since all we would be interested in are the addressof
...@@ -670,6 +707,25 @@ static_execute (void) ...@@ -670,6 +707,25 @@ static_execute (void)
pointer_set_destroy (visited_nodes); pointer_set_destroy (visited_nodes);
visited_nodes = NULL; visited_nodes = NULL;
}
/* Produce the global information by preforming a transitive closure
on the local information that was produced by generate_summary.
Note that there is no function_transform pass since this only
updates the function_decl. */
static unsigned int
propagate (void)
{
struct cgraph_node *node;
struct cgraph_node *w;
struct cgraph_node **order =
XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
int order_pos;
int i;
struct ipa_dfs_info * w_info;
order_pos = ipa_utils_reduced_inorder (order, true, false);
if (dump_file) if (dump_file)
{ {
dump_cgraph (dump_file); dump_cgraph (dump_file);
...@@ -744,6 +800,8 @@ static_execute (void) ...@@ -744,6 +800,8 @@ static_execute (void)
if (!w_l->state_set_in_source) if (!w_l->state_set_in_source)
{ {
w_l->pure_const_state = pure_const_state; w_l->pure_const_state = pure_const_state;
w_l->looping = looping;
switch (pure_const_state) switch (pure_const_state)
{ {
case IPA_CONST: case IPA_CONST:
...@@ -775,17 +833,20 @@ static_execute (void) ...@@ -775,17 +833,20 @@ static_execute (void)
/* Cleanup. */ /* Cleanup. */
for (node = cgraph_nodes; node; node = node->next) for (node = cgraph_nodes; node; node = node->next)
{
/* Get rid of the aux information. */ /* Get rid of the aux information. */
if (node->aux) if (node->aux)
{ {
w_info = (struct ipa_dfs_info *) node->aux; w_info = (struct ipa_dfs_info *) node->aux;
if (w_info->aux)
free (w_info->aux);
free (node->aux); free (node->aux);
node->aux = NULL; node->aux = NULL;
} }
if (node->analyzed && cgraph_is_master_clone (node))
free (get_function_state (node));
}
free (order); free (order);
finish_state ();
return 0; return 0;
} }
...@@ -797,13 +858,13 @@ gate_pure_const (void) ...@@ -797,13 +858,13 @@ gate_pure_const (void)
&& !(errorcount || sorrycount)); && !(errorcount || sorrycount));
} }
struct simple_ipa_opt_pass pass_ipa_pure_const = struct ipa_opt_pass pass_ipa_pure_const =
{ {
{ {
SIMPLE_IPA_PASS, IPA_PASS,
"pure-const", /* name */ "pure-const", /* name */
gate_pure_const, /* gate */ gate_pure_const, /* gate */
static_execute, /* execute */ propagate, /* execute */
NULL, /* sub */ NULL, /* sub */
NULL, /* next */ NULL, /* next */
0, /* static_pass_number */ 0, /* static_pass_number */
...@@ -813,7 +874,12 @@ struct simple_ipa_opt_pass pass_ipa_pure_const = ...@@ -813,7 +874,12 @@ struct simple_ipa_opt_pass pass_ipa_pure_const =
0, /* properties_destroyed */ 0, /* properties_destroyed */
0, /* todo_flags_start */ 0, /* todo_flags_start */
0 /* todo_flags_finish */ 0 /* todo_flags_finish */
} },
generate_summary, /* generate_summary */
NULL, /* write_summary */
NULL, /* read_summary */
NULL, /* function_read_summary */
0, /* TODOs */
NULL, /* function_transform */
NULL /* variable_transform */
}; };
gcc/ipa-reference.c
/* Callgraph based analysis of static variables. /* Callgraph based analysis of static variables.
Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
Contributed by Kenneth Zadeck <zadeck@naturalbridge.com> Contributed by Kenneth Zadeck <zadeck@naturalbridge.com>
This file is part of GCC. This file is part of GCC.
...@@ -642,7 +642,8 @@ propagate_bits (struct cgraph_node *x) ...@@ -642,7 +642,8 @@ propagate_bits (struct cgraph_node *x)
{ {
if (get_reference_vars_info_from_cgraph (y)) if (get_reference_vars_info_from_cgraph (y))
{ {
ipa_reference_vars_info_t y_info = get_reference_vars_info_from_cgraph (y); ipa_reference_vars_info_t y_info
= get_reference_vars_info_from_cgraph (y);
ipa_reference_global_vars_info_t y_global = y_info->global; ipa_reference_global_vars_info_t y_global = y_info->global;
if (x_global->statics_read if (x_global->statics_read
...@@ -798,33 +799,42 @@ analyze_variable (struct varpool_node *vnode) ...@@ -798,33 +799,42 @@ analyze_variable (struct varpool_node *vnode)
&wi, wi.pset); &wi, wi.pset);
} }
/* This is the main routine for finding the reference patterns for /* Set up the persistent info for FN. */
global variables within a function FN. */
static void static ipa_reference_local_vars_info_t
analyze_function (struct cgraph_node *fn) init_function_info (struct cgraph_node *fn)
{ {
ipa_reference_vars_info_t info ipa_reference_vars_info_t info
= XCNEW (struct ipa_reference_vars_info_d); = XCNEW (struct ipa_reference_vars_info_d);
ipa_reference_local_vars_info_t l ipa_reference_local_vars_info_t l
= XCNEW (struct ipa_reference_local_vars_info_d); = XCNEW (struct ipa_reference_local_vars_info_d);
tree decl = fn->decl; tree decl = fn->decl;
struct walk_stmt_info wi;
/* Add the info to the tree's annotation. */ /* Add the info to the tree's annotation. */
get_function_ann (fn->decl)->reference_vars_info = info; get_function_ann (decl)->reference_vars_info = info;
info->local = l; info->local = l;
l->statics_read = BITMAP_ALLOC (&ipa_obstack); l->statics_read = BITMAP_ALLOC (&ipa_obstack);
l->statics_written = BITMAP_ALLOC (&ipa_obstack); l->statics_written = BITMAP_ALLOC (&ipa_obstack);
if (dump_file) return l;
fprintf (dump_file, "\n local analysis of %s\n", cgraph_node_name (fn)); }
{ /* This is the main routine for finding the reference patterns for
global variables within a function FN. */
static void
analyze_function (struct cgraph_node *fn)
{
ipa_reference_local_vars_info_t l = init_function_info (fn);
tree decl = fn->decl;
struct walk_stmt_info wi;
struct function *this_cfun = DECL_STRUCT_FUNCTION (decl); struct function *this_cfun = DECL_STRUCT_FUNCTION (decl);
basic_block this_block; basic_block this_block;
if (dump_file)
fprintf (dump_file, "\n local analysis of %s\n", cgraph_node_name (fn));
FOR_EACH_BB_FN (this_block, this_cfun) FOR_EACH_BB_FN (this_block, this_cfun)
{ {
gimple_stmt_iterator gsi; gimple_stmt_iterator gsi;
...@@ -854,7 +864,6 @@ analyze_function (struct cgraph_node *fn) ...@@ -854,7 +864,6 @@ analyze_function (struct cgraph_node *fn)
walk_gimple_stmt (&gsi, scan_stmt_for_static_refs, walk_gimple_stmt (&gsi, scan_stmt_for_static_refs,
scan_op_for_static_refs, &wi); scan_op_for_static_refs, &wi);
} }
}
/* There may be const decls with interesting right hand sides. */ /* There may be const decls with interesting right hand sides. */
if (DECL_STRUCT_FUNCTION (decl)) if (DECL_STRUCT_FUNCTION (decl))
...@@ -922,28 +931,27 @@ clean_function (struct cgraph_node *fn) ...@@ -922,28 +931,27 @@ clean_function (struct cgraph_node *fn)
free (g); free (g);
} }
free (get_function_ann (fn->decl)->reference_vars_info); free (get_function_ann (fn->decl)->reference_vars_info);
get_function_ann (fn->decl)->reference_vars_info = NULL; get_function_ann (fn->decl)->reference_vars_info = NULL;
} }
/* Produce the global information by preforming a transitive closure /* Analyze each function in the cgraph to see which global or statics
on the local information that was produced by ipa_analyze_function are read or written. */
and ipa_analyze_variable. */
static unsigned int static void
static_execute (void) generate_summary (void)
{ {
struct cgraph_node *node; struct cgraph_node *node;
struct varpool_node *vnode; struct varpool_node *vnode;
struct cgraph_node *w; unsigned int index;
struct cgraph_node **order = bitmap_iterator bi;
XCNEWVEC (struct cgraph_node *, cgraph_n_nodes); bitmap module_statics_readonly;
int order_pos = ipa_utils_reduced_inorder (order, false, true); bitmap bm_temp;
int i;
ipa_init (); ipa_init ();
module_statics_readonly = BITMAP_ALLOC (&ipa_obstack);
bm_temp = BITMAP_ALLOC (&ipa_obstack);
/* Process all of the variables first. */ /* Process all of the variables first. */
FOR_EACH_STATIC_INITIALIZER (vnode) FOR_EACH_STATIC_INITIALIZER (vnode)
...@@ -969,17 +977,9 @@ static_execute (void) ...@@ -969,17 +977,9 @@ static_execute (void)
pointer_set_destroy (visited_nodes); pointer_set_destroy (visited_nodes);
visited_nodes = NULL; visited_nodes = NULL;
if (dump_file)
dump_cgraph (dump_file);
/* Prune out the variables that were found to behave badly /* Prune out the variables that were found to behave badly
(i.e. have their address taken). */ (i.e. have their address taken). */
{
unsigned int index;
bitmap_iterator bi;
bitmap module_statics_readonly = BITMAP_ALLOC (&ipa_obstack);
bitmap bm_temp = BITMAP_ALLOC (&ipa_obstack);
EXECUTE_IF_SET_IN_BITMAP (module_statics_escape, 0, index, bi) EXECUTE_IF_SET_IN_BITMAP (module_statics_escape, 0, index, bi)
{ {
splay_tree_remove (reference_vars_to_consider, index); splay_tree_remove (reference_vars_to_consider, index);
...@@ -1039,10 +1039,13 @@ static_execute (void) ...@@ -1039,10 +1039,13 @@ static_execute (void)
get_static_name (index)); get_static_name (index));
} }
for (i = 0; i < order_pos; i++ ) for (node = cgraph_nodes; node; node = node->next)
if (node->analyzed
&& (cgraph_is_master_clone (node)
|| (cgraph_function_body_availability (node)
== AVAIL_OVERWRITABLE)))
{ {
ipa_reference_local_vars_info_t l; ipa_reference_local_vars_info_t l;
node = order[i];
l = get_reference_vars_info_from_cgraph (node)->local; l = get_reference_vars_info_from_cgraph (node)->local;
/* Any variables that are not in all_module_statics are /* Any variables that are not in all_module_statics are
...@@ -1057,17 +1060,18 @@ static_execute (void) ...@@ -1057,17 +1060,18 @@ static_execute (void)
BITMAP_FREE(module_statics_readonly); BITMAP_FREE(module_statics_readonly);
BITMAP_FREE(bm_temp); BITMAP_FREE(bm_temp);
}
if (dump_file) if (dump_file)
for (node = cgraph_nodes; node; node = node->next)
if (node->analyzed
&& (cgraph_is_master_clone (node)
|| (cgraph_function_body_availability (node)
== AVAIL_OVERWRITABLE)))
{ {
for (i = 0; i < order_pos; i++ )
{
unsigned int index;
ipa_reference_local_vars_info_t l; ipa_reference_local_vars_info_t l;
unsigned int index;
bitmap_iterator bi; bitmap_iterator bi;
node = order[i];
l = get_reference_vars_info_from_cgraph (node)->local; l = get_reference_vars_info_from_cgraph (node)->local;
fprintf (dump_file, fprintf (dump_file,
"\nFunction name:%s/%i:", "\nFunction name:%s/%i:",
...@@ -1087,7 +1091,24 @@ static_execute (void) ...@@ -1087,7 +1091,24 @@ static_execute (void)
get_static_name (index)); get_static_name (index));
} }
} }
} }
/* Produce the global information by preforming a transitive closure
on the local information that was produced by ipa_analyze_function
and ipa_analyze_variable. */
static unsigned int
propagate (void)
{
struct cgraph_node *node;
struct cgraph_node *w;
struct cgraph_node **order =
XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
int order_pos = ipa_utils_reduced_inorder (order, false, true);
int i;
if (dump_file)
dump_cgraph (dump_file);
/* Propagate the local information thru the call graph to produce /* Propagate the local information thru the call graph to produce
the global information. All the nodes within a cycle will have the global information. All the nodes within a cycle will have
...@@ -1348,13 +1369,13 @@ gate_reference (void) ...@@ -1348,13 +1369,13 @@ gate_reference (void)
&& !(errorcount || sorrycount)); && !(errorcount || sorrycount));
} }
struct simple_ipa_opt_pass pass_ipa_reference = struct ipa_opt_pass pass_ipa_reference =
{ {
{ {
SIMPLE_IPA_PASS, IPA_PASS,
"static-var", /* name */ "static-var", /* name */
gate_reference, /* gate */ gate_reference, /* gate */
static_execute, /* execute */ propagate, /* execute */
NULL, /* sub */ NULL, /* sub */
NULL, /* next */ NULL, /* next */
0, /* static_pass_number */ 0, /* static_pass_number */
...@@ -1364,7 +1385,14 @@ struct simple_ipa_opt_pass pass_ipa_reference = ...@@ -1364,7 +1385,14 @@ struct simple_ipa_opt_pass pass_ipa_reference =
0, /* properties_destroyed */ 0, /* properties_destroyed */
0, /* todo_flags_start */ 0, /* todo_flags_start */
0 /* todo_flags_finish */ 0 /* todo_flags_finish */
} },
generate_summary, /* generate_summary */
NULL, /* write_summary */
NULL, /* read_summary */
NULL, /* function_read_summary */
0, /* TODOs */
NULL, /* function_transform */
NULL /* variable_transform */
}; };
#include "gt-ipa-reference.h" #include "gt-ipa-reference.h"
gcc/tree-pass.h
...@@ -390,12 +390,12 @@ extern struct gimple_opt_pass pass_reset_cc_flags; ...@@ -390,12 +390,12 @@ extern struct gimple_opt_pass pass_reset_cc_flags;
/* IPA Passes */ /* IPA Passes */
extern struct ipa_opt_pass pass_ipa_inline; extern struct ipa_opt_pass pass_ipa_inline;
extern struct simple_ipa_opt_pass pass_ipa_reference; extern struct ipa_opt_pass pass_ipa_reference;
extern struct ipa_opt_pass pass_ipa_pure_const;
extern struct simple_ipa_opt_pass pass_ipa_matrix_reorg; extern struct simple_ipa_opt_pass pass_ipa_matrix_reorg;
extern struct simple_ipa_opt_pass pass_ipa_cp; extern struct simple_ipa_opt_pass pass_ipa_cp;
extern struct simple_ipa_opt_pass pass_ipa_early_inline; extern struct simple_ipa_opt_pass pass_ipa_early_inline;
extern struct simple_ipa_opt_pass pass_ipa_pure_const;
extern struct simple_ipa_opt_pass pass_ipa_type_escape; extern struct simple_ipa_opt_pass pass_ipa_type_escape;
extern struct simple_ipa_opt_pass pass_ipa_pta; extern struct simple_ipa_opt_pass pass_ipa_pta;
extern struct simple_ipa_opt_pass pass_ipa_struct_reorg; extern struct simple_ipa_opt_pass pass_ipa_struct_reorg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment