X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprofile.c;h=5ff78fec12617dae798497c00e0a5292ea47b9b4;hb=7719bf6a7bd442f4763731d56d856cb082156877;hp=d6a9ab6df3a136e1e8d4b576921ad535cb752fe3;hpb=9d564d6198d8a1e36a3a9c9ec9ca4d13c6acd153;p=libfirm diff --git a/ir/ir/irprofile.c b/ir/ir/irprofile.c index d6a9ab6df..5ff78fec1 100644 --- a/ir/ir/irprofile.c +++ b/ir/ir/irprofile.c @@ -74,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; @@ -84,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; @@ -93,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); @@ -107,8 +110,7 @@ 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 *load, *store, *offset, *add, *projm, *proji, *unknown; @@ -117,19 +119,19 @@ instrument_block(ir_node *bb, ir_node *address, unsigned int id) /** * 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, 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(bb, load, mode_M, pn_Load_M); - proji = new_r_Proj(bb, load, mode_Iu, pn_Load_res); + 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(bb, store, mode_M, pn_Store_M); + projm = new_r_Proj(store, mode_M, pn_Store_M); set_irn_link(bb, projm); set_irn_link(projm, load); } @@ -141,8 +143,7 @@ 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; @@ -182,7 +183,7 @@ static void add_constructor(ir_entity *method) method, NULL); set_entity_compiler_generated(ptr, 1); - set_entity_variability(ptr, variability_constant); + set_entity_linkage(ptr, IR_LINKAGE_CONSTANT); set_atomic_ent_value(ptr, val); } @@ -192,8 +193,7 @@ static void add_constructor(ir_entity *method) * 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 *ins[4]; ident *name = new_id_from_str("__firmprof_initializer"); @@ -241,7 +241,7 @@ gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bb ins[3] = new_r_Const_long(irg, mode_Iu, n_blocks); call = new_r_Call(bb, get_irg_initial_mem(irg), symconst, 4, ins, init_type); - ret = new_r_Return(bb, new_r_Proj(bb, call, mode_M, pn_Call_M), 0, NULL); + 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); @@ -274,11 +274,11 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) int i, len = strlen(fname) + 1; tarval **tarval_string; - snprintf(buf, sizeof(buf), "firm_name_arr.%d", nr); + snprintf(buf, sizeof(buf), "firm_name_arr.%u", nr); arr = new_type_array(1, wd->tp_char); set_array_bounds_int(arr, 0, 0, len); - snprintf(buf, sizeof(buf), "__firm_name.%d", nr++); + snprintf(buf, sizeof(buf), "__firm_name.%u", nr++); id = new_id_from_str(buf); ent = new_entity(get_glob_type(), id, arr); set_entity_ld_ident(ent, id); @@ -290,7 +290,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) 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; @@ -307,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; @@ -324,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; @@ -343,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; @@ -385,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); @@ -427,7 +422,7 @@ ir_profile_instrument(const char *filename, unsigned flags) /* 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; } @@ -438,7 +433,7 @@ ir_profile_instrument(const char *filename, unsigned flags) 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 */ @@ -464,7 +459,6 @@ ir_profile_instrument(const char *filename, unsigned flags) 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) { @@ -500,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; @@ -528,29 +522,27 @@ ir_profile_instrument(const char *filename, unsigned flags) 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); } @@ -559,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(); @@ -597,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); } @@ -609,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); } @@ -623,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", @@ -647,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; } @@ -675,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);