This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] analysis of global statics and removal associated vdefs andvuses
- From: Kenneth Zadeck <zadeck at naturalbridge dot com>
- To: gcc-patches at gcc dot gnu dot org, "Novillo, Diego" <dnovillo at redhat dot com>,"Berlin, Daniel" <dberlin at dberlin dot org>
- Date: Thu, 26 Aug 2004 18:01:25 -0400
- Subject: [PATCH] analysis of global statics and removal associated vdefs andvuses
This proposed patch consists of three parts:
1) bug fixes in the gcc/makefile.in to properly account for some .h
files included into other .h files.
2) analysis of compilation unit scoped static variables to determine if
they escape the compilation unit as well as how they may be effected by
function calls.
3) use of the analysis in (2) so that the code in
gcc/tree-ssa-operands.c reduces the number of vdefs and vuses that are
inserted to account for call clobbering.
Note that other uses of (2) will follow in subsequent patches.
Kenny Zadeck
zadeck@naturalbridge.com
=========================
2004-08-26 Kenneth Zadeck <Kenneth.Zadeck@NaturalBridge.com>
* tree-ssa-operands.c (get_call_expr_operands): Change. Added parm
to add_call_clobber_ops and add_call_read_ops.
(add_call_clobber_ops, add_call_read_ops): Change. Added code to
reduce the number of vdefs and vuses inserted based on analysis of
global variables across calls.
* tree-dfa.c (find_referenced_vars): Change. Needed to reset
static var maps before each function is compiled.
* cgraphunit.c:
(static_vars_to_consider_by_tree,static_vars_to_consider_by_uid,
static_vars_info,functions_to_static_vars_info,module_statics_escape,
all_module_statics,searchc_env,dfs_info): New fields to support
analysis of static global static variables.
(print_order
convert_UIDs_in_bitmap, cgraph_reset_static_var_maps
get_static_vars_info, get_local_static_vars_info
get_statics_not_read_for_function_call
get_statics_not_written_for_function_call
get_statics_read_in_function, get_statics_written_in_function
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
cgraph_get_static_name_by_uid, clear_static_vars_maps
cgraph_propagate_bits, cgraph_characterize_statics):
New. Functions to support analysis of static global variables.
(cgraph_mark_local_functions): Renamed to:
(cgraph_mark_local_and_external_functions)
(cgraph_expand_all_functions): Changed to call
cgraph_mark_local_and_external_functions.
(cgraph_optimize): Changed. Added driver to analyze
static variables.
* cgraph.h (struct cgraph_local_info, GTY): Added statics_read,
statics_written, local, calls_read_all, calls_write_all,
for_functions_valid.
(struct cgraph_node): Added next_cycle.
* cgraph.c (dump_cgraph_node): Added print routines for new fields.
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1361
diff -c -3 -p -w -r1.1361 Makefile.in
*** gcc/Makefile.in 26 Aug 2004 17:10:46 -0000 1.1361
--- gcc/Makefile.in 26 Aug 2004 21:18:44 -0000
*************** INTEGRATE_H = integrate.h varray.h
*** 697,702 ****
--- 697,703 ----
LOOP_H = loop.h varray.h bitmap.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
*************** c-incpath.o: c-incpath.c c-incpath.h $(C
*** 1360,1366 ****
c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) function.h output.h \
$(EXPR_H) debug.h toplev.h intl.h $(TM_P_H) tree-inline.h $(TIMEVAR_H) \
! opts.h $(C_PRAGMA_H) gt-c-decl.h cgraph.h $(HASHTAB_H) libfuncs.h except.h \
$(LANGHOOKS_DEF_H) $(TREE_DUMP_H)
c-typeck.o : c-typeck.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
$(TARGET_H) $(FLAGS_H) intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) \
--- 1361,1367 ----
c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) function.h output.h \
$(EXPR_H) debug.h toplev.h intl.h $(TM_P_H) tree-inline.h $(TIMEVAR_H) \
! opts.h $(C_PRAGMA_H) gt-c-decl.h $(CGRAPH_H) $(HASHTAB_H) libfuncs.h except.h \
$(LANGHOOKS_DEF_H) $(TREE_DUMP_H)
c-typeck.o : c-typeck.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
$(TARGET_H) $(FLAGS_H) intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) \
*************** c-ppoutput.o : c-ppoutput.c $(CONFIG_H)
*** 1380,1386 ****
c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(C_TREE_H) $(RTL_H) insn-config.h $(INTEGRATE_H) $(EXPR_H) \
$(FLAGS_H) toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \
! langhooks.h $(GGC_H) $(TARGET_H) cgraph.h $(C_PRETTY_PRINT_H) c-objc-common.h
c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(C_TREE_H) $(FLAGS_H) toplev.h
c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
--- 1381,1387 ----
c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(C_TREE_H) $(RTL_H) insn-config.h $(INTEGRATE_H) $(EXPR_H) \
$(FLAGS_H) toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \
! langhooks.h $(GGC_H) $(TARGET_H) $(CGRAPH_H) $(C_PRETTY_PRINT_H) c-objc-common.h
c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(C_TREE_H) $(FLAGS_H) toplev.h
c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
*************** gtype-desc.o: gtype-desc.c $(CONFIG_H) $
*** 1541,1547 ****
varray.h $(HASHTAB_H) $(SPLAY_TREE_H) bitmap.h $(TREE_H) $(RTL_H) \
function.h insn-config.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
cselib.h insn-addr.h $(OPTABS_H) libfuncs.h debug.h $(GGC_H) \
! cgraph.h tree-alias-type.h $(TREE_FLOW_H) reload.h $(CPP_ID_DATA_H)
ggc-common.o: ggc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GGC_H) \
$(HASHTAB_H) toplev.h $(PARAMS_H) hosthooks.h
--- 1542,1548 ----
varray.h $(HASHTAB_H) $(SPLAY_TREE_H) bitmap.h $(TREE_H) $(RTL_H) \
function.h insn-config.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
cselib.h insn-addr.h $(OPTABS_H) libfuncs.h debug.h $(GGC_H) \
! $(CGRAPH_H) tree-alias-type.h $(TREE_FLOW_H) reload.h $(CPP_ID_DATA_H)
ggc-common.o: ggc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GGC_H) \
$(HASHTAB_H) toplev.h $(PARAMS_H) hosthooks.h
*************** tree-dump.o: tree-dump.c $(CONFIG_H) $(S
*** 1576,1582 ****
tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(RTL_H) $(EXPR_H) $(FLAGS_H) $(PARAMS_H) input.h insn-config.h \
$(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
! langhooks.h $(C_COMMON_H) tree-inline.h cgraph.h intl.h function.h \
$(TREE_GIMPLE_H)
print-tree.o : print-tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(GGC_H) langhooks.h real.h
--- 1577,1583 ----
tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(RTL_H) $(EXPR_H) $(FLAGS_H) $(PARAMS_H) input.h insn-config.h \
$(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
! langhooks.h $(C_COMMON_H) tree-inline.h $(CGRAPH_H) intl.h function.h \
$(TREE_GIMPLE_H)
print-tree.o : print-tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(GGC_H) langhooks.h real.h
*************** tree-alias-type.o: tree-alias-type.c tre
*** 1588,1597 ****
$(GGC_H) $(TM_H) coretypes.h $(VARRAY_H)
tree-alias-ander.o: tree-alias-ander.c tree-alias-ander.h $(SYSTEM_H) \
$(CONFIG_H) $(GGC_H) $(TREE_H) $(TREE_FLOW_H) tree-alias-common.h \
! $(TM_H) coretypes.h cgraph.h tree-pass.h
tree-alias-common.o: tree-alias-common.c tree-alias-common.h $(SYSTEM_H) \
$(CONFIG_H) $(GGC_H) $(TREE_H) gt-tree-alias-common.h $(TREE_FLOW_H) \
! $(TM_H) coretypes.h cgraph.h tree-pass.h $(TIMEVAR_H) tree-alias-type.h \
bitmap.h tree-alias-ander.h $(FLAGS_H) $(RTL_H) $(TM_P_H) \
hard-reg-set.h $(BASIC_BLOCK_H) output.h errors.h $(EXPR_H) \
$(DIAGNOSTIC_H) $(C_COMMON_H) tree-inline.h varray.h $(C_TREE_H) \
--- 1589,1598 ----
$(GGC_H) $(TM_H) coretypes.h $(VARRAY_H)
tree-alias-ander.o: tree-alias-ander.c tree-alias-ander.h $(SYSTEM_H) \
$(CONFIG_H) $(GGC_H) $(TREE_H) $(TREE_FLOW_H) tree-alias-common.h \
! $(TM_H) coretypes.h $(CGRAPH_H) tree-pass.h
tree-alias-common.o: tree-alias-common.c tree-alias-common.h $(SYSTEM_H) \
$(CONFIG_H) $(GGC_H) $(TREE_H) gt-tree-alias-common.h $(TREE_FLOW_H) \
! $(TM_H) coretypes.h $(CGRAPH_H) tree-pass.h $(TIMEVAR_H) tree-alias-type.h \
bitmap.h tree-alias-ander.h $(FLAGS_H) $(RTL_H) $(TM_P_H) \
hard-reg-set.h $(BASIC_BLOCK_H) output.h errors.h $(EXPR_H) \
$(DIAGNOSTIC_H) $(C_COMMON_H) tree-inline.h varray.h $(C_TREE_H) \
*************** tree-tailcall.o : tree-tailcall.c $(TREE
*** 1667,1682 ****
$(TREE_DUMP_H) diagnostic.h except.h tree-pass.h $(FLAGS_H) langhooks.h
tree-nested.o: tree-nested.c $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(TREE_H) \
$(RTL_H) $(TM_P_H) function.h tree-dump.h tree-inline.h tree-iterator.h \
! tree-gimple.h cgraph.h $(EXPR_H) langhooks.h $(GGC_H) gt-tree-nested.h
tree-iterator.o : tree-iterator.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
coretypes.h $(GGC_H) tree-iterator.h tree-gimple.h gt-tree-iterator.h
tree-dfa.o : tree-dfa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h diagnostic.h \
errors.h tree-inline.h $(HASHTAB_H) $(FLAGS_H) function.h $(TIMEVAR_H) \
tree-alias-common.h convert.h $(TM_H) coretypes.h langhooks.h \
! $(TREE_DUMP_H) tree-pass.h params.h
tree-ssa-operands.o : tree-ssa-operands.c $(TREE_FLOW_H) $(CONFIG_H) \
! $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(GGC_H) diagnostic.h \
tree-inline.h $(FLAGS_H) function.h $(TM_H) $(TIMEVAR_H) tree-pass.h
tree-eh.o : tree-eh.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_H) $(FLAGS_H) function.h except.h langhooks.h \
--- 1668,1683 ----
$(TREE_DUMP_H) diagnostic.h except.h tree-pass.h $(FLAGS_H) langhooks.h
tree-nested.o: tree-nested.c $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(TREE_H) \
$(RTL_H) $(TM_P_H) function.h tree-dump.h tree-inline.h tree-iterator.h \
! tree-gimple.h $(CGRAPH_H) $(EXPR_H) langhooks.h $(GGC_H) gt-tree-nested.h
tree-iterator.o : tree-iterator.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
coretypes.h $(GGC_H) tree-iterator.h tree-gimple.h gt-tree-iterator.h
tree-dfa.o : tree-dfa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h diagnostic.h \
errors.h tree-inline.h $(HASHTAB_H) $(FLAGS_H) function.h $(TIMEVAR_H) \
tree-alias-common.h convert.h $(TM_H) coretypes.h langhooks.h \
! $(TREE_DUMP_H) tree-pass.h params.h $(CGRAPH_H)
tree-ssa-operands.o : tree-ssa-operands.c $(TREE_FLOW_H) $(CONFIG_H) \
! $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(GGC_H) diagnostic.h $(CGRAPH_H) \
tree-inline.h $(FLAGS_H) function.h $(TM_H) $(TIMEVAR_H) tree-pass.h
tree-eh.o : tree-eh.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_H) $(FLAGS_H) function.h except.h langhooks.h \
*************** tree-optimize.o : tree-optimize.c $(TREE
*** 1713,1727 ****
$(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) \
$(GGC_H) output.h diagnostic.h errors.h $(FLAGS_H) tree-alias-common.h \
$(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) toplev.h function.h \
! langhooks.h $(FLAGS_H) cgraph.h tree-inline.h tree-mudflap.h $(GGC_H) \
! cgraph.h tree-pass.h
c-gimplify.o : c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
$(C_TREE_H) $(C_COMMON_H) diagnostic.h $(TREE_GIMPLE_H) varray.h $(FLAGS_H) \
langhooks.h toplev.h rtl.h $(TREE_FLOW_H) langhooks-def.h \
! $(TM_H) coretypes.h $(C_PRETTY_PRINT_H) cgraph.h
gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
diagnostic.h $(TREE_GIMPLE_H) tree-inline.h varray.h langhooks.h \
! langhooks-def.h $(TREE_FLOW_H) cgraph.h $(TIMEVAR_H) $(TM_H) coretypes.h \
except.h $(FLAGS_H) $(RTL_H) function.h $(EXPR_H) output.h $(GGC_H) \
gt-gimplify.h
gimple-low.o : gimple-low.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
--- 1714,1728 ----
$(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) \
$(GGC_H) output.h diagnostic.h errors.h $(FLAGS_H) tree-alias-common.h \
$(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) toplev.h function.h \
! langhooks.h $(FLAGS_H) $(CGRAPH_H) tree-inline.h tree-mudflap.h $(GGC_H) \
! $(CGRAPH_H) tree-pass.h
c-gimplify.o : c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
$(C_TREE_H) $(C_COMMON_H) diagnostic.h $(TREE_GIMPLE_H) varray.h $(FLAGS_H) \
langhooks.h toplev.h rtl.h $(TREE_FLOW_H) langhooks-def.h \
! $(TM_H) coretypes.h $(C_PRETTY_PRINT_H) $(CGRAPH_H)
gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
diagnostic.h $(TREE_GIMPLE_H) tree-inline.h varray.h langhooks.h \
! langhooks-def.h $(TREE_FLOW_H) $(CGRAPH_H) $(TIMEVAR_H) $(TM_H) coretypes.h \
except.h $(FLAGS_H) $(RTL_H) function.h $(EXPR_H) output.h $(GGC_H) \
gt-gimplify.h
gimple-low.o : gimple-low.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
*************** tree-gimple.o : tree-gimple.c $(CONFIG_H
*** 1750,1756 ****
tree-mudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(C_TREE_H) $(C_COMMON_H) $(TREE_GIMPLE_H) diagnostic.h $(HASHTAB_H) \
output.h varray.h langhooks.h tree-mudflap.h $(TM_H) coretypes.h \
! $(TREE_DUMP_H) tree-pass.h cgraph.h
tree-nomudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(C_TREE_H) $(C_COMMON_H) $(TREE_GIMPLE_H) diagnostic.h $(HASHTAB_H) \
output.h varray.h langhooks.h tree-mudflap.h $(TM_H) coretypes.h
--- 1751,1757 ----
tree-mudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(C_TREE_H) $(C_COMMON_H) $(TREE_GIMPLE_H) diagnostic.h $(HASHTAB_H) \
output.h varray.h langhooks.h tree-mudflap.h $(TM_H) coretypes.h \
! $(TREE_DUMP_H) tree-pass.h $(CGRAPH_H)
tree-nomudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(C_TREE_H) $(C_COMMON_H) $(TREE_GIMPLE_H) diagnostic.h $(HASHTAB_H) \
output.h varray.h langhooks.h tree-mudflap.h $(TM_H) coretypes.h
*************** toplev.o : toplev.c $(CONFIG_H) $(SYSTEM
*** 1777,1783 ****
graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
$(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) \
langhooks.h insn-flags.h $(CFGLAYOUT_H) real.h $(CFGLOOP_H) \
! hosthooks.h $(LANGHOOKS_DEF_H) cgraph.h $(COVERAGE_H) alloc-pool.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DTARGET_NAME=\"$(target_noncanonical)\" \
-c $(srcdir)/toplev.c $(OUTPUT_OPTION)
--- 1778,1784 ----
graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
$(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) \
langhooks.h insn-flags.h $(CFGLAYOUT_H) real.h $(CFGLOOP_H) \
! hosthooks.h $(LANGHOOKS_DEF_H) $(CGRAPH_H) $(COVERAGE_H) alloc-pool.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DTARGET_NAME=\"$(target_noncanonical)\" \
-c $(srcdir)/toplev.c $(OUTPUT_OPTION)
*************** passes.o : passes.c $(CONFIG_H) $(SYSTEM
*** 1789,1795 ****
graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
$(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) \
langhooks.h insn-flags.h $(CFGLAYOUT_H) real.h $(CFGLOOP_H) \
! hosthooks.h $(LANGHOOKS_DEF_H) cgraph.h $(COVERAGE_H) alloc-pool.h
main.o : main.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h
--- 1790,1796 ----
graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
$(PARAMS_H) $(TM_P_H) reload.h dwarf2asm.h $(TARGET_H) \
langhooks.h insn-flags.h $(CFGLAYOUT_H) real.h $(CFGLOOP_H) \
! hosthooks.h $(LANGHOOKS_DEF_H) $(CGRAPH_H) $(COVERAGE_H) alloc-pool.h
main.o : main.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h
*************** except.o : except.c $(CONFIG_H) $(SYSTEM
*** 1826,1832 ****
$(TREE_H) $(FLAGS_H) except.h function.h $(EXPR_H) libfuncs.h $(INTEGRATE_H) \
langhooks.h insn-config.h hard-reg-set.h $(BASIC_BLOCK_H) output.h \
dwarf2asm.h dwarf2out.h toplev.h $(HASHTAB_H) intl.h $(GGC_H) \
! gt-except.h cgraph.h
expr.o : expr.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
function.h $(REGS_H) $(EXPR_H) $(OPTABS_H) libfuncs.h $(INSN_ATTR_H) insn-config.h \
$(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \
--- 1827,1833 ----
$(TREE_H) $(FLAGS_H) except.h function.h $(EXPR_H) libfuncs.h $(INTEGRATE_H) \
langhooks.h insn-config.h hard-reg-set.h $(BASIC_BLOCK_H) output.h \
dwarf2asm.h dwarf2out.h toplev.h $(HASHTAB_H) intl.h $(GGC_H) \
! gt-except.h $(CGRAPH_H)
expr.o : expr.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
function.h $(REGS_H) $(EXPR_H) $(OPTABS_H) libfuncs.h $(INSN_ATTR_H) insn-config.h \
$(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \
*************** builtins.o : builtins.c $(CONFIG_H) $(SY
*** 1841,1847 ****
except.h $(TM_P_H) $(PREDICT_H) libfuncs.h real.h langhooks.h basic-block.h
calls.o : calls.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
$(EXPR_H) $(OPTABS_H) langhooks.h $(TARGET_H) \
! libfuncs.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H) cgraph.h except.h
expmed.o : expmed.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
$(FLAGS_H) insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) real.h \
toplev.h $(TM_P_H) langhooks.h
--- 1842,1848 ----
except.h $(TM_P_H) $(PREDICT_H) libfuncs.h real.h langhooks.h basic-block.h
calls.o : calls.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
$(EXPR_H) $(OPTABS_H) langhooks.h $(TARGET_H) \
! libfuncs.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H) $(CGRAPH_H) except.h
expmed.o : expmed.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
$(FLAGS_H) insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) real.h \
toplev.h $(TM_P_H) langhooks.h
*************** dwarf2out.o : dwarf2out.c $(CONFIG_H) $(
*** 1865,1871 ****
$(TREE_H) version.h $(RTL_H) dwarf2.h debug.h $(FLAGS_H) insn-config.h reload.h \
output.h $(DIAGNOSTIC_H) real.h hard-reg-set.h $(REGS_H) $(EXPR_H) \
libfuncs.h toplev.h dwarf2out.h varray.h $(GGC_H) except.h dwarf2asm.h \
! $(TM_P_H) langhooks.h $(HASHTAB_H) gt-dwarf2out.h $(TARGET_H) cgraph.h \
$(MD5_H) input.h
dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(FLAGS_H) $(RTL_H) \
$(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
--- 1866,1872 ----
$(TREE_H) version.h $(RTL_H) dwarf2.h debug.h $(FLAGS_H) insn-config.h reload.h \
output.h $(DIAGNOSTIC_H) real.h hard-reg-set.h $(REGS_H) $(EXPR_H) \
libfuncs.h toplev.h dwarf2out.h varray.h $(GGC_H) except.h dwarf2asm.h \
! $(TM_P_H) langhooks.h $(HASHTAB_H) gt-dwarf2out.h $(TARGET_H) $(CGRAPH_H) \
$(MD5_H) input.h
dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(FLAGS_H) $(RTL_H) \
$(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
*************** simplify-rtx.o : simplify-rtx.c $(CONFIG
*** 1891,1901 ****
$(REGS_H) hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
output.h function.h $(GGC_H) $(OBSTACK_H) $(TM_P_H) $(TREE_H) $(TARGET_H)
cgraph.o : cgraph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
! langhooks.h toplev.h $(FLAGS_H) $(GGC_H) $(TARGET_H) cgraph.h gt-cgraph.h \
output.h intl.h
cgraphunit.o : cgraphunit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
! langhooks.h tree-inline.h toplev.h $(FLAGS_H) $(GGC_H) $(TARGET_H) cgraph.h intl.h \
! function.h
coverage.o : coverage.c gcov-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
toplev.h $(GGC_H) $(TARGET_H) langhooks.h $(COVERAGE_H) libfuncs.h \
--- 1892,1902 ----
$(REGS_H) hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
output.h function.h $(GGC_H) $(OBSTACK_H) $(TM_P_H) $(TREE_H) $(TARGET_H)
cgraph.o : cgraph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
! langhooks.h toplev.h $(FLAGS_H) $(GGC_H) $(TARGET_H) $(CGRAPH_H) gt-cgraph.h \
output.h intl.h
cgraphunit.o : cgraphunit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
! langhooks.h tree-inline.h toplev.h $(FLAGS_H) $(GGC_H) $(TARGET_H) $(CGRAPH_H) intl.h \
! function.h $(TREE_GIMPLE_H) $(TREE_FLOW_H)
coverage.o : coverage.c gcov-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
toplev.h $(GGC_H) $(TARGET_H) langhooks.h $(COVERAGE_H) libfuncs.h \
*************** reorg.o : reorg.c $(CONFIG_H) $(SYSTEM_H
*** 2077,2083 ****
alias.o : alias.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
hard-reg-set.h $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(ALIAS_H) $(EMIT_RTL_H) \
$(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H) langhooks.h $(TARGET_H) \
! gt-alias.h $(TIMEVAR_H) cgraph.h
regmove.o : regmove.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) insn-config.h \
$(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) function.h \
$(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H) except.h reload.h
--- 2078,2084 ----
alias.o : alias.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
hard-reg-set.h $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(ALIAS_H) $(EMIT_RTL_H) \
$(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H) langhooks.h $(TARGET_H) \
! gt-alias.h $(TIMEVAR_H) $(CGRAPH_H)
regmove.o : regmove.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) insn-config.h \
$(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) function.h \
$(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H) except.h reload.h
*************** GTFILES = $(srcdir)/input.h $(srcdir)/co
*** 2380,2385 ****
--- 2381,2387 ----
$(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 \
Index: gcc/cgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.c,v
retrieving revision 1.53
diff -c -3 -p -w -r1.53 cgraph.c
*** gcc/cgraph.c 30 May 2004 07:12:48 -0000 1.53
--- gcc/cgraph.c 26 Aug 2004 21:18:44 -0000
*************** dump_cgraph_node (FILE *f, struct cgraph
*** 479,484 ****
--- 479,490 ----
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)
Index: gcc/cgraph.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.h,v
retrieving revision 1.34
diff -c -3 -p -w -r1.34 cgraph.h
*** gcc/cgraph.h 15 Jul 2004 17:32:58 -0000 1.34
--- gcc/cgraph.h 26 Aug 2004 21:18:44 -0000
*************** Software Foundation, 59 Temple Place - S
*** 22,27 ****
--- 22,29 ----
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
#include "hashtab.h"
+ #include "bitmap.h"
+ #include "tree.h"
/* Information about the function collected locally.
Available after function is analyzed. */
*************** struct cgraph_local_info GTY(())
*** 30,48 ****
--- 32,77 ----
{
/* Size of the function before inlining. */
int self_insns;
+
+ /* Local statics that are read and written by this function and
+ indexed by DECL_UID. */
+ bitmap statics_read;
+ bitmap statics_written;
+
+ /* Same as above except indexed by var_ann (VAR_DECL)->uid. */
+ bitmap statics_read_for_function;
+ bitmap statics_written_for_function;
+
/* Set when function function is visible in current compilation unit only
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;
/* False when there something makes inlining impossible (such as va_arg). */
bool inlinable;
+
/* True when function should be inlined independently on it's size. */
bool disregard_inline_limits;
+
/* True when the function has been originally extern inline, but it is
redefined now. */
bool redefined_extern_inline;
+
+ /* True if statics_read_for_function and
+ statics_written_for_function contain valid data. */
+ bool for_functions_valid;
};
/* Information about the function that needs to be computed globally
*************** struct cgraph_node GTY((chain_next ("%h.
*** 91,96 ****
--- 120,127 ----
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;
*************** void verify_cgraph_node (struct cgraph_n
*** 193,197 ****
--- 224,233 ----
void cgraph_mark_inline_edge (struct cgraph_edge *e);
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_statics_not_read_for_function_call (tree fn);
+ bitmap get_statics_not_written_for_function_call (tree fn);
+ bitmap get_statics_read_in_function (tree fn);
+ bitmap get_statics_written_in_function (tree fn);
#endif /* GCC_CGRAPH_H */
Index: gcc/cgraphunit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraphunit.c,v
retrieving revision 1.72
diff -c -3 -p -w -r1.72 cgraphunit.c
*** gcc/cgraphunit.c 29 Jul 2004 17:59:24 -0000 1.72
--- gcc/cgraphunit.c 26 Aug 2004 21:18:44 -0000
*************** Software Foundation, 59 Temple Place - S
*** 163,174 ****
--- 163,188 ----
cgraph_decide_inlining implements heuristics taking whole callgraph
into account, while cgraph_decide_inlining_incrementally considers
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_charactize_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"
#include "tm.h"
#include "tree.h"
#include "rtl.h"
+ #include "tree-flow.h"
#include "tree-inline.h"
#include "langhooks.h"
#include "hashtab.h"
*************** Software Foundation, 59 Temple Place - S
*** 185,190 ****
--- 199,205 ----
#include "c-common.h"
#include "intl.h"
#include "function.h"
+ #include "tree-gimple.h"
#define INSNS_PER_CALL 10
*************** static void cgraph_expand_all_functions
*** 192,198 ****
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 *);
--- 207,213 ----
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 *);
*************** static int overall_insns;
*** 209,214 ****
--- 224,279 ----
record_calls_1. */
static htab_t visited_nodes;
+ /* 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;
+
+ /* same as above but indexed by DECL_UID */
+ static GTY((param1_is(int), param2_is(tree)))
+ splay_tree static_vars_to_consider_by_uid;
+
+ /* Global statics that are read and written by some set of functions.
+ The index in the first four bitmaps can be found by using the
+ DECL_UID macro. The index of the two "_for_function" variables are
+ based on the var_ann (VAR_DECL)->uid and are reset in every
+ function. The "_not_" variables are computed by subtracting the
+ regular bits from all_module_statics. */
+ struct static_vars_info GTY(())
+ {
+ bitmap statics_read;
+ bitmap statics_written;
+ bitmap statics_not_read;
+ bitmap statics_not_written;
+ bitmap statics_not_read_for_function;
+ bitmap statics_not_written_for_function;
+
+ /* For_functions_valid is reset at the start of compilation for each
+ function because the indexing that the "_for_functions" is based
+ on is invalidated between function compilations. This allows for
+ lazy creation of the "_for_function" variables. */
+ bool for_functions_valid;
+ };
+
+ /* Mapping from functions to the read and write clobber sets for the
+ static variables. */
+ static GTY((param1_is(tree), param2_is(struct static_vars_info *)))
+ splay_tree functions_to_static_vars_info;
+
+ /* 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;
+
+ /* 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;
+
/* 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
*************** decide_is_function_needed (struct cgraph
*** 274,279 ****
--- 339,552 ----
return false;
}
+ /* Debugging function for postorder and inorder code. */
+
+ 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");
+ }
+
+
+ /* Convert a bitmap indexed by DECL_UID to a bitmap indexed by
+ var_ann (VAR_DECL)->uid. */
+
+ static void
+ convert_UIDs_in_bitmap (bitmap in_ann, bitmap in_decl)
+ {
+ int index;
+ EXECUTE_IF_SET_IN_BITMAP(in_decl, 0, index,
+ {
+ 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);
+ }
+ });
+ }
+
+ /* 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)
+ {
+ splay_tree_node n;
+ struct cgraph_node *node;
+
+ if (!functions_to_static_vars_info)
+ /* Was not compiled -O2 or higher. */
+ return;
+
+ n = splay_tree_min (functions_to_static_vars_info);
+ while(n)
+ {
+ struct static_vars_info *v = (struct static_vars_info *)n->value;
+ if (v->for_functions_valid)
+ {
+ bitmap_clear (v->statics_not_read_for_function);
+ bitmap_clear (v->statics_not_written_for_function);
+ v->for_functions_valid = false;
+ }
+
+ n = splay_tree_successor (functions_to_static_vars_info, n->key);
+ }
+
+ for (node = cgraph_nodes; node; node = node->next)
+ {
+ if (node->local.statics_read)
+ {
+ bitmap_clear (node->local.statics_read_for_function);
+ bitmap_clear (node->local.statics_written_for_function);
+ }
+ else
+ {
+ /* Handle the case where a cgraph node has been inserted
+ after the analysis. We know nothing. */
+ node->local.statics_read = BITMAP_GGC_ALLOC ();
+ node->local.statics_written = BITMAP_GGC_ALLOC ();
+ node->local.statics_read_for_function = BITMAP_GGC_ALLOC ();
+ node->local.statics_written_for_function = BITMAP_GGC_ALLOC ();
+ }
+ node->local.for_functions_valid = false;
+ }
+ }
+
+ /* Get the static_vars_info structure and make sure the for_function
+ bitmaps are properly converted. */
+
+ static struct static_vars_info *
+ get_static_vars_info (tree fn)
+ {
+ struct static_vars_info *v;
+ splay_tree_node n;
+
+ if (!functions_to_static_vars_info)
+ /* Was not compiled -O2 or higher. */
+ return NULL;
+
+ n = splay_tree_lookup (functions_to_static_vars_info,
+ (splay_tree_key)fn);
+ if (n == NULL)
+ return NULL;
+
+ v = (struct static_vars_info *)n->value;
+ if (!v->for_functions_valid)
+ {
+ convert_UIDs_in_bitmap(v->statics_not_read_for_function,
+ v->statics_not_read);
+ convert_UIDs_in_bitmap(v->statics_not_written_for_function,
+ v->statics_not_written);
+ v->for_functions_valid = true;
+ }
+ return v;
+ }
+
+ /* Get the cgraph_node for the local function and make sure the
+ for_function bitmaps are properly converted. */
+
+ static struct cgraph_node *
+ get_local_static_vars_info (tree fn)
+ {
+ struct cgraph_node *node = cgraph_node (fn);
+ if (node == NULL)
+ return NULL;
+
+ if (!node->local.for_functions_valid)
+ {
+ convert_UIDs_in_bitmap (node->local.statics_read_for_function,
+ node->local.statics_read);
+ convert_UIDs_in_bitmap (node->local.statics_written_for_function,
+ node->local.statics_written);
+ node->local.for_functions_valid = true;
+ }
+ return node;
+ }
+
+ /* 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_statics_not_read_for_function_call (tree fn)
+ {
+ struct static_vars_info *v = get_static_vars_info (fn);
+ if (v)
+ return v->statics_not_read_for_function;
+ 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_statics_not_written_for_function_call (tree fn)
+ {
+ struct static_vars_info *v = get_static_vars_info (fn);
+ if (v)
+ return v->statics_not_written_for_function;
+ else
+ return NULL;
+ }
+
+ /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
+ variables that may be read locally by 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_statics_read_in_function (tree fn)
+ {
+ struct cgraph_node *node = get_local_static_vars_info (fn);
+ if (node)
+ return node->local.statics_read_for_function;
+ else
+ return NULL;
+ }
+
+ /* Return a bitmap indexed by var_ann (VAR_DECL)->uid for the static
+ variables that may be written locally by 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_statics_written_in_function (tree fn)
+ {
+ struct cgraph_node *node = get_local_static_vars_info (fn);
+ if (node)
+ return node->local.statics_written_for_function;
+ else
+ return NULL;
+ }
+
/* When not doing unit-at-a-time, output all functions enqueued.
Return true when such a functions were found. */
*************** cgraph_postorder (struct cgraph_node **o
*** 877,882 ****
--- 1150,1305 ----
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 AHU75 pages 192-193. The env parameter is
+ because it is recursive and there are no nested functions here.
+ This function should only be called from cgraph_reduced_inorder. */
+ 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
and thus needs to be done only after inlining decisions has been made. */
*************** cgraph_inline_p (struct cgraph_edge *e,
*** 1631,1636 ****
--- 2054,2680 ----
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. */
+
+ static inline
+ int 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 interrested 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));
+ }
+ 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));
+ }
+ bitmap_set_bit (fn->local.statics_read, DECL_UID (t));
+ }
+ }
+
+ /* Check to see if t is an assignement 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));
+ }
+
+ bitmap_set_bit (fn->local.statics_written, 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.
+
+ It is possible that someone who knew the code better could combine
+ these two functions, but the magic in the other version is too
+ subtle for me, fkz */
+
+ 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 (strcmp (TREE_STRING_POINTER (TREE_VALUE (link)), "memory") == 0)
+ {
+ /* Abandon all hope, ye who enter here. */
+ bitmap_a_or_b (fn->local.statics_read,
+ fn->local.statics_read,
+ all_module_statics);
+ bitmap_a_or_b (fn->local.statics_written,
+ fn->local.statics_written,
+ all_module_statics);
+
+ }
+ }
+
+ /* Check the parameters of a call to see if any are static vars and
+ check the caller to see if it 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;
+ }
+ }
+ }
+ }
+
+
+ /* 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. */
+ 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 '2':
+ check_rhs_var (fn, TREE_OPERAND (rhs, 0));
+ check_rhs_var (fn, TREE_OPERAND (rhs, 1));
+ break;
+ case '1':
+ case 'r':
+ check_rhs_var (fn, TREE_OPERAND (rhs, 0));
+ break;
+ case 'd':
+ check_rhs_var (fn, rhs);
+ break;
+ case 'e':
+ 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;
+
+ /* The nodes we're interested in are never shared, so walk
+ the tree ignoring duplicates. */
+ visited_nodes = htab_create (37, htab_hash_pointer,
+ htab_eq_pointer, NULL);
+
+ fn->local.statics_read = BITMAP_GGC_ALLOC ();
+ fn->local.statics_written = BITMAP_GGC_ALLOC ();
+ fn->local.statics_read_for_function = BITMAP_GGC_ALLOC ();
+ fn->local.statics_written_for_function = 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);
+ htab_delete (visited_nodes);
+ visited_nodes = NULL;
+ }
+
+ /* Convert the uid of a static variable 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 statics from further consideration that escape
+ (i.e. have their 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);
+ }
+ }
+
+ /* Or in all of the bits from every callee into the caller's bit
+ vector. There are several cases to check to avoid the sparce
+ bitmap oring. */
+ static void
+ cgraph_propagate_bits (struct cgraph_node *x)
+ {
+ struct static_vars_info *x_info = (struct static_vars_info *)x->aux;
+ 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)
+ {
+ struct static_vars_info *y_info;
+ y_info = (struct static_vars_info *)y->aux;
+
+ if (x_info->statics_read != all_module_statics)
+ {
+ if (y_info->statics_read == all_module_statics)
+ {
+ x_info->statics_read = all_module_statics;
+ }
+ /* Skip bitmaps that are pointer equal to node's bitmap
+ (no reason to spin within the cycle). */
+ else if (x_info->statics_read != y_info->statics_read)
+ {
+ bitmap_a_or_b (x_info->statics_read,
+ x_info->statics_read,
+ y_info->statics_read);
+ }
+ }
+
+ if (x_info->statics_written != all_module_statics)
+ {
+ if (y_info->statics_written == all_module_statics)
+ {
+ x_info->statics_written = all_module_statics;
+ }
+ /* Skip bitmaps that are pointer equal to node's bitmap
+ (no reason to spin within the cycle). */
+ else if (x_info->statics_written != y_info->statics_written)
+ {
+ bitmap_a_or_b (x_info->statics_written,
+ x_info->statics_written,
+ y_info->statics_written);
+ }
+ }
+ }
+ }
+ }
+
+ /* 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);
+ functions_to_static_vars_info =
+ splay_tree_new_ggc (splay_tree_compare_pointers);
+
+ 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);
+ 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));
+ }
+ 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;
+ EXECUTE_IF_SET_IN_BITMAP (module_statics_escape,
+ 0, index, 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--)
+ {
+ node = order[i];
+ bitmap_operation (node->local.statics_read, node->local.statics_read,
+ module_statics_escape, BITMAP_AND_COMPL);
+ bitmap_operation (node->local.statics_written, node->local.statics_written,
+ module_statics_escape, BITMAP_AND_COMPL);
+ }
+ }
+
+ if (cgraph_dump_file)
+ {
+ for (i = order_pos - 1; i >= 0; i--)
+ {
+ int index;
+ node = order[i];
+ 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 (node->local.statics_read,
+ 0, index,
+ fprintf (cgraph_dump_file, "%s ",
+ cgraph_get_static_name_by_uid (index)));
+ fprintf (cgraph_dump_file, "\n locals written: ");
+ EXECUTE_IF_SET_IN_BITMAP (node->local.statics_written,
+ 0, index,
+ 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--)
+ {
+ struct static_vars_info *node_info =
+ ggc_calloc (1, sizeof (struct static_vars_info));
+
+ bool read_all;
+ bool write_all;
+
+ node = order[i];
+
+ 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_info->statics_read = all_module_statics;
+ else
+ {
+ node_info->statics_read = BITMAP_GGC_ALLOC ();
+ bitmap_copy (node_info->statics_read, node->local.statics_read);
+ }
+
+ if (write_all)
+ node_info->statics_written = all_module_statics;
+ else
+ {
+ node_info->statics_written = BITMAP_GGC_ALLOC ();
+ bitmap_copy (node_info->statics_written, node->local.statics_written);
+ }
+ node->aux = node_info;
+ splay_tree_insert (functions_to_static_vars_info,
+ (splay_tree_key)node->decl,
+ (splay_tree_value)node_info);
+
+ /* All nodes within a cycle share the same global info bitmaps.
+ These is initialized from the local info of all of the nodes
+ in the region */
+ w = node->next_cycle;
+ while (w)
+ {
+ w->aux = node_info;
+ splay_tree_insert (functions_to_static_vars_info,
+ (splay_tree_key)w->decl,
+ (splay_tree_value)node_info);
+
+ /* No need to do any work if the bitmaps were set to
+ all_module_statics. */
+ if (!read_all)
+ bitmap_a_or_b (node_info->statics_read,
+ node_info->statics_read,
+ w->local.statics_read);
+ if (!write_all)
+ bitmap_a_or_b (node_info->statics_written,
+ node_info->statics_written,
+ w->local.statics_written);
+ 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--)
+ {
+ struct static_vars_info *node_info;
+ int index;
+ node = order[i];
+ node_info = (struct static_vars_info *)node->aux;
+ 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_info->statics_read,
+ 0, index,
+ 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_info->statics_written,
+ 0, index,
+ fprintf (cgraph_dump_file, "%s ",
+ cgraph_get_static_name_by_uid (index)));
+ }
+ }
+
+ /* Cleanup. */
+ for (i = order_pos - 1; i >= 0; i--)
+ {
+ struct static_vars_info *node_info;
+ node = order[i];
+
+ node_info = (struct static_vars_info *)node->aux;
+ node_info->statics_not_read_for_function = BITMAP_GGC_ALLOC ();
+ node_info->statics_not_written_for_function = BITMAP_GGC_ALLOC ();
+ node_info->for_functions_valid = false;
+
+ node_info->statics_not_read = BITMAP_GGC_ALLOC ();
+ node_info->statics_not_written = BITMAP_GGC_ALLOC ();
+
+ if (node_info->statics_read != all_module_statics)
+ bitmap_operation(node_info->statics_not_read,
+ all_module_statics,
+ node_info->statics_read,
+ BITMAP_AND_COMPL);
+
+ if (node_info->statics_written != all_module_statics)
+ bitmap_operation(node_info->statics_not_written,
+ all_module_statics,
+ node_info->statics_written,
+ BITMAP_AND_COMPL);
+
+ node->aux = NULL;
+ w = node->next_cycle;
+
+ while (w)
+ {
+ struct cgraph_node * last = w;
+ w->aux = NULL;
+ w = w->next_cycle;
+ last->next_cycle = NULL;
+ }
+ }
+
+ free (order);
+ }
+
/* Expand all functions that must be output.
Attempt to topologically sort the nodes so function is output when
*************** cgraph_expand_all_functions (void)
*** 1650,1658 ****
int order_pos = 0, new_order_pos = 0;
int i;
- cgraph_mark_functions_to_output ();
-
order_pos = cgraph_postorder (order);
if (order_pos != cgraph_n_nodes)
abort ();
--- 2694,2701 ----
int order_pos = 0, new_order_pos = 0;
int i;
order_pos = cgraph_postorder (order);
+
if (order_pos != cgraph_n_nodes)
abort ();
*************** cgraph_expand_all_functions (void)
*** 1676,1709 ****
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;
- if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "\nMarking local functions:");
-
/* Figure out functions we want to assemble. */
for (node = cgraph_nodes; node; node = node->next)
{
node->local.local = (!node->needed
&& DECL_SAVED_TREE (node->decl)
&& !TREE_PUBLIC (node->decl));
! if (cgraph_dump_file && node->local.local)
! fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
}
if (cgraph_dump_file)
fprintf (cgraph_dump_file, "\n\n");
}
/* Return true when function body of DECL still needs to be kept around
for later re-use. */
--- 2719,2764 ----
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;
/* Figure out functions we want to assemble. */
for (node = cgraph_nodes; node; node = node->next)
{
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)
+ {
+ fprintf (cgraph_dump_file, "\nMarking local functions:");
+ for (node = cgraph_nodes; node; node = node->next)
+ 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
for later re-use. */
*************** cgraph_optimize (void)
*** 1737,1743 ****
if (!quiet_flag)
fprintf (stderr, "Performing intraprocedural optimizations\n");
! cgraph_mark_local_functions ();
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "Marked ");
--- 2792,2798 ----
if (!quiet_flag)
fprintf (stderr, "Performing intraprocedural optimizations\n");
! cgraph_mark_local_and_external_functions ();
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "Marked ");
*************** cgraph_optimize (void)
*** 1760,1765 ****
--- 2815,2829 ----
#ifdef ENABLE_CHECKING
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)
{
*************** cgraph_build_static_cdtor (char which, t
*** 1857,1859 ****
--- 2921,2924 ----
fn (XEXP (DECL_RTL (decl), 0), priority);
}
}
+ #include "gt-cgraphunit.h"
Index: gcc/tree-dfa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dfa.c,v
retrieving revision 2.25
diff -c -3 -p -w -r2.25 tree-dfa.c
*** gcc/tree-dfa.c 25 Aug 2004 21:21:14 -0000 2.25
--- gcc/tree-dfa.c 26 Aug 2004 21:18:45 -0000
*************** Boston, MA 02111-1307, USA. */
*** 46,51 ****
--- 46,52 ----
#include "tree-pass.h"
#include "convert.h"
#include "params.h"
+ #include "cgraph.h"
/* Build and maintain data flow information for trees. */
*************** find_referenced_vars (void)
*** 120,125 ****
--- 121,128 ----
}
htab_delete (vars_found);
+
+ cgraph_reset_static_var_maps ();
}
struct tree_opt_pass pass_referenced_vars =
Index: gcc/tree-ssa-operands.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-operands.c,v
retrieving revision 2.32
diff -c -3 -p -w -r2.32 tree-ssa-operands.c
*** gcc/tree-ssa-operands.c 25 Aug 2004 21:21:11 -0000 2.32
--- gcc/tree-ssa-operands.c 26 Aug 2004 21:18:45 -0000
*************** Boston, MA 02111-1307, USA. */
*** 31,37 ****
--- 31,39 ----
#include "tree-pass.h"
#include "ggc.h"
#include "timevar.h"
+ #include "cgraph.h"
+ #include "langhooks.h"
/* This file contains the code required to mnage the operands cache of the
SSA optimizer. For every stmt, we maintain an operand cache in the stmt
*************** static inline void append_def (tree *);
*** 132,139 ****
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. */
--- 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, 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. */
*************** get_call_expr_operands (tree stmt, tree
*** 1365,1370 ****
--- 1367,1373 ----
{
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);
*************** get_call_expr_operands (tree stmt, tree
*** 1381,1389 ****
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);
}
}
--- 1384,1392 ----
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);
}
}
*************** note_addressable (tree var, stmt_ann_t s
*** 1562,1568 ****
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. */
--- 1565,1571 ----
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. */
*************** add_call_clobber_ops (tree stmt)
*** 1579,1594 ****
{
size_t i;
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i,
{
tree var = referenced_var (i);
! /* If VAR is read-only, don't add a V_MAY_DEF, just a
! VUSE operand. */
! if (!TREE_READONLY (var))
add_stmt_operand (&var, stmt, opf_is_def);
else
add_stmt_operand (&var, stmt, opf_none);
});
}
}
--- 1582,1640 ----
{
size_t i;
+ /* 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. */
+
+ bitmap not_read_b = callee
+ ? get_statics_not_read_for_function_call (callee) : NULL;
+ bitmap not_written_b = callee
+ ? get_statics_not_written_for_function_call (callee) : NULL;
+
+
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i,
{
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)
! {
! /* Nothing. */
! }
! else
! {
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);
+ }
+ else
+ {
+ /* The not_read and not_written bits are only set
+ for module static variables. If neither are set,
+ 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. */
+ if (TREE_READONLY (var))
+ add_stmt_operand (&var, stmt, opf_none);
+ else
+ add_stmt_operand (&var, stmt, opf_is_def);
+ }
+ }
});
}
}
*************** add_call_clobber_ops (tree stmt)
*** 1598,1604 ****
function. */
static void
! add_call_read_ops (tree stmt)
{
/* Otherwise, if the function is not pure, it may reference memory. Add
a VUSE for .GLOBAL_VAR if it has been created. Otherwise, add a VUSE
--- 1644,1650 ----
function. */
static void
! add_call_read_ops (tree stmt, tree callee)
{
/* Otherwise, if the function is not pure, it may reference memory. Add
a VUSE for .GLOBAL_VAR if it has been created. Otherwise, add a VUSE
*************** add_call_read_ops (tree stmt)
*** 1609,1618 ****
--- 1655,1669 ----
else
{
size_t i;
+ bitmap not_read_b = callee
+ ? get_statics_not_read_for_function_call (callee) : NULL;
EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i,
{
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);
});
}