#ifndef __FUNCNODE_H__
#define __FUNCNODE_H__
-#include "action.h"
-#include "funcinst.h"
-#include "hashtable.h"
#include "hashset.h"
-#include "predicate.h"
+#include "hashfunction.h"
+#include "classlist.h"
+#include "threads-model.h"
+
+#define MAX_DIST 10
typedef ModelList<FuncInst *> func_inst_list_mt;
-typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
+typedef enum edge_type {
+ IN_EDGE, OUT_EDGE, BI_EDGE
+} edge_type_t;
class FuncNode {
public:
- FuncNode();
+ FuncNode(ModelHistory * history);
~FuncNode();
uint32_t get_func_id() { return func_id; }
const char * get_func_name() { return func_name; }
void set_func_id(uint32_t id) { func_id = id; }
void set_func_name(const char * name) { func_name = name; }
+ 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; }
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 store_read(ModelAction * act, uint32_t tid);
- uint64_t query_last_read(void * location, uint32_t tid);
- void clear_read_map(uint32_t tid);
+ void incr_exit_count() { exit_count++; }
+ uint32_t get_exit_count() { return exit_count; }
- /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
- void update_predicate_tree(action_list_t * act_list, HashTable<ModelAction *, FuncInst *, uintptr_t, 4> * act_inst_map);
- bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map, HashTable<void *, FuncInst *, uintptr_t, 4>* loc_inst_map);
- void print_predicate_tree();
+ SnapList<action_list_t *> * get_action_list_buffer() { return action_list_buffer; }
+
+ 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 print_last_read(uint32_t tid);
+ 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 assign_base_score();
+ void print_predicate_tree();
MEMALLOC
private:
uint32_t func_id;
const char * func_name;
- bool predicate_tree_initialized;
- Predicate * predicate_tree_entry; // a dummy node whose children are the real entries
+ ModelHistory * history;
+ 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 marker;
+
+ void incr_marker() { marker++; }
/* Use source line number as the key of hashtable, to check if
* atomic operation with this line number has been added or not
*/
HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;
- /* list of all atomic actions in this function */
+ /* List of all atomic actions in this function */
func_inst_list_mt inst_list;
- /* possible entry atomic actions in this function */
+ /* Possible entry atomic actions in this function */
func_inst_list_mt entry_insts;
- /* Store the values read by atomic read actions per memory location for each thread */
- ModelVector<read_map_t *> thrd_read_map;
- HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> predicate_tree_backedges;
+ 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);
+
+ /* Store action_lists when calls to update_tree are deferred */
+ SnapList<action_list_t *> * action_list_buffer;
+
+ /* Set of locations read by this FuncNode */
+ loc_set_t * read_locations;
+
+ /* Set of locations written to by this FuncNode */
+ loc_set_t * write_locations;
+
+ /* Keeps track of locations that have the same values written to */
+ HashTable<uint64_t, loc_set_t *, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free, int64_hash> * val_loc_map;
+
+ /* 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;
+
+ // value_set_t * values_may_read_from;
+
+ /* Run-time position in the predicate tree for each thread */
+ ModelVector<Predicate *> predicate_tree_position;
+
+ /* 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;
};
-#endif /* __FUNCNODE_H__ */
+#endif /* __FUNCNODE_H__ */
projects / c11tester.git / blobdiff