From 1773e1d55aa2505cf36876fec532603f0c72dfd3 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Wed, 22 Apr 2026 21:45:44 +0200
Subject: [PATCH] run FullTraceImporter when importing trace + import --sources

---
 scripts/runner.pl | 94 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 30 deletions(-)

diff --git a/scripts/runner.pl b/scripts/runner.pl
index bef6092..c4596da 100644
--- a/scripts/runner.pl
+++ b/scripts/runner.pl
@@ -63,6 +63,7 @@ sub import_trace {
 
     Util::notify("Importing $experiment trace...");
 
+    # Benchmark: mem
     system(
         join " ",
         (
@@ -75,6 +76,8 @@ sub import_trace {
             "-b mem"
         )
     );
+
+    # Benchmark: regs
     system(
         join " ",
         (
@@ -85,9 +88,11 @@ sub import_trace {
             "-e $remote_builds_dir/$experiment/system.elf",
             "-v $experiment",
             "-b regs",
-            "--flags"
+            "--flags"    # Inject flags register
         )
     );
+
+    # Benchmark: ip
     system(
         join " ",
         (
@@ -98,11 +103,25 @@ sub import_trace {
             "-e $remote_builds_dir/$experiment/system.elf",
             "-v $experiment",
             "-b ip",
-            "--no-gp",
-            "--ip"
+            "--no-gp",    # Don't inject general purpose registers
+            "--ip"        # Inject instruction pointer
         )
     );
 
+    # Import fulltrace for VisualFAIL
+    system(
+        join " ",
+        (
+            "$fail_import",
+            "--database-option-file $remote_db_conf",
+            "-t $remote_builds_dir/$experiment/trace.pb",
+            "-i FullTraceImporter",
+            "-e $remote_builds_dir/$experiment/system.elf",
+            "-v $experiment",
+        )
+    );
+
+    # Import objdump disassembly + source files
     system(
         join " ",
         (
@@ -110,39 +129,54 @@ sub import_trace {
             "--database-option-file $remote_db_conf",
             "-t $remote_builds_dir/$experiment/trace.pb",
             "-i ElfImporter",
-            "--objdump objdump",
             "-e $remote_builds_dir/$experiment/system.elf",
             "-v $experiment",
-            "-b ip"
-        )
-    );
-    system(
-        join " ",
-        (
-            "$fail_import",
-            "--database-option-file $remote_db_conf",
-            "-t $remote_builds_dir/$experiment/trace.pb",
-            "-i ElfImporter",
             "--objdump objdump",
-            "-e $remote_builds_dir/$experiment/system.elf",
-            "-v $experiment",
-            "-b mem"
-        )
-    );
-    system(
-        join " ",
-        (
-            "$fail_import",
-            "--database-option-file $remote_db_conf",
-            "-t $remote_builds_dir/$experiment/trace.pb",
-            "-i ElfImporter",
-            "--objdump objdump",
-            "-e $remote_builds_dir/$experiment/system.elf",
-            "-v $experiment",
-            "-b regs"
+            "--sources",
         )
     );
 
+    # I think those are redundant with the import above?
+    # system(
+    #     join " ",
+    #     (
+    #         "$fail_import",
+    #         "--database-option-file $remote_db_conf",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "-i ElfImporter",
+    #         "--objdump objdump",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-v $experiment",
+    #         "-b ip"
+    #     )
+    # );
+    # system(
+    #     join " ",
+    #     (
+    #         "$fail_import",
+    #         "--database-option-file $remote_db_conf",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "-i ElfImporter",
+    #         "--objdump objdump",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-v $experiment",
+    #         "-b mem"
+    #     )
+    # );
+    # system(
+    #     join " ",
+    #     (
+    #         "$fail_import",
+    #         "--database-option-file $remote_db_conf",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "-i ElfImporter",
+    #         "--objdump objdump",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-v $experiment",
+    #         "-b regs"
+    #     )
+    # );
+
     system(
         join " ",
         (