Skip to content

Optimize solver cloning #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2022
Merged

Optimize solver cloning #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc358d
optimize solver cloning
May 23, 2022
cf9a22b
add method expectUndefined
May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions utbot-framework/src/main/kotlin/org/utbot/engine/ExecutionState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import kotlinx.collections.immutable.persistentHashMapOf
import kotlinx.collections.immutable.persistentHashSetOf
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.plus
import org.utbot.engine.pc.UtSolverStatusUNDEFINED
import soot.SootMethod
import soot.jimple.Stmt

Expand Down Expand Up @@ -205,6 +206,15 @@ data class ExecutionState(
)
}

/**
* Tell to solver that states with status [UtSolverStatusUNDEFINED] can be created from current state.
*
* Note: Solver optimize cloning respect this flag.
*/
fun expectUndefined() {
solver.expectUndefined = true
}

override fun close() {
solver.close()
}
Expand Down
5 changes: 5 additions & 0 deletions utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,7 @@ class UtBotSymbolicEngine(
val negativeCasePathConstraint = mkNot(positiveCasePathConstraint)

positiveCaseEdge?.let { edge ->
environment.state.expectUndefined()
val positiveCaseState = environment.state.updateQueued(
edge,
SymbolicStateUpdate(
Expand Down Expand Up @@ -1435,6 +1436,9 @@ class UtBotSymbolicEngine(
}
else -> error("Unknown switch $current")
}
if (successors.size > 1) {
environment.state.expectUndefined()
}
successors.forEach { (target, expr) ->
pathSelector.offer(
environment.state.updateQueued(
Expand Down Expand Up @@ -3432,6 +3436,7 @@ class UtBotSymbolicEngine(

val symException = implicitThrown(exception, findNewAddr(), isInNestedMethod())
if (!traverseCatchBlock(environment.state.stmt, symException, conditions)) {
environment.state.expectUndefined()
val nextState = environment.state.createExceptionState(
symException,
queuedSymbolicStateUpdates
Expand Down
11 changes: 4 additions & 7 deletions utbot-framework/src/main/kotlin/org/utbot/engine/pc/UtSolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,13 @@ data class UtSolver constructor(
val assertions: Set<UtBoolExpression>
get(): Set<UtBoolExpression> = constraints.hard

var expectUndefined: Boolean = false

fun add(hard: HardConstraint, soft: SoftConstraint): UtSolver {
// status can implicitly change here to UNDEFINED or UNSAT
val newConstraints = constraints.with(hard.constraints, soft.constraints)
/*
Always there is at least one new state with SAT status if current status is SAT
Thus we can prioritize states like this to reuse current solver.
*/
val isSAT = constraints.status is UtSolverStatusSAT
val wantClone = (isSAT && newConstraints.status is UtSolverStatusSAT)
|| (!isSAT && newConstraints !is UnsatQuery)
val wantClone = (expectUndefined && newConstraints.status is UtSolverStatusUNDEFINED)
|| (!expectUndefined && newConstraints.status !is UtSolverStatusUNSAT)

return if (wantClone && canBeCloned) {
// try to reuse z3 Solver with value SAT when possible
Expand Down