OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.in (LTO_STREAMER_H): Add GCOV_IO_H.

Browse Source 
* Makefile.in (LTO_STREAMER_H): Add GCOV_IO_H.
	* lto-cgraph.c (merge_profile_summaries): Fix thinko.

From-SVN: r167459
This commit is contained in:
Jan Hubicka 2010-12-04 23:00:12 +01:00 committed by Jan Hubicka
parent db0bf14f6b
commit 40e584a1b7
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-03 Jan Hubicka <jh@suse.cz>
* Makefile.in (LTO_STREAMER_H): Add GCOV_IO_H.
* lto-cgraph.c (merge_profile_summaries): Fix thinko.
2010-12-03 Jan Hubicka <jh@suse.cz> 2010-12-03 Jan Hubicka <jh@suse.cz>
PR tree-optimization/46760 PR tree-optimization/46760

3
gcc/Makefile.in
View File

@ -975,7 +975,8 @@ IRA_INT_H = ira.h ira-int.h $(CFGLOOP_H) alloc-pool.h
DBGCNT_H = dbgcnt.h dbgcnt.def DBGCNT_H = dbgcnt.h dbgcnt.def
EBITMAP_H = ebitmap.h sbitmap.h EBITMAP_H = ebitmap.h sbitmap.h
LTO_STREAMER_H = lto-streamer.h $(LINKER_PLUGIN_API_H) $(TARGET_H) \ LTO_STREAMER_H = lto-streamer.h $(LINKER_PLUGIN_API_H) $(TARGET_H) \
$(CGRAPH_H) $(VEC_H) vecprim.h $(TREE_H) $(GIMPLE_H) $(CGRAPH_H) $(VEC_H) vecprim.h $(TREE_H) $(GIMPLE_H) \
$(GCOV_IO_H)
TREE_VECTORIZER_H = tree-vectorizer.h $(TREE_DATA_REF_H) TREE_VECTORIZER_H = tree-vectorizer.h $(TREE_DATA_REF_H)
IPA_PROP_H = ipa-prop.h $(TREE_H) $(VEC_H) $(CGRAPH_H) $(GIMPLE_H) IPA_PROP_H = ipa-prop.h $(TREE_H) $(VEC_H) $(CGRAPH_H) $(GIMPLE_H)
GSTAB_H = gstab.h stab.def GSTAB_H = gstab.h stab.def

14
gcc/lto-cgraph.c
View File

@ -1504,16 +1504,14 @@ merge_profile_summaries (struct lto_file_decl_data **file_data_vec)
During LTRANS we already have values of count_materialization_scale During LTRANS we already have values of count_materialization_scale
computed, so just update them. */ computed, so just update them. */
for (node = cgraph_nodes; node; node = node->next) for (node = cgraph_nodes; node; node = node->next)
if (node->local.lto_file_data->profile_info.run_max) if (node->local.lto_file_data->profile_info.runs)
{ {
int scale; int scale;
if (node->local.lto_file_data->profile_info.runs)
scale = scale =
((node->count_materialization_scale * max_runs ((node->count_materialization_scale * max_runs
+ node->local.lto_file_data->profile_info.run_max / 2) + node->local.lto_file_data->profile_info.runs / 2)
/ node->local.lto_file_data->profile_info.run_max); / node->local.lto_file_data->profile_info.runs);
else
scale = node->count_materialization_scale;
node->count_materialization_scale = scale; node->count_materialization_scale = scale;
if (scale < 0) if (scale < 0)
fatal_error ("Profile information in %s corrupted", fatal_error ("Profile information in %s corrupted",