* removal of static vars analysis code from mainline.
@ 2004-10-25 18:58 Kenneth Zadeck
2004-10-25 21:30 ` Mark Mitchell
0 siblings, 1 reply; 7+ messages in thread
From: Kenneth Zadeck @ 2004-10-25 18:58 UTC (permalink / raw)
To: gcc-patches, Mark Mitchell, Novillo, Diego, Berlin, Daniel, Jan Hubicka
[-- Attachment #1: Type: text/plain, Size: 1963 bytes --]
Mark,
Jan has explained to me that it appears to be impossible for me find all
of the variables in the mainline branch. It appears that at the time
cgraph is run, some of the variables have disappeared from the trees and
are only in the asm file and that the front ends are still keeping some
of the variables a secret.
He claims to have fixed these problems (or at least all the ones he has
found) on the tree profiling branch but believes that is not worthwhile
to port onto the mainline so the correct solution appears to be remove
my code from the mainline and work on the tree profiling branch until
things open back up on the mainline.
Enclosed is a patch to remove my code.
Kenny
=======================
2004-10-24 Kenneth Zadeck <zadeck@naturalbridge.com>
* gcc/Makefile.in: removed ggc for cgraphunit.
* gcc/cgraph.c.dump_cgraph_node: removed static var analysis.
* gcc/cgraph.h: removed static var analysis data structures and calls.
* gcc/cgraphunit.c:
cgraph_mark_local_and_external_functions:changed name to
cgraph_mark_local_functions
(print_order,convert_UIDs_in_bitmap,new_static_vars_info,
cgraph_reset_static_var_maps,get_global_static_vars_info,
get_global_statics_not_read,get_global_statics_not_written,searchc,
cgraph_reduced_inorder,has_proper_scope_for_analysis,check_rhs_var,
check_lhs_var,get_asm_expr_operands,process_call_for_static_vars,
scan_for_static_refs,cgraph_characterize_statics_local,
clear_static_vars_maps,cgraph_propagate_bits,cgraph_characterize_statics):
removed.
(cgraph_optimize,init_cgraph): removed calls to static vars analysis
* gcc/tree-dfa.c find_referenced_vars: removed call to static vars
analysis
* gcc/tree-flow.h static_vars_info: removed
* gcc/tree-ssa-operands.c (add_call_clobber_ops,add_call_read_ops):
removed calls to static vars analysis.
get_call_expr_operands: removed callee variable.
[-- Attachment #2: backout.patch --]
[-- Type: text/x-patch, Size: 55147 bytes --]
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1413
diff -c -3 -p -r1.1413 Makefile.in
*** Makefile.in 18 Oct 2004 15:52:37 -0000 1.1413
--- Makefile.in 24 Oct 2004 13:22:24 -0000
*************** SCHED_INT_H = sched-int.h $(INSN_ATTR_H)
*** 703,709 ****
INTEGRATE_H = integrate.h varray.h
CFGLAYOUT_H = cfglayout.h $(BASIC_BLOCK_H)
CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H)
! CGRAPH_H = cgraph.h bitmap.h tree.h $(HASHTAB_H)
DF_H = df.h bitmap.h sbitmap.h $(BASIC_BLOCK_H)
DDG_H = ddg.h sbitmap.h $(DF_H)
GCC_H = gcc.h version.h
--- 703,709 ----
INTEGRATE_H = integrate.h varray.h
CFGLAYOUT_H = cfglayout.h $(BASIC_BLOCK_H)
CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H)
! CGRAPH_H = cgraph.h tree.h
DF_H = df.h bitmap.h sbitmap.h $(BASIC_BLOCK_H)
DDG_H = ddg.h sbitmap.h $(DF_H)
GCC_H = gcc.h version.h
*************** GTFILES = $(srcdir)/input.h $(srcdir)/co
*** 2406,2412 ****
$(srcdir)/cselib.h $(srcdir)/basic-block.h $(srcdir)/cgraph.h \
$(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
$(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
- $(srcdir)/cgraphunit.c \
$(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
$(srcdir)/dojump.c \
$(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
--- 2406,2411 ----
Index: cgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.c,v
retrieving revision 1.58
diff -c -3 -p -r1.58 cgraph.c
*** cgraph.c 20 Sep 2004 20:38:16 -0000 1.58
--- cgraph.c 24 Oct 2004 13:22:24 -0000
*************** dump_cgraph_node (FILE *f, struct cgraph
*** 471,485 ****
fprintf (f, " tree");
if (node->output)
fprintf (f, " output");
-
if (node->local.local)
fprintf (f, " local");
- if (node->local.external)
- fprintf (f, " external");
- if (node->local.calls_read_all)
- fprintf (f, " calls_read_all");
- if (node->local.calls_write_all)
- fprintf (f, " calls_write_all");
if (node->local.disregard_inline_limits)
fprintf (f, " always_inline");
else if (node->local.inlinable)
--- 471,478 ----
Index: cgraph.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.h,v
retrieving revision 1.38
diff -c -3 -p -r1.38 cgraph.h
*** cgraph.h 20 Sep 2004 20:38:16 -0000 1.38
--- cgraph.h 24 Oct 2004 13:22:24 -0000
*************** Software Foundation, 59 Temple Place - S
*** 21,28 ****
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
- #include "hashtab.h"
- #include "bitmap.h"
#include "tree.h"
/* Information about the function collected locally.
--- 21,26 ----
*************** struct cgraph_local_info GTY(())
*** 37,52 ****
and it's address is never taken. */
bool local;
- /* Set when function is defined in another compilation unit. */
- bool external;
-
- /* Set when this function calls a function external of the
- compilation unit. In general, such calls are modeled as reading
- and writing all variables (both bits on) but sometime there are
- attributes on the called function so we can do better. */
- bool calls_read_all;
- bool calls_write_all;
-
/* Set once it has been finalized so we consider it to be output. */
bool finalized;
--- 35,40 ----
*************** struct cgraph_rtl_info GTY(())
*** 90,159 ****
bool pure_function;
};
- /* FIXME -- PROFILE-RESTRUCTURE: When the next round of the profiling
- code gets merged in, it will contain a restructing where ssa form
- is built for every function within the compilation unit before the
- rest of the compilation continues. When this reorgination is done,
- it will no longer be necessary to have the _decl_uid versions of
- local_static_vars_info and global_static_vars_info structures.
- Having both structures is now required because the _ann_uid values
- for static variables are reset as each function is compiled.
- Currently, the analysis is done using the _decl_uid versions and
- converted to the _var_ann versions on demand.
-
- Also, the var_anns_valid fields within these structures can also go
- away.
- */
-
- /* The static variables defined within the compilation unit that are
- loaded or stored directly by function that owns this structure. */
-
- struct local_static_vars_info_d GTY(())
- {
- bitmap statics_read_by_decl_uid;
- bitmap statics_written_by_decl_uid;
- };
-
- struct global_static_vars_info_d GTY(())
- {
- bitmap statics_read_by_decl_uid;
- bitmap statics_written_by_decl_uid;
- bitmap statics_read_by_ann_uid;
- bitmap statics_written_by_ann_uid;
- bitmap statics_not_read_by_decl_uid;
- bitmap statics_not_written_by_decl_uid;
- bitmap statics_not_read_by_ann_uid;
- bitmap statics_not_written_by_ann_uid;
-
- /* var_anns_valid is reset at the start of compilation for each
- function because the indexing that the "_var_anns" is based
- on is invalidated between function compilations. This allows for
- lazy creation of the "_var_ann" variables. */
- bool var_anns_valid;
- };
-
- /* Statics that are read and written by some set of functions. The
- local ones are based on the loads and stores local to the function.
- The global ones are based on the local info as well as the
- transitive closure of the functions that are called. The
- structures are separated to allow the global structures to be
- shared between several functions since every function within a
- strongly connected component will have the same information. This
- sharing saves both time and space in the computation of the vectors
- as well as their translation from decl_uid form to ann_uid
- form. */
-
- typedef struct local_static_vars_info_d *local_static_vars_info_t;
- typedef struct global_static_vars_info_d *global_static_vars_info_t;
-
- struct static_vars_info_d GTY(())
- {
- local_static_vars_info_t local;
- global_static_vars_info_t global;
- };
-
- typedef struct static_vars_info_d *static_vars_info_t;
-
/* The cgraph data structure.
Each function decl has assigned cgraph_node listing callees and callers. */
--- 78,83 ----
*************** struct cgraph_node GTY((chain_next ("%h.
*** 174,191 ****
struct cgraph_node *next_needed;
/* Pointer to the next clone. */
struct cgraph_node *next_clone;
- /* Pointer to next node in a recursive call graph cycle; */
- struct cgraph_node *next_cycle;
PTR GTY ((skip)) aux;
struct cgraph_local_info local;
struct cgraph_global_info global;
struct cgraph_rtl_info rtl;
- /* Pointer to the structure that contains the sets of global
- variables modified by function calls. */
- static_vars_info_t static_vars_info;
-
/* Unique id of the node. */
int uid;
/* Set when function must be output - it is externally visible
--- 98,109 ----
*************** void cgraph_mark_inline_edge (struct cgr
*** 284,291 ****
void cgraph_clone_inlined_nodes (struct cgraph_edge *e, bool duplicate);
void cgraph_build_static_cdtor (char which, tree body, int priority);
void cgraph_reset_static_var_maps (void);
- bitmap get_global_statics_not_read (tree fn);
- bitmap get_global_statics_not_written(tree fn);
void init_cgraph (void);
#endif /* GCC_CGRAPH_H */
--- 202,207 ----
Index: cgraphunit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraphunit.c,v
retrieving revision 1.88
diff -c -3 -p -r1.88 cgraphunit.c
*** cgraphunit.c 22 Oct 2004 17:05:02 -0000 1.88
--- cgraphunit.c 24 Oct 2004 13:22:25 -0000
*************** Software Foundation, 59 Temple Place - S
*** 165,182 ****
only one function at a time and is used in non-unit-at-a-time mode. */
- /* Additionally this file gathers information about how local statics
- are used. This is done in cgraph_characterize_statics. After the
- call graph has been built, each function is analyzed to determine
- which local static variables are either read or written or have
- their address taken. Any local static that has its address taken
- is removed from consideration. Once the local read and writes
- are determined, a transitive closure of this information is
- performed over the call graph to determine the worst case set of
- side effects of each call. In a later part of the compiler, these
- local and global sets are examined to make the call clobbering less
- traumatic both with respect to aliasing and to code generation. */
-
#include "config.h"
#include "system.h"
#include "coretypes.h"
--- 165,170 ----
*************** static void cgraph_expand_all_functions
*** 208,214 ****
static void cgraph_mark_functions_to_output (void);
static void cgraph_expand_function (struct cgraph_node *);
static tree record_call_1 (tree *, int *, void *);
! static void cgraph_mark_local_and_external_functions (void);
static bool cgraph_default_inline_p (struct cgraph_node *n);
static void cgraph_analyze_function (struct cgraph_node *node);
static void cgraph_decide_inlining_incrementally (struct cgraph_node *);
--- 196,202 ----
static void cgraph_mark_functions_to_output (void);
static void cgraph_expand_function (struct cgraph_node *);
static tree record_call_1 (tree *, int *, void *);
! static void cgraph_mark_local_functions (void);
static bool cgraph_default_inline_p (struct cgraph_node *n);
static void cgraph_analyze_function (struct cgraph_node *node);
static void cgraph_decide_inlining_incrementally (struct cgraph_node *);
*************** static struct pointer_set_t *visited_nod
*** 227,260 ****
static FILE *cgraph_dump_file;
- /* These splay trees contain all of the static variables that are
- being considered by the compilation level alias analysis. For
- module_at_a_time compilation, this is the set of static but not
- public variables. Any variables that either have their address
- taken or participate in otherwise unsavory operations are deleted
- from this list. */
- static GTY((param1_is(tree), param2_is(tree)))
- splay_tree static_vars_to_consider_by_tree;
-
- /* FIXME -- PROFILE-RESTRUCTURE: change comment from DECL_UID to var-ann. */
- /* Same as above but indexed by DECL_UID. */
- static GTY((param1_is(int), param2_is(tree)))
- splay_tree static_vars_to_consider_by_uid;
-
- /* This bitmap is used to knock out the module static variables whose
- addresses have been taken and passed around. This is indexed by
- uid. */
- static bitmap module_statics_escape;
-
- /* FIXME -- PROFILE-RESTRUCTURE: change comment from DECL_UID to var-ann. */
- /* A bit is set for every module static we are considering and is
- indexed by DECL_UID. This is ored into the local info when asm
- code is found that clobbers all memory. */
- static GTY(()) bitmap all_module_statics;
-
- /* Holds the value of "memory". */
- static tree memory_identifier;
-
/* Determine if function DECL is needed. That is, visible to something
either outside this translation unit, something magic in the system
configury, or (if not doing unit-at-a-time) to something we havn't
--- 215,220 ----
*************** decide_is_function_needed (struct cgraph
*** 321,510 ****
return false;
}
- /* Debugging function for postorder and inorder code. NOTE is a string
- that is printed before the nodes are printed. ORDER is an array of
- cgraph_nodes that has COUNT useful nodes in it. */
-
- static void
- print_order (const char * note, struct cgraph_node** order, int count)
- {
- int i;
- fprintf (cgraph_dump_file, "\n\n ordered call graph: %s\n", note);
-
- for (i = count - 1; i >= 0; i--)
- {
- struct cgraph_edge *edge;
-
- fprintf (cgraph_dump_file, "\n %s<-(", cgraph_node_name (order[i]));
-
- for (edge = order[i]->callers; edge; edge = edge->next_caller)
- fprintf (cgraph_dump_file, " %s", cgraph_node_name (edge->caller));
- fprintf (cgraph_dump_file, ")");
- }
- fprintf (cgraph_dump_file, "\n");
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove this function, it becomes a nop. */
- /* Convert IN_DECL bitmap which is indexed by DECL_UID to IN_ANN, a
- bitmap indexed by var_ann (VAR_DECL)->uid. */
-
- static void
- convert_UIDs_in_bitmap (bitmap in_ann, bitmap in_decl)
- {
- int index;
- bitmap_iterator bi;
-
- EXECUTE_IF_SET_IN_BITMAP(in_decl, 0, index, bi)
- {
- splay_tree_node n =
- splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (n != NULL)
- {
- tree t = (tree)n->value;
- var_ann_t va = var_ann (t);
- if (va)
- bitmap_set_bit(in_ann, va->uid);
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Delete all stmts initing *_decl_uid
- variables. Add code to create a var_ann for tree node within the
- cgraph_node and have it point to the newly created
- static_vars_info. */
- /* Create a new static_vars_info structure and place it into
- cgraph_node, NODE. INIT_GLOBAL causes the global part of the
- structure to be initialized. */
- static static_vars_info_t
- new_static_vars_info(struct cgraph_node* node,
- bool init_global)
- {
- static_vars_info_t info = ggc_calloc (1, sizeof (struct static_vars_info_d));
- local_static_vars_info_t l
- = ggc_calloc (1, sizeof (struct local_static_vars_info_d));
-
- /* Add the info to the tree's annotation. */
- var_ann_t var_ann = get_var_ann(node->decl);
- node->static_vars_info = info;
- var_ann->static_vars_info = info;
-
- info->local = l;
- l->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- l->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- if (init_global)
- {
- global_static_vars_info_t g
- = ggc_calloc (1, sizeof (struct global_static_vars_info_d));
- info->global = g;
- g->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- }
- return info;
- }
-
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove this function, it becomes a
- nop. */
- /* The bitmaps used to represent the static global variables are
- indexed by DECL_UID however, this is not used inside of functions
- to index the ssa variables. The denser var_ann (VAR_DECL)->uid is
- used there. This function is called from
- tree_dfa:find_referenced_vars after the denser representation is
- built. This function invalidates any cached indexes. */
-
- void
- cgraph_reset_static_var_maps (void)
- {
- struct cgraph_node *node;
-
- for (node = cgraph_nodes; node; node = node->next)
- {
- static_vars_info_t info = node->static_vars_info;
- if (info)
- {
- global_static_vars_info_t g = info->global;
- if (g->var_anns_valid)
- {
- bitmap_clear (g->statics_read_by_ann_uid);
- bitmap_clear (g->statics_written_by_ann_uid);
- bitmap_clear (g->statics_not_read_by_ann_uid);
- bitmap_clear (g->statics_not_written_by_ann_uid);
- g->var_anns_valid = false;
- }
- }
- else
- /* Handle the case where a cgraph node has been inserted
- after the analysis. We know nothing. */
- new_static_vars_info(node, true);
- }
- }
-
- /* Get the global static_vars_info structure for the function FN and
- make sure the ann_uid's bitmaps are properly converted. */
-
- static global_static_vars_info_t
- get_global_static_vars_info (tree fn)
- {
- global_static_vars_info_t g;
- /* Was not compiled -O2 or higher. */
- static_vars_info_t info = get_var_ann(fn)->static_vars_info;
- if (!info)
- return NULL;
-
- g = info->global;
- if (!g->var_anns_valid)
- {
- convert_UIDs_in_bitmap (g->statics_read_by_ann_uid,
- g->statics_read_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_written_by_ann_uid,
- g->statics_written_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_not_read_by_ann_uid,
- g->statics_not_read_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_not_written_by_ann_uid,
- g->statics_not_written_by_decl_uid);
- g->var_anns_valid = true;
- }
- return g;
- }
-
- /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
- variables that are not read during the execution of the function
- FN. Returns NULL if no data is available, such as it was not
- compiled with -O2 or higher. */
-
- bitmap
- get_global_statics_not_read (tree fn)
- {
- global_static_vars_info_t g = get_global_static_vars_info (fn);
- if (g)
- return g->statics_not_read_by_ann_uid;
- else
- return NULL;
- }
-
- /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
- variables that are not written during the execution of the function
- FN. Note that variables written may or may not be read during the
- function call. Returns NULL if no data is available, such as it
- was not compiled with -O2 or higher. */
-
- bitmap
- get_global_statics_not_written (tree fn)
- {
- global_static_vars_info_t g = get_global_static_vars_info (fn);
- if (g)
- return g->statics_not_written_by_ann_uid;
- else
- return NULL;
- }
/* When not doing unit-at-a-time, output all functions enqueued.
Return true when such a functions were found. */
--- 281,287 ----
*************** cgraph_postorder (struct cgraph_node **o
*** 1123,1271 ****
return order_pos;
}
- struct searchc_env {
- struct cgraph_node **stack;
- int stack_size;
- struct cgraph_node **result;
- int order_pos;
- splay_tree nodes_marked_new;
- bool reduce;
- int count;
- };
-
- struct dfs_info {
- int dfn_number;
- int low_link;
- bool new;
- bool on_stack;
- };
-
- /* This is an implementation of Tarjan's strongly connected region
- finder as reprinted in Aho Hopcraft and Ullman's The Design and
- Analysis of Computer Programs (1975) pages 192-193. This version
- has been customized for cgraph_nodes. The env parameter is because
- it is recursive and there are no nested functions here. This
- function should only be called from itself or
- cgraph_reduced_inorder. ENV is a stack env and would be
- unnecessary if C had nested functions. V is the node to start
- searching from. */
-
- static void
- searchc (struct searchc_env* env, struct cgraph_node *v)
- {
- struct cgraph_edge *edge;
- struct dfs_info *v_info = v->aux;
-
- /* mark node as old */
- v_info->new = false;
- splay_tree_remove (env->nodes_marked_new, v->uid);
-
- v_info->dfn_number = env->count;
- v_info->low_link = env->count;
- env->count++;
- env->stack[(env->stack_size)++] = v;
- v_info->on_stack = true;
-
- for (edge = v->callers; edge; edge = edge->next_caller)
- {
- struct dfs_info * w_info;
- struct cgraph_node *w = edge->caller;
- /* skip the nodes that we are supposed to ignore */
- if (w->aux)
- {
- w_info = w->aux;
- if (w_info->new)
- {
- searchc (env, w);
- v_info->low_link =
- (v_info->low_link < w_info->low_link) ?
- v_info->low_link : w_info->low_link;
- }
- else
- if ((w_info->dfn_number < v_info->dfn_number)
- && (w_info->on_stack))
- v_info->low_link =
- (w_info->dfn_number < v_info->low_link) ?
- w_info->dfn_number : v_info->low_link;
- }
- }
-
-
- if (v_info->low_link == v_info->dfn_number)
- {
- struct cgraph_node *last = NULL;
- struct cgraph_node *x;
- struct dfs_info *x_info;
- do {
- x = env->stack[--(env->stack_size)];
- x_info = x->aux;
- x_info->on_stack = false;
-
- if (env->reduce)
- {
- x->next_cycle = last;
- last = x;
- }
- else
- env->result[env->order_pos++] = x;
- }
- while (v != x);
- if (env->reduce)
- env->result[env->order_pos++] = v;
- }
- }
-
- /* Topsort the call graph by caller relation. Put the result in ORDER.
-
- The REDUCE flag is true if you want the cycles reduced to single
- nodes. Only consider nodes that have the output bit set. */
-
- static int
- cgraph_reduced_inorder (struct cgraph_node **order, bool reduce)
- {
- struct cgraph_node *node;
- struct searchc_env env;
- splay_tree_node result;
- env.stack = xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- env.stack_size = 0;
- env.result = order;
- env.order_pos = 0;
- env.nodes_marked_new = splay_tree_new (splay_tree_compare_ints, 0, 0);
- env.count = 1;
- env.reduce = reduce;
-
- for (node = cgraph_nodes; node; node = node->next)
- if (node->output)
- {
- struct dfs_info *info = xcalloc (1, sizeof (struct dfs_info));
- info->new = true;
- info->on_stack = false;
- node->aux = info;
- node->next_cycle = NULL;
-
- splay_tree_insert (env.nodes_marked_new,
- node->uid, (splay_tree_value)node);
- }
- else
- node->aux = NULL;
- result = splay_tree_min (env.nodes_marked_new);
- while (result)
- {
- node = (struct cgraph_node *)result->value;
- searchc (&env, node);
- result = splay_tree_min (env.nodes_marked_new);
- }
- splay_tree_delete (env.nodes_marked_new);
- free (env.stack);
-
- for (node = cgraph_nodes; node; node = node->next)
- if (node->aux)
- {
- free (node->aux);
- node->aux = NULL;
- }
- return env.order_pos;
- }
/* Perform reachability analysis and reclaim all unreachable nodes.
This function also remove unneeded bodies of extern inline functions
--- 900,905 ----
*************** cgraph_inline_p (struct cgraph_edge *e,
*** 2015,2692 ****
return !e->inline_failed;
}
- /* FIXME this needs to be enhanced. If we are compiling a single
- module this returns true if the variable is a module level static,
- but if we are doing whole program compilation, this could return
- true if TREE_PUBLIC is true. */
- /* Return true if the variable T is the right kind of static variable to
- perform compilation unit scope escape analysis. */
-
- static inline
- bool has_proper_scope_for_analysis (tree t)
- {
- return (TREE_STATIC(t)) && !(TREE_PUBLIC(t)) && !(TREE_THIS_VOLATILE(t));
- }
-
- /* Check to see if T is a read or address of operation on a static var
- we are interested in analyzing. FN is passed in to get access to
- its bit vectors. */
-
- static void
- check_rhs_var (struct cgraph_node *fn, tree t)
- {
- if (TREE_CODE (t) == ADDR_EXPR)
- {
- tree x = TREE_OPERAND (t, 0);
- if ((TREE_CODE (x) == VAR_DECL) && has_proper_scope_for_analysis (x))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding address:%s",
- lang_hooks.decl_printable_name (x, 2));
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (module_statics_escape, DECL_UID (x));
- }
- }
- t = get_base_address (t);
- if (!t) return;
- if ((TREE_CODE (t) == VAR_DECL) && has_proper_scope_for_analysis (t))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding rhs:%s",
- lang_hooks.decl_printable_name (t, 2));
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (fn->static_vars_info->local->statics_read_by_decl_uid,
- DECL_UID (t));
- }
- }
-
- /* Check to see if T is an assignment to a static var we are
- interrested in analyzing. FN is passed in to get access to its bit
- vectors.
- */
-
- static void
- check_lhs_var (struct cgraph_node *fn, tree t)
- {
- t = get_base_address (t);
- if (!t) return;
- if ((TREE_CODE (t) == VAR_DECL) && has_proper_scope_for_analysis (t))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding lhs:%s",
- lang_hooks.decl_printable_name (t, 2));
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (fn->static_vars_info->local->statics_written_by_decl_uid,
- DECL_UID (t));
- }
- }
-
- /* This is a scaled down version of get_asm_expr_operands from
- tree_ssa_operands.c. The version there runs much later and assumes
- that aliasing information is already available. Here we are just
- trying to find if the set of inputs and outputs contain references
- or address of operations to local static variables. FN is the
- function being analyzed and STMT is the actual asm statement. */
-
- static void
- get_asm_expr_operands (struct cgraph_node * fn, tree stmt)
- {
- int noutputs = list_length (ASM_OUTPUTS (stmt));
- const char **oconstraints
- = (const char **) alloca ((noutputs) * sizeof (const char *));
- int i;
- tree link;
- const char *constraint;
- bool allows_mem, allows_reg, is_inout;
-
- for (i=0, link = ASM_OUTPUTS (stmt); link; ++i, link = TREE_CHAIN (link))
- {
- oconstraints[i] = constraint
- = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
- parse_output_constraint (&constraint, i, 0, 0,
- &allows_mem, &allows_reg, &is_inout);
-
- /* Memory operands are addressable. Note that STMT needs the
- address of this operand. */
- if (!allows_reg && allows_mem)
- {
- check_lhs_var (fn, TREE_VALUE (link));
- }
- }
-
- for (link = ASM_INPUTS (stmt); link; link = TREE_CHAIN (link))
- {
- constraint
- = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
- parse_input_constraint (&constraint, 0, 0, noutputs, 0,
- oconstraints, &allows_mem, &allows_reg);
-
- /* Memory operands are addressable. Note that STMT needs the
- address of this operand. */
- if (!allows_reg && allows_mem)
- {
- check_rhs_var (fn, TREE_VALUE (link));
- }
- }
-
- for (link = ASM_CLOBBERS (stmt); link; link = TREE_CHAIN (link))
- if (TREE_VALUE (link) == memory_identifier)
- {
- /* Abandon all hope, ye who enter here. */
- local_static_vars_info_t l = fn->static_vars_info->local;
- bitmap_a_or_b (l->statics_read_by_decl_uid,
- l->statics_read_by_decl_uid,
- all_module_statics);
- bitmap_a_or_b (l->statics_written_by_decl_uid,
- l->statics_written_by_decl_uid,
- all_module_statics);
-
- }
- }
-
- /* Check the parameters of a function call from CALLER to CALL_EXPR to
- see if any of them are static vars. Also check to see if this is
- either an indirect call, a call outside the compilation unit, or
- has special attributes that effect the clobbers. The caller
- parameter is the tree node for the caller and the second operand is
- the tree node for the entire call expression. */
- static void
- process_call_for_static_vars(struct cgraph_node * caller, tree call_expr)
- {
- int flags = call_expr_flags(call_expr);
- tree operandList = TREE_OPERAND (call_expr, 1);
- tree operand;
-
- for (operand = operandList;
- operand != NULL_TREE;
- operand = TREE_CHAIN (operand))
- {
- tree argument = TREE_VALUE (operand);
- check_rhs_var (caller, argument);
- }
-
- /* Const and pure functions have less clobber effects than other
- functions so we process these first. Otherwise if it is a call
- outside the compilation unit or an indirect call we punt. This
- leaves local calls which will be processed by following the call
- graph. */
- if (flags & ECF_CONST)
- return;
- else if (flags & ECF_PURE)
- caller->local.calls_write_all = true;
- else
- {
- tree callee_t = get_callee_fndecl (call_expr);
- if (callee_t == NULL)
- {
- /* Indirect call. */
- caller->local.calls_read_all = true;
- caller->local.calls_write_all = true;
- }
- else
- {
- struct cgraph_node* callee = cgraph_node(callee_t);
-
- if (callee->local.external)
- {
- caller->local.calls_read_all = true;
- caller->local.calls_write_all = true;
- }
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change to walk by explicitly walking
- the basic blocks rather than calling walktree. */
- /* Walk tree and record all calls. Called via walk_tree. FIXME When
- this is moved into the tree-profiling-branch, and is dealing with
- low GIMPLE, this routine should be changed to use tree iterators
- rather than being a walk_tree callback. The data is the function
- that is being scanned. */
- /* TP is the part of the tree currently under the
- microscope. WALK_SUBTREES is part of the walk_tree api but is
- unused here. DATA is cgraph_node of the function being walked. */
-
- static tree
- scan_for_static_refs (tree *tp,
- int *walk_subtrees ATTRIBUTE_UNUSED,
- void *data)
- {
- struct cgraph_node *fn = data;
- tree t = *tp;
-
- switch (TREE_CODE (t))
- {
- case MODIFY_EXPR:
- {
- /* First look on the lhs and see what variable is stored to. */
- tree rhs = TREE_OPERAND (t, 1);
- check_lhs_var (fn, TREE_OPERAND (t, 0));
- /* Next check the operands on the rhs to see if they are ok. */
- switch (TREE_CODE_CLASS (TREE_CODE (rhs))) {
- case tcc_binary:
- check_rhs_var (fn, TREE_OPERAND (rhs, 0));
- check_rhs_var (fn, TREE_OPERAND (rhs, 1));
- break;
- case tcc_unary:
- case tcc_reference:
- check_rhs_var (fn, TREE_OPERAND (rhs, 0));
- break;
- case tcc_declaration:
- check_rhs_var (fn, rhs);
- break;
- case tcc_expression:
- switch (TREE_CODE (rhs)) {
- case ADDR_EXPR:
- check_rhs_var (fn, rhs);
- break;
- case CALL_EXPR:
- process_call_for_static_vars (fn, rhs);
- break;
- default:
- break;
- }
- break;
- default:
- break;
- }
- }
- break;
-
-
- case CALL_EXPR:
- process_call_for_static_vars (fn, t);
- break;
-
- case ASM_EXPR:
- get_asm_expr_operands (fn, t);
- break;
-
- default:
- break;
- }
- return NULL;
- }
-
-
- /* This is the main routine for finding the reference patterns for
- global variables within a function FN */
- static void
- cgraph_characterize_statics_local (struct cgraph_node *fn)
- {
- tree decl = fn->decl;
- static_vars_info_t info = new_static_vars_info(fn, false);
- local_static_vars_info_t l = info->local;
-
-
- /* The nodes we're interested in are never shared, so walk
- the tree ignoring duplicates. */
- visited_nodes = pointer_set_create ();
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove creation of _decl_uid vars. */
- l->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- l->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\n local analysis of %s", cgraph_node_name (fn));
-
- walk_tree (&DECL_SAVED_TREE (decl), scan_for_static_refs, fn, visited_nodes);
- pointer_set_destroy (visited_nodes);
- visited_nodes = NULL;
- }
-
- /* Lookup the tree node for the static variable that has UID and
- conver the name to a string for debugging. */
- static const char *
- cgraph_get_static_name_by_uid (int index)
- {
- splay_tree_node stn = splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (stn)
- return lang_hooks.decl_printable_name ((tree)(stn->value), 2);
- return NULL;
- }
-
- /* Clear out any the static variable with uid INDEX from further
- consideration because it escapes (i.e. has had its address
- taken). */
- static void
- clear_static_vars_maps (int index)
- {
- splay_tree_node stn = splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (stn)
- {
- splay_tree_remove (static_vars_to_consider_by_tree, stn->value);
- splay_tree_remove (static_vars_to_consider_by_uid, index);
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change all *_decl_uid to *_ann_uid. */
-
- /* Or in all of the bits from every callee into X, the caller's, bit
- vector. There are several cases to check to avoid the sparse
- bitmap oring. */
- static void
- cgraph_propagate_bits (struct cgraph_node *x)
- {
- static_vars_info_t x_info = x->static_vars_info;
- global_static_vars_info_t x_global = x_info->global;
-
- struct cgraph_edge *e;
- for (e = x->callees; e; e = e->next_callee)
- {
- struct cgraph_node *y = e->callee;
-
- /* We are only going to look at edges that point to nodes that
- have their output bit set. */
- if (y->output)
- {
- static_vars_info_t y_info;
- global_static_vars_info_t y_global;
- y_info = y->static_vars_info;
- y_global = y_info->global;
-
- if (x_global->statics_read_by_decl_uid != all_module_statics)
- {
- if (y_global->statics_read_by_decl_uid == all_module_statics)
- x_global->statics_read_by_decl_uid = all_module_statics;
- /* Skip bitmaps that are pointer equal to node's bitmap
- (no reason to spin within the cycle). */
- else if (x_global->statics_read_by_decl_uid != y_global->statics_read_by_decl_uid)
- bitmap_a_or_b (x_global->statics_read_by_decl_uid,
- x_global->statics_read_by_decl_uid,
- y_global->statics_read_by_decl_uid);
- }
-
- if (x_global->statics_written_by_decl_uid != all_module_statics)
- {
- if (y_global->statics_written_by_decl_uid == all_module_statics)
- x_global->statics_written_by_decl_uid = all_module_statics;
- /* Skip bitmaps that are pointer equal to node's bitmap
- (no reason to spin within the cycle). */
- else if (x_global->statics_written_by_decl_uid != y_global->statics_written_by_decl_uid)
- bitmap_a_or_b (x_global->statics_written_by_decl_uid,
- x_global->statics_written_by_decl_uid,
- y_global->statics_written_by_decl_uid);
- }
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change all *_decl_uid to *_ann_uid
- except where noted below. */
-
- /* The main routine for analyzing global static variable usage. See
- comments at top for description. */
-
- static void
- cgraph_characterize_statics (void)
- {
- struct cgraph_node *node;
- struct cgraph_node *w;
- struct cgraph_node **order =
- xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- int order_pos = 0;
- int i;
-
- struct cgraph_varpool_node *vnode;
- tree global;
-
- /* Get rid of the splay trees from the previous compilation unit. */
-
- static_vars_to_consider_by_tree =
- splay_tree_new_ggc (splay_tree_compare_pointers);
- static_vars_to_consider_by_uid =
- splay_tree_new_ggc (splay_tree_compare_ints);
-
- if (module_statics_escape)
- {
- bitmap_clear (module_statics_escape);
- bitmap_clear (all_module_statics);
- }
- else
- {
- module_statics_escape = BITMAP_XMALLOC ();
- all_module_statics = BITMAP_GGC_ALLOC ();
- }
-
- /* Find all of the global variables that we wish to analyze. */
- for (vnode = cgraph_varpool_nodes_queue; vnode; vnode = vnode->next_needed)
- {
- global = vnode->decl;
- if ((TREE_CODE (global) == VAR_DECL) &&
- has_proper_scope_for_analysis (global))
- {
- splay_tree_insert (static_vars_to_consider_by_tree,
- (splay_tree_key) global,
- (splay_tree_value) global);
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- splay_tree_insert (static_vars_to_consider_by_uid,
- DECL_UID (global), (splay_tree_value)global);
-
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nConsidering global:%s",
- lang_hooks.decl_printable_name (global, 2));
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (all_module_statics, DECL_UID (global));
- }
- }
-
- order_pos = cgraph_reduced_inorder (order, false);
- if (cgraph_dump_file)
- print_order("new", order, order_pos);
-
- for (i = order_pos - 1; i >= 0; i--)
- {
- node = order[i];
-
- /* Scan each function to determine the variable usage
- patterns. */
- cgraph_characterize_statics_local (node);
- }
-
- /* Prune out the variables that were found to behave badly
- (i.e. have there address taken). */
- {
- int index;
- bitmap_iterator bi;
-
- EXECUTE_IF_SET_IN_BITMAP (module_statics_escape, 0, index, bi)
- {
- clear_static_vars_maps (index);
- }
- bitmap_operation (all_module_statics, all_module_statics,
- module_statics_escape, BITMAP_AND_COMPL);
-
- for (i = order_pos - 1; i >= 0; i--)
- {
- local_static_vars_info_t l;
- node = order[i];
- l = node->static_vars_info->local;
-
- bitmap_operation (l->statics_read_by_decl_uid,
- l->statics_read_by_decl_uid,
- module_statics_escape,
- BITMAP_AND_COMPL);
- bitmap_operation (l->statics_written_by_decl_uid,
- l->statics_written_by_decl_uid,
- module_statics_escape,
- BITMAP_AND_COMPL);
- }
- }
-
- if (cgraph_dump_file)
- {
- for (i = order_pos - 1; i >= 0; i--)
- {
- int index;
- local_static_vars_info_t l;
- bitmap_iterator bi;
-
- node = order[i];
- l = node->static_vars_info->local;
- fprintf (cgraph_dump_file,
- "\nFunction name:%s/%i:",
- cgraph_node_name (node), node->uid);
- fprintf (cgraph_dump_file, "\n locals read: ");
- EXECUTE_IF_SET_IN_BITMAP (l->statics_read_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- fprintf (cgraph_dump_file, "\n locals written: ");
- EXECUTE_IF_SET_IN_BITMAP (l->statics_written_by_decl_uid,
- 0, index, bi)
- {
- fprintf(cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- }
- }
-
- /* Propagate the local information thru the call graph to produce
- the global information. All the nodes within a cycle will have
- the same info so we collapse cycles first. Then we can do the
- propagation in one pass from the leaves to the roots. */
- order_pos = cgraph_reduced_inorder (order, true);
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g =
- ggc_calloc (1, sizeof (struct global_static_vars_info_d));
- local_static_vars_info_t node_l;
-
-
- bool read_all;
- bool write_all;
-
- node = order[i];
- node_info = node->static_vars_info;
- node_info->global = node_g;
- node_l = node_info->local;
-
- read_all = node->local.calls_read_all;
- write_all = node->local.calls_write_all;
-
- /* If any node in a cycle is calls_read_all or calls_write_all
- they all are. */
- w = node->next_cycle;
- while (w)
- {
- read_all |= w->local.calls_read_all;
- write_all |= w->local.calls_write_all;
- w = w->next_cycle;
- }
-
- /* Initialized the bitmaps for the reduced nodes */
- if (read_all)
- node_g->statics_read_by_decl_uid = all_module_statics;
- else
- {
- node_g->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- bitmap_copy (node_g->statics_read_by_decl_uid,
- node_l->statics_read_by_decl_uid);
- }
-
- if (write_all)
- node_g->statics_written_by_decl_uid = all_module_statics;
- else
- {
- node_g->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- bitmap_copy (node_g->statics_written_by_decl_uid,
- node_l->statics_written_by_decl_uid);
- }
-
- w = node->next_cycle;
- while (w)
- {
- /* All nodes within a cycle share the same global info bitmaps. */
- static_vars_info_t w_info = w->static_vars_info;
- local_static_vars_info_t w_l;
-
- w_info->global = node_g;
- w_l = w_info->local;
-
- /* These global bitmaps are initialized from the local info
- of all of the nodes in the region. However there is no
- need to do any work if the bitmaps were set to
- all_module_statics. */
- if (!read_all)
- bitmap_a_or_b (node_g->statics_read_by_decl_uid,
- node_g->statics_read_by_decl_uid,
- w_l->statics_read_by_decl_uid);
- if (!write_all)
- bitmap_a_or_b (node_g->statics_written_by_decl_uid,
- node_g->statics_written_by_decl_uid,
- w_l->statics_written_by_decl_uid);
- w = w->next_cycle;
- }
-
- cgraph_propagate_bits (node);
-
- w = node->next_cycle;
- while (w)
- {
- cgraph_propagate_bits (w);
- w = w->next_cycle;
- }
- }
-
- if (cgraph_dump_file)
- {
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g;
- int index;
- bitmap_iterator bi;
-
- node = order[i];
- node_info = node->static_vars_info;
- node_g = node_info->global;
- fprintf (cgraph_dump_file,
- "\nFunction name:%s/%i:",
- cgraph_node_name (node), node->uid);
- w = node->next_cycle;
- while (w)
- {
- fprintf (cgraph_dump_file, "\n next cycle: %s/%i ",
- cgraph_node_name (w), w->uid);
- w = w->next_cycle;
- }
- fprintf (cgraph_dump_file, "\n globals read: ");
- EXECUTE_IF_SET_IN_BITMAP (node_g->statics_read_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- fprintf (cgraph_dump_file, "\n globals written: ");
- EXECUTE_IF_SET_IN_BITMAP (node_g->statics_written_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- }
- }
-
- /* Cleanup. */
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g;
- node = order[i];
- node_info = node->static_vars_info;
- node_g = node_info->global;
-
- node_g->var_anns_valid = false;
-
- /* Create the complimentary sets. These are more useful for
- certain apis. */
- node_g->statics_not_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- /* FIXME -- PROFILE-RESTRUCTURE: Delete next 4 assignments. */
- node_g->statics_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_written_by_ann_uid = BITMAP_GGC_ALLOC ();
-
- if (node_g->statics_read_by_decl_uid != all_module_statics)
- {
- bitmap_operation (node_g->statics_not_read_by_decl_uid,
- all_module_statics,
- node_g->statics_read_by_decl_uid,
- BITMAP_AND_COMPL);
- }
-
- if (node_g->statics_written_by_decl_uid != all_module_statics)
- bitmap_operation (node_g->statics_not_written_by_decl_uid,
- all_module_statics,
- node_g->statics_written_by_decl_uid,
- BITMAP_AND_COMPL);
-
- w = node->next_cycle;
-
- while (w)
- {
- struct cgraph_node * last = w;
- w = w->next_cycle;
- last->next_cycle = NULL;
- }
- }
-
- free (order);
- }
/* Expand all functions that must be output.
--- 1649,1655 ----
*************** cgraph_expand_all_functions (void)
*** 2729,2746 ****
free (order);
}
! /* Mark all local and external functions.
A local function is one whose calls can occur only in the current
compilation unit and all its calls are explicit, so we can change
its calling convention. We simply mark all static functions whose
! address is not taken as local.
!
! An external function is one whose body is outside the current
! compilation unit. */
static void
! cgraph_mark_local_and_external_functions (void)
{
struct cgraph_node *node;
--- 1692,1706 ----
free (order);
}
! /* Mark all local functions.
A local function is one whose calls can occur only in the current
compilation unit and all its calls are explicit, so we can change
its calling convention. We simply mark all static functions whose
! address is not taken as local. */
static void
! cgraph_mark_local_functions (void)
{
struct cgraph_node *node;
*************** cgraph_mark_local_and_external_functions
*** 2750,2757 ****
node->local.local = (!node->needed
&& DECL_SAVED_TREE (node->decl)
&& !TREE_PUBLIC (node->decl));
- node->local.external = (!DECL_SAVED_TREE (node->decl)
- && TREE_PUBLIC (node->decl));
}
if (cgraph_dump_file)
--- 1710,1715 ----
*************** cgraph_mark_local_and_external_functions
*** 2761,2773 ****
if (node->local.local)
fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
fprintf (cgraph_dump_file, "\n\n");
!
! fprintf (cgraph_dump_file, "\nMarking external functions:");
! for (node = cgraph_nodes; node; node = node->next)
! if (node->local.external)
! fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
! fprintf (cgraph_dump_file, "\n\n");
! }
}
/* Return true when function body of DECL still needs to be kept around
--- 1719,1725 ----
if (node->local.local)
fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
fprintf (cgraph_dump_file, "\n\n");
! }
}
/* Return true when function body of DECL still needs to be kept around
*************** cgraph_optimize (void)
*** 2802,2808 ****
if (!quiet_flag)
fprintf (stderr, "Performing intraprocedural optimizations\n");
! cgraph_mark_local_and_external_functions ();
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "Marked ");
--- 1754,1760 ----
if (!quiet_flag)
fprintf (stderr, "Performing intraprocedural optimizations\n");
! cgraph_mark_local_functions ();
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "Marked ");
*************** cgraph_optimize (void)
*** 2826,2839 ****
verify_cgraph ();
#endif
- /* This call was moved here from cgraph_expand_all_functions so that
- cgraph_characterize_statics could use the output flag of the cgraph
- node. */
-
cgraph_mark_functions_to_output ();
- cgraph_characterize_statics ();
-
cgraph_expand_all_functions ();
if (cgraph_dump_file)
{
--- 1778,1785 ----
*************** void
*** 2941,2946 ****
init_cgraph (void)
{
cgraph_dump_file = dump_begin (TDI_cgraph, NULL);
- memory_identifier = get_identifier("memory");
}
- #include "gt-cgraphunit.h"
--- 1887,1890 ----
Index: tree-dfa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dfa.c,v
retrieving revision 2.38
diff -c -3 -p -r2.38 tree-dfa.c
*** tree-dfa.c 22 Oct 2004 17:05:06 -0000 2.38
--- tree-dfa.c 24 Oct 2004 13:22:25 -0000
*************** find_referenced_vars (void)
*** 109,115 ****
block_stmt_iterator si;
struct walk_state walk_state;
- cgraph_reset_static_var_maps ();
vars_found = htab_create (50, htab_hash_pointer, htab_eq_pointer, NULL);
memset (&walk_state, 0, sizeof (walk_state));
walk_state.vars_found = vars_found;
--- 109,114 ----
Index: tree-flow.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-flow.h,v
retrieving revision 2.53
diff -c -3 -p -r2.53 tree-flow.h
*** tree-flow.h 18 Oct 2004 18:01:09 -0000 2.53
--- tree-flow.h 24 Oct 2004 13:22:25 -0000
*************** struct var_ann_d GTY(())
*** 200,210 ****
live at the same time and this can happen for each call to the
dominator optimizer. */
tree current_def;
-
- /* Pointer to the structure that contains the sets of global
- variables modified by function calls. This field is only used
- for FUNCTION_DECLs. */
- static_vars_info_t static_vars_info;
};
--- 200,205 ----
Index: tree-ssa-operands.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-operands.c,v
retrieving revision 2.49
diff -c -3 -p -r2.49 tree-ssa-operands.c
*** tree-ssa-operands.c 5 Oct 2004 22:42:34 -0000 2.49
--- tree-ssa-operands.c 24 Oct 2004 13:22:26 -0000
*************** Boston, MA 02111-1307, USA. */
*** 32,38 ****
#include "tree-pass.h"
#include "ggc.h"
#include "timevar.h"
- #include "cgraph.h"
#include "langhooks.h"
--- 32,37 ----
*************** static inline void append_def (tree *);
*** 135,142 ****
static inline void append_use (tree *);
static void append_v_may_def (tree);
static void append_v_must_def (tree);
! static void add_call_clobber_ops (tree, tree);
! static void add_call_read_ops (tree, tree);
static void add_stmt_operand (tree *, tree, int);
/* Return a vector of contiguous memory for NUM def operands. */
--- 134,141 ----
static inline void append_use (tree *);
static void append_v_may_def (tree);
static void append_v_must_def (tree);
! static void add_call_clobber_ops (tree);
! static void add_call_read_ops (tree);
static void add_stmt_operand (tree *, tree, int);
/* Return a vector of contiguous memory for NUM def operands. */
*************** get_call_expr_operands (tree stmt, tree
*** 1399,1405 ****
{
tree op;
int call_flags = call_expr_flags (expr);
- tree callee = get_callee_fndecl (expr);
/* Find uses in the called function. */
get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_none);
--- 1398,1403 ----
*************** get_call_expr_operands (tree stmt, tree
*** 1416,1424 ****
there is no point in recording that. */
if (TREE_SIDE_EFFECTS (expr)
&& !(call_flags & (ECF_PURE | ECF_CONST | ECF_NORETURN)))
! add_call_clobber_ops (stmt, callee);
else if (!(call_flags & ECF_CONST))
! add_call_read_ops (stmt, callee);
}
}
--- 1414,1422 ----
there is no point in recording that. */
if (TREE_SIDE_EFFECTS (expr)
&& !(call_flags & (ECF_PURE | ECF_CONST | ECF_NORETURN)))
! add_call_clobber_ops (stmt);
else if (!(call_flags & ECF_CONST))
! add_call_read_ops (stmt);
}
}
*************** note_addressable (tree var, stmt_ann_t s
*** 1582,1588 ****
clobbered variables in the function. */
static void
! add_call_clobber_ops (tree stmt, tree callee)
{
/* Functions that are not const, pure or never return may clobber
call-clobbered variables. */
--- 1580,1586 ----
clobbered variables in the function. */
static void
! add_call_clobber_ops (tree stmt)
{
/* Functions that are not const, pure or never return may clobber
call-clobbered variables. */
*************** add_call_clobber_ops (tree stmt, tree ca
*** 1598,1656 ****
else
{
size_t i;
- bitmap not_read_b = NULL, not_written_b = NULL;
bitmap_iterator bi;
- /* Get info for module level statics. There is a bit set for
- each static if the call being processed does not read or
- write that variable. */
-
- /* ??? Turn off the optimization until it gets fixed. */
- if (0 && callee)
- {
- not_read_b = get_global_statics_not_read (callee);
- not_written_b = get_global_statics_not_written (callee);
- }
-
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
!
! bool not_read
! = not_read_b ? bitmap_bit_p (not_read_b, i) : false;
! bool not_written
! = not_written_b ? bitmap_bit_p (not_written_b, i) : false;
!
! if (not_read)
! {
! /* The var is not read during the call. */
! if (!not_written)
! add_stmt_operand (&var, stmt, opf_is_def);
! }
else
! {
! /* The var is read during the call. */
! if (not_written)
! add_stmt_operand (&var, stmt, opf_none);
!
! /* The not_read and not_written bits are only set for module
! static variables. Neither is set here, so we may be dealing
! with a module static or we may not. So we still must look
! anywhere else we can (such as the TREE_READONLY) to get
! better info. */
!
! /* If VAR is read-only, don't add a V_MAY_DEF, just a
! VUSE operand. FIXME, this is quirky. TREE_READONLY
! by itself is not enough here. We can only decide
! that the call will not affect VAR if all these
! conditions are met. One would think that
! TREE_READONLY should be sufficient. */
! else if (TREE_READONLY (var)
! && (TREE_STATIC (var) || DECL_EXTERNAL (var)))
! add_stmt_operand (&var, stmt, opf_none);
! else
! add_stmt_operand (&var, stmt, opf_is_def);
! }
}
}
}
--- 1596,1611 ----
else
{
size_t i;
bitmap_iterator bi;
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
! if (TREE_READONLY (var)
! && (TREE_STATIC (var) || DECL_EXTERNAL (var)))
! add_stmt_operand (&var, stmt, opf_none);
else
! add_stmt_operand (&var, stmt, opf_is_def);
}
}
}
*************** add_call_clobber_ops (tree stmt, tree ca
*** 1660,1666 ****
function. */
static void
! add_call_read_ops (tree stmt, tree callee)
{
bitmap_iterator bi;
--- 1615,1621 ----
function. */
static void
! add_call_read_ops (tree stmt)
{
bitmap_iterator bi;
*************** add_call_read_ops (tree stmt, tree calle
*** 1673,1687 ****
else
{
size_t i;
! bitmap not_read_b = callee
! ? get_global_statics_not_read (callee) : NULL;
!
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
- bool not_read = not_read_b
- ? bitmap_bit_p(not_read_b, i) : false;
- if (!not_read)
add_stmt_operand (&var, stmt, opf_none);
}
}
--- 1628,1637 ----
else
{
size_t i;
!
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
add_stmt_operand (&var, stmt, opf_none);
}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 18:58 removal of static vars analysis code from mainline Kenneth Zadeck
@ 2004-10-25 21:30 ` Mark Mitchell
2004-10-25 22:06 ` Kenneth Zadeck
0 siblings, 1 reply; 7+ messages in thread
From: Mark Mitchell @ 2004-10-25 21:30 UTC (permalink / raw)
To: Kenneth Zadeck; +Cc: gcc-patches, Novillo, Diego, Berlin, Daniel, Jan Hubicka
Kenneth Zadeck wrote:
> Mark,
>
> Jan has explained to me that it appears to be impossible for me find
> all of the variables in the mainline branch. It appears that at the
> time cgraph is run, some of the variables have disappeared from the
> trees and are only in the asm file and that the front ends are still
> keeping some of the variables a secret.
>
> He claims to have fixed these problems (or at least all the ones he
> has found) on the tree profiling branch but believes that is not
> worthwhile to port onto the mainline so the correct solution appears
> to be remove my code from the mainline and work on the tree profiling
> branch until things open back up on the mainline.
>
> Enclosed is a patch to remove my code.
How sad. Patch OK.
--
Mark Mitchell
CodeSourcery, LLC
(916) 791-8304
mark@codesourcery.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 21:30 ` Mark Mitchell
@ 2004-10-25 22:06 ` Kenneth Zadeck
2004-10-25 23:00 ` Jan Hubicka
0 siblings, 1 reply; 7+ messages in thread
From: Kenneth Zadeck @ 2004-10-25 22:06 UTC (permalink / raw)
To: Mark Mitchell; +Cc: gcc-patches, Novillo, Diego, Berlin, Daniel, Jan Hubicka
Mark Mitchell wrote:
> Kenneth Zadeck wrote:
>
>> Mark,
>>
>> Jan has explained to me that it appears to be impossible for me find
>> all of the variables in the mainline branch. It appears that at the
>> time cgraph is run, some of the variables have disappeared from the
>> trees and are only in the asm file and that the front ends are still
>> keeping some of the variables a secret.
>>
>> He claims to have fixed these problems (or at least all the ones he
>> has found) on the tree profiling branch but believes that is not
>> worthwhile to port onto the mainline so the correct solution appears
>> to be remove my code from the mainline and work on the tree profiling
>> branch until things open back up on the mainline.
>>
>> Enclosed is a patch to remove my code.
>
>
> How sad. Patch OK.
>
I would feel a lot worse if Jan had not fixed the code in tree-profile
branch. I will make it work there and get it into 4.1.
Thanks for the speedy review.
kenny
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 22:06 ` Kenneth Zadeck
@ 2004-10-25 23:00 ` Jan Hubicka
2004-10-25 23:31 ` Kenneth Zadeck
0 siblings, 1 reply; 7+ messages in thread
From: Jan Hubicka @ 2004-10-25 23:00 UTC (permalink / raw)
To: Kenneth Zadeck
Cc: Mark Mitchell, gcc-patches, Novillo, Diego, Berlin, Daniel,
Jan Hubicka, stevenb
>
>
> Mark Mitchell wrote:
>
> >Kenneth Zadeck wrote:
> >
> >>Mark,
> >>
> >>Jan has explained to me that it appears to be impossible for me find
> >>all of the variables in the mainline branch. It appears that at the
> >>time cgraph is run, some of the variables have disappeared from the
> >>trees and are only in the asm file and that the front ends are still
> >>keeping some of the variables a secret.
> >>
> >>He claims to have fixed these problems (or at least all the ones he
> >>has found) on the tree profiling branch but believes that is not
> >>worthwhile to port onto the mainline so the correct solution appears
> >>to be remove my code from the mainline and work on the tree profiling
> >>branch until things open back up on the mainline.
> >>
> >>Enclosed is a patch to remove my code.
> >
> >
> >How sad. Patch OK.
> >
> I would feel a lot worse if Jan had not fixed the code in tree-profile
> branch. I will make it work there and get it into 4.1.
Kenny,
I've been thinking about your code in the train now and I think sad
problem we run into was that I didn't realized what you really need for
your analysis (ie we always chatted only about the functions, not
variables tought it is trivial to notice that these are needed too) and
you simply assumed sane interfaces on the mostly half finished IPA
interface to be sane.
Your work is actually the second IPA pass we have (I implemented only
inlining) and it is very first that cares about the variables and thus
you sadly run into more issues than you would do if you choosed some
less pioneering work ;))
Since tree-profiling really fixes all the underlying problems I
understand to, I would suggest that I will avoid merging the revert to
the branch and apply modified version of your patch introducing master
clones (I would like to keep the files named ipa-something).
(steven, is that OK with you if I do so this week before cfg inliner or
shall I wait?)
I will try to then look into your code and hook it into current
tree-profiling interface for IPAs (ie the passmanager and the cgraph
structures) and send you the patch for review. This way I guess I will
learn how exactly the aliasing work and hopefully will ensure if
something is still wrong and I think I can give you the more complette
testcase how things work so you can easier comment on it.
Last week I made similar experiment with the Razya's ipcp
implementation and it was ineed interesting try.
Does that sound sane to you?
Honza
>
> Thanks for the speedy review.
>
> kenny
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 23:00 ` Jan Hubicka
@ 2004-10-25 23:31 ` Kenneth Zadeck
2004-10-25 23:35 ` Jan Hubicka
0 siblings, 1 reply; 7+ messages in thread
From: Kenneth Zadeck @ 2004-10-25 23:31 UTC (permalink / raw)
To: Jan Hubicka
Cc: Mark Mitchell, gcc-patches, Novillo, Diego, Berlin, Daniel,
Jan Hubicka, stevenb
Jan, I sent you directly (about 15 minutes ago) a patch that is the same
as I applied to the mainline but fixed up for the current tree profiling
branch.
I am going to rework my new code to the for the tree profiling branch
but I am going to change the names of most of the functions so that they
are a little saner and fit with the naming scheme better. I will also
fix the ggc problems you noticed today.
Kenny
Jan Hubicka wrote:
>>Mark Mitchell wrote:
>>
>>
>>
>>>Kenneth Zadeck wrote:
>>>
>>>
>>>
>>>>Mark,
>>>>
>>>>Jan has explained to me that it appears to be impossible for me find
>>>>all of the variables in the mainline branch. It appears that at the
>>>>time cgraph is run, some of the variables have disappeared from the
>>>>trees and are only in the asm file and that the front ends are still
>>>>keeping some of the variables a secret.
>>>>
>>>>He claims to have fixed these problems (or at least all the ones he
>>>>has found) on the tree profiling branch but believes that is not
>>>>worthwhile to port onto the mainline so the correct solution appears
>>>>to be remove my code from the mainline and work on the tree profiling
>>>>branch until things open back up on the mainline.
>>>>
>>>>Enclosed is a patch to remove my code.
>>>>
>>>>
>>>How sad. Patch OK.
>>>
>>>
>>>
>>I would feel a lot worse if Jan had not fixed the code in tree-profile
>>branch. I will make it work there and get it into 4.1.
>>
>>
>
>Kenny,
>I've been thinking about your code in the train now and I think sad
>problem we run into was that I didn't realized what you really need for
>your analysis (ie we always chatted only about the functions, not
>variables tought it is trivial to notice that these are needed too) and
>you simply assumed sane interfaces on the mostly half finished IPA
>interface to be sane.
>
>Your work is actually the second IPA pass we have (I implemented only
>inlining) and it is very first that cares about the variables and thus
>you sadly run into more issues than you would do if you choosed some
>less pioneering work ;))
>
>Since tree-profiling really fixes all the underlying problems I
>understand to, I would suggest that I will avoid merging the revert to
>the branch and apply modified version of your patch introducing master
>clones (I would like to keep the files named ipa-something).
>(steven, is that OK with you if I do so this week before cfg inliner or
>shall I wait?)
>
>I will try to then look into your code and hook it into current
>tree-profiling interface for IPAs (ie the passmanager and the cgraph
>structures) and send you the patch for review. This way I guess I will
>learn how exactly the aliasing work and hopefully will ensure if
>something is still wrong and I think I can give you the more complette
>testcase how things work so you can easier comment on it.
>Last week I made similar experiment with the Razya's ipcp
>implementation and it was ineed interesting try.
>
>Does that sound sane to you?
>Honza
>
>
>>Thanks for the speedy review.
>>
>>kenny
>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 23:31 ` Kenneth Zadeck
@ 2004-10-25 23:35 ` Jan Hubicka
2004-10-26 14:32 ` Kenneth Zadeck
0 siblings, 1 reply; 7+ messages in thread
From: Jan Hubicka @ 2004-10-25 23:35 UTC (permalink / raw)
To: Kenneth Zadeck
Cc: Jan Hubicka, Mark Mitchell, gcc-patches, Novillo, Diego, Berlin,
Daniel, Jan Hubicka, stevenb
> Jan, I sent you directly (about 15 minutes ago) a patch that is the same
> as I applied to the mainline but fixed up for the current tree profiling
> branch.
>
> I am going to rework my new code to the for the tree profiling branch
> but I am going to change the names of most of the functions so that they
> are a little saner and fit with the naming scheme better. I will also
> fix the ggc problems you noticed today.
Our lines has crossed again. That patch is, of course, OK for tree
profiling branch.
Honza
>
> Kenny
>
> Jan Hubicka wrote:
>
> >>Mark Mitchell wrote:
> >>
> >>
> >>
> >>>Kenneth Zadeck wrote:
> >>>
> >>>
> >>>
> >>>>Mark,
> >>>>
> >>>>Jan has explained to me that it appears to be impossible for me find
> >>>>all of the variables in the mainline branch. It appears that at the
> >>>>time cgraph is run, some of the variables have disappeared from the
> >>>>trees and are only in the asm file and that the front ends are still
> >>>>keeping some of the variables a secret.
> >>>>
> >>>>He claims to have fixed these problems (or at least all the ones he
> >>>>has found) on the tree profiling branch but believes that is not
> >>>>worthwhile to port onto the mainline so the correct solution appears
> >>>>to be remove my code from the mainline and work on the tree profiling
> >>>>branch until things open back up on the mainline.
> >>>>
> >>>>Enclosed is a patch to remove my code.
> >>>>
> >>>>
> >>>How sad. Patch OK.
> >>>
> >>>
> >>>
> >>I would feel a lot worse if Jan had not fixed the code in tree-profile
> >>branch. I will make it work there and get it into 4.1.
> >>
> >>
> >
> >Kenny,
> >I've been thinking about your code in the train now and I think sad
> >problem we run into was that I didn't realized what you really need for
> >your analysis (ie we always chatted only about the functions, not
> >variables tought it is trivial to notice that these are needed too) and
> >you simply assumed sane interfaces on the mostly half finished IPA
> >interface to be sane.
> >
> >Your work is actually the second IPA pass we have (I implemented only
> >inlining) and it is very first that cares about the variables and thus
> >you sadly run into more issues than you would do if you choosed some
> >less pioneering work ;))
> >
> >Since tree-profiling really fixes all the underlying problems I
> >understand to, I would suggest that I will avoid merging the revert to
> >the branch and apply modified version of your patch introducing master
> >clones (I would like to keep the files named ipa-something).
> >(steven, is that OK with you if I do so this week before cfg inliner or
> >shall I wait?)
> >
> >I will try to then look into your code and hook it into current
> >tree-profiling interface for IPAs (ie the passmanager and the cgraph
> >structures) and send you the patch for review. This way I guess I will
> >learn how exactly the aliasing work and hopefully will ensure if
> >something is still wrong and I think I can give you the more complette
> >testcase how things work so you can easier comment on it.
> >Last week I made similar experiment with the Razya's ipcp
> >implementation and it was ineed interesting try.
> >
> >Does that sound sane to you?
> >Honza
> >
> >
> >>Thanks for the speedy review.
> >>
> >>kenny
> >>
> >>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: removal of static vars analysis code from mainline.
2004-10-25 23:35 ` Jan Hubicka
@ 2004-10-26 14:32 ` Kenneth Zadeck
0 siblings, 0 replies; 7+ messages in thread
From: Kenneth Zadeck @ 2004-10-26 14:32 UTC (permalink / raw)
To: Jan Hubicka
Cc: Jan Hubicka, Mark Mitchell, gcc-patches, Novillo, Diego, Berlin,
Daniel, stevenb
[-- Attachment #1: Type: text/plain, Size: 3759 bytes --]
The enclosed patch was committed to the tree profiling branch. It was
approved by Jan. It is a similar patch to the one for the mainline
accepted by mark but fixed up for the significantly different cgraph*
files that are on this branch.
kenny
Jan Hubicka wrote:
>>Jan, I sent you directly (about 15 minutes ago) a patch that is the same
>>as I applied to the mainline but fixed up for the current tree profiling
>>branch.
>>
>>I am going to rework my new code to the for the tree profiling branch
>>but I am going to change the names of most of the functions so that they
>>are a little saner and fit with the naming scheme better. I will also
>>fix the ggc problems you noticed today.
>>
>>
>
>Our lines has crossed again. That patch is, of course, OK for tree
>profiling branch.
>
>Honza
>
>
>>Kenny
>>
>>Jan Hubicka wrote:
>>
>>
>>
>>>>Mark Mitchell wrote:
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>>Kenneth Zadeck wrote:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>>Mark,
>>>>>>
>>>>>>Jan has explained to me that it appears to be impossible for me find
>>>>>>all of the variables in the mainline branch. It appears that at the
>>>>>>time cgraph is run, some of the variables have disappeared from the
>>>>>>trees and are only in the asm file and that the front ends are still
>>>>>>keeping some of the variables a secret.
>>>>>>
>>>>>>He claims to have fixed these problems (or at least all the ones he
>>>>>>has found) on the tree profiling branch but believes that is not
>>>>>>worthwhile to port onto the mainline so the correct solution appears
>>>>>>to be remove my code from the mainline and work on the tree profiling
>>>>>>branch until things open back up on the mainline.
>>>>>>
>>>>>>Enclosed is a patch to remove my code.
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>How sad. Patch OK.
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>I would feel a lot worse if Jan had not fixed the code in tree-profile
>>>>branch. I will make it work there and get it into 4.1.
>>>>
>>>>
>>>>
>>>>
>>>Kenny,
>>>I've been thinking about your code in the train now and I think sad
>>>problem we run into was that I didn't realized what you really need for
>>>your analysis (ie we always chatted only about the functions, not
>>>variables tought it is trivial to notice that these are needed too) and
>>>you simply assumed sane interfaces on the mostly half finished IPA
>>>interface to be sane.
>>>
>>>Your work is actually the second IPA pass we have (I implemented only
>>>inlining) and it is very first that cares about the variables and thus
>>>you sadly run into more issues than you would do if you choosed some
>>>less pioneering work ;))
>>>
>>>Since tree-profiling really fixes all the underlying problems I
>>>understand to, I would suggest that I will avoid merging the revert to
>>>the branch and apply modified version of your patch introducing master
>>>clones (I would like to keep the files named ipa-something).
>>>(steven, is that OK with you if I do so this week before cfg inliner or
>>>shall I wait?)
>>>
>>>I will try to then look into your code and hook it into current
>>>tree-profiling interface for IPAs (ie the passmanager and the cgraph
>>>structures) and send you the patch for review. This way I guess I will
>>>learn how exactly the aliasing work and hopefully will ensure if
>>>something is still wrong and I think I can give you the more complette
>>>testcase how things work so you can easier comment on it.
>>>Last week I made similar experiment with the Razya's ipcp
>>>implementation and it was ineed interesting try.
>>>
>>>Does that sound sane to you?
>>>Honza
>>>
>>>
>>>
>>>
>>>>Thanks for the speedy review.
>>>>
>>>>kenny
>>>>
>>>>
>>>>
>>>>
[-- Attachment #2: pbackout.patch --]
[-- Type: text/x-patch, Size: 52905 bytes --]
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.903.2.179.2.21
diff -c -3 -p -r1.903.2.179.2.21 Makefile.in
*** Makefile.in 22 Oct 2004 21:51:37 -0000 1.903.2.179.2.21
--- Makefile.in 25 Oct 2004 22:13:01 -0000
*************** SCHED_INT_H = sched-int.h $(INSN_ATTR_H)
*** 703,709 ****
INTEGRATE_H = integrate.h varray.h
CFGLAYOUT_H = cfglayout.h $(BASIC_BLOCK_H)
CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H)
! CGRAPH_H = cgraph.h bitmap.h tree.h $(HASHTAB_H)
DF_H = df.h bitmap.h sbitmap.h $(BASIC_BLOCK_H)
DDG_H = ddg.h sbitmap.h $(DF_H)
GCC_H = gcc.h version.h
--- 703,709 ----
INTEGRATE_H = integrate.h varray.h
CFGLAYOUT_H = cfglayout.h $(BASIC_BLOCK_H)
CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H)
! CGRAPH_H = cgraph.h tree.h
DF_H = df.h bitmap.h sbitmap.h $(BASIC_BLOCK_H)
DDG_H = ddg.h sbitmap.h $(DF_H)
GCC_H = gcc.h version.h
*************** GTFILES = $(srcdir)/input.h $(srcdir)/co
*** 2410,2416 ****
$(srcdir)/cselib.h $(srcdir)/basic-block.h $(srcdir)/cgraph.h \
$(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
$(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
! $(srcdir)/cgraphunit.c $(srcdir)/ipa_prop.c \
$(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
$(srcdir)/dojump.c \
$(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
--- 2410,2416 ----
$(srcdir)/cselib.h $(srcdir)/basic-block.h $(srcdir)/cgraph.h \
$(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
$(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
! $(srcdir)/ipa_prop.c \
$(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
$(srcdir)/dojump.c \
$(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
Index: cgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.c,v
retrieving revision 1.4.4.18.2.11
diff -c -3 -p -r1.4.4.18.2.11 cgraph.c
*** cgraph.c 22 Oct 2004 23:54:30 -0000 1.4.4.18.2.11
--- cgraph.c 25 Oct 2004 22:13:01 -0000
*************** dump_cgraph_node (FILE *f, struct cgraph
*** 475,489 ****
fprintf (f, " tree");
if (node->output)
fprintf (f, " output");
-
if (node->local.local)
fprintf (f, " local");
- if (node->local.external)
- fprintf (f, " external");
- if (node->local.calls_read_all)
- fprintf (f, " calls_read_all");
- if (node->local.calls_write_all)
- fprintf (f, " calls_write_all");
if (node->local.disregard_inline_limits)
fprintf (f, " always_inline");
else if (node->local.inlinable)
--- 475,482 ----
Index: cgraph.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.h,v
retrieving revision 1.1.4.16.2.9
diff -c -3 -p -r1.1.4.16.2.9 cgraph.h
*** cgraph.h 22 Oct 2004 23:54:30 -0000 1.1.4.16.2.9
--- cgraph.h 25 Oct 2004 22:13:01 -0000
*************** Software Foundation, 59 Temple Place - S
*** 21,28 ****
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
- #include "hashtab.h"
- #include "bitmap.h"
#include "tree.h"
/* Information about the function collected locally.
--- 21,26 ----
*************** struct cgraph_local_info GTY(())
*** 37,55 ****
and it's address is never taken. */
bool local;
- /* Set when function is defined in another compilation unit. */
- bool external;
-
/* Set when function is visible by other units. */
bool externally_visible;
- /* Set when this function calls a function external of the
- compilation unit. In general, such calls are modeled as reading
- and writing all variables (both bits on) but sometime there are
- attributes on the called function so we can do better. */
- bool calls_read_all;
- bool calls_write_all;
-
/* Set once it has been finalized so we consider it to be output. */
bool finalized;
--- 35,43 ----
*************** struct cgraph_rtl_info GTY(())
*** 93,162 ****
bool pure_function;
};
- /* FIXME -- PROFILE-RESTRUCTURE: When the next round of the profiling
- code gets merged in, it will contain a restructing where ssa form
- is built for every function within the compilation unit before the
- rest of the compilation continues. When this reorgination is done,
- it will no longer be necessary to have the _decl_uid versions of
- local_static_vars_info and global_static_vars_info structures.
- Having both structures is now required because the _ann_uid values
- for static variables are reset as each function is compiled.
- Currently, the analysis is done using the _decl_uid versions and
- converted to the _var_ann versions on demand.
-
- Also, the var_anns_valid fields within these structures can also go
- away.
- */
-
- /* The static variables defined within the compilation unit that are
- loaded or stored directly by function that owns this structure. */
-
- struct local_static_vars_info_d GTY(())
- {
- bitmap statics_read_by_decl_uid;
- bitmap statics_written_by_decl_uid;
- };
-
- struct global_static_vars_info_d GTY(())
- {
- bitmap statics_read_by_decl_uid;
- bitmap statics_written_by_decl_uid;
- bitmap statics_read_by_ann_uid;
- bitmap statics_written_by_ann_uid;
- bitmap statics_not_read_by_decl_uid;
- bitmap statics_not_written_by_decl_uid;
- bitmap statics_not_read_by_ann_uid;
- bitmap statics_not_written_by_ann_uid;
-
- /* var_anns_valid is reset at the start of compilation for each
- function because the indexing that the "_var_anns" is based
- on is invalidated between function compilations. This allows for
- lazy creation of the "_var_ann" variables. */
- bool var_anns_valid;
- };
-
- /* Statics that are read and written by some set of functions. The
- local ones are based on the loads and stores local to the function.
- The global ones are based on the local info as well as the
- transitive closure of the functions that are called. The
- structures are separated to allow the global structures to be
- shared between several functions since every function within a
- strongly connected component will have the same information. This
- sharing saves both time and space in the computation of the vectors
- as well as their translation from decl_uid form to ann_uid
- form. */
-
- typedef struct local_static_vars_info_d *local_static_vars_info_t;
- typedef struct global_static_vars_info_d *global_static_vars_info_t;
-
- struct static_vars_info_d GTY(())
- {
- local_static_vars_info_t local;
- global_static_vars_info_t global;
- };
-
- typedef struct static_vars_info_d *static_vars_info_t;
-
/* The cgraph data structure.
Each function decl has assigned cgraph_node listing callees and callers. */
--- 81,86 ----
*************** struct cgraph_node GTY((chain_next ("%h.
*** 177,194 ****
struct cgraph_node *next_needed;
/* Pointer to the next clone. */
struct cgraph_node *next_clone;
- /* Pointer to next node in a recursive call graph cycle; */
- struct cgraph_node *next_cycle;
PTR GTY ((skip)) aux;
struct cgraph_local_info local;
struct cgraph_global_info global;
struct cgraph_rtl_info rtl;
- /* Pointer to the structure that contains the sets of global
- variables modified by function calls. */
- static_vars_info_t static_vars_info;
-
/* Unique id of the node. */
int uid;
/* Set when function must be output - it is externally visible
--- 101,112 ----
*************** void cgraph_mark_inline_edge (struct cgr
*** 293,300 ****
void cgraph_clone_inlined_nodes (struct cgraph_edge *e, bool duplicate);
void cgraph_build_static_cdtor (char which, tree body, int priority);
void cgraph_reset_static_var_maps (void);
- bitmap get_global_statics_not_read (tree fn);
- bitmap get_global_statics_not_written(tree fn);
void init_cgraph (void);
#endif /* GCC_CGRAPH_H */
--- 211,216 ----
Index: cgraphunit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraphunit.c,v
retrieving revision 1.1.4.35.2.21
diff -c -3 -p -r1.1.4.35.2.21 cgraphunit.c
*** cgraphunit.c 25 Oct 2004 09:15:34 -0000 1.1.4.35.2.21
--- cgraphunit.c 25 Oct 2004 22:13:02 -0000
*************** Software Foundation, 59 Temple Place - S
*** 165,182 ****
only one function at a time and is used in non-unit-at-a-time mode. */
- /* Additionally this file gathers information about how local statics
- are used. This is done in cgraph_characterize_statics. After the
- call graph has been built, each function is analyzed to determine
- which local static variables are either read or written or have
- their address taken. Any local static that has its address taken
- is removed from consideration. Once the local read and writes
- are determined, a transitive closure of this information is
- performed over the call graph to determine the worst case set of
- side effects of each call. In a later part of the compiler, these
- local and global sets are examined to make the call clobbering less
- traumatic both with respect to aliasing and to code generation. */
-
#include "config.h"
#include "system.h"
#include "coretypes.h"
--- 165,170 ----
*************** static struct pointer_set_t *visited_nod
*** 229,262 ****
static FILE *cgraph_dump_file;
- /* These splay trees contain all of the static variables that are
- being considered by the compilation level alias analysis. For
- module_at_a_time compilation, this is the set of static but not
- public variables. Any variables that either have their address
- taken or participate in otherwise unsavory operations are deleted
- from this list. */
- static GTY((param1_is(tree), param2_is(tree)))
- splay_tree static_vars_to_consider_by_tree;
-
- /* FIXME -- PROFILE-RESTRUCTURE: change comment from DECL_UID to var-ann. */
- /* same as above but indexed by DECL_UID */
- static GTY((param1_is(int), param2_is(tree)))
- splay_tree static_vars_to_consider_by_uid;
-
- /* This bitmap is used to knock out the module static variables whose
- addresses have been taken and passed around. This is indexed by
- uid. */
- static bitmap module_statics_escape;
-
- /* FIXME -- PROFILE-RESTRUCTURE: change comment from DECL_UID to var-ann. */
- /* A bit is set for every module static we are considering and is
- indexed by DECL_UID. This is ored into the local info when asm
- code is found that clobbers all memory. */
- static GTY(()) bitmap all_module_statics;
-
- /* Holds the value of "memory". */
- static tree memory_identifier;
-
/* Determine if function DECL is needed. That is, visible to something
either outside this translation unit, something magic in the system
configury, or (if not doing unit-at-a-time) to something we havn't
--- 217,222 ----
*************** decide_is_function_needed (struct cgraph
*** 338,528 ****
return false;
}
- /* Debugging function for postorder and inorder code. NOTE is a string
- that is printed before the nodes are printed. ORDER is an array of
- cgraph_nodes that has COUNT useful nodes in it. */
-
- static void
- print_order (const char * note, struct cgraph_node** order, int count)
- {
- int i;
- fprintf (cgraph_dump_file, "\n\n ordered call graph: %s\n", note);
-
- for (i = count - 1; i >= 0; i--)
- {
- struct cgraph_edge *edge;
-
- fprintf (cgraph_dump_file, "\n %s<-(", cgraph_node_name (order[i]));
-
- for (edge = order[i]->callers; edge; edge = edge->next_caller)
- fprintf (cgraph_dump_file, " %s", cgraph_node_name (edge->caller));
- fprintf (cgraph_dump_file, ")");
- }
- fprintf (cgraph_dump_file, "\n");
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove this function, it becomes a nop. */
- /* Convert IN_DECL bitmap which is indexed by DECL_UID to IN_ANN, a
- bitmap indexed by var_ann (VAR_DECL)->uid. */
-
- static void
- convert_UIDs_in_bitmap (bitmap in_ann, bitmap in_decl)
- {
- int index;
- bitmap_iterator bi;
-
- EXECUTE_IF_SET_IN_BITMAP(in_decl, 0, index, bi)
- {
- splay_tree_node n =
- splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (n != NULL)
- {
- tree t = (tree)n->value;
- var_ann_t va = var_ann (t);
- if (va)
- bitmap_set_bit(in_ann, va->uid);
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Delete all stmts initing *_decl_uid
- variables. Add code to create a var_ann for tree node within the
- cgraph_node and have it point to the newly created
- static_vars_info. */
- /* Create a new static_vars_info structure and place it into
- cgraph_node, NODE. INIT_GLOBAL causes the global part of the
- structure to be initialized. */
- static static_vars_info_t
- new_static_vars_info(struct cgraph_node* node,
- bool init_global)
- {
- static_vars_info_t info = ggc_calloc (1, sizeof (struct static_vars_info_d));
- local_static_vars_info_t l
- = ggc_calloc (1, sizeof (struct local_static_vars_info_d));
-
- /* Add the info to the tree's annotation. */
- var_ann_t var_ann = get_var_ann(node->decl);
- node->static_vars_info = info;
- var_ann->static_vars_info = info;
-
- info->local = l;
- l->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- l->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- if (init_global)
- {
- global_static_vars_info_t g
- = ggc_calloc (1, sizeof (struct global_static_vars_info_d));
- info->global = g;
- g->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- g->statics_not_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- }
- return info;
- }
-
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove this function, it becomes a
- nop. */
- /* The bitmaps used to represent the static global variables are
- indexed by DECL_UID however, this is not used inside of functions
- to index the ssa variables. The denser var_ann (VAR_DECL)->uid is
- used there. This function is called from
- tree_dfa:find_referenced_vars after the denser representation is
- built. This function invalidates any cached indexes. */
-
- void
- cgraph_reset_static_var_maps (void)
- {
- struct cgraph_node *node;
-
- for (node = cgraph_nodes; node; node = node->next)
- {
- static_vars_info_t info = node->static_vars_info;
- if (info)
- {
- global_static_vars_info_t g = info->global;
- if (g->var_anns_valid)
- {
- bitmap_clear (g->statics_read_by_ann_uid);
- bitmap_clear (g->statics_written_by_ann_uid);
- bitmap_clear (g->statics_not_read_by_ann_uid);
- bitmap_clear (g->statics_not_written_by_ann_uid);
- g->var_anns_valid = false;
- }
- }
- else
- /* Handle the case where a cgraph node has been inserted
- after the analysis. We know nothing. */
- new_static_vars_info(node, true);
- }
- }
-
- /* Get the global static_vars_info structure for the function FN and
- make sure the ann_uid's bitmaps are properly converted. */
-
- static global_static_vars_info_t
- get_global_static_vars_info (tree fn)
- {
- global_static_vars_info_t g;
-
- /* Was not compiled -O2 or higher. */
- static_vars_info_t info = get_var_ann(fn)->static_vars_info;
- if (!info)
- return NULL;
-
- g = info->global;
- if (!g->var_anns_valid)
- {
- convert_UIDs_in_bitmap (g->statics_read_by_ann_uid,
- g->statics_read_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_written_by_ann_uid,
- g->statics_written_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_not_read_by_ann_uid,
- g->statics_not_read_by_decl_uid);
- convert_UIDs_in_bitmap (g->statics_not_written_by_ann_uid,
- g->statics_not_written_by_decl_uid);
- g->var_anns_valid = true;
- }
- return g;
- }
-
- /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
- variables that are not read during the execution of the function
- FN. Returns NULL if no data is available, such as it was not
- compiled with -O2 or higher. */
-
- bitmap
- get_global_statics_not_read (tree fn)
- {
- global_static_vars_info_t g = get_global_static_vars_info (fn);
- if (g)
- return g->statics_not_read_by_ann_uid;
- else
- return NULL;
- }
-
- /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
- variables that are not written during the execution of the function
- FN. Note that variables written may or may not be read during the
- function call. Returns NULL if no data is available, such as it
- was not compiled with -O2 or higher. */
-
- bitmap
- get_global_statics_not_written (tree fn)
- {
- global_static_vars_info_t g = get_global_static_vars_info (fn);
- if (g)
- return g->statics_not_written_by_ann_uid;
- else
- return NULL;
- }
-
/* When not doing unit-at-a-time, output all functions enqueued.
Return true when such a functions were found. */
--- 298,303 ----
*************** cgraph_postorder (struct cgraph_node **o
*** 1215,1364 ****
return order_pos;
}
- struct searchc_env {
- struct cgraph_node **stack;
- int stack_size;
- struct cgraph_node **result;
- int order_pos;
- splay_tree nodes_marked_new;
- bool reduce;
- int count;
- };
-
- struct dfs_info {
- int dfn_number;
- int low_link;
- bool new;
- bool on_stack;
- };
-
- /* This is an implementation of Tarjan's strongly connected region
- finder as reprinted in Aho Hopcraft and Ullman's The Design and
- Analysis of Computer Programs (1975) pages 192-193. This version
- has been customized for cgraph_nodes. The env parameter is because
- it is recursive and there are no nested functions here. This
- function should only be called from itself or
- cgraph_reduced_inorder. ENV is a stack env and would be
- unnecessary if C had nested functions. V is the node to start
- searching from. */
-
- static void
- searchc (struct searchc_env* env, struct cgraph_node *v)
- {
- struct cgraph_edge *edge;
- struct dfs_info *v_info = v->aux;
-
- /* mark node as old */
- v_info->new = false;
- splay_tree_remove (env->nodes_marked_new, v->uid);
-
- v_info->dfn_number = env->count;
- v_info->low_link = env->count;
- env->count++;
- env->stack[(env->stack_size)++] = v;
- v_info->on_stack = true;
-
- for (edge = v->callers; edge; edge = edge->next_caller)
- {
- struct dfs_info * w_info;
- struct cgraph_node *w = edge->caller;
- /* skip the nodes that we are supposed to ignore */
- if (w->aux)
- {
- w_info = w->aux;
- if (w_info->new)
- {
- searchc (env, w);
- v_info->low_link =
- (v_info->low_link < w_info->low_link) ?
- v_info->low_link : w_info->low_link;
- }
- else
- if ((w_info->dfn_number < v_info->dfn_number)
- && (w_info->on_stack))
- v_info->low_link =
- (w_info->dfn_number < v_info->low_link) ?
- w_info->dfn_number : v_info->low_link;
- }
- }
-
-
- if (v_info->low_link == v_info->dfn_number)
- {
- struct cgraph_node *last = NULL;
- struct cgraph_node *x;
- struct dfs_info *x_info;
- do {
- x = env->stack[--(env->stack_size)];
- x_info = x->aux;
- x_info->on_stack = false;
-
- if (env->reduce)
- {
- x->next_cycle = last;
- last = x;
- }
- else
- env->result[env->order_pos++] = x;
- }
- while (v != x);
- if (env->reduce)
- env->result[env->order_pos++] = v;
- }
- }
-
- /* Topsort the call graph by caller relation. Put the result in ORDER.
-
- The REDUCE flag is true if you want the cycles reduced to single
- nodes. Only consider nodes that have the output bit set. */
-
- static int
- cgraph_reduced_inorder (struct cgraph_node **order, bool reduce)
- {
- struct cgraph_node *node;
- struct searchc_env env;
- splay_tree_node result;
- env.stack = xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- env.stack_size = 0;
- env.result = order;
- env.order_pos = 0;
- env.nodes_marked_new = splay_tree_new (splay_tree_compare_ints, 0, 0);
- env.count = 1;
- env.reduce = reduce;
-
- for (node = cgraph_nodes; node; node = node->next)
- if (node->output)
- {
- struct dfs_info *info = xcalloc (1, sizeof (struct dfs_info));
- info->new = true;
- info->on_stack = false;
- node->aux = info;
- node->next_cycle = NULL;
-
- splay_tree_insert (env.nodes_marked_new,
- node->uid, (splay_tree_value)node);
- }
- else
- node->aux = NULL;
- result = splay_tree_min (env.nodes_marked_new);
- while (result)
- {
- node = (struct cgraph_node *)result->value;
- searchc (&env, node);
- result = splay_tree_min (env.nodes_marked_new);
- }
- splay_tree_delete (env.nodes_marked_new);
- free (env.stack);
-
- for (node = cgraph_nodes; node; node = node->next)
- if (node->aux)
- {
- free (node->aux);
- node->aux = NULL;
- }
- return env.order_pos;
- }
-
/* Perform reachability analysis and reclaim all unreachable nodes.
If BEFORE_INLINING_P is true this function is called before inlining
decisions has been made. If BEFORE_INLINING_P is false this function also
--- 990,995 ----
*************** cgraph_inline_p (struct cgraph_edge *e,
*** 2170,2840 ****
/* Return true if the variable T is the right kind of static variable to
perform compilation unit scope escape analysis. */
- static inline
- bool has_proper_scope_for_analysis (tree t)
- {
- return (TREE_STATIC(t)) && !(TREE_PUBLIC(t)) && !(TREE_THIS_VOLATILE(t));
- }
-
- /* Check to see if T is a read or address of operation on a static var
- we are interested in analyzing. FN is passed in to get access to
- its bit vectors. */
-
- static void
- check_rhs_var (struct cgraph_node *fn, tree t)
- {
- if (TREE_CODE (t) == ADDR_EXPR)
- {
- tree x = TREE_OPERAND (t, 0);
- if ((TREE_CODE (x) == VAR_DECL) && has_proper_scope_for_analysis (x))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding address:%s",
- lang_hooks.decl_printable_name (x, 2));
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (module_statics_escape, DECL_UID (x));
- }
- }
- t = get_base_address (t);
- if (!t) return;
- if ((TREE_CODE (t) == VAR_DECL) && has_proper_scope_for_analysis (t))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding rhs:%s",
- lang_hooks.decl_printable_name (t, 2));
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (fn->static_vars_info->local->statics_read_by_decl_uid,
- DECL_UID (t));
- }
- }
-
- /* Check to see if T is an assignment to a static var we are
- interrested in analyzing. FN is passed in to get access to its bit
- vectors.
- */
-
- static void
- check_lhs_var (struct cgraph_node *fn, tree t)
- {
- t = get_base_address (t);
- if (!t) return;
- if ((TREE_CODE (t) == VAR_DECL) && has_proper_scope_for_analysis (t))
- {
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nadding lhs:%s",
- lang_hooks.decl_printable_name (t, 2));
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (fn->static_vars_info->local->statics_written_by_decl_uid,
- DECL_UID (t));
- }
- }
-
- /* This is a scaled down version of get_asm_expr_operands from
- tree_ssa_operands.c. The version there runs much later and assumes
- that aliasing information is already available. Here we are just
- trying to find if the set of inputs and outputs contain references
- or address of operations to local static variables. FN is the
- function being analyzed and STMT is the actual asm statement. */
-
- static void
- get_asm_expr_operands (struct cgraph_node * fn, tree stmt)
- {
- int noutputs = list_length (ASM_OUTPUTS (stmt));
- const char **oconstraints
- = (const char **) alloca ((noutputs) * sizeof (const char *));
- int i;
- tree link;
- const char *constraint;
- bool allows_mem, allows_reg, is_inout;
-
- for (i=0, link = ASM_OUTPUTS (stmt); link; ++i, link = TREE_CHAIN (link))
- {
- oconstraints[i] = constraint
- = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
- parse_output_constraint (&constraint, i, 0, 0,
- &allows_mem, &allows_reg, &is_inout);
-
- /* Memory operands are addressable. Note that STMT needs the
- address of this operand. */
- if (!allows_reg && allows_mem)
- {
- check_lhs_var (fn, TREE_VALUE (link));
- }
- }
-
- for (link = ASM_INPUTS (stmt); link; link = TREE_CHAIN (link))
- {
- constraint
- = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
- parse_input_constraint (&constraint, 0, 0, noutputs, 0,
- oconstraints, &allows_mem, &allows_reg);
-
- /* Memory operands are addressable. Note that STMT needs the
- address of this operand. */
- if (!allows_reg && allows_mem)
- {
- check_rhs_var (fn, TREE_VALUE (link));
- }
- }
-
- for (link = ASM_CLOBBERS (stmt); link; link = TREE_CHAIN (link))
- if (TREE_VALUE (link) == memory_identifier)
- {
- /* Abandon all hope, ye who enter here. */
- local_static_vars_info_t l = fn->static_vars_info->local;
- bitmap_a_or_b (l->statics_read_by_decl_uid,
- l->statics_read_by_decl_uid,
- all_module_statics);
- bitmap_a_or_b (l->statics_written_by_decl_uid,
- l->statics_written_by_decl_uid,
- all_module_statics);
-
- }
- }
-
- /* Check the parameters of a function call from CALLER to CALL_EXPR to
- see if any of them are static vars. Also check to see if this is
- either an indirect call, a call outside the compilation unit, or
- has special attributes that effect the clobbers. The caller
- parameter is the tree node for the caller and the second operand is
- the tree node for the entire call expression. */
- static void
- process_call_for_static_vars(struct cgraph_node * caller, tree call_expr)
- {
- int flags = call_expr_flags(call_expr);
- tree operandList = TREE_OPERAND (call_expr, 1);
- tree operand;
-
- for (operand = operandList;
- operand != NULL_TREE;
- operand = TREE_CHAIN (operand))
- {
- tree argument = TREE_VALUE (operand);
- check_rhs_var (caller, argument);
- }
-
- /* Const and pure functions have less clobber effects than other
- functions so we process these first. Otherwise if it is a call
- outside the compilation unit or an indirect call we punt. This
- leaves local calls which will be processed by following the call
- graph. */
- if (flags & ECF_CONST)
- return;
- else if (flags & ECF_PURE)
- caller->local.calls_write_all = true;
- else
- {
- tree callee_t = get_callee_fndecl (call_expr);
- if (callee_t == NULL)
- {
- /* Indirect call. */
- caller->local.calls_read_all = true;
- caller->local.calls_write_all = true;
- }
- else
- {
- struct cgraph_node* callee = cgraph_node(callee_t);
-
- if (callee->local.external)
- {
- caller->local.calls_read_all = true;
- caller->local.calls_write_all = true;
- }
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change to walk by explicitly walking
- the basic blocks rather than calling walktree. */
-
- /* Walk tree and record all calls. Called via walk_tree. FIXME When
- this is moved into the tree-profiling-branch, and is dealing with
- low GIMPLE, this routine should be changed to use tree iterators
- rather than being a walk_tree callback. The data is the function
- that is being scanned. */
- /* TP is the part of the tree currently under the
- microscope. WALK_SUBTREES is part of the walk_tree api but is
- unused here. DATA is cgraph_node of the function being walked. */
-
- static tree
- scan_for_static_refs (tree *tp,
- int *walk_subtrees ATTRIBUTE_UNUSED,
- void *data)
- {
- struct cgraph_node *fn = data;
- tree t = *tp;
-
- switch (TREE_CODE (t))
- {
- case MODIFY_EXPR:
- {
- /* First look on the lhs and see what variable is stored to */
- tree rhs = TREE_OPERAND (t, 1);
- check_lhs_var (fn, TREE_OPERAND (t, 0));
- /* Next check the operands on the rhs to see if they are ok. */
- switch (TREE_CODE_CLASS (TREE_CODE (rhs))) {
- case tcc_binary:
- check_rhs_var (fn, TREE_OPERAND (rhs, 0));
- check_rhs_var (fn, TREE_OPERAND (rhs, 1));
- break;
- case tcc_unary:
- case tcc_reference:
- check_rhs_var (fn, TREE_OPERAND (rhs, 0));
- break;
- case tcc_declaration:
- check_rhs_var (fn, rhs);
- break;
- case tcc_expression:
- switch (TREE_CODE (rhs)) {
- case ADDR_EXPR:
- check_rhs_var (fn, rhs);
- break;
- case CALL_EXPR:
- process_call_for_static_vars (fn, rhs);
- break;
- default:
- break;
- }
- break;
- default:
- break;
- }
- }
- break;
-
-
- case CALL_EXPR:
- process_call_for_static_vars (fn, t);
- break;
-
- case ASM_EXPR:
- get_asm_expr_operands (fn, t);
- break;
-
- default:
- break;
- }
- return NULL;
- }
-
-
- /* This is the main routine for finding the reference patterns for
- global variables within a function FN */
- static void
- cgraph_characterize_statics_local (struct cgraph_node *fn)
- {
- tree decl = fn->decl;
- static_vars_info_t info = new_static_vars_info(fn, false);
- local_static_vars_info_t l = info->local;
-
-
- /* The nodes we're interested in are never shared, so walk
- the tree ignoring duplicates. */
- visited_nodes = pointer_set_create ();
-
- /* FIXME -- PROFILE-RESTRUCTURE: Remove creation of _decl_uid vars. */
- l->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- l->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\n local analysis of %s", cgraph_node_name (fn));
-
- walk_tree (&DECL_SAVED_TREE (decl), scan_for_static_refs, fn, visited_nodes);
- pointer_set_destroy (visited_nodes);
- visited_nodes = NULL;
- }
-
- /* Lookup the tree node for the static variable that has UID and
- conver the name to a string for debugging. */
- static const char *
- cgraph_get_static_name_by_uid (int index)
- {
- splay_tree_node stn = splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (stn)
- return lang_hooks.decl_printable_name ((tree)(stn->value), 2);
- return NULL;
- }
-
- /* Clear out any the static variable with uid INDEX from further
- consideration because it escapes (i.e. has had its address
- taken). */
- static void
- clear_static_vars_maps (int index)
- {
- splay_tree_node stn = splay_tree_lookup (static_vars_to_consider_by_uid, index);
- if (stn)
- {
- splay_tree_remove (static_vars_to_consider_by_tree, stn->value);
- splay_tree_remove (static_vars_to_consider_by_uid, index);
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change all *_decl_uid to *_ann_uid. */
-
- /* Or in all of the bits from every callee into X, the caller's, bit
- vector. There are several cases to check to avoid the sparse
- bitmap oring. */
- static void
- cgraph_propagate_bits (struct cgraph_node *x)
- {
- static_vars_info_t x_info = x->static_vars_info;
- global_static_vars_info_t x_global = x_info->global;
-
- struct cgraph_edge *e;
- for (e = x->callees; e; e = e->next_callee)
- {
- struct cgraph_node *y = e->callee;
-
- /* We are only going to look at edges that point to nodes that
- have their output bit set. */
- if (y->output)
- {
- static_vars_info_t y_info;
- global_static_vars_info_t y_global;
- y_info = y->static_vars_info;
- y_global = y_info->global;
-
- if (x_global->statics_read_by_decl_uid != all_module_statics)
- {
- if (y_global->statics_read_by_decl_uid == all_module_statics)
- x_global->statics_read_by_decl_uid = all_module_statics;
- /* Skip bitmaps that are pointer equal to node's bitmap
- (no reason to spin within the cycle). */
- else if (x_global->statics_read_by_decl_uid != y_global->statics_read_by_decl_uid)
- bitmap_a_or_b (x_global->statics_read_by_decl_uid,
- x_global->statics_read_by_decl_uid,
- y_global->statics_read_by_decl_uid);
- }
-
- if (x_global->statics_written_by_decl_uid != all_module_statics)
- {
- if (y_global->statics_written_by_decl_uid == all_module_statics)
- x_global->statics_written_by_decl_uid = all_module_statics;
- /* Skip bitmaps that are pointer equal to node's bitmap
- (no reason to spin within the cycle). */
- else if (x_global->statics_written_by_decl_uid != y_global->statics_written_by_decl_uid)
- bitmap_a_or_b (x_global->statics_written_by_decl_uid,
- x_global->statics_written_by_decl_uid,
- y_global->statics_written_by_decl_uid);
- }
- }
- }
- }
-
- /* FIXME -- PROFILE-RESTRUCTURE: Change all *_decl_uid to *_ann_uid
- except where noted below. */
-
- /* The main routine for analyzing global static variable usage. See
- comments at top for description. */
-
- static void
- cgraph_characterize_statics (void)
- {
- struct cgraph_node *node;
- struct cgraph_node *w;
- struct cgraph_node **order =
- xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- int order_pos = 0;
- int i;
-
- struct cgraph_varpool_node *vnode;
- tree global;
-
- /* get rid of the splay trees from the previous compilation unit. */
-
- static_vars_to_consider_by_tree =
- splay_tree_new_ggc (splay_tree_compare_pointers);
- static_vars_to_consider_by_uid =
- splay_tree_new_ggc (splay_tree_compare_ints);
-
- if (module_statics_escape)
- {
- bitmap_clear (module_statics_escape);
- bitmap_clear (all_module_statics);
- }
- else
- {
- module_statics_escape = BITMAP_XMALLOC ();
- all_module_statics = BITMAP_GGC_ALLOC ();
- }
-
- /* Find all of the global variables that we wish to analyze. */
- for (vnode = cgraph_varpool_nodes_queue; vnode; vnode = vnode->next_needed)
- {
- global = vnode->decl;
- if ((TREE_CODE (global) == VAR_DECL) &&
- has_proper_scope_for_analysis (global))
- {
- splay_tree_insert (static_vars_to_consider_by_tree,
- (splay_tree_key) global,
- (splay_tree_value) global);
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- splay_tree_insert (static_vars_to_consider_by_uid,
- DECL_UID (global), (splay_tree_value)global);
-
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nConsidering global:%s",
- lang_hooks.decl_printable_name (global, 2));
- /* FIXME -- PROFILE-RESTRUCTURE: Change the call from
- DECL_UID to get the uid from the var_ann field. */
- bitmap_set_bit (all_module_statics, DECL_UID (global));
- }
- }
-
- order_pos = cgraph_reduced_inorder (order, false);
- if (cgraph_dump_file)
- print_order("new", order, order_pos);
-
- for (i = order_pos - 1; i >= 0; i--)
- {
- node = order[i];
-
- /* Scan each function to determine the variable usage
- patterns. */
- cgraph_characterize_statics_local (node);
- }
-
- /* Prune out the variables that were found to behave badly
- (i.e. have there address taken). */
- {
- int index;
- bitmap_iterator bi;
-
- EXECUTE_IF_SET_IN_BITMAP (module_statics_escape, 0, index, bi)
- {
- clear_static_vars_maps (index);
- }
- bitmap_operation (all_module_statics, all_module_statics,
- module_statics_escape, BITMAP_AND_COMPL);
-
- for (i = order_pos - 1; i >= 0; i--)
- {
- local_static_vars_info_t l;
- node = order[i];
- l = node->static_vars_info->local;
-
- bitmap_operation (l->statics_read_by_decl_uid,
- l->statics_read_by_decl_uid,
- module_statics_escape,
- BITMAP_AND_COMPL);
- bitmap_operation (l->statics_written_by_decl_uid,
- l->statics_written_by_decl_uid,
- module_statics_escape,
- BITMAP_AND_COMPL);
- }
- }
-
- if (cgraph_dump_file)
- {
- for (i = order_pos - 1; i >= 0; i--)
- {
- int index;
- local_static_vars_info_t l;
- bitmap_iterator bi;
-
- node = order[i];
- l = node->static_vars_info->local;
- fprintf (cgraph_dump_file,
- "\nFunction name:%s/%i:",
- cgraph_node_name (node), node->uid);
- fprintf (cgraph_dump_file, "\n locals read: ");
- EXECUTE_IF_SET_IN_BITMAP (l->statics_read_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- fprintf (cgraph_dump_file, "\n locals written: ");
- EXECUTE_IF_SET_IN_BITMAP (l->statics_written_by_decl_uid,
- 0, index, bi)
- {
- fprintf(cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- }
- }
-
- /* Propagate the local information thru the call graph to produce
- the global information. All the nodes within a cycle will have
- the same info so we collapse cycles first. Then we can do the
- propagation in one pass from the leaves to the roots. */
- order_pos = cgraph_reduced_inorder (order, true);
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g =
- ggc_calloc (1, sizeof (struct global_static_vars_info_d));
- local_static_vars_info_t node_l;
-
-
- bool read_all;
- bool write_all;
-
- node = order[i];
- node_info = node->static_vars_info;
- node_info->global = node_g;
- node_l = node_info->local;
-
- read_all = node->local.calls_read_all;
- write_all = node->local.calls_write_all;
-
- /* If any node in a cycle is calls_read_all or calls_write_all
- they all are. */
- w = node->next_cycle;
- while (w)
- {
- read_all |= w->local.calls_read_all;
- write_all |= w->local.calls_write_all;
- w = w->next_cycle;
- }
-
- /* Initialized the bitmaps for the reduced nodes */
- if (read_all)
- node_g->statics_read_by_decl_uid = all_module_statics;
- else
- {
- node_g->statics_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- bitmap_copy (node_g->statics_read_by_decl_uid,
- node_l->statics_read_by_decl_uid);
- }
-
- if (write_all)
- node_g->statics_written_by_decl_uid = all_module_statics;
- else
- {
- node_g->statics_written_by_decl_uid = BITMAP_GGC_ALLOC ();
- bitmap_copy (node_g->statics_written_by_decl_uid,
- node_l->statics_written_by_decl_uid);
- }
-
- w = node->next_cycle;
- while (w)
- {
- /* All nodes within a cycle share the same global info bitmaps. */
- static_vars_info_t w_info = w->static_vars_info;
- local_static_vars_info_t w_l;
-
- w_info->global = node_g;
- w_l = w_info->local;
-
- /* These global bitmaps are initialized from the local info
- of all of the nodes in the region. However there is no
- need to do any work if the bitmaps were set to
- all_module_statics. */
- if (!read_all)
- bitmap_a_or_b (node_g->statics_read_by_decl_uid,
- node_g->statics_read_by_decl_uid,
- w_l->statics_read_by_decl_uid);
- if (!write_all)
- bitmap_a_or_b (node_g->statics_written_by_decl_uid,
- node_g->statics_written_by_decl_uid,
- w_l->statics_written_by_decl_uid);
- w = w->next_cycle;
- }
-
- cgraph_propagate_bits (node);
-
- w = node->next_cycle;
- while (w)
- {
- cgraph_propagate_bits (w);
- w = w->next_cycle;
- }
- }
-
- if (cgraph_dump_file)
- {
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g;
- int index;
- bitmap_iterator bi;
-
- node = order[i];
- node_info = node->static_vars_info;
- node_g = node_info->global;
- fprintf (cgraph_dump_file,
- "\nFunction name:%s/%i:",
- cgraph_node_name (node), node->uid);
- w = node->next_cycle;
- while (w)
- {
- fprintf (cgraph_dump_file, "\n next cycle: %s/%i ",
- cgraph_node_name (w), w->uid);
- w = w->next_cycle;
- }
- fprintf (cgraph_dump_file, "\n globals read: ");
- EXECUTE_IF_SET_IN_BITMAP (node_g->statics_read_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- fprintf (cgraph_dump_file, "\n globals written: ");
- EXECUTE_IF_SET_IN_BITMAP (node_g->statics_written_by_decl_uid,
- 0, index, bi)
- {
- fprintf (cgraph_dump_file, "%s ",
- cgraph_get_static_name_by_uid (index));
- }
- }
- }
-
- /* Cleanup. */
- for (i = order_pos - 1; i >= 0; i--)
- {
- static_vars_info_t node_info;
- global_static_vars_info_t node_g;
- node = order[i];
- node_info = node->static_vars_info;
- node_g = node_info->global;
-
- node_g->var_anns_valid = false;
-
- /* Create the complimentary sets. These are more useful for
- certain apis. */
- node_g->statics_not_read_by_decl_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_written_by_decl_uid = BITMAP_GGC_ALLOC ();
-
- /* FIXME -- PROFILE-RESTRUCTURE: Delete next 4 assignments. */
- node_g->statics_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_written_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_read_by_ann_uid = BITMAP_GGC_ALLOC ();
- node_g->statics_not_written_by_ann_uid = BITMAP_GGC_ALLOC ();
-
- if (node_g->statics_read_by_decl_uid != all_module_statics)
- {
- bitmap_operation (node_g->statics_not_read_by_decl_uid,
- all_module_statics,
- node_g->statics_read_by_decl_uid,
- BITMAP_AND_COMPL);
- }
-
- if (node_g->statics_written_by_decl_uid != all_module_statics)
- bitmap_operation (node_g->statics_not_written_by_decl_uid,
- all_module_statics,
- node_g->statics_written_by_decl_uid,
- BITMAP_AND_COMPL);
-
- w = node->next_cycle;
-
- while (w)
- {
- struct cgraph_node * last = w;
- w = w->next_cycle;
- last->next_cycle = NULL;
- }
- }
-
- free (order);
- }
/* Expand all functions that must be output.
--- 1801,1806 ----
*************** cgraph_function_and_variable_visibility
*** 2913,2920 ****
node->local.local = (!node->needed
&& node->analyzed
&& !TREE_PUBLIC (node->decl));
- node->local.external = (!node->analyzed
- && TREE_PUBLIC (node->decl));
}
for (vnode = cgraph_varpool_nodes_queue; vnode; vnode = vnode->next_needed)
{
--- 1879,1884 ----
*************** cgraph_function_and_variable_visibility
*** 2942,2953 ****
if (node->local.local)
fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
fprintf (cgraph_dump_file, "\n\n");
-
- fprintf (cgraph_dump_file, "\nMarking external functions:");
- for (node = cgraph_nodes; node; node = node->next)
- if (node->local.external)
- fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
- fprintf (cgraph_dump_file, "\n\n");
}
}
--- 1906,1911 ----
*************** cgraph_optimize (void)
*** 3012,3025 ****
verify_cgraph ();
#endif
- /* This call was moved here from cgraph_expand_all_functions so that
- cgraph_characterize_statics could use the output flag of the cgraph
- node. */
-
cgraph_mark_functions_to_output ();
- cgraph_characterize_statics ();
-
cgraph_expand_all_functions ();
cgraph_varpool_assemble_pending_decls ();
--- 1970,1977 ----
*************** void
*** 3129,3134 ****
init_cgraph (void)
{
cgraph_dump_file = dump_begin (TDI_cgraph, NULL);
- memory_identifier = get_identifier("memory");
}
- #include "gt-cgraphunit.h"
--- 2081,2084 ----
Index: tree-dfa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dfa.c,v
retrieving revision 1.1.4.217.2.13
diff -c -3 -p -r1.1.4.217.2.13 tree-dfa.c
*** tree-dfa.c 25 Oct 2004 09:15:35 -0000 1.1.4.217.2.13
--- tree-dfa.c 25 Oct 2004 22:13:06 -0000
*************** find_referenced_vars (void)
*** 109,115 ****
block_stmt_iterator si;
struct walk_state walk_state;
- cgraph_reset_static_var_maps ();
vars_found = htab_create (50, htab_hash_pointer, htab_eq_pointer, NULL);
memset (&walk_state, 0, sizeof (walk_state));
walk_state.vars_found = vars_found;
--- 109,114 ----
Index: tree-flow.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-flow.h,v
retrieving revision 1.1.4.187.2.18
diff -c -3 -p -r1.1.4.187.2.18 tree-flow.h
*** tree-flow.h 22 Oct 2004 21:51:39 -0000 1.1.4.187.2.18
--- tree-flow.h 25 Oct 2004 22:13:06 -0000
*************** struct var_ann_d GTY(())
*** 201,211 ****
live at the same time and this can happen for each call to the
dominator optimizer. */
tree current_def;
-
- /* Pointer to the structure that contains the sets of global
- variables modified by function calls. This field is only used
- for FUNCTION_DECLs. */
- static_vars_info_t static_vars_info;
};
--- 201,206 ----
Index: tree-ssa-operands.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-operands.c,v
retrieving revision 1.1.2.9.2.14
diff -c -3 -p -r1.1.2.9.2.14 tree-ssa-operands.c
*** tree-ssa-operands.c 17 Oct 2004 18:31:05 -0000 1.1.2.9.2.14
--- tree-ssa-operands.c 25 Oct 2004 22:13:07 -0000
*************** Boston, MA 02111-1307, USA. */
*** 32,38 ****
#include "tree-pass.h"
#include "ggc.h"
#include "timevar.h"
- #include "cgraph.h"
#include "langhooks.h"
--- 32,37 ----
*************** static inline void append_def (tree *);
*** 135,142 ****
static inline void append_use (tree *);
static void append_v_may_def (tree);
static void append_v_must_def (tree);
! static void add_call_clobber_ops (tree, tree);
! static void add_call_read_ops (tree, tree);
static void add_stmt_operand (tree *, tree, int);
/* Return a vector of contiguous memory for NUM def operands. */
--- 134,141 ----
static inline void append_use (tree *);
static void append_v_may_def (tree);
static void append_v_must_def (tree);
! static void add_call_clobber_ops (tree);
! static void add_call_read_ops (tree);
static void add_stmt_operand (tree *, tree, int);
/* Return a vector of contiguous memory for NUM def operands. */
*************** get_call_expr_operands (tree stmt, tree
*** 1399,1405 ****
{
tree op;
int call_flags = call_expr_flags (expr);
- tree callee = get_callee_fndecl (expr);
/* Find uses in the called function. */
get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_none);
--- 1398,1403 ----
*************** get_call_expr_operands (tree stmt, tree
*** 1416,1424 ****
there is no point in recording that. */
if (TREE_SIDE_EFFECTS (expr)
&& !(call_flags & (ECF_PURE | ECF_CONST | ECF_NORETURN)))
! add_call_clobber_ops (stmt, callee);
else if (!(call_flags & ECF_CONST))
! add_call_read_ops (stmt, callee);
}
}
--- 1414,1422 ----
there is no point in recording that. */
if (TREE_SIDE_EFFECTS (expr)
&& !(call_flags & (ECF_PURE | ECF_CONST | ECF_NORETURN)))
! add_call_clobber_ops (stmt);
else if (!(call_flags & ECF_CONST))
! add_call_read_ops (stmt);
}
}
*************** note_addressable (tree var, stmt_ann_t s
*** 1582,1588 ****
clobbered variables in the function. */
static void
! add_call_clobber_ops (tree stmt, tree callee)
{
/* Functions that are not const, pure or never return may clobber
call-clobbered variables. */
--- 1580,1586 ----
clobbered variables in the function. */
static void
! add_call_clobber_ops (tree stmt)
{
/* Functions that are not const, pure or never return may clobber
call-clobbered variables. */
*************** add_call_clobber_ops (tree stmt, tree ca
*** 1598,1656 ****
else
{
size_t i;
- bitmap not_read_b = NULL, not_written_b = NULL;
bitmap_iterator bi;
- /* Get info for module level statics. There is a bit set for
- each static if the call being processed does not read or
- write that variable. */
-
- /* ??? Turn off the optimization until it gets fixed. */
- if (0 && callee)
- {
- not_read_b = get_global_statics_not_read (callee);
- not_written_b = get_global_statics_not_written (callee);
- }
-
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
!
! bool not_read
! = not_read_b ? bitmap_bit_p (not_read_b, i) : false;
! bool not_written
! = not_written_b ? bitmap_bit_p (not_written_b, i) : false;
!
! if (not_read)
! {
! /* The var is not read during the call. */
! if (!not_written)
! add_stmt_operand (&var, stmt, opf_is_def);
! }
else
! {
! /* The var is read during the call. */
! if (not_written)
! add_stmt_operand (&var, stmt, opf_none);
!
! /* The not_read and not_written bits are only set for module
! static variables. Neither is set here, so we may be dealing
! with a module static or we may not. So we still must look
! anywhere else we can (such as the TREE_READONLY) to get
! better info. */
!
! /* If VAR is read-only, don't add a V_MAY_DEF, just a
! VUSE operand. FIXME, this is quirky. TREE_READONLY
! by itself is not enough here. We can only decide
! that the call will not affect VAR if all these
! conditions are met. One would think that
! TREE_READONLY should be sufficient. */
! else if (TREE_READONLY (var)
! && (TREE_STATIC (var) || DECL_EXTERNAL (var)))
! add_stmt_operand (&var, stmt, opf_none);
! else
! add_stmt_operand (&var, stmt, opf_is_def);
! }
}
}
}
--- 1596,1611 ----
else
{
size_t i;
bitmap_iterator bi;
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
! if (TREE_READONLY (var)
! && (TREE_STATIC (var) || DECL_EXTERNAL (var)))
! add_stmt_operand (&var, stmt, opf_none);
else
! add_stmt_operand (&var, stmt, opf_is_def);
}
}
}
*************** add_call_clobber_ops (tree stmt, tree ca
*** 1660,1666 ****
function. */
static void
! add_call_read_ops (tree stmt, tree callee)
{
bitmap_iterator bi;
--- 1615,1621 ----
function. */
static void
! add_call_read_ops (tree stmt)
{
bitmap_iterator bi;
*************** add_call_read_ops (tree stmt, tree calle
*** 1673,1687 ****
else
{
size_t i;
! bitmap not_read_b = callee
! ? get_global_statics_not_read (callee) : NULL;
!
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
- bool not_read = not_read_b
- ? bitmap_bit_p(not_read_b, i) : false;
- if (!not_read)
add_stmt_operand (&var, stmt, opf_none);
}
}
--- 1628,1637 ----
else
{
size_t i;
!
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
{
tree var = referenced_var (i);
add_stmt_operand (&var, stmt, opf_none);
}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2004-10-26 14:10 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-25 18:58 removal of static vars analysis code from mainline Kenneth Zadeck
2004-10-25 21:30 ` Mark Mitchell
2004-10-25 22:06 ` Kenneth Zadeck
2004-10-25 23:00 ` Jan Hubicka
2004-10-25 23:31 ` Kenneth Zadeck
2004-10-25 23:35 ` Jan Hubicka
2004-10-26 14:32 ` Kenneth Zadeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).