From 0595e3603406e7f7b457bf9c99059bf1a48d97ef Mon Sep 17 00:00:00 2001 From: Victor Rodriguez Date: Tue, 28 Nov 2017 19:49:59 +0530 Subject: benchtests: Adjust valid and accepted properties Benchmark workload-spec2006.wrf does not produce max, min or mean results but instead produce throughput. This is represented in benchtests/bench-skeleton.c. This patch adjust benchout.schema.json to consider bench.out from bench-math benchmarks as valid ChangeLog: * benchtests/scripts/benchout.schema.json: Add throughput as accepted result from property and remove "max", min" and "mean" from required properties based on benchtests/bench-skeleton.c. Signed-off-by: Victor Rodriguez Reviewed-By: Siddhesh Poyarekar --- benchtests/scripts/benchout.schema.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'benchtests/scripts/benchout.schema.json') diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json index affb7c11f4..dfc00b1475 100644 --- a/benchtests/scripts/benchout.schema.json +++ b/benchtests/scripts/benchout.schema.json @@ -19,6 +19,7 @@ "properties": { "duration": {"type": "number"}, "iterations": {"type": "number"}, + "throughput": {"type": "number"}, "max": {"type": "number"}, "min": {"type": "number"}, "mean": {"type": "number"}, @@ -27,7 +28,7 @@ "items": {"type": "number"} } }, - "required": ["duration", "iterations", "max", "min", "mean"], + "required": ["duration", "iterations"], "additionalProperties": false } }, -- cgit v1.2.3 From d5090db30edf04f39dc0eacfc09db72af8045f39 Mon Sep 17 00:00:00 2001 From: Victor Rodriguez Date: Tue, 28 Nov 2017 19:52:57 +0530 Subject: benchtests: Expand range of tests names in schema.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When executing bench-math the benchmark output is invalid with this error msg: Invalid benchmark output: 'workload-spec2006.wrf' does not match any of the regexes: '^[_a-zA-Z0-9]*$ยน or Invalid benchmark output: Additional properties are not allowed ('workload-spec2006.wrf' was unexpected) The error was seen when running the test: workload-spec2006.wrf, 'stack=1024,guard=1' and 'stack=1024,guard=2'. The problem is that the current regex's do not accept the hyphen, dot, equal and comma in the output. This patch changes the regex in benchout.schema.json to accept symbols in benchmark tests names. ChangeLog: * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider range of tests names. Signed-off-by: Victor Rodriguez Reviewed-By: Siddhesh Poyarekar --- ChangeLog | 3 +++ benchtests/scripts/benchout.schema.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'benchtests/scripts/benchout.schema.json') diff --git a/ChangeLog b/ChangeLog index 21fd04ab21..9685aec392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-11-28 Victor Rodriguez + * benchtests/scripts/benchout.schema.json: Fix regex to accept a wider + range of tests names. + * benchtests/scripts/benchout.schema.json: Add throughput as accepted result from property and remove "max", min" and "mean" from required properties based on benchtests/bench-skeleton.c. diff --git a/benchtests/scripts/benchout.schema.json b/benchtests/scripts/benchout.schema.json index dfc00b1475..0eca21b6bd 100644 --- a/benchtests/scripts/benchout.schema.json +++ b/benchtests/scripts/benchout.schema.json @@ -13,7 +13,7 @@ "title": "Function names", "type": "object", "patternProperties": { - "^[_a-zA-Z0-9]*$": { + "^[_a-zA-Z0-9,=.-]*$": { "title": "Function variants", "type": "object", "properties": { -- cgit v1.2.3