Merge changes I7953020c,I960cfdb8 into main
* changes:
Skip metrics upload when doing benchmarks.
Fix formatting string in benchmark pretty printer
diff --git a/tools/perf/benchmarks b/tools/perf/benchmarks
index df4c87b..e188858 100755
--- a/tools/perf/benchmarks
+++ b/tools/perf/benchmarks
@@ -335,6 +335,7 @@
"--build-mode",
"--all-modules",
f"--dir={self._options.root}",
+ "--skip-metrics-upload",
] + modules
env = dict(os.environ)
env["TARGET_PRODUCT"] = lunch.target_product
diff --git a/tools/perf/format_benchmarks b/tools/perf/format_benchmarks
index c01aa76..845d73f 100755
--- a/tools/perf/format_benchmarks
+++ b/tools/perf/format_benchmarks
@@ -73,14 +73,6 @@
# Rows:
# Benchmark
-@dataclasses.dataclass(frozen=True)
-class Key():
- pass
-
-class Column():
- def __init__(self):
- pass
-
def lunch_str(d):
"Convert a lunch dict to a string"
return f"{d['TARGET_PRODUCT']}-{d['TARGET_RELEASE']}-{d['TARGET_BUILD_VARIANT']}"
@@ -186,7 +178,7 @@
for key, column in summary["columns"]:
for id, cell in column:
duration_ns = statistics.median([b["duration_ns"] for b in cell])
- table.Set(tuple([summary["date"].strftime("YYYY-MM-DD"),
+ table.Set(tuple([summary["date"].strftime("%Y-%m-%d"),
summary["branch"],
summary["tag"]]
+ list(key)),