do optimization for FuncNode::update_tree

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index d2bc3cf2f7ae079597a5e380f7746d01015a4db1..4ba239856df8e468a7bf4f6b7518a7a95381bed7 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -5,6 +5,7 @@
 #include "funcinst.h"
 #include "hashtable.h"
 #include "hashset.h"
+#include "predicate.h"
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
 typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
@@ -19,20 +20,25 @@ public:
        void set_func_id(uint32_t id) { func_id = id; }
        void set_func_name(const char * name) { func_name = name; }
 
-       FuncInst * get_or_add_action(ModelAction *act);
+       void add_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 link_insts(func_inst_list_t * inst_list);
+
+       void update_tree(action_list_t * act_list);
+       void update_inst_tree(func_inst_list_t * inst_list);
 
        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);
 
        /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
-       void generate_predicate(FuncInst * func_inst);
+       void update_predicate_tree(action_list_t * act_list);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0>* loc_act_map);
+       void print_predicate_tree();
 
        void print_last_read(uint32_t tid);
 
@@ -40,6 +46,8 @@ public:
 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
 
        /* Use source line number as the key of hashtable, to check if
         * atomic operation with this line number has been added or not
@@ -54,7 +62,6 @@ private:
 
        /* Store the values read by atomic read actions per memory location for each thread */
        ModelVector<read_map_t *> thrd_read_map;
-
 };
 
 #endif /* __FUNCNODE_H__ */