X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=986b9c9df4be85f15d57cbf13f46d62626a3c35d;hb=c9a40b4c0218a83d4ec91fe3f9019dc9dbd6b142;hp=fca063e7a4f86c2462f75a01f006d9c911487a26;hpb=f4d77c40b4029cdc18f4aaa5a4e01dfbcfca5f7b;p=cdsspec-compiler.git
diff --git a/nodestack.h b/nodestack.h
index fca063e..986b9c9 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -12,6 +12,7 @@
#include "mymemory.h"
#include "modeltypes.h"
+#include "schedule.h"
class ModelAction;
class Thread;
@@ -23,11 +24,14 @@ class Thread;
*
@b fulfilled: satisfied by this Node's ModelAction under the current
* configuration.
*/
-typedef enum {
- PROMISE_IGNORE = 0, /**< This promise is inapplicable; ignore it */
- PROMISE_UNFULFILLED, /**< This promise is applicable but unfulfilled */
- PROMISE_FULFILLED /**< This promise is applicable and fulfilled */
-} promise_t;
+
+#define PROMISE_IGNORE 0 /**< This promise is inapplicable; ignore it */
+#define PROMISE_UNFULFILLED 1 /**< This promise is applicable but unfulfilled */
+#define PROMISE_FULFILLED 2 /**< This promise is applicable and fulfilled */
+#define PROMISE_MASK 0xf
+#define PROMISE_RMW 0x10
+
+typedef int promise_t;
struct future_value {
uint64_t value;
@@ -52,19 +56,21 @@ struct fairness_info {
*/
class Node {
public:
- Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
+ Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
~Node();
/* return true = thread choice has already been explored */
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
- void explore_child(ModelAction *act, bool * is_enabled);
+ void explore_child(ModelAction *act, enabled_type_t * is_enabled);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
thread_id_t get_next_backtrack();
bool is_enabled(Thread *t);
bool is_enabled(thread_id_t tid);
+ enabled_type_t enabled_status(thread_id_t tid);
+
ModelAction * get_action() { return action; }
bool has_priority(thread_id_t tid);
int get_num_threads() {return num_threads;}
@@ -85,10 +91,21 @@ public:
int get_read_from_size();
const ModelAction * get_read_from_at(int i);
- void set_promise(unsigned int i);
+ void set_promise(unsigned int i, bool is_rmw);
bool get_promise(unsigned int i);
bool increment_promise();
bool promise_empty();
+ enabled_type_t *get_enabled_array() {return enabled_array;}
+
+ void set_misc_max(int i);
+ int get_misc();
+ bool increment_misc();
+ bool misc_empty();
+
+ void add_relseq_break(const ModelAction *write);
+ const ModelAction * get_relseq_break();
+ bool increment_relseq_break();
+ bool relseq_break_empty();
void print();
void print_may_read_from();
@@ -104,7 +121,7 @@ private:
std::vector< bool, ModelAlloc > backtrack;
std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
int numBacktracks;
- bool *enabled_array;
+ enabled_type_t *enabled_array;
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
@@ -115,6 +132,12 @@ private:
std::vector< struct future_value, ModelAlloc > future_values;
std::vector< promise_t, ModelAlloc > promises;
int future_index;
+
+ std::vector< const ModelAction *, ModelAlloc > relseq_break_writes;
+ int relseq_break_index;
+
+ int misc_index;
+ int misc_max;
};
typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
@@ -131,7 +154,7 @@ class NodeStack {
public:
NodeStack();
~NodeStack();
- ModelAction * explore_action(ModelAction *act, bool * is_enabled);
+ ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
Node * get_head();
Node * get_next();
void reset_execution();