Skip to content

Introduce Tool.USVM in ContestEstimator, implement runUsvmGeneration #2666

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
IlyaMuravjov merged 4 commits into from
Oct 27, 2023
Merged

Introduce Tool.USVM in ContestEstimator, implement runUsvmGeneration #2666

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0695ab5
Add `Tool.USVM` in `ContestEstimator`, implement `runUsvmGeneration`
IlyaMuravjov Oct 27, 2023
45d6b2c
Remove redundant TODO
IlyaMuravjov Oct 27, 2023
33176fd
Bump UtBot dependencies version to match USVM dependencies
IlyaMuravjov Oct 27, 2023
675a797
Use `UTestExecutionResult.trace` instead of `JcCoverage`
IlyaMuravjov Oct 27, 2023
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
Prev Previous commit
Use UTestExecutionResult.trace instead of JcCoverage
  • Loading branch information
@IlyaMuravjov
IlyaMuravjov committed Oct 27, 2023
commit 675a79726fa995212ccc7cc1d9aa15d71c19a257
24 changes: 18 additions & 6 deletions utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
package org.utbot.contest.usvm

import org.jacodb.api.JcClassOrInterface
import org.jacodb.api.cfg.JcInst
import org.jacodb.api.ext.jcdbSignature
import org.usvm.api.JcCoverage
import org.usvm.instrumentation.testcase.api.UTestExecutionExceptionResult
import org.usvm.instrumentation.testcase.api.UTestExecutionFailedResult
import org.usvm.instrumentation.testcase.api.UTestExecutionInitFailedResult
import org.usvm.instrumentation.testcase.api.UTestExecutionResult
import org.usvm.instrumentation.testcase.api.UTestExecutionSuccessResult
import org.usvm.instrumentation.testcase.api.UTestExecutionTimedOutResult
import org.usvm.instrumentation.testcase.descriptor.Descriptor2ValueConverter
import org.usvm.instrumentation.util.enclosingClass
import org.usvm.instrumentation.util.enclosingMethod
Expand Down Expand Up @@ -39,7 +45,7 @@ class JcToUtExecutionConverter(
stateBefore = MissingState,
stateAfter = MissingState,
result = UtExecutionSuccess(UtVoidModel),
coverage = convertCoverage(jcExecution.coverage, jcExecution.method.enclosingType.jcClass),
coverage = convertCoverage(getTrace(jcExecution.uTestExecutionResult), jcExecution.method.enclosingType.jcClass),
instrumentation = emptyList()
)
// val coverage = Coverage(convertCoverage())
Expand Down Expand Up @@ -70,17 +76,23 @@ class JcToUtExecutionConverter(
// }
}

private fun convertCoverage(jcCoverage: JcCoverage, jcClass: JcClassOrInterface) = Coverage(
coveredInstructions = jcCoverage.targetClassToCoverage.values.flatMap { jcClassCoverage ->
jcClassCoverage.visitedStmts.map {
private fun getTrace(executionResult: UTestExecutionResult): List<JcInst>? = when (executionResult) {
is UTestExecutionExceptionResult -> executionResult.trace
is UTestExecutionInitFailedResult -> executionResult.trace
is UTestExecutionSuccessResult -> executionResult.trace
is UTestExecutionFailedResult -> emptyList()
is UTestExecutionTimedOutResult -> emptyList()
}

private fun convertCoverage(jcCoverage: List<JcInst>?, jcClass: JcClassOrInterface) = Coverage(
coveredInstructions = jcCoverage.orEmpty().map {
val methodSignature = it.enclosingMethod.jcdbSignature
Instruction(
internalName = it.enclosingClass.name.replace('.', '/'),
methodSignature = methodSignature,
lineNumber = it.lineNumber,
id = instructionIdProvider.provideInstructionId(methodSignature, it.location.index)
)
}
},
// TODO usvm-sbft: maybe add cache here
// TODO usvm-sbft: make sure static initializers are included into instructions count
Expand Down