X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprofile.c;h=866e1bf62518ab3eb1d1c04224abdd72e62996ca;hb=c79fe4adc914d8d867772053bedf449a4f85645d;hp=1609687dd7c328284a0452cf0907ab1f729dcd10;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/ir/irprofile.c b/ir/ir/irprofile.c index 1609687dd..866e1bf62 100644 --- a/ir/ir/irprofile.c +++ b/ir/ir/irprofile.c @@ -24,9 +24,7 @@ * @date 06.04.2006 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -36,6 +34,7 @@ #include "set.h" #include "list.h" #include "pmap.h" +#include "array_t.h" #include "irprintf.h" #include "irgwalk.h" @@ -75,7 +74,8 @@ typedef struct _execcount_t { /** * Compare two execcount_t entries. */ -static int cmp_execcount(const void *a, const void *b, size_t size) { +static int cmp_execcount(const void *a, const void *b, size_t size) +{ const execcount_t *ea = a; const execcount_t *eb = b; (void) size; @@ -85,7 +85,8 @@ static int cmp_execcount(const void *a, const void *b, size_t size) { /** * Block walker, count number of blocks. */ -static void block_counter(ir_node * bb, void * data) { +static void block_counter(ir_node * bb, void * data) +{ unsigned int *count = data; (void) bb; *count = *count + 1; @@ -94,7 +95,8 @@ static void block_counter(ir_node * bb, void * data) { /** * Return the number of blocks the given graph. */ -static unsigned int count_blocks(ir_graph *irg) { +static unsigned int count_blocks(ir_graph *irg) +{ unsigned int count = 0; irg_block_walk_graph(irg, block_counter, NULL, &count); @@ -108,30 +110,28 @@ static hook_entry_t hook; /** * Instrument a block with code needed for profiling */ -static void -instrument_block(ir_node *bb, ir_node *address, unsigned int id) +static void instrument_block(ir_node *bb, ir_node *address, unsigned int id) { ir_graph *irg = get_irn_irg(bb); - ir_node *start_block = get_irg_start_block(irg); ir_node *load, *store, *offset, *add, *projm, *proji, *unknown; ir_node *cnst; /** * We can't instrument the end block as there are no real instructions there */ - if(bb == get_irg_end_block(irg)) + if (bb == get_irg_end_block(irg)) return; unknown = new_r_Unknown(irg, mode_M); - cnst = new_r_Const_long(irg, start_block, mode_Iu, get_mode_size_bytes(mode_Iu) * id); - offset = new_r_Add(irg, bb, address, cnst, mode_P); - load = new_r_Load(irg, bb, unknown, offset, mode_Iu); - projm = new_r_Proj(irg, bb, load, mode_M, pn_Load_M); - proji = new_r_Proj(irg, bb, load, mode_Iu, pn_Load_res); - cnst = new_r_Const_long(irg, start_block, mode_Iu, 1); - add = new_r_Add(irg, bb, proji, cnst, mode_Iu); - store = new_r_Store(irg, bb, projm, offset, add); - projm = new_r_Proj(irg, bb, store, mode_M, pn_Store_M); + cnst = new_r_Const_long(irg, mode_Iu, get_mode_size_bytes(mode_Iu) * id); + offset = new_r_Add(bb, address, cnst, get_modeP_data()); + load = new_r_Load(bb, unknown, offset, mode_Iu, 0); + projm = new_r_Proj(load, mode_M, pn_Load_M); + proji = new_r_Proj(load, mode_Iu, pn_Load_res); + cnst = new_r_Const_long(irg, mode_Iu, 1); + add = new_r_Add(bb, proji, cnst, mode_Iu); + store = new_r_Store(bb, projm, offset, add, 0); + projm = new_r_Proj(store, mode_M, pn_Store_M); set_irn_link(bb, projm); set_irn_link(projm, load); } @@ -143,35 +143,49 @@ typedef struct fix_env { /** * SSA Construction for instrumentation code memory */ -static void -fix_ssa(ir_node * bb, void * data) +static void fix_ssa(ir_node *bb, void *data) { fix_env *env = data; ir_node *mem; int arity = get_Block_n_cfgpreds(bb); - /* start and end block are not instrumented, skip! */ + /* end block are not instrumented, skip! */ if (bb == env->end_block) return; if (bb == get_irg_start_block(get_irn_irg(bb))) { - mem = new_NoMem(); + mem = get_irg_initial_mem(get_irn_irg(bb)); } else if (arity == 1) { mem = get_irn_link(get_Block_cfgpred_block(bb, 0)); } else { int n; ir_node **ins; - ir_graph *irg = current_ir_graph; NEW_ARR_A(ir_node*, ins, arity); for (n = arity - 1; n >= 0; --n) { ins[n] = get_irn_link(get_Block_cfgpred_block(bb, n)); } - mem = new_r_Phi(irg, bb, arity, ins, mode_M); + mem = new_r_Phi(bb, arity, ins, mode_M); } set_Load_mem(get_irn_link(get_irn_link(bb)), mem); } +static void add_constructor(ir_entity *method) +{ + ir_type *method_type = get_entity_type(method); + ir_type *ptr_type = new_type_pointer(method_type); + + ir_type *constructors = get_segment_type(IR_SEGMENT_CONSTRUCTORS); + ident *ide = id_unique("constructor_ptr.%u"); + ir_entity *ptr = new_entity(constructors, ide, ptr_type); + ir_graph *irg = get_const_code_irg(); + ir_node *val = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code, + method, NULL); + + set_entity_compiler_generated(ptr, 1); + set_entity_linkage(ptr, IR_LINKAGE_CONSTANT); + set_atomic_ent_value(ptr, val); +} /** * Generates a new irg which calls the initializer @@ -179,19 +193,16 @@ fix_ssa(ir_node * bb, void * data) * Pseudocode: * void __firmprof_initializer(void) { __init_firmprof(ent_filename, bblock_id, bblock_counts, n_blocks); } */ -static ir_graph * -gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * bblock_counts, int n_blocks) +static ir_graph *gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bblock_counts, int n_blocks) { - ir_node *start_block; - ir_node *ins[4]; ident *name = new_id_from_str("__firmprof_initializer"); - ir_entity *ent = new_entity(get_glob_type(), name, new_type_method(name, 0, 0)); + ir_entity *ent = new_entity(get_glob_type(), name, new_type_method(0, 0)); ir_node *ret, *call, *symconst; symconst_symbol sym; ident *init_name = new_id_from_str("__init_firmprof"); - ir_type *init_type = new_type_method(init_name, 4, 0); + ir_type *init_type = new_type_method(4, 0); ir_type *uint, *uintptr, *string; ir_entity *init_ent; ir_graph *irg; @@ -200,9 +211,9 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * set_entity_ld_ident(ent, name); - uint = new_type_primitive(new_id_from_str("__uint"), mode_Iu); - uintptr = new_type_pointer(new_id_from_str("__uintptr"), uint, mode_P); - string = new_type_pointer(new_id_from_str("__charptr"), new_type_primitive(new_id_from_str("__char"), mode_Bs), mode_P); + uint = new_type_primitive(mode_Iu); + uintptr = new_type_pointer(uint); + string = new_type_pointer(new_type_primitive(mode_Bs)); set_method_param_type(init_type, 0, string); set_method_param_type(init_type, 1, uintptr); @@ -214,24 +225,23 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * irg = new_ir_graph(ent, 0); empty_frame_type = get_irg_frame_type(irg); set_type_size_bytes(empty_frame_type, 0); + set_type_state(empty_frame_type, layout_fixed); bb = get_cur_block(); - start_block = get_irg_start_block(irg); - sym.entity_p = init_ent; - symconst = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + symconst = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); sym.entity_p = ent_filename; - ins[0] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + ins[0] = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); sym.entity_p = bblock_id; - ins[1] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + ins[1] = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); sym.entity_p = bblock_counts; - ins[2] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); - ins[3] = new_r_Const_long(irg, start_block, mode_Iu, n_blocks); + ins[2] = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); + ins[3] = new_r_Const_long(irg, mode_Iu, n_blocks); - call = new_r_Call(irg, bb, get_irg_initial_mem(irg), symconst, 4, ins, init_type); - ret = new_r_Return(irg, bb, new_r_Proj(irg, bb, call, mode_M, pn_Call_M_regular), 0, NULL); + call = new_r_Call(bb, get_irg_initial_mem(irg), symconst, 4, ins, init_type); + ret = new_r_Return(bb, new_r_Proj(call, mode_M, pn_Call_M), 0, NULL); mature_immBlock(bb); add_immBlock_pred(get_irg_end_block(irg), ret); @@ -239,6 +249,8 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * irg_finalize_cons(irg); + add_constructor(ent); + return irg; } @@ -263,7 +275,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) tarval **tarval_string; snprintf(buf, sizeof(buf), "firm_name_arr.%d", nr); - arr = new_type_array(new_id_from_str(buf), 1, wd->tp_char); + arr = new_type_array(1, wd->tp_char); set_array_bounds_int(arr, 0, 0, len); snprintf(buf, sizeof(buf), "__firm_name.%d", nr++); @@ -274,11 +286,11 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) pmap_insert(wd->fname_map, (void *)fname, ent); /* initialize file name string constant */ - tarval_string = alloca(sizeof(*tarval_string) * (len)); + tarval_string = ALLOCAN(tarval*, len); for (i = 0; i < len; ++i) { tarval_string[i] = new_tarval_from_long(fname[i], mode_Bs); } - set_entity_variability(ent, variability_constant); + set_entity_linkage(ent, IR_LINKAGE_CONSTANT); set_array_entity_values(ent, tarval_string, len); } else { ent = entry->value; @@ -295,8 +307,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) * Walker: assigns an ID to every block. * Builds the string table */ -static void -block_id_walker(ir_node * bb, void * data) +static void block_id_walker(ir_node *bb, void *data) { block_id_walker_data_t *wd = data; @@ -312,8 +323,7 @@ block_id_walker(ir_node * bb, void * data) #define IDENT(x) new_id_from_chars(x, sizeof(x) - 1) -ir_graph * -ir_profile_instrument(const char *filename, unsigned flags) +ir_graph *ir_profile_instrument(const char *filename, unsigned flags) { int n, i; int n_blocks = 0; @@ -331,7 +341,6 @@ ir_profile_instrument(const char *filename, unsigned flags) ir_type *loc_type = NULL; ir_type *charptr_type; ir_type *gtp; - ir_node *start_block; tarval **tarval_array; tarval **tarval_string; tarval *tv; @@ -352,17 +361,17 @@ ir_profile_instrument(const char *filename, unsigned flags) /* create all the necessary types and entities. Note that the types must have a fixed layout, because we already running in the backend */ - uint_type = new_type_primitive(IDENT("__uint"), mode_Iu); + uint_type = new_type_primitive(mode_Iu); set_type_alignment_bytes(uint_type, get_type_size_bytes(uint_type)); - array_type = new_type_array(IDENT("__block_info_array"), 1, uint_type); + array_type = new_type_array(1, uint_type); set_array_bounds_int(array_type, 0, 0, n_blocks); set_type_size_bytes(array_type, n_blocks * get_mode_size_bytes(mode_Iu)); set_type_alignment_bytes(array_type, get_mode_size_bytes(mode_Iu)); set_type_state(array_type, layout_fixed); - character_type = new_type_primitive(IDENT("__char"), mode_Bs); - string_type = new_type_array(IDENT("__filename"), 1, character_type); + character_type = new_type_primitive(mode_Bs); + string_type = new_type_array(1, character_type); set_array_bounds_int(string_type, 0, 0, filename_len); set_type_size_bytes(string_type, filename_len); set_type_alignment_bytes(string_type, 1); @@ -373,12 +382,10 @@ ir_profile_instrument(const char *filename, unsigned flags) cur_ident = IDENT("__FIRMPROF__BLOCK_IDS"); bblock_id = new_entity(gtp, cur_ident, array_type); set_entity_ld_ident(bblock_id, cur_ident); - set_entity_variability(bblock_id, variability_initialized); cur_ident = IDENT("__FIRMPROF__BLOCK_COUNTS"); bblock_counts = new_entity(gtp, cur_ident, array_type); set_entity_ld_ident(bblock_counts, cur_ident); - set_entity_variability(bblock_counts, variability_initialized); cur_ident = IDENT("__FIRMPROF__FILE_NAME"); ent_filename = new_entity(gtp, cur_ident, string_type); @@ -391,7 +398,7 @@ ir_profile_instrument(const char *filename, unsigned flags) size = get_type_size_bytes(uint_type); set_entity_offset(loc_lineno, 0); - charptr_type = new_type_pointer(IDENT("__charptr"), character_type, mode_P_data); + charptr_type = new_type_pointer(character_type); align_n = get_type_size_bytes(charptr_type); set_type_alignment_bytes(charptr_type, align_n); loc_name = new_entity(loc_type, IDENT("name"), charptr_type); @@ -405,28 +412,28 @@ ir_profile_instrument(const char *filename, unsigned flags) set_type_size_bytes(loc_type, size); set_type_state(loc_type, layout_fixed); - loc_type = new_type_array(IDENT("__locarray"), 1, loc_type); + loc_type = new_type_array(1, loc_type); set_array_bounds_int(string_type, 0, 0, n_blocks); - cur_ident = IDENT("__FIRMPROF__LOCATIONS"); - ent_locations = new_entity(gtp, cur_ident, loc_type); + cur_ident = IDENT("__FIRMPROF__LOCATIONS"); + ent_locations = new_entity(gtp, cur_ident, loc_type); set_entity_ld_ident(ent_locations, cur_ident); } /* initialize count array */ NEW_ARR_A(tarval *, tarval_array, n_blocks); - tv = get_tarval_null(mode_Iu); + tv = get_mode_null(mode_Iu); for (i = 0; i < n_blocks; ++i) { tarval_array[i] = tv; } set_array_entity_values(bblock_counts, tarval_array, n_blocks); /* initialize function name string constant */ - tarval_string = alloca(sizeof(*tarval_string) * (filename_len)); + tarval_string = ALLOCAN(tarval*, filename_len); for (i = 0; i < filename_len; ++i) { tarval_string[i] = new_tarval_from_long(filename[i], mode_Bs); } - set_entity_variability(ent_filename, variability_constant); + set_entity_linkage(ent_filename, IR_LINKAGE_CONSTANT); set_array_entity_values(ent_filename, tarval_string, filename_len); /* initialize block id array and instrument blocks */ @@ -449,10 +456,9 @@ ir_profile_instrument(const char *filename, unsigned flags) /* generate a symbolic constant pointing to the count array */ sym.entity_p = bblock_counts; - wd.symconst = new_r_SymConst(irg, get_irg_start_block(irg), mode_P_data, sym, symconst_addr_ent); + wd.symconst = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); irg_block_walk_graph(irg, block_id_walker, NULL, &wd); - start_block = get_irg_start_block(irg); env.end_block = get_irg_end_block(irg); irg_block_walk_graph(irg, fix_ssa, NULL, &env); for (i = get_Block_n_cfgpreds(endbb) - 1; i >= 0; --i) { @@ -465,13 +471,13 @@ ir_profile_instrument(const char *filename, unsigned flags) case iro_Return: ins[0] = get_irn_link(bb); ins[1] = get_Return_mem(node); - sync = new_r_Sync(irg, bb, 2, ins); + sync = new_r_Sync(bb, 2, ins); set_Return_mem(node, sync); break; case iro_Raise: ins[0] = get_irn_link(bb); ins[1] = get_Raise_mem(node); - sync = new_r_Sync(irg, bb, 2, ins); + sync = new_r_Sync(bb, 2, ins); set_Raise_mem(node, sync); break; default: @@ -488,7 +494,7 @@ ir_profile_instrument(const char *filename, unsigned flags) rem = current_ir_graph; current_ir_graph = get_const_code_irg(); ent = get_array_element_entity(loc_type); - set_entity_variability(ent_locations, variability_constant); + set_entity_linkage(ent_locations, IR_LINKAGE_CONSTANT); for (i = 0; i < n_blocks; ++i) { compound_graph_path *path; tarval *tv; @@ -500,7 +506,7 @@ ir_profile_instrument(const char *filename, unsigned flags) set_compound_graph_path_node(path, 0, ent); set_compound_graph_path_node(path, 1, loc_lineno); tv = new_tarval_from_long(wd.locs[i].lineno, mode_Iu); - add_compound_ent_value_w_path(ent_locations, new_Const(mode_Iu, tv), path); + add_compound_ent_value_w_path(ent_locations, new_Const(tv), path); /* name */ path = new_compound_graph_path(loc_type, 2); @@ -511,34 +517,32 @@ ir_profile_instrument(const char *filename, unsigned flags) sym.entity_p = wd.locs[i].fname; n = new_SymConst(mode_P_data, sym, symconst_addr_ent); } else { - n = new_Const(mode_P_data, get_mode_null(mode_P_data)); + n = new_Const(get_mode_null(mode_P_data)); } add_compound_ent_value_w_path(ent_locations, n, path); } pmap_destroy(wd.fname_map); + current_ir_graph = rem; } return gen_initializer_irg(ent_filename, bblock_id, bblock_counts, n_blocks); } -static void -profile_node_info(void *ctx, FILE *f, const ir_node *irn) +static void profile_node_info(void *ctx, FILE *f, const ir_node *irn) { (void) ctx; - if(is_Block(irn)) { + if (is_Block(irn)) { fprintf(f, "profiled execution count: %u\n", ir_profile_get_block_execcount(irn)); } } -static void -register_vcg_hook(void) +static void register_vcg_hook(void) { memset(&hook, 0, sizeof(hook)); hook.hook._hook_node_info = profile_node_info; register_hook(hook_node_info, &hook); } -static void -unregister_vcg_hook(void) +static void unregister_vcg_hook(void) { unregister_hook(hook_node_info, &hook); } @@ -547,36 +551,35 @@ unregister_vcg_hook(void) * Reads the corresponding profile info file if it exists and returns a * profile info struct */ -void -ir_profile_read(const char *filename) +void ir_profile_read(const char *filename) { FILE *f; char buf[8]; size_t ret; f = fopen(filename, "r"); - if(f == NULL) { + if (f == NULL) { return; } printf("found profile data '%s'.\n", filename); /* check magic */ ret = fread(buf, 8, 1, f); - if(ret == 0 || strncmp(buf, "firmprof", 8) != 0) { + if (ret == 0 || strncmp(buf, "firmprof", 8) != 0) { return; } - if(profile) ir_profile_free(); + if (profile) ir_profile_free(); profile = new_set(cmp_execcount, 16); - do { + for (;;) { execcount_t query; ret = fread(&query, sizeof(unsigned int), 2, f); - if(ret != 2) break; + if (ret != 2) break; set_insert(profile, &query, sizeof(query), query.block); - } while(1); + } fclose(f); register_vcg_hook(); @@ -585,10 +588,9 @@ ir_profile_read(const char *filename) /** * Frees the profile info */ -void -ir_profile_free(void) +void ir_profile_free(void) { - if(profile) { + if (profile) { unregister_vcg_hook(); del_set(profile); } @@ -597,8 +599,7 @@ ir_profile_free(void) /** * Tells whether profile module has acquired data */ -int -ir_profile_has_data(void) +int ir_profile_has_data(void) { return (profile != NULL); } @@ -611,13 +612,13 @@ ir_profile_get_block_execcount(const ir_node *block) { execcount_t *ec, query; - if(!profile) + if (!profile) return 1; query.block = get_irn_node_nr(block); ec = set_find(profile, &query, sizeof(query), get_irn_node_nr(block)); - if(ec != NULL) { + if (ec != NULL) { return ec->count; } else { ir_fprintf(stderr, "Warning: Profile contains no data for %+F\n", @@ -635,17 +636,18 @@ typedef struct _intialize_execfreq_env_t { // minimal execution frequency (an execfreq of 0 confuses algos) static const double MIN_EXECFREQ = 0.00001; -static void initialize_execfreq(ir_node *block, void *data) { +static void initialize_execfreq(ir_node *block, void *data) +{ initialize_execfreq_env_t *env = data; double freq; - if(block == get_irg_start_block(env->irg) + if (block == get_irg_start_block(env->irg) || block == get_irg_end_block(env->irg)) { freq = 1.0; } else { freq = ir_profile_get_block_execcount(block); freq *= env->freq_factor; - if(freq < MIN_EXECFREQ) + if (freq < MIN_EXECFREQ) freq = MIN_EXECFREQ; } @@ -663,7 +665,7 @@ ir_exec_freq *ir_create_execfreqs_from_profile(ir_graph *irg) start_block = get_irg_start_block(irg); count = ir_profile_get_block_execcount(start_block); - if(count == 0) { + if (count == 0) { // the function was never executed, so fallback to estimated freqs free_execfreq(env.execfreqs);