X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=8ea79e439069e0ccb5baac8d0028c82fbdf9793b;hp=29a99118eda43b1e26b6553afb11164d9ca2ea08;hb=91c222d99149ed6f9792a227205fa58d44e0a773;hpb=a255c76241d54ef340c21c25a8c640e88988d204 diff --git a/src/csolver.cc b/src/csolver.cc index 29a9911..8ea79e4 100644 --- a/src/csolver.cc +++ b/src/csolver.cc @@ -11,14 +11,21 @@ #include "sattranslator.h" #include "tunable.h" #include "polarityassignment.h" -#include "analyzer.h" +#include "decomposeordertransform.h" #include "autotuner.h" #include "astops.h" #include "structs.h" +#include "orderresolver.h" +#include "integerencoding.h" +#include "qsort.h" +#include "preprocess.h" +#include "serializer.h" +#include "deserializer.h" +#include "encodinggraph.h" CSolver::CSolver() : - boolTrue(new BooleanConst(true)), - boolFalse(new BooleanConst(false)), + boolTrue(BooleanEdge(new BooleanConst(true))), + boolFalse(boolTrue.negate()), unsat(false), tuner(NULL), elapsedTime(0) @@ -64,23 +71,41 @@ CSolver::~CSolver() { delete allFunctions.get(i); } - delete boolTrue; - delete boolFalse; + delete boolTrue.getBoolean(); delete satEncoder; } CSolver *CSolver::clone() { CSolver *copy = new CSolver(); CloneMap map; - SetIteratorBoolean *it = getConstraints(); + SetIteratorBooleanEdge *it = getConstraints(); while (it->hasNext()) { - Boolean *b = it->next(); - copy->addConstraint(b->clone(copy, &map)); + BooleanEdge b = it->next(); + copy->addConstraint(cloneEdge(copy, &map, b)); } delete it; return copy; } +void CSolver::serialize() { + model_print("serializing ...\n"); + { + Serializer serializer("dump"); + SetIteratorBooleanEdge *it = getConstraints(); + while (it->hasNext()) { + BooleanEdge b = it->next(); + serializeBooleanEdge(&serializer, b); + } + delete it; + } + model_print("deserializing ...\n"); + { + Deserializer deserializer("dump"); + deserializer.deserialize(); + } + +} + Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) { Set *set = new Set(type, elements, numelements); allSets.push(set); @@ -114,6 +139,10 @@ uint64_t CSolver::createUniqueItem(MutableSet *set) { return element; } +void CSolver::finalizeMutableSet(MutableSet* set){ + set->finalize(); +} + Element *CSolver::getElementVar(Set *set) { Element *element = new ElementSet(set); allElements.push(element); @@ -123,7 +152,7 @@ Element *CSolver::getElementVar(Set *set) { Element *CSolver::getElementConst(VarType type, uint64_t value) { uint64_t array[] = {value}; Set *set = new Set(type, array, 1); - Element *element = new ElementConst(value, type, set); + Element *element = new ElementConst(value, set); Element *e = elemMap.get(element); if (e == NULL) { allSets.push(set); @@ -137,10 +166,11 @@ Element *CSolver::getElementConst(VarType type, uint64_t value) { } } -Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus) { +Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus) { Element *element = new ElementFunction(function,array,numArrays,overflowstatus); Element *e = elemMap.get(element); if (e == NULL) { + element->updateParents(); allElements.push(element); elemMap.put(element, element); return element; @@ -188,181 +218,205 @@ Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) { return function; } -Boolean *CSolver::getBooleanVar(VarType type) { +BooleanEdge CSolver::getBooleanVar(VarType type) { Boolean *boolean = new BooleanVar(type); allBooleans.push(boolean); - return boolean; + return BooleanEdge(boolean); } -Boolean *CSolver::getBooleanTrue() { +BooleanEdge CSolver::getBooleanTrue() { return boolTrue; } -Boolean *CSolver::getBooleanFalse() { +BooleanEdge CSolver::getBooleanFalse() { return boolFalse; } -Boolean *CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) { - return applyPredicateTable(predicate, inputs, numInputs, NULL); +BooleanEdge CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) { + return applyPredicateTable(predicate, inputs, numInputs, BooleanEdge(NULL)); } -Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) { +BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus) { BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus); - Boolean * b = boolMap.get(boolean); + Boolean *b = boolMap.get(boolean); if (b == NULL) { + boolean->updateParents(); boolMap.put(boolean, boolean); allBooleans.push(boolean); - return boolean; + return BooleanEdge(boolean); } else { delete boolean; - return b; + return BooleanEdge(b); } } -bool CSolver::isTrue(Boolean *b) { - return b->isTrue(); +bool CSolver::isTrue(BooleanEdge b) { + return b.isNegated()?b->isFalse():b->isTrue(); } -bool CSolver::isFalse(Boolean *b) { - return b->isFalse(); +bool CSolver::isFalse(BooleanEdge b) { + return b.isNegated()?b->isTrue():b->isFalse(); } -Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean * arg1, Boolean * arg2) { - Boolean * array[] = {arg1, arg2}; +BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2) { + BooleanEdge array[] = {arg1, arg2}; return applyLogicalOperation(op, array, 2); } -Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean *arg) { - Boolean * array[] = {arg}; +BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg) { + BooleanEdge array[] = {arg}; return applyLogicalOperation(op, array, 1); } +static int ptrcompares(const void *p1, const void *p2) { + uintptr_t b1 = *(uintptr_t const *) p1; + uintptr_t b2 = *(uintptr_t const *) p2; + if (b1 < b2) + return -1; + else if (b1 == b2) + return 0; + else + return 1; +} + +BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) { + BooleanEdge newarray[asize]; + memcpy(newarray, array, asize * sizeof(BooleanEdge)); + for(uint i=0; i < asize; i++) { + BooleanEdge b=newarray[i]; + if (b->type == LOGICOP) { + if (((BooleanLogic *) b.getBoolean())->replaced) { + newarray[i] = doRewrite(newarray[i]); + i--;//Check again + } + } + } + return applyLogicalOperation(op, newarray, asize); +} -Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean **array, uint asize) { - Boolean * newarray[asize]; - switch(op) { +BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) { + BooleanEdge newarray[asize]; + switch (op) { case SATC_NOT: { - if (array[0]->type == LOGICOP && ((BooleanLogic *)array[0])->op==SATC_NOT) { - return ((BooleanLogic *) array[0])->inputs.get(0); - } else if (array[0]->type == BOOLCONST) { - return array[0]->isTrue() ? boolFalse : boolTrue; - } - break; + return array[0].negate(); } - case SATC_XOR: { - for(uint i=0;i<2;i++) { + case SATC_IFF: { + for (uint i = 0; i < 2; i++) { if (array[i]->type == BOOLCONST) { if (array[i]->isTrue()) { - newarray[0]=array[1-i]; + return array[1 - i]; + } else { + newarray[0] = array[1 - i]; return applyLogicalOperation(SATC_NOT, newarray, 1); - } else - return array[1-i]; + } + } else if (array[i]->type == LOGICOP) { + BooleanLogic *b =(BooleanLogic *)array[i].getBoolean(); + if (b->replaced) { + return rewriteLogicalOperation(op, array, asize); + } } } break; } case SATC_OR: { - uint newindex=0; - for(uint i=0;itype == BOOLCONST) { - if (b->isTrue()) - return b; - else - continue; - } else - newarray[newindex++]=b; + for (uint i =0; i type==BOOLCONST) && ((BooleanLogic *)newarray[0])->op == SATC_NOT; - bool isNot1 = (newarray[1]->type==BOOLCONST) && ((BooleanLogic *)newarray[1])->op == SATC_NOT; - - if (isNot0 != isNot1) { - if (isNot0) { - newarray[0] = ((BooleanLogic *) newarray[0])->inputs.get(0); - } else { - Boolean *tmp = ((BooleanLogic *) array[1])->inputs.get(0); - array[1] = array[0]; - array[0] = tmp; - } - return applyLogicalOperation(SATC_IMPLIES, newarray, 2); - } - } else { - array = newarray; - asize = newindex; - } - break; + return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_AND, newarray, asize)); } case SATC_AND: { - uint newindex=0; - for(uint i=0;itype == LOGICOP) { + if (((BooleanLogic *)b.getBoolean())->replaced) + return rewriteLogicalOperation(op, array, asize); + } if (b->type == BOOLCONST) { if (b->isTrue()) continue; else - return b; + return boolFalse; } else - newarray[newindex++]=b; + newarray[newindex++] = b; } - if(newindex==1) { + if (newindex == 0) { + return boolTrue; + } else if (newindex == 1) { return newarray[0]; } else { + bsdqsort(newarray, newindex, sizeof(BooleanEdge), ptrcompares); array = newarray; asize = newindex; } break; } + case SATC_XOR: { + //handle by translation + return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_IFF, array, asize)); + } case SATC_IMPLIES: { - if (array[0]->type == BOOLCONST) { - if (array[0]->isTrue()) { - return array[1]; - } else { - return boolTrue; - } - } else if (array[1]->type == BOOLCONST) { - if (array[1]->isTrue()) { - return array[1]; - } else { - return applyLogicalOperation(SATC_NOT, array, 1); - } - } - break; + //handle by translation + return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]); } } - + + ASSERT(asize != 0); Boolean *boolean = new BooleanLogic(this, op, array, asize); Boolean *b = boolMap.get(boolean); if (b == NULL) { + boolean->updateParents(); boolMap.put(boolean, boolean); allBooleans.push(boolean); - return boolean; + return BooleanEdge(boolean); } else { delete boolean; - return b; + return BooleanEdge(b); } } -Boolean *CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) { +BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) { Boolean *constraint = new BooleanOrder(order, first, second); allBooleans.push(constraint); - return constraint; + return BooleanEdge(constraint); } -void CSolver::addConstraint(Boolean *constraint) { - if (constraint == boolTrue) +void CSolver::addConstraint(BooleanEdge constraint) { + if (isTrue(constraint)) return; - else if (constraint == boolFalse) + else if (isFalse(constraint)) setUnSAT(); - else + else { + if (constraint->type == LOGICOP) { + BooleanLogic *b=(BooleanLogic *) constraint.getBoolean(); + if (!constraint.isNegated()) { + if (b->op==SATC_AND) { + for(uint i=0;iinputs.getSize();i++) { + addConstraint(b->inputs.get(i)); + } + return; + } + } + if (b->replaced) { + addConstraint(doRewrite(constraint)); + return; + } + } constraints.add(constraint); + Boolean *ptr=constraint.getBoolean(); + + if (ptr->boolVal == BV_UNSAT) + setUnSAT(); + + replaceBooleanWithTrueNoRemove(constraint); + constraint->parents.clear(); + } } Order *CSolver::createOrder(OrderType type, Set *set) { Order *order = new Order(type, set); allOrders.push(order); + activeOrders.add(order); return order; } @@ -372,10 +426,23 @@ int CSolver::solve() { tuner = new DefaultTuner(); deleteTuner = true; } - + long long startTime = getTimeNano(); computePolarities(this); - orderAnalysis(this); + + Preprocess pp(this); + pp.doTransform(); + + DecomposeOrderTransform dot(this); + dot.doTransform(); + + IntegerEncodingTransform iet(this); + iet.doTransform(); + + EncodingGraph eg(this); + eg.buildGraph(); + eg.encode(); + naiveEncodingDecision(this); satEncoder->encodeAllSATEncoder(this); int result = unsat ? IS_UNSAT : satEncoder->solve(); @@ -400,7 +467,8 @@ uint64_t CSolver::getElementValue(Element *element) { exit(-1); } -bool CSolver::getBooleanValue(Boolean *boolean) { +bool CSolver::getBooleanValue(BooleanEdge bedge) { + Boolean *boolean=bedge.getBoolean(); switch (boolean->type) { case BOOLEANVAR: return getBooleanVariableValueSATTranslator(this, boolean); @@ -410,8 +478,8 @@ bool CSolver::getBooleanValue(Boolean *boolean) { exit(-1); } -HappenedBefore CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) { - return getOrderConstraintValueSATTranslator(this, order, first, second); +bool CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) { + return order->encoding.resolver->resolveOrder(first, second); } long long CSolver::getEncodeTime() { return satEncoder->getEncodeTime(); } @@ -419,7 +487,7 @@ long long CSolver::getEncodeTime() { return satEncoder->getEncodeTime(); } long long CSolver::getSolveTime() { return satEncoder->getSolveTime(); } void CSolver::autoTune(uint budget) { - AutoTuner * autotuner=new AutoTuner(budget); + AutoTuner *autotuner = new AutoTuner(budget); autotuner->addProblem(this); autotuner->tune(); delete autotuner;