Skip to content

Removed Soot initialization #2707

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
Dec 1, 2023
Merged

Removed Soot initialization #2707

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
bae2533
Disabled Soot initialization for usvm competition
Damtev Dec 1, 2023
251cafc
Changed logging messages for jacodb initialization
Damtev Dec 1, 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
3 changes: 2 additions & 1 deletion utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ fun main(args: Array<String>) {
withUtContext(context) {
// Initialize the soot before a contest is started.
// This saves the time budget for real work instead of soot initialization.
TestCaseGenerator(listOf(classfileDir), classpathString, dependencyPath, JdkInfoService.provide())
// TODO usvm-sbft-merge: Soot is not not used in usvm
// TestCaseGenerator(listOf(classfileDir), classpathString, dependencyPath, JdkInfoService.provide())

// TODO usvm-sbft-merge: utbot instrumentation not used in usvm
// logger.info().measureTime({ "warmup: kotlin reflection :: init" }) {
Expand Down
14 changes: 7 additions & 7 deletions utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,18 @@ fun runUsvmGeneration(
)
)

logger.info().measureTime({ "Contest preparation: ensure JacoDB is initialized (NOT counted in time budget)" }) {
jcContainer // force init lazy property
}
logger.info().measureTime({ "Contest preparation: ensure executor is started (NOT counted in time budget)" }) {
jcContainer.runner.ensureRunnerAlive()
}

logger.info().measureTime({ "class ${cut.fqn}" }, { statsForClass }) {
val filteredMethods = logger.info().measureTime({ "preparation class ${cut.clazz}: kotlin reflection :: run" }) {
prepareClass(cut.clazz, methodNameFilter)
}

logger.info().measureTime({ "preparation: ensure JacoDB is initialized (counted in time budget)" }) {
jcContainer // force init lazy property
}
logger.info().measureTime({ "preparation: ensure executor is started (counted in time budget)" }) {
jcContainer.runner.ensureRunnerAlive()
}

statsForClass.methodsCount = filteredMethods.size
val methodToStats = filteredMethods.associateWith { method ->
StatsForMethod(
Expand Down