Incorporate failed predicates in weights

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index ea591a2e05ba5426c0e553b11cacfa609c0df078..a0eb6233988c1d082de9e88a734ee084772209c4 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -36,7 +36,7 @@ public:
        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);
        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);
+       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; }
 
        void incr_exit_count() { exit_count++; }
        uint32_t get_exit_count() { return exit_count; }


@@ -60,9 +60,9 @@ public:
        ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
        int compute_distance(FuncNode * target, int max_step = MAX_DIST);
 
        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_predicate_tree();

-       void print_val_loc_map();
-       void print_last_read(thread_id_t tid);

 
        MEMALLOC
 private:
 
        MEMALLOC
 private:


@@ -72,7 +72,6 @@ private:
        Predicate * predicate_tree_entry;       // A dummy node whose children are the real entries
        Predicate * predicate_tree_exit;        // A dummy node
 
        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;
 
        uint32_t exit_count;
        uint32_t marker;
 


@@ -89,9 +88,18 @@ private:
        /* Possible entry atomic actions in this function */
        func_inst_list_mt entry_insts;
 
        /* 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 */
+       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 */
        SnapList<action_list_t *> * action_list_buffer;
 
        /* Store action_lists when calls to update_tree are deferred */
        SnapList<action_list_t *> * action_list_buffer;


@@ -113,11 +121,19 @@ private:
        /* 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 */
        ModelVector<Predicate *> predicate_tree_position;
 

+       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;
        /* 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__ */