X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=predicate.h;h=8afc24be0839ff5da5c11e05a1b0c910a7fa1133;hb=5d3037f7280786b48caa804d92aa360a6dea846d;hp=e901d91fe3d71c357a83be46b8a098d8123f69e3;hpb=8c52c96262bbb96bcb4d18706daf8dbd77990b1d;p=c11tester.git

diff --git a/predicate.h b/predicate.h
index e901d91f..8afc24be 100644
--- a/predicate.h
+++ b/predicate.h
@@ -1,53 +1,20 @@
-#ifndef __PREDICTAE_H__
+#ifndef __PREDICATE_H__
 #define __PREDICATE_H__
 
-#include "funcinst.h"
 #include "hashset.h"
+#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;
 typedef HSIterator<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSetIter;
 
-typedef enum predicate_token {
-	NOPREDICATE, EQUALITY, NULLITY
-} token_t;
-
-/* If token is EQUALITY, then the predicate asserts whether
- * this load should read the same value as the last value
- * read at memory location specified in predicate_expr.
- */
-struct pred_expr {
-	pred_expr(token_t token, FuncInst * inst, bool value) :
-		token(token),
-		func_inst(inst),
-		value(value)
-	{}
-
-	token_t token;
-	FuncInst * func_inst;
-	bool value;
-
-	MEMALLOC
-};
-
-/* Used by predicate generator */
-struct half_pred_expr {
-	half_pred_expr(token_t token, FuncInst * inst) :
-		token(token),
-		func_inst(inst)
-	{}
-
-	token_t token;
-	FuncInst * func_inst;
-
-	SNAPSHOTALLOC
-};
-
-
 class Predicate {
 public:
-	Predicate(FuncInst * func_inst, bool is_entry = false);
+	Predicate(FuncInst * func_inst, bool is_entry = false, bool is_exit = false);
 	~Predicate();
 
 	FuncInst * get_func_inst() { return func_inst; }
@@ -55,17 +22,39 @@ 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_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; }
 
+	/* Whether func_inst does write or not */
+	bool is_write() { return does_write; }
+	void set_write(bool is_write) { does_write = is_write; }
+
+	ConcretePredicate * evaluate(inst_act_map_t * inst_act_map, thread_id_t tid);
+
+	uint32_t get_expl_count() { return exploration_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_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();
 
@@ -73,16 +62,27 @@ public:
 private:
 	FuncInst * func_inst;
 	bool entry_predicate;
+	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 store_visible_count;
+	uint32_t total_checking_count;	/* The number of times the store visibility is checked */
 
-	/* may have multiple predicate expressions */
+	/* May have multiple predicate expressions */
 	PredExprSet pred_expressions;
 	ModelVector<Predicate *> children;
 
-	/* only a single parent may exist */
+	/* Only a single parent may exist */
 	Predicate * parent;
+	Predicate * exit;
 
-	/* may have multiple back edges, e.g. nested loops */
+	/* May have multiple back edges, e.g. nested loops */
 	PredSet backedges;
 };
 
-#endif /* __PREDICATE_H__ */
+#endif	/* __PREDICATE_H__ */