#ifndef __FUNCNODE_H__
#define __FUNCNODE_H__
-#include "action.h"
-#include "funcinst.h"
-#include "hashtable.h"
#include "hashset.h"
-#include "predicate.h"
-#include "history.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> read_map_t;
-typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
+typedef enum edge_type {
+ IN_EDGE, OUT_EDGE, BI_EDGE
+} edge_type_t;
class FuncNode {
public:
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, HashTable<FuncInst *, ModelAction *, uintptr_t, 0>* inst_act_map, SnapVector<Predicate *> * unset_predicates);
- void generate_predicate(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);
+ bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, Predicate ** unset_predicate);
void incr_exit_count() { exit_count++; }
uint32_t get_exit_count() { return exit_count; }
- ModelList<action_list_t *> * get_action_list_buffer() { return &action_list_buffer; }
+ 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_inst_act_map(thread_id_t tid, ModelAction * read_act);
inst_act_map_t * get_inst_act_map(thread_id_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 add_failed_predicate(Predicate * pred);
+
void print_predicate_tree();
- void print_val_loc_map();
- void print_last_read(thread_id_t tid);
MEMALLOC
private:
uint32_t func_id;
const char * func_name;
ModelHistory * history;
- bool predicate_tree_initialized;
- Predicate * predicate_tree_entry; // a dummy node whose children are the real entries
+ 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
/* 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;
+ /* Map a FuncInst to the its predicate when updating predicate trees */
+ HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_pred_map;
+
+ /* Number FuncInsts to detect loops when updating predicate trees */
+ HashTable<FuncInst *, uint32_t, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_id_map;
+
+ /* Delect read actions at the same locations when updating predicate trees */
+ HashTable<void *, ModelAction *, uintptr_t, 0, model_malloc, model_calloc, model_free> loc_act_map;
+
+ 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);
/* Store action_lists when calls to update_tree are deferred */
- ModelList<action_list_t *> action_list_buffer;
+ SnapList<action_list_t *> * action_list_buffer;
- /* read_locations: set of locations read by this FuncNode
- * val_loc_map: keep track of locations that have the same values written to;
- * loc_may_equal_map: deduced from val_loc_map;
- */
+ /* Set of locations read by this FuncNode */
loc_set_t * read_locations;
- HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
+
+ /* 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 */
+ /* Run-time position in the predicate tree for each thread */
ModelVector<Predicate *> predicate_tree_position;
- SnapVector<inst_act_map_t *> * thrd_inst_act_map;
+ PredSet predicate_leaves;
+ ModelVector<Predicate *> leaves_tmp_storage;
+ ModelVector<Predicate *> weight_debug_vec;
+ PredSet failed_predicates;
+
+ /* 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 assign_initial_weight();
+ void update_predicate_tree_weight();
};
-#endif /* __FUNCNODE_H__ */
+#endif /* __FUNCNODE_H__ */
projects / c11tester.git / blobdiff