X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcnode.h;h=35f1969dcc8cce36e51a878264efeea49fa157ba;hp=473847337e60c5a9b85a8ad9ded6790edf779d14;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=0d3c4eca7d657d93c5a30681f22d9856847370f9 diff --git a/funcnode.h b/funcnode.h index 47384733..35f1969d 100644 --- a/funcnode.h +++ b/funcnode.h @@ -9,6 +9,12 @@ #define MAX_DIST 10 typedef ModelList func_inst_list_mt; +typedef ModelVector predicate_trace_t; + +typedef HashTable loc_inst_map_t; +typedef HashTable inst_id_map_t; +typedef HashTable inst_pred_map_t; + typedef enum edge_type { IN_EDGE, OUT_EDGE, BI_EDGE } edge_type_t; @@ -28,41 +34,30 @@ public: FuncInst * create_new_inst(ModelAction *act); FuncInst * get_inst(ModelAction *act); - HashTable * getFuncInstMap() { return &func_inst_map; } func_inst_list_mt * get_inst_list() { return &inst_list; } func_inst_list_mt * get_entry_insts() { return &entry_insts; } void add_entry_inst(FuncInst * inst); - void update_tree(action_list_t * act_list); - void update_inst_tree(func_inst_list_t * inst_list); - void update_predicate_tree(action_list_t * act_list); - bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, SnapVector * unset_predicates); + void function_entry_handler(thread_id_t tid); + void function_exit_handler(thread_id_t tid); - void incr_exit_count() { exit_count++; } - uint32_t get_exit_count() { return exit_count; } - - SnapList * get_action_list_buffer() { return action_list_buffer; } + void update_tree(ModelAction * act); void add_to_val_loc_map(uint64_t val, void * loc); void add_to_val_loc_map(value_set_t * values, void * loc); void update_loc_may_equal_map(void * new_loc, loc_set_t * old_locations); - void init_predicate_tree_position(thread_id_t tid); - void set_predicate_tree_position(thread_id_t tid, Predicate * pred); Predicate * get_predicate_tree_position(thread_id_t tid); - void init_inst_act_map(thread_id_t tid); - void reset_inst_act_map(thread_id_t tid); - void update_inst_act_map(thread_id_t tid, ModelAction * read_act); - inst_act_map_t * get_inst_act_map(thread_id_t tid); + void add_predicate_to_trace(thread_id_t tid, Predicate *pred); + + uint64_t get_associated_read(thread_id_t tid, FuncInst * inst); void add_out_edge(FuncNode * other); ModelList * get_out_edges() { return &out_edges; } int compute_distance(FuncNode * target, int max_step = MAX_DIST); void print_predicate_tree(); - void print_val_loc_map(); - void print_last_read(thread_id_t tid); MEMALLOC private: @@ -72,10 +67,13 @@ private: Predicate * predicate_tree_entry; // A dummy node whose children are the real entries Predicate * predicate_tree_exit; // A dummy node - uint32_t exit_count; + uint32_t inst_counter; uint32_t marker; + uint32_t exit_count; + ModelVector< ModelVector *> thrd_markers; + ModelVector thrd_recursion_depth; // Recursion depth starts from 0 to match with vector indexes. - void incr_marker() { marker++; } + void init_marker(thread_id_t tid); /* Use source line number as the key of hashtable, to check if * atomic operation with this line number has been added or not @@ -88,12 +86,25 @@ private: /* Possible entry atomic actions in this function */ func_inst_list_mt entry_insts; - void infer_predicates(FuncInst * next_inst, ModelAction * next_act, HashTable * loc_act_map, SnapVector * half_pred_expressions); - void generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector * half_pred_expressions); - bool amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act); + /* Map a FuncInst to the its predicate when updating predicate trees */ + ModelVector< ModelVector * > thrd_inst_pred_maps; + + /* Number FuncInsts to detect loops when updating predicate trees */ + ModelVector< ModelVector *> thrd_inst_id_maps; + + /* Detect read actions at the same locations when updating predicate trees */ + ModelVector< ModelVector *> thrd_loc_inst_maps; - /* Store action_lists when calls to update_tree are deferred */ - SnapList * action_list_buffer; + void init_local_maps(thread_id_t tid); + void reset_local_maps(thread_id_t tid); + + void update_inst_tree(func_inst_list_t * inst_list); + void update_predicate_tree(ModelAction * act); + bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, Predicate ** unset_predicate); + + void infer_predicates(FuncInst * next_inst, ModelAction * next_act, SnapVector * half_pred_expressions); + void generate_predicates(Predicate * curr_pred, FuncInst * next_inst, SnapVector * half_pred_expressions); + bool amend_predicate_expr(Predicate * curr_pred, FuncInst * next_inst, ModelAction * next_act); /* Set of locations read by this FuncNode */ loc_set_t * read_locations; @@ -107,16 +118,29 @@ private: /* Keeps track of locations that may share the same value as key, deduced from val_loc_map */ HashTable * loc_may_equal_map; + HashTable likely_null_set; + + bool likely_reads_from_null(ModelAction * read); // value_set_t * values_may_read_from; - /* Run-time position in the predicate tree for each thread */ - ModelVector predicate_tree_position; + /* Run-time position in the predicate tree for each thread + * The inner vector is used to deal with recursive functions. */ + ModelVector< ModelVector * > thrd_predicate_tree_position; + + ModelVector< ModelVector * > thrd_predicate_trace; + + void set_predicate_tree_position(thread_id_t tid, Predicate * pred); + + void init_predicate_tree_data_structure(thread_id_t tid); + void reset_predicate_tree_data_structure(thread_id_t tid); /* Store the relation between this FuncNode and other FuncNodes */ HashTable edge_table; /* FuncNodes that follow this node */ ModelList out_edges; + + void update_predicate_tree_weight(thread_id_t tid); }; #endif /* __FUNCNODE_H__ */