suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix and adjust inlining metric

Browse Source 
svn: r17274
This commit is contained in:
Matthew Flatt 2009-12-12 03:18:24 +00:00
parent 4f140eed03
commit ea1929841b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mzscheme/src/env.c
View File

@ -3166,7 +3166,7 @@ Optimize_Info *scheme_optimize_info_create()
#ifdef MZTAG_REQUIRED #ifdef MZTAG_REQUIRED
info->type = scheme_rt_optimize_info; info->type = scheme_rt_optimize_info;
#endif #endif
info->inline_fuel = 16; info->inline_fuel = 32;
return info; return info;
} }

14
src/mzscheme/src/eval.c
View File

@ -2552,14 +2552,14 @@ static Scheme_Object *optimize_application(Scheme_Object *o, Optimize_Info *info
all_vals = 0; all_vals = 0;
} }
info->size += 1;
if (all_vals) { if (all_vals) {
le = try_optimize_fold(app->args[0], (Scheme_Object *)app, info); le = try_optimize_fold(app->args[0], (Scheme_Object *)app, info);
if (le) if (le)
return le; return le;
} }
info->size += 1;
info->preserves_marks = !!(rator_flags & CLOS_PRESERVES_MARKS); info->preserves_marks = !!(rator_flags & CLOS_PRESERVES_MARKS);
info->single_result = !!(rator_flags & CLOS_SINGLE_RESULT); info->single_result = !!(rator_flags & CLOS_SINGLE_RESULT);
if (rator_flags & CLOS_RESULT_TENTATIVE) { if (rator_flags & CLOS_RESULT_TENTATIVE) {
@ -2723,14 +2723,14 @@ static Scheme_Object *optimize_application3(Scheme_Object *o, Optimize_Info *inf
/* Fold or continue */ /* Fold or continue */
info->size += 1;
if (all_vals) { if (all_vals) {
le = try_optimize_fold(app->rator, (Scheme_Object *)app, info); le = try_optimize_fold(app->rator, (Scheme_Object *)app, info);
if (le) if (le)
return le; return le;
} }
info->size += 1;
/* Check for (call-with-values (lambda () M) N): */ /* Check for (call-with-values (lambda () M) N): */
if (SAME_OBJ(app->rator, scheme_call_with_values_proc)) { if (SAME_OBJ(app->rator, scheme_call_with_values_proc)) {
if (SAME_TYPE(SCHEME_TYPE(app->rand1), scheme_compiled_unclosed_procedure_type)) { if (SAME_TYPE(SCHEME_TYPE(app->rand1), scheme_compiled_unclosed_procedure_type)) {
@ -3154,8 +3154,10 @@ Scheme_Object *scheme_optimize_expr(Scheme_Object *expr, Optimize_Info *info)
val = scheme_optimize_info_lookup(info, pos, NULL, NULL); val = scheme_optimize_info_lookup(info, pos, NULL, NULL);
if (val) { if (val) {
if (SAME_TYPE(SCHEME_TYPE(val), scheme_compiled_toplevel_type)) if (SAME_TYPE(SCHEME_TYPE(val), scheme_compiled_toplevel_type)) {
info->size -= 1;
return scheme_optimize_expr(val, info); return scheme_optimize_expr(val, info);
}
return val; return val;
} }
@ -3189,6 +3191,7 @@ Scheme_Object *scheme_optimize_expr(Scheme_Object *expr, Optimize_Info *info)
case scheme_compiled_let_void_type: case scheme_compiled_let_void_type:
return scheme_optimize_lets(expr, info, 0); return scheme_optimize_lets(expr, info, 0);
case scheme_compiled_toplevel_type: case scheme_compiled_toplevel_type:
info->size += 1;
if (info->top_level_consts) { if (info->top_level_consts) {
int pos; int pos;
Scheme_Object *c; Scheme_Object *c;
@ -3226,6 +3229,7 @@ Scheme_Object *scheme_optimize_expr(Scheme_Object *expr, Optimize_Info *info)
scheme_optimize_info_used_top(info); scheme_optimize_info_used_top(info);
return expr; return expr;
case scheme_compiled_quote_syntax_type: case scheme_compiled_quote_syntax_type:
info->size += 1;
scheme_optimize_info_used_top(info); scheme_optimize_info_used_top(info);
return expr; return expr;
case scheme_variable_type: case scheme_variable_type: