Incorporate failed predicates in weights

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 3e1867fd6cf1a36221712267a5b284c811f4ffbf..df46ca1052551dc04b0423e5d3a394261c669f1c 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -5,6 +5,8 @@
 #include "predicatetypes.h"
 #include "classlist.h"
 
+#define MAX_DEPTH 0x7fffffff
+
 unsigned int pred_expr_hash (struct pred_expr *);
 bool pred_expr_equal(struct pred_expr *, struct pred_expr *);
 typedef HashSet<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSet;
@@ -20,15 +22,18 @@ public:
 
        void add_predicate_expr(token_t token, FuncInst * func_inst, bool value);
        void add_child(Predicate * child);
-       void set_parent(Predicate * parent_pred) { parent = parent_pred; }
-       void set_exit(Predicate * exit_pred) { exit = exit_pred; }
+       void set_parent(Predicate * parent_pred);
+       void set_exit(Predicate * exit_pred);
        void add_backedge(Predicate * back_pred) { backedges.add(back_pred); }
+       void set_weight(double weight_) { weight = weight_; }
        void copy_predicate_expr(Predicate * other);
 
+       Predicate * follow_write_child(FuncInst * inst);
        ModelVector<Predicate *> * get_children() { return &children; }
        Predicate * get_parent() { return parent; }
        Predicate * get_exit() { return exit; }
        PredSet * get_backedges() { return &backedges; }
+       double get_weight() { return weight; }
 
        bool is_entry_predicate() { return entry_predicate; }
        void set_entry_predicate() { entry_predicate = true; }
@@ -40,13 +45,18 @@ public:
        ConcretePredicate * evaluate(inst_act_map_t * inst_act_map, thread_id_t tid);
 
        uint32_t get_expl_count() { return exploration_count; }
+       uint32_t get_fail_count() { return failure_count; }
        uint32_t get_store_visible_count() { return store_visible_count; }
        uint32_t get_total_checking_count() { return total_checking_count; }
 
        void incr_expl_count() { exploration_count++; }
+       void incr_fail_count() { failure_count++; }
        void incr_store_visible_count() { store_visible_count++; }
        void incr_total_checking_count() { total_checking_count++; }
 
+       uint32_t get_depth() { return depth; }
+       void set_depth(uint32_t depth_) { depth = depth_; }
+
        void print_predicate();
        void print_pred_subtree();
 
@@ -57,7 +67,12 @@ private:
        bool exit_predicate;
        bool does_write;
 
+       /* Height of this predicate node in the predicate tree */
+       uint32_t depth;
+       double weight;
+
        uint32_t exploration_count;
+       uint32_t failure_count;
        uint32_t store_visible_count;
        uint32_t total_checking_count;  /* The number of times the store visibility is checked */
 
@@ -73,4 +88,4 @@ private:
        PredSet backedges;
 };
 
-#endif /* __PREDICATE_H__ */
+#endif /* __PREDICATE_H__ */