perf: Improve performance interference model construction performance

2 files changed, 12 insertions, 2 deletions

diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/workload/PerformanceInterferenceModel.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/workload/PerformanceInterferenceModel.kt
index 45024a49..fab4ae9d 100644
--- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/workload/PerformanceInterferenceModel.kt
+++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/core/workload/PerformanceInterferenceModel.kt
@@ -58,10 +58,20 @@ class PerformanceInterferenceModel(
         lhs.hashCode().compareTo(rhs.hashCode())
     }
     val items = TreeSet(comparator)
+    val workloadToItem: Map<String, Set<PerformanceInterferenceModelItem>>
     private val colocatedWorkloads = TreeSet<String>()
 
     init {
-        this.items.addAll(items)
+        val workloadToItem = mutableMapOf<String, MutableSet<PerformanceInterferenceModelItem>>()
+
+        for (item in items) {
+            for (workload in item.workloadNames) {
+                workloadToItem.getOrPut(workload) { mutableSetOf() }.add(item)
+            }
+            this.items.add(item)
+        }
+
+        this.workloadToItem = workloadToItem
     }
 
     fun vmStarted(server: Server) {
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20ParquetTraceReader.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20ParquetTraceReader.kt
index 17b42f3d..28026fde 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20ParquetTraceReader.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20ParquetTraceReader.kt
@@ -64,7 +64,7 @@ class Sc20ParquetTraceReader(
                         val id = image.name
                         val relevantPerformanceInterferenceModelItems =
                             PerformanceInterferenceModel(
-                                performanceInterferenceModel.items.filter { id in it.workloadNames }.toSet(),
+                                performanceInterferenceModel.workloadToItem[id] ?: emptySet(),
                                 Random(random.nextInt())
                             )
                         val newImage =