* [committed 1/2] benchtests: Fix pthread-locks test to produce valid json
@ 2021-04-18 7:34 Siddhesh Poyarekar via Libc-alpha
2021-04-18 7:34 ` [committed 2/2] benchtests: Fix name of exp10f benchmark variant Siddhesh Poyarekar via Libc-alpha
0 siblings, 1 reply; 2+ messages in thread
From: Siddhesh Poyarekar via Libc-alpha @ 2021-04-18 7:34 UTC (permalink / raw)
To: libc-alpha
The benchtests json allows {function {variant}} categorization of
results whereas the pthread-locks tests had {function {variant
{subvariant}}}, which broke validation. Fix that by serializing the
subvariants as variant-subvariant. Also update the schema to
recognize the new benchmark attributes after fixing the naming
conventions.
---
benchtests/bench-pthread-locks.c | 15 +++++++--------
benchtests/scripts/benchout.schema.json | 4 ++++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/benchtests/bench-pthread-locks.c b/benchtests/bench-pthread-locks.c
index 318c92bd8e..5274246a4b 100644
--- a/benchtests/bench-pthread-locks.c
+++ b/benchtests/bench-pthread-locks.c
@@ -487,17 +487,20 @@ do_bench_2 (const char *name, test_t func, int filler, json_ctx_t *js)
}
stdev = sqrt (stdev / (RUN_COUNT - 1));
- json_attr_object_begin (js, filler ? "filler" : "empty");
+ char buf[128];
+ snprintf (buf, sizeof buf, "%s-%s", name, filler ? "filler" : "empty");
+
+ json_attr_object_begin (js, buf);
json_attr_double (js, "duration", (double) cur);
json_attr_double (js, "iterations", (double) iters);
- json_attr_double (js, "wall_sec", (double) td);
+ json_attr_double (js, "wall-sec", (double) td);
json_attr_double (js, "mean", mean);
json_attr_double (js, "stdev", stdev);
- json_attr_double (js, "min_outlier", (double) curs[0] / (double) iters);
+ json_attr_double (js, "min-outlier", (double) curs[0] / (double) iters);
json_attr_double (js, "min", (double) curs[1] / (double) iters);
json_attr_double (js, "max", (double) curs[RUN_COUNT] / (double) iters);
- json_attr_double (js, "max_outlier", (double) curs[RUN_COUNT + 1] / (double) iters);
+ json_attr_double (js, "max-outlier", (double) curs[RUN_COUNT + 1] / (double) iters);
json_attr_object_end (js);
@@ -509,13 +512,9 @@ do_bench_1 (const char *name, test_t func, json_ctx_t *js)
{
int rv = 0;
- json_attr_object_begin (js, name);
-
rv += do_bench_2 (name, func, 0, js);
rv += do_bench_2 (name, func, 1, js);
- json_attr_object_end (js);
-
return rv;
}
diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json
index 8cfd606497..5f098e91c9 100644
--- a/benchtests/scripts/benchout.schema.json
+++ b/benchtests/scripts/benchout.schema.json
@@ -27,6 +27,10 @@
"min-throughput": {"type": "number"},
"max-throughput": {"type": "number"},
"reciprocal-throughput": {"type": "number"},
+ "min-outlier": {"type": "number"},
+ "max-outlier": {"type": "number"},
+ "wall-sec": {"type": "number"},
+ "stdev": {"type": "number"},
"timings": {
"type": "array",
"items": {"type": "number"}
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [committed 2/2] benchtests: Fix name of exp10f benchmark variant
2021-04-18 7:34 [committed 1/2] benchtests: Fix pthread-locks test to produce valid json Siddhesh Poyarekar via Libc-alpha
@ 2021-04-18 7:34 ` Siddhesh Poyarekar via Libc-alpha
0 siblings, 0 replies; 2+ messages in thread
From: Siddhesh Poyarekar via Libc-alpha @ 2021-04-18 7:34 UTC (permalink / raw)
To: libc-alpha
Variant names don't accept brackets.
---
benchtests/exp10f-inputs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/benchtests/exp10f-inputs b/benchtests/exp10f-inputs
index 302af485eb..49c62e6089 100644
--- a/benchtests/exp10f-inputs
+++ b/benchtests/exp10f-inputs
@@ -1,7 +1,7 @@
## args: float
## ret: float
## includes: math.h
-## name: workload-spec2017.wrf (adapted)
+## name: workload-spec2017.wrf-adapted
0x0p+0
-0x1.cca64ap+0
-0x1.570ef6p-2
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-18 7:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-18 7:34 [committed 1/2] benchtests: Fix pthread-locks test to produce valid json Siddhesh Poyarekar via Libc-alpha
2021-04-18 7:34 ` [committed 2/2] benchtests: Fix name of exp10f benchmark variant Siddhesh Poyarekar via Libc-alpha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).