Make JcMachine's budget distributing strategy and refactor

Author: IlyaMuravjov

gradle.properties

@@ -102,7 +102,7 @@ commonsIOVersion=2.11.0
 javaxVersion=2.2
 jakartaVersion=3.1.0
 jacoDbVersion=1.3.0
-usvmVersion=comp-231118-1620
+usvmVersion=comp-231120-1719
 
 # use latest Java 8 compaitable Spring and Spring Boot versions
 springVersion=5.3.28

utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt

@@ -26,7 +26,7 @@ import org.utbot.contest.Paths.evosuiteReportFile
 import org.utbot.contest.Paths.jarsDir
 import org.utbot.contest.Paths.moduleTestDir
 import org.utbot.contest.Paths.outputDir
-import org.utbot.contest.usvm.executor.UTestRunner
+import org.utbot.contest.usvm.jc.JcContainer
 import org.utbot.contest.usvm.runUsvmGeneration
 import org.utbot.features.FeatureExtractorFactoryImpl
 import org.utbot.features.FeatureProcessorWithStatesRepetitionFactory
@@ -266,8 +266,7 @@ interface Tool {
         )
 
         override fun close() {
-            if (UTestRunner.isInitialized())
-                UTestRunner.runner.close()
+            JcContainer.close()
         }
     }
 

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.jacodb.analysis.library.analyzers.thisInstance
 import org.jacodb.api.JcArrayType

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/EnvironmentStateKind.kt

@@ -0,0 +1,12 @@
+package org.utbot.contest.usvm.converter
+
+fun interface InstructionIdProvider {
+    fun provideInstructionId(methodSignature: String, instIndex: Int): Long
+}
+
+class SimpleInstructionIdProvider : InstructionIdProvider {
+    private val instructionIds = mutableMapOf<Pair<String, Int>, Long>()
+
+    override fun provideInstructionId(methodSignature: String, instIndex: Int): Long =
+        instructionIds.getOrPut(methodSignature to instIndex) { instructionIds.size.toLong() }
+}

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/InstructionIdProvider.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import mu.KotlinLogging
 import org.jacodb.api.JcClassOrInterface
@@ -18,7 +18,7 @@ import org.usvm.instrumentation.testcase.descriptor.UTestExceptionDescriptor
 import org.usvm.instrumentation.util.enclosingClass
 import org.usvm.instrumentation.util.enclosingMethod
 import org.utbot.common.isPublic
-import org.utbot.contest.usvm.executor.JcExecution
+import org.utbot.contest.usvm.jc.JcExecution
 import org.utbot.framework.codegen.domain.builtin.UtilMethodProvider
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.Coverage
@@ -58,7 +58,7 @@ class JcToUtExecutionConverter(
     private var jcToUtModelConverter: JcToUtModelConverter
 
     init {
-        val instToModelConverter = UTestInst2UtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
+        val instToModelConverter = UTestInstToUtModelConverter(idGenerator, jcClasspath, utilMethodProvider)
 
         instToModelConverter.processUTest(jcExecution.uTest)
         jcToUtModelConverter = JcToUtModelConverter(idGenerator, jcClasspath, instToModelConverter)

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JacoDBContainer.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.jacodb.api.JcClasspath
 import org.usvm.instrumentation.testcase.api.UTestExpression
@@ -29,10 +29,14 @@ import org.utbot.framework.plugin.api.util.jClass
 import org.utbot.framework.plugin.api.util.stringClassId
 import org.utbot.fuzzer.IdGenerator
 
+enum class EnvironmentStateKind {
+    INITIAL, FINAL
+}
+
 class JcToUtModelConverter(
     private val idGenerator: IdGenerator<Int>,
     private val jcClasspath: JcClasspath,
-    private val instToUtModelConverter: UTestInst2UtModelConverter,
+    private val instToUtModelConverter: UTestInstToUtModelConverter,
 ) {
     private val descriptorToModelCache = mutableMapOf<UTestValueDescriptor, UtModel>()
     private val refIdAndStateKindToDescriptorCache =

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/Utils.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.jacodb.api.JcClasspath
 import org.usvm.instrumentation.testcase.UTest
@@ -49,7 +49,7 @@ import org.utbot.framework.plugin.api.util.classClassId
 import org.utbot.framework.plugin.api.util.objectClassId
 import org.utbot.fuzzer.IdGenerator
 
-class UTestInst2UtModelConverter(
+class UTestInstToUtModelConverter(
     private val idGenerator: IdGenerator<Int>,
     private val jcClasspath: JcClasspath,
     private val utilMethodProvider: UtilMethodProvider,

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ConverterUtils.kt renamed to utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/ConverterUtils.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.usvm.instrumentation.testcase.descriptor.UTestArrayDescriptor
 import org.usvm.instrumentation.testcase.descriptor.UTestClassDescriptor

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/InstructionIdProvider.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm
+package org.utbot.contest.usvm.converter
 
 import org.utbot.framework.plugin.api.Coverage
 import org.utbot.framework.plugin.api.DocStatement
@@ -7,6 +7,9 @@ import org.utbot.framework.plugin.api.UtExecution
 import org.utbot.framework.plugin.api.UtExecutionResult
 import org.utbot.framework.plugin.api.UtExecutionWithInstrumentation
 import org.utbot.framework.plugin.api.UtInstrumentation
+import org.utbot.framework.plugin.api.mapper.UtModelMapper
+import org.utbot.framework.plugin.api.mapper.mapModelIfExists
+import org.utbot.framework.plugin.api.mapper.mapModels
 
 class UtUsvmExecution(
     stateBefore: EnvironmentModels,
@@ -64,4 +67,15 @@ class UtUsvmExecution(
         displayName,
         instrumentation,
     )
-}
+}
+
+fun UtUsvmExecution.mapModels(mapper: UtModelMapper) = copy(
+    stateBefore = stateBefore.mapModels(mapper),
+    stateAfter = stateAfter.mapModels(mapper),
+    result = result.mapModelIfExists(mapper),
+    coverage = this.coverage,
+    summary = this.summary,
+    testMethodName = this.testMethodName,
+    displayName = this.displayName,
+    instrumentation = instrumentation.map { it.mapModels(mapper) },
+)

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtExecutionConverter.kt renamed to utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/JcToUtExecutionConverter.kt

@@ -0,0 +1,82 @@
+package org.utbot.contest.usvm.jc
+
+import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
+import org.jacodb.api.JcClasspath
+import org.jacodb.api.JcDatabase
+import org.jacodb.impl.JcSettings
+import org.jacodb.impl.features.classpaths.UnknownClasses
+import org.jacodb.impl.jacodb
+import org.usvm.UMachineOptions
+import org.usvm.instrumentation.executor.UTestConcreteExecutor
+import org.usvm.instrumentation.instrumentation.JcRuntimeTraceInstrumenterFactory
+import org.usvm.machine.JcMachine
+import java.io.File
+import kotlin.time.Duration.Companion.seconds
+
+private val logger = KotlinLogging.logger {}
+
+// TODO usvm-sbft-refactoring: copied from `usvm/usvm-jvm/test`, extract this class back to USVM project
+class JcContainer private constructor(
+    classpath: List<File>,
+    machineOptions: UMachineOptions,
+    builder: JcSettings.() -> Unit,
+) : AutoCloseable {
+    val db: JcDatabase
+    val cp: JcClasspath
+    val machine: JcMachine
+    val runner: UTestConcreteExecutor
+
+    init {
+        val (db, cp) = runBlocking {
+            val db = jacodb(builder)
+            // TODO usvm-sbft: use classpathWithApproximations here when approximation decoders are finished
+            val cp = db.classpath(classpath, listOf(UnknownClasses))
+            db to cp
+        }
+        this.db = db
+        this.cp = cp
+        this.machine = JcMachine(cp, machineOptions)
+        this.runner = UTestConcreteExecutor(
+            JcRuntimeTraceInstrumenterFactory::class,
+            classpath.map { it.absolutePath },
+            cp,
+            CONTEST_TEST_EXECUTION_TIMEOUT
+        )
+        runBlocking {
+            db.awaitBackgroundJobs()
+        }
+    }
+
+    override fun close() {
+        cp.close()
+        db.close()
+        machine.close()
+        runner.close()
+    }
+
+    companion object : AutoCloseable {
+        val CONTEST_TEST_EXECUTION_TIMEOUT = 1.seconds
+
+        private val cache = HashMap<Pair<List<File>, UMachineOptions>, JcContainer>()
+
+        operator fun invoke(
+            classpath: List<File>,
+            machineOptions: UMachineOptions,
+            builder: JcSettings.() -> Unit,
+        ): JcContainer {
+            val cacheKey = classpath to machineOptions
+            return cache[cacheKey] ?: run {
+                // TODO usvm-sbft: right now max cache size is 1, do we need to increase it?
+                logger.info { "JcContainer cache miss" }
+                close()
+                JcContainer(classpath, machineOptions, builder).also { cache[cacheKey] = it }
+            }
+        }
+
+        override fun close() {
+            cache.values.forEach { it.close() }
+            cache.clear()
+        }
+    }
+}

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/JcToUtModelConverter.kt renamed to utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/JcToUtModelConverter.kt

@@ -1,4 +1,4 @@
-package org.utbot.contest.usvm.executor
+package org.utbot.contest.usvm.jc
 
 import org.jacodb.api.JcTypedMethod
 import org.usvm.api.JcCoverage