cleanup

Author: MForest7

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/ifds/EtsBackwardIfdsRunner.kt

@@ -28,25 +28,24 @@ class EtsBackwardIfdsRunner<Fact, Event : AnalyzerEvent>(
 
     private val queueIsEmpty = QueueEmptinessChanged(runner = this, isEmpty = true)
 
-    private val methods = graph.cp.projectAndSdkClasses.flatMap { it.methods + it.ctor }
-    private val runners = methods.associateWith {
-        EtsBackwardMethodRunner(
-            graph = graph,
-            method = it,
-            analyzer = analyzer,
-            traits = traits,
-            manager = manager,
-            commonRunner = this@EtsBackwardIfdsRunner,
-        )
-    }
+    private val runners = mutableMapOf<EtsMethod, EtsBackwardMethodRunner<Fact, Event>>()
 
     fun getMethodRunner(method: EtsMethod): EtsBackwardMethodRunner<Fact, Event> {
-        return runners.getValue(method)
+        return runners.getOrPut(method) {
+            EtsBackwardMethodRunner(
+                graph = graph,
+                method = method,
+                analyzer = analyzer,
+                traits = traits,
+                manager = manager,
+                commonRunner = this@EtsBackwardIfdsRunner,
+            )
+        }
     }
 
     override suspend fun run(startMethods: List<EtsMethod>) {
         for (method in startMethods) {
-            runners[method]?.addStart()
+            getMethodRunner(method).addStart()
         }
 
         tabulationAlgorithm()

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/ifds/EtsBackwardMethodRunner.kt

@@ -27,7 +27,7 @@ class EtsBackwardMethodRunner<Fact, Event : AnalyzerEvent>(
     /**
      * Remember only the sink since the source is specified by runner
      *
-     * `ip` - index of the end statement
+     * `ip` - index of the end statement (instruction pointer)
      *
      * `fact` - fact at the end statement
      */

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/ifds/EtsForwardIfdsRunner.kt

@@ -28,25 +28,24 @@ class EtsForwardIfdsRunner<Fact, Event : AnalyzerEvent>(
 
     private val queueIsEmpty = QueueEmptinessChanged(runner = this, isEmpty = true)
 
-    private val methods = graph.cp.projectAndSdkClasses.flatMap { it.methods + it.ctor }
-    private val runners = methods.associateWith {
-        EtsForwardMethodRunner(
-            graph = graph,
-            method = it,
-            analyzer = analyzer,
-            traits = traits,
-            manager = manager,
-            commonRunner = this@EtsForwardIfdsRunner
-        )
-    }
+    private val runners = mutableMapOf<EtsMethod, EtsForwardMethodRunner<Fact, Event>>()
 
     fun getMethodRunner(method: EtsMethod): EtsForwardMethodRunner<Fact, Event> {
-        return runners.getValue(method)
+        return runners.getOrPut(method) {
+            EtsForwardMethodRunner(
+                graph = graph,
+                method = method,
+                analyzer = analyzer,
+                traits = traits,
+                manager = manager,
+                commonRunner = this@EtsForwardIfdsRunner
+            )
+        }
     }
 
     override suspend fun run(startMethods: List<EtsMethod>) {
         for (method in startMethods) {
-            val runner = runners[method] ?: continue
+            val runner = getMethodRunner(method)
             runner.addStart()
         }
 

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/ifds/EtsForwardMethodRunner.kt

@@ -94,7 +94,7 @@ class EtsForwardMethodRunner<Fact, Event : AnalyzerEvent>(
     /**
      * Remember only the sink since the source is specified by runner
      *
-     * `ip` - index of the end statement
+     * `ip` - index of the end statement (instruction pointer)
      *
      * `fact` - fact at the end statement
      */

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/infer/ForwardAnalyzer.kt

@@ -36,9 +36,11 @@ class ForwardAnalyzer(
 
     private fun variableIsDying(fact: ForwardTypeDomainFact, stmt: EtsStmt): Boolean {
         if (fact !is ForwardTypeDomainFact.TypedVariable) return false
-        val base = fact.variable.base
-        if (base !is AccessPathBase.Local) return false
-        return !flowFunctions.liveVariables(stmt.method).isAliveAt(base.name, stmt)
+        return when (val base = fact.variable.base) {
+            is AccessPathBase.Local -> !flowFunctions.liveVariables(stmt.method).isAliveAt(base.name, stmt)
+            is AccessPathBase.Arg -> !flowFunctions.liveVariables(stmt.method).isAliveAt("arg(${base.index})", stmt)
+            else -> false
+        }
     }
 
     override fun handleNewEdge(edge: Edge<ForwardTypeDomainFact, EtsStmt>): List<AnalyzerEvent> {

usvm-ts-dataflow/src/main/kotlin/org/usvm/dataflow/ts/infer/LiveVariables.kt

@@ -25,7 +25,7 @@ interface LiveVariables {
     fun isAliveAt(local: String, stmt: EtsStmt): Boolean
 
     companion object {
-        private const val THRESHOLD: Int = 20
+        private const val THRESHOLD: Int = 10
 
         fun from(method: EtsMethod): LiveVariables =
             if (method.cfg.stmts.size > THRESHOLD) LiveVariablesImpl(method) else AlwaysAlive

usvm-ts-dataflow/src/test/kotlin/org/usvm/dataflow/ts/test/utils/PerformanceReport.kt

@@ -33,10 +33,10 @@ data class PerformanceReport(
     fun dumpToString(): String = listOf<Any>(
         projectId,
         totalStmts,
-        minTime.toString(unit = DurationUnit.SECONDS, decimals = 2),
-        maxTime.toString(unit = DurationUnit.SECONDS, decimals = 2),
-        avgTime.toString(unit = DurationUnit.SECONDS, decimals = 2),
-        medianTime.toString(unit = DurationUnit.SECONDS, decimals = 2),
+        minTime.toString(unit = DurationUnit.SECONDS, decimals = 1),
+        maxTime.toString(unit = DurationUnit.SECONDS, decimals = 1),
+        avgTime.toString(unit = DurationUnit.SECONDS, decimals = 1),
+        medianTime.toString(unit = DurationUnit.SECONDS, decimals = 1),
         improvement.toBigDecimal().setScale(1, RoundingMode.HALF_UP).toDouble()
     ).joinToString(
         separator = "|",