X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FASTAnalyses%2FEncoding%2Fsubgraph.h;h=88a129129a8c3de1e8b005469727ba1656218e61;hp=bc7fdbf5bb8164ed64261ec3398e9fa31f75f881;hb=457ee300c637089a095444672c9d4628faf901e7;hpb=80c81c7a3aeeb577e3c4f514b964e5c84ac6c658

diff --git a/src/ASTAnalyses/Encoding/subgraph.h b/src/ASTAnalyses/Encoding/subgraph.h
index bc7fdbf..88a1291 100644
--- a/src/ASTAnalyses/Encoding/subgraph.h
+++ b/src/ASTAnalyses/Encoding/subgraph.h
@@ -5,47 +5,65 @@
 #include "graphstructs.h"
 
 class NodeValuePair {
- public:
- NodeValuePair(EncodingNode *n, uint64_t val) : node(n), value(val) {}
+public:
+	NodeValuePair(EncodingNode *n, uint64_t val) : node(n), value(val) {}
 	EncodingNode *node;
 	uint64_t value;
 };
 
+class EncodingValue;
+
+typedef Hashset<EncodingValue *, uintptr_t, PTRSHIFT> HashsetEncodingValue;
+typedef SetIterator<EncodingValue *, uintptr_t, PTRSHIFT> SetIteratorEncodingValue;
+
 class EncodingValue {
- public:
- EncodingValue(uint64_t _val) : value(_val), inComparison(false) {}
+public:
+	EncodingValue(uint64_t _val) : value(_val), encoding(0), inComparison(false), assigned(false) {}
 	void merge(EncodingValue *value);
 	uint64_t value;
+	uint encoding;
 	bool inComparison;
+	bool assigned;
 	HashsetEncodingNode nodes;
-	Vector<EncodingValue *> larger;
+	HashsetEncodingValue larger;
+	HashsetEncodingValue notequals;
 };
 
 uint hashNodeValuePair(NodeValuePair *nvp);
 bool equalsNodeValuePair(NodeValuePair *nvp1, NodeValuePair *nvp2);
 
-typedef Hashtable<NodeValuePair *, EncodingValue *, uintptr_t, 4, hashNodeValuePair, equalsNodeValuePair> NVPMap;
+typedef Hashtable<NodeValuePair *, EncodingValue *, uintptr_t, 0, hashNodeValuePair, equalsNodeValuePair> NVPMap;
 
 class EncodingSubGraph {
- public:
+public:
 	EncodingSubGraph();
+	~EncodingSubGraph();
 	void addNode(EncodingNode *n);
-	SetIteratorEncodingNode * nodeIterator();
+	SetIteratorEncodingNode *nodeIterator();
 	void encode();
-	
+	uint getEncoding(EncodingNode *n, uint64_t val);
+	uint getEncodingMaxVal(EncodingNode *n) { return maxEncodingVal;}
+
 	CMEMALLOC;
- private:
+private:
 	uint estimateNewSize(EncodingNode *n);
 	uint estimateNewSize(EncodingSubGraph *sg);
 	void traverseValue(EncodingNode *node, uint64_t value);
 	void computeEncodingValue();
-	void computeInequalities();
+	void computeComparisons();
+	void computeEqualities();
+	void solveComparisons();
+	void solveEquals();
 	void generateComparison(EncodingNode *left, EncodingNode *right);
+	void generateEquals(EncodingNode *left, EncodingNode *right);
+	void orderEV(EncodingValue *smaller, EncodingValue *larger);
 
+	HashsetEncodingValue values;
 	HashsetEncodingNode nodes;
 	NVPMap map;
 	uint encodingSize;
 	uint numElements;
+	uint maxEncodingVal;
 
 	friend class EncodingGraph;
 };