Merge branch 'master' into decisiontrees

2 files changed, 68 insertions, 35 deletions

diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 4c442af..5a6b8f0 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -101,6 +101,9 @@ Options:
 
 --export-energymodel=<model.json>
     Export energy model. Works out of the box for v1 and v2 logfiles. Requires --hwmodel for v0 logfiles.
+
+--no-cache
+    Do not load cached measurement results
 """
 
 import getopt
@@ -142,6 +145,15 @@ def format_quality_measures(result):
 
 
 def model_quality_table(result_lists, info_list):
+    print(
+        "{:20s} {:15s}       {:19s}       {:19s}       {:19s}".format(
+            "key",
+            "attribute",
+            "static".center(19),
+            "parameterized".center(19),
+            "LUT".center(19),
+        )
+    )
     for state_or_tran in result_lists[0]["by_name"].keys():
         for key in result_lists[0]["by_name"][state_or_tran].keys():
             buf = "{:20s} {:15s}".format(state_or_tran, key)
@@ -152,7 +164,7 @@ def model_quality_table(result_lists, info_list):
                     result = results["by_name"][state_or_tran][key]
                     buf += format_quality_measures(result)
                 else:
-                    buf += "{:6}----{:9}".format("", "")
+                    buf += "{:7}----{:8}".format("", "")
             print(buf)
 
 
@@ -300,7 +312,7 @@ if __name__ == "__main__":
 
     try:
         optspec = (
-            "info "
+            "info no-cache "
             "plot-unparam= plot-param= plot-traces= show-models= show-quality= "
             "ignored-trace-indexes= function-override= "
             "export-traces= "
@@ -362,11 +374,18 @@ if __name__ == "__main__":
         sys.exit(2)
 
     raw_data = RawData(
-        args, with_traces=("export-traces" in opt or "plot-traces" in opt)
+        args,
+        with_traces=("export-traces" in opt or "plot-traces" in opt),
+        skip_cache=("no-cache" in opt),
     )
 
     if "info" in opt:
         print(" ".join(raw_data.filenames) + ":")
+        if raw_data.ptalog:
+            options = " --".join(
+                map(lambda kv: f"{kv[0]}={str(kv[1])}", raw_data.ptalog["opt"].items())
+            )
+            print(f"    Options: --{options}")
         if raw_data.version <= 1:
             data_source = "MIMOSA"
         elif raw_data.version == 2:
@@ -420,7 +439,7 @@ if __name__ == "__main__":
             )
             sys.exit(2)
 
-        if len(traces) > 20:
+        if len(traces) > 40:
             print(f"""Truncating plot to 40 of {len(traces)} traces (random sample)""")
             traces = random.sample(traces, 40)
 
@@ -693,7 +712,7 @@ if __name__ == "__main__":
         )
 
     if "overall" in show_quality or "all" in show_quality:
-        print("overall static/param/lut MAE assuming equal state distribution:")
+        print("overall state static/param/lut MAE assuming equal state distribution:")
         print(
             "    {:6.1f}  /  {:6.1f}  /  {:6.1f}  µW".format(
                 model.assess_states(static_model),
@@ -701,15 +720,30 @@ if __name__ == "__main__":
                 model.assess_states(lut_model),
             )
         )
-        print("overall static/param/lut MAE assuming 95% STANDBY1:")
-        distrib = {"STANDBY1": 0.95, "POWERDOWN": 0.03, "TX": 0.01, "RX": 0.01}
-        print(
-            "    {:6.1f}  /  {:6.1f}  /  {:6.1f}  µW".format(
-                model.assess_states(static_model, distribution=distrib),
-                model.assess_states(param_model, distribution=distrib),
-                model.assess_states(lut_model, distribution=distrib),
+        distrib = dict()
+        num_states = len(model.states())
+        p95_state = None
+        for state in model.states():
+            distrib[state] = 1.0 / num_states
+
+        if "STANDBY1" in model.states():
+            p95_state = "STANDBY1"
+        elif "SLEEP" in model.states():
+            p95_state = "SLEEP"
+
+        if p95_state is not None:
+            for state in distrib.keys():
+                distrib[state] = 0.05 / (num_states - 1)
+            distrib[p95_state] = 0.95
+
+            print(f"overall state static/param/lut MAE assuming 95% {p95_state}:")
+            print(
+                "    {:6.1f}  /  {:6.1f}  /  {:6.1f}  µW".format(
+                    model.assess_states(static_model, distribution=distrib),
+                    model.assess_states(param_model, distribution=distrib),
+                    model.assess_states(lut_model, distribution=distrib),
+                )
             )
-        )
 
     if "summary" in show_quality or "all" in show_quality:
         model_summary_table(
diff --git a/bin/generate-dfa-benchmark.py b/bin/generate-dfa-benchmark.py
index 1410c28..64f8f73 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(target.sleep_ms(opt["sleep"]))
                 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:
@@ -289,7 +283,7 @@ def run_benchmark(
         needs_split = True
     else:
         try:
-            runner.build(arch, app, run_args)
+            target.build(app, run_args)
         except RuntimeError:
             if len(runs) > 50:
                 # Application is too large -> split up runs
@@ -342,14 +336,14 @@ def run_benchmark(
         i = 0
         while i < opt["repeat"]:
             print(f"""[RUN] flashing benchmark {i+1}/{opt["repeat"]}""")
-            runner.flash(arch, app, run_args)
+            target.flash(app, run_args)
             if "mimosa" in opt:
-                monitor = runner.get_monitor(
-                    arch, callback=harness.parser_cb, mimosa=opt["mimosa"]
+                monitor = target.get_monitor(
+                    callback=harness.parser_cb, mimosa=opt["mimosa"]
                 )
             elif "energytrace" in opt:
-                monitor = runner.get_monitor(
-                    arch, callback=harness.parser_cb, energytrace=opt["energytrace"]
+                monitor = target.get_monitor(
+                    callback=harness.parser_cb, energytrace=opt["energytrace"]
                 )
 
             sync_error = False
@@ -400,8 +394,8 @@ def run_benchmark(
 
         return [(runs, harness, monitor, files)]
     else:
-        runner.flash(arch, app, run_args)
-        monitor = runner.get_monitor(arch, callback=harness.parser_cb)
+        target.flash(app, run_args)
+        monitor = target.get_monitor(callback=harness.parser_cb)
 
         if arch == "posix":
             print("[RUN] Will run benchmark for {:.0f} seconds".format(run_timeout))
@@ -518,6 +512,11 @@ if __name__ == "__main__":
         print(err)
         sys.exit(2)
 
+    if "msp430fr" in opt["arch"]:
+        target = runner.Arch(opt["arch"], ["cpu_freq=8000000"])
+    else:
+        target = runner.Arch(opt["arch"])
+
     modelfile = args[0]
 
     pta = PTA.from_file(modelfile)
@@ -594,8 +593,8 @@ if __name__ == "__main__":
         if "codegen" in driver_definition and "flags" in driver_definition["codegen"]:
             if run_flags is None:
                 run_flags = driver_definition["codegen"]["flags"]
-    if run_flags is None:
-        run_flags = opt["run"].split()
+    if "run" in opt:
+        run_flags.extend(opt["run"].split())
 
     runs = list(
         pta.dfs(
@@ -642,7 +641,7 @@ if __name__ == "__main__":
             gpio_pin=timer_pin,
             gpio_mode=gpio_mode,
             pta=pta,
-            counter_limits=runner.get_counter_limits_us(opt["arch"]),
+            counter_limits=target.get_counter_limits_us(run_flags),
             log_return_values=need_return_values,
             repeat=1,
         )
@@ -650,7 +649,7 @@ if __name__ == "__main__":
         harness = OnboardTimerHarness(
             gpio_pin=timer_pin,
             pta=pta,
-            counter_limits=runner.get_counter_limits_us(opt["arch"]),
+            counter_limits=target.get_counter_limits_us(run_flags),
             log_return_values=need_return_values,
             repeat=opt["repeat"],
         )