Run MSP430FR benchmarks at 8 MHz; support sleep > 500 ms for energytrace

1 files changed, 7 insertions, 10 deletions

diff --git a/bin/generate-dfa-benchmark.py b/bin/generate-dfa-benchmark.py
index 1410c28..2c53d9f 100755
--- a/bin/generate-dfa-benchmark.py
+++ b/bin/generate-dfa-benchmark.py
@@ -223,17 +223,11 @@ def benchmark_from_runs(
                     )
             elif opt["sleep"]:
                 if "energytrace" in opt:
-                    outbuf.write(
-                        "arch.sleep_ms({:d}); // {}\n".format(
-                            opt["sleep"], transition.destination.name
-                        )
-                    )
+                    outbuf.write(f"// -> {transition.destination.name}\n")
+                    outbuf.write(runner.sleep_ms(opt["sleep"], opt["arch"]))
                 else:
-                    outbuf.write(
-                        "arch.delay_ms({:d}); // {}\n".format(
-                            opt["sleep"], transition.destination.name
-                        )
-                    )
+                    outbuf.write(f"// -> {transition.destination.name}\n")
+                    outbuf.write("arch.delay_ms({:d});\n".format(opt["sleep"]))
 
         outbuf.write(harness.stop_run(num_traces))
         if dummy:
@@ -597,6 +591,9 @@ if __name__ == "__main__":
     if run_flags is None:
         run_flags = opt["run"].split()
 
+    if "msp430fr" in opt["arch"]:
+        run_flags.append("cpu_freq=8000000")
+
     runs = list(
         pta.dfs(
             opt["depth"],