X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=311ad0f5052ac00ac29ff03cbdbc1082912fcd94;hp=3e240a4df2741050576d1cf00cc3a6f639f5bb54;hb=5c85052f51461617085157442e8ca37db875e803;hpb=3ecb35ec6bebb65520c085d264fa1d2f3ba96f80 diff --git a/src/csolver.cc b/src/csolver.cc index 3e240a4..311ad0f 100644 --- a/src/csolver.cc +++ b/src/csolver.cc @@ -17,7 +17,11 @@ #include "structs.h" #include "orderresolver.h" #include "integerencoding.h" -#include +#include "qsort.h" +#include "preprocess.h" +#include "serializer.h" +#include "deserializer.h" +#include "encodinggraph.h" CSolver::CSolver() : boolTrue(BooleanEdge(new BooleanConst(true))), @@ -77,12 +81,31 @@ CSolver *CSolver::clone() { SetIteratorBooleanEdge *it = getConstraints(); while (it->hasNext()) { BooleanEdge b = it->next(); - copy->addConstraint(b->clone(copy, &map)); + 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); @@ -95,6 +118,10 @@ Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange return set; } +VarType CSolver::getSetVarType(Set *set) { + return set->getType(); +} + Element *CSolver::createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange) { Set *s = createRangeSet(type, lowrange, highrange); return getElementVar(s); @@ -116,16 +143,25 @@ 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); return element; } +Set *CSolver::getElementRange (Element *element) { + return element->getRange(); +} + + 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); @@ -143,6 +179,7 @@ Element *CSolver::applyFunction(Function *function, Element **array, uint numArr 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; @@ -205,13 +242,14 @@ BooleanEdge CSolver::getBooleanFalse() { } BooleanEdge CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) { - return applyPredicateTable(predicate, inputs, numInputs, NULL); + return applyPredicateTable(predicate, inputs, numInputs, BooleanEdge(NULL)); } BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus) { BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus); Boolean *b = boolMap.get(boolean); if (b == NULL) { + boolean->updateParents(); boolMap.put(boolean, boolean); allBooleans.push(boolean); return BooleanEdge(boolean); @@ -222,11 +260,11 @@ BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, } bool CSolver::isTrue(BooleanEdge b) { - return b.isNegated()?b->isFalse():b->isTrue(); + return b.isNegated() ? b->isFalse() : b->isTrue(); } bool CSolver::isFalse(BooleanEdge b) { - return b.isNegated()?b->isTrue():b->isFalse(); + return b.isNegated() ? b->isTrue() : b->isFalse(); } BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2) { @@ -241,7 +279,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg) { static int ptrcompares(const void *p1, const void *p2) { uintptr_t b1 = *(uintptr_t const *) p1; - uintptr_t b2 = *(uintptr_t const *) p2; + uintptr_t b2 = *(uintptr_t const *) p2; if (b1 < b2) return -1; else if (b1 == b2) @@ -250,6 +288,21 @@ static int ptrcompares(const void *p1, const void *p2) { 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); +} + BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) { BooleanEdge newarray[asize]; switch (op) { @@ -259,18 +312,23 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint case SATC_IFF: { for (uint i = 0; i < 2; i++) { if (array[i]->type == BOOLCONST) { - if (array[i]->isTrue()) { + if (isTrue(array[i])) { // It can be undefined return array[1 - i]; - } else { + } else if (isFalse(array[i])) { newarray[0] = array[1 - i]; return applyLogicalOperation(SATC_NOT, newarray, 1); } + } else if (array[i]->type == LOGICOP) { + BooleanLogic *b = (BooleanLogic *)array[i].getBoolean(); + if (b->replaced) { + return rewriteLogicalOperation(op, array, asize); + } } } break; } case SATC_OR: { - for (uint i =0; i type == LOGICOP) { + if (((BooleanLogic *)b.getBoolean())->replaced) + return rewriteLogicalOperation(op, array, asize); + } if (b->type == BOOLCONST) { - if (b->isTrue()) + if (isTrue(b)) continue; - else + else { return boolFalse; + } } else newarray[newindex++] = b; } @@ -292,7 +355,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint } else if (newindex == 1) { return newarray[0]; } else { - qsort(newarray, newindex, sizeof(BooleanEdge), ptrcompares); + bsdqsort(newarray, newindex, sizeof(BooleanEdge), ptrcompares); array = newarray; asize = newindex; } @@ -312,6 +375,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint 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 BooleanEdge(boolean); @@ -322,28 +386,44 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint } BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) { + ASSERT(first != second); Boolean *constraint = new BooleanOrder(order, first, second); allBooleans.push(constraint); return BooleanEdge(constraint); } void CSolver::addConstraint(BooleanEdge constraint) { - if (constraint == boolTrue) + if (isTrue(constraint)) return; - else if (constraint == boolFalse) + else if (isFalse(constraint)) { + int t = 0; setUnSAT(); + } else { - if (!constraint.isNegated() && constraint->type == LOGICOP) { - BooleanLogic *b=(BooleanLogic *) constraint.getBoolean(); - if (b->op==SATC_AND) { - for(uint i=0;iinputs.getSize();i++) { - addConstraint(b->inputs.get(i)); + if (constraint->type == LOGICOP) { + BooleanLogic *b = (BooleanLogic *) constraint.getBoolean(); + if (!constraint.isNegated()) { + if (b->op == SATC_AND) { + for (uint i = 0; i < b->inputs.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(); } } @@ -364,16 +444,24 @@ int CSolver::solve() { long long startTime = getTimeNano(); computePolarities(this); + Preprocess pp(this); + pp.doTransform(); + DecomposeOrderTransform dot(this); dot.doTransform(); - //This leaks like crazy - // IntegerEncodingTransform iet(this); - //iet.doTransform(); + IntegerEncodingTransform iet(this); + iet.doTransform(); + EncodingGraph eg(this); + eg.buildGraph(); + eg.encode(); + printConstraints(); naiveEncodingDecision(this); satEncoder->encodeAllSATEncoder(this); + model_print("Is problem UNSAT after encoding: %d\n", unsat); int result = unsat ? IS_UNSAT : satEncoder->solve(); + model_print("Result Computed in CSolver: %d\n", result); long long finishTime = getTimeNano(); elapsedTime = finishTime - startTime; if (deleteTuner) { @@ -383,6 +471,19 @@ int CSolver::solve() { return result; } +void CSolver::printConstraints() { + SetIteratorBooleanEdge *it = getConstraints(); + while (it->hasNext()) { + BooleanEdge b = it->next(); + if (b.isNegated()) + model_print("!"); + b->print(); + model_print("\n"); + } + delete it; + +} + uint64_t CSolver::getElementValue(Element *element) { switch (element->type) { case ELEMSET: @@ -396,7 +497,7 @@ uint64_t CSolver::getElementValue(Element *element) { } bool CSolver::getBooleanValue(BooleanEdge bedge) { - Boolean *boolean=bedge.getBoolean(); + Boolean *boolean = bedge.getBoolean(); switch (boolean->type) { case BOOLEANVAR: return getBooleanVariableValueSATTranslator(this, boolean);