summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/analyze-archive.py9
-rwxr-xr-xbin/generate-dfa-benchmark.py7
2 files changed, 12 insertions, 4 deletions
diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 5c7c97e..10fe304 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -104,6 +104,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
@@ -304,7 +307,7 @@ if __name__ == "__main__":
try:
optspec = (
- "info "
+ "info no-cache "
"plot-unparam= plot-param= plot-traces= show-models= show-quality= "
"ignored-trace-indexes= discard-outliers= function-override= "
"export-traces= "
@@ -369,7 +372,9 @@ 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:
diff --git a/bin/generate-dfa-benchmark.py b/bin/generate-dfa-benchmark.py
index 1410c28..6540702 100755
--- a/bin/generate-dfa-benchmark.py
+++ b/bin/generate-dfa-benchmark.py
@@ -393,7 +393,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()
@@ -636,8 +636,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,
@@ -645,6 +647,7 @@ if __name__ == "__main__":
counter_limits=runner.get_counter_limits_us(opt["arch"]),
log_return_values=need_return_values,
repeat=1,
+ energytrace_sync=energytrace_sync,
)
elif "timing" in opt:
harness = OnboardTimerHarness(
@@ -677,7 +680,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"]