merge

1 files changed, 5 insertions, 2 deletions

diff --git a/bin/generate-dfa-benchmark.py b/bin/generate-dfa-benchmark.py
index 64f8f73..c8681c5 100755
--- a/bin/generate-dfa-benchmark.py
+++ b/bin/generate-dfa-benchmark.py
@@ -387,7 +387,7 @@ def run_benchmark(
                     os.remove(filename)
                 harness.undo(i)
             else:
-                files.extend(monitor.get_files())
+                files.append(monitor.get_files())
                 i += 1
 
             harness.restart()
@@ -635,8 +635,10 @@ if __name__ == "__main__":
     elif "energytrace" in opt:
         # Use barcode sync by default
         gpio_mode = "bar"
+        energytrace_sync = None
         if "sync" in opt["energytrace"] and opt["energytrace"]["sync"] != "bar":
             gpio_mode = "around"
+            energytrace_sync = "led"
         harness = OnboardTimerHarness(
             gpio_pin=timer_pin,
             gpio_mode=gpio_mode,
@@ -644,6 +646,7 @@ if __name__ == "__main__":
             counter_limits=target.get_counter_limits_us(run_flags),
             log_return_values=need_return_values,
             repeat=1,
+            energytrace_sync=energytrace_sync,
         )
     elif "timing" in opt:
         harness = OnboardTimerHarness(
@@ -676,7 +679,7 @@ if __name__ == "__main__":
             "files": list(map(lambda x: x[3], results)),
             "configs": list(map(lambda x: x[2].get_config(), results)),
         }
-        extra_files = flatten(json_out["files"])
+        extra_files = flatten(map(flatten, json_out["files"]))
         if "instance" in pta.codegen:
             output_prefix = (
                 opt["data"] + time.strftime("/%Y%m%d-%H%M%S-") + pta.codegen["instance"]