#define MAX_DIST 10
typedef ModelList<FuncInst *> func_inst_list_mt;
+typedef ModelVector<Predicate *> predicate_trace_t;
+
+typedef HashTable<void *, FuncInst *, uintptr_t, 0, model_malloc, model_calloc, model_free> loc_inst_map_t;
+typedef HashTable<FuncInst *, uint32_t, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_id_map_t;
+typedef HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_pred_map_t;
+
typedef enum edge_type {
IN_EDGE, OUT_EDGE, BI_EDGE
} edge_type_t;
void set_new_exec_flag();
void add_inst(ModelAction *act);
+ FuncInst * create_new_inst(ModelAction *act);
FuncInst * get_inst(ModelAction *act);
- HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * 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<Predicate *> * 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<action_list_t *> * 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<FuncNode *> * 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:
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<uint32_t> *> thrd_markers;
+ ModelVector<int> 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
/* Possible entry atomic actions in this function */
func_inst_list_mt entry_insts;
- void infer_predicates(FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map, SnapVector<struct half_pred_expr *> * half_pred_expressions);
- void generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * 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<inst_pred_map_t *> * > thrd_inst_pred_maps;
+
+ /* Number FuncInsts to detect loops when updating predicate trees */
+ ModelVector< ModelVector<inst_id_map_t *> *> thrd_inst_id_maps;
- /* Store action_lists when calls to update_tree are deferred */
- SnapList<action_list_t *> * action_list_buffer;
+ /* Detect read actions at the same locations when updating predicate trees */
+ ModelVector< ModelVector<loc_inst_map_t *> *> thrd_loc_inst_maps;
+
+ 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<struct half_pred_expr *> * half_pred_expressions);
+ void generate_predicates(Predicate * curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * 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;
/* Keeps track of locations that may share the same value as key, deduced from val_loc_map */
HashTable<void *, loc_set_t *, uintptr_t, 0> * loc_may_equal_map;
+ HashTable<FuncInst *, bool, uintptr_t, 0, model_malloc, model_calloc, model_free> 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 *> 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<Predicate *> * > thrd_predicate_tree_position;
+
+ ModelVector< ModelVector<predicate_trace_t *> * > 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<FuncNode *, edge_type_t, uintptr_t, 0, model_malloc, model_calloc, model_free> edge_table;
/* FuncNodes that follow this node */
ModelList<FuncNode *> out_edges;
+
+ void update_predicate_tree_weight(thread_id_t tid);
};
-#endif /* __FUNCNODE_H__ */
+#endif /* __FUNCNODE_H__ */
projects / c11tester.git / blobdiff