mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
Validate bench.out against a JSON schema
This patch adds a JSON schema for the benchmark output file and also adds a script that validates the generated output against the schema.
This commit is contained in:
parent
4a594c3435
commit
42b1161e8c
@ -1,3 +1,9 @@
|
|||||||
|
2014-06-11 Siddhesh Poyarekar <siddhesh@redhat.com>
|
||||||
|
|
||||||
|
* benchtests/scripts/validate_benchout.py: New script.
|
||||||
|
* benchtests/Makefile (bench-func): Call it.
|
||||||
|
* benchtests/scripts/benchout.schema.json: New file.
|
||||||
|
|
||||||
2014-06-10 Chris Metcalf <cmetcalf@tilera.com>
|
2014-06-10 Chris Metcalf <cmetcalf@tilera.com>
|
||||||
|
|
||||||
* sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h: Moved ...
|
* sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h: Moved ...
|
||||||
|
@ -131,6 +131,8 @@ bench-func: $(binaries-bench)
|
|||||||
mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
|
mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
|
||||||
fi; \
|
fi; \
|
||||||
mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
|
mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
|
||||||
|
scripts/validate_benchout.py $(objpfx)bench.out \
|
||||||
|
scripts/benchout.schema.json
|
||||||
|
|
||||||
$(timing-type) $(binaries-bench) $(binaries-benchset): %: %.o $(objpfx)json-lib.o \
|
$(timing-type) $(binaries-bench) $(binaries-benchset): %: %.o $(objpfx)json-lib.o \
|
||||||
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||||||
|
42
benchtests/scripts/benchout.schema.json
Normal file
42
benchtests/scripts/benchout.schema.json
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"title": "benchmark",
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"timing_type": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"functions": {
|
||||||
|
"title": "Associative array of functions",
|
||||||
|
"type": "object",
|
||||||
|
"patternProperties": {
|
||||||
|
"^[_a-zA-Z][_a-zA-Z0-9]+$": {
|
||||||
|
"title": "Function names",
|
||||||
|
"type": "object",
|
||||||
|
"patternProperties": {
|
||||||
|
"^[_a-zA-Z0-9]*$": {
|
||||||
|
"title": "Function variants",
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"duration": {"type": "number"},
|
||||||
|
"iterations": {"type": "number"},
|
||||||
|
"max": {"type": "number"},
|
||||||
|
"min": {"type": "number"},
|
||||||
|
"mean": {"type": "number"},
|
||||||
|
"timings": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {"type": "number"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": ["duration", "iterations", "max", "min", "mean"],
|
||||||
|
"additionalProperties": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"additionalProperties": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"minProperties": 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": ["timing_type", "functions"],
|
||||||
|
"additionalProperties": false
|
||||||
|
}
|
85
benchtests/scripts/validate_benchout.py
Executable file
85
benchtests/scripts/validate_benchout.py
Executable file
@ -0,0 +1,85 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||||
|
# This file is part of the GNU C Library.
|
||||||
|
#
|
||||||
|
# The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU Lesser General Public
|
||||||
|
# License as published by the Free Software Foundation; either
|
||||||
|
# version 2.1 of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public
|
||||||
|
# License along with the GNU C Library; if not, see
|
||||||
|
# <http://www.gnu.org/licenses/>.
|
||||||
|
"""Benchmark output validator
|
||||||
|
|
||||||
|
Given a benchmark output file in json format and a benchmark schema file,
|
||||||
|
validate the output against the schema.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import print_function
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
|
try:
|
||||||
|
import jsonschema
|
||||||
|
except ImportError:
|
||||||
|
print('Could not find jsonschema module. Output not validated.')
|
||||||
|
# Return success because we don't want the bench target to fail just
|
||||||
|
# because the jsonschema module was not found.
|
||||||
|
sys.exit(os.EX_OK)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_bench(benchfile, schemafile):
|
||||||
|
"""Validate benchmark file
|
||||||
|
|
||||||
|
Validate a benchmark output file against a JSON schema.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
benchfile: The file name of the bench.out file.
|
||||||
|
schemafile: The file name of the JSON schema file to validate
|
||||||
|
bench.out against.
|
||||||
|
|
||||||
|
Exceptions:
|
||||||
|
jsonschema.ValidationError: When bench.out is not valid
|
||||||
|
jsonschema.SchemaError: When the JSON schema is not valid
|
||||||
|
IOError: If any of the files are not found.
|
||||||
|
"""
|
||||||
|
with open(benchfile, 'r') as bfile:
|
||||||
|
with open(schemafile, 'r') as sfile:
|
||||||
|
bench = json.load(bfile)
|
||||||
|
schema = json.load(sfile)
|
||||||
|
jsonschema.validate(bench, schema)
|
||||||
|
|
||||||
|
# If we reach here, we're all good.
|
||||||
|
print("Benchmark output in %s is valid." % benchfile)
|
||||||
|
|
||||||
|
|
||||||
|
def main(args):
|
||||||
|
"""Main entry point
|
||||||
|
|
||||||
|
Args:
|
||||||
|
args: The command line arguments to the program
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
0 on success or a non-zero failure code
|
||||||
|
|
||||||
|
Exceptions:
|
||||||
|
Exceptions thrown by validate_bench
|
||||||
|
"""
|
||||||
|
if len(args) != 2:
|
||||||
|
print("Usage: %s <bench.out file> <bench.out schema>" % sys.argv[0],
|
||||||
|
file=sys.stderr)
|
||||||
|
return os.EX_USAGE
|
||||||
|
|
||||||
|
validate_bench(args[0], args[1])
|
||||||
|
return os.EX_OK
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
sys.exit(main(sys.argv[1:]))
|
Loading…
Reference in New Issue
Block a user