2017-06-22 18:14:50 +00:00
|
|
|
#!/usr/bin/python
|
2019-01-01 00:11:28 +00:00
|
|
|
# Copyright (C) 2017-2019 Free Software Foundation, Inc.
|
2017-06-22 18:14:50 +00:00
|
|
|
# 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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
# <https://www.gnu.org/licenses/>.
|
2017-06-22 18:14:50 +00:00
|
|
|
"""Compare results of string functions
|
|
|
|
|
|
|
|
Given a string benchmark result file, print a table with comparisons with a
|
|
|
|
baseline. The baseline is the first function, which typically is the builtin
|
|
|
|
function.
|
|
|
|
"""
|
2017-08-07 19:26:10 +00:00
|
|
|
import matplotlib as mpl
|
|
|
|
mpl.use('Agg')
|
2017-08-07 19:25:12 +00:00
|
|
|
|
2017-06-22 18:14:50 +00:00
|
|
|
import sys
|
|
|
|
import os
|
|
|
|
import json
|
|
|
|
import pylab
|
2017-09-16 06:17:32 +00:00
|
|
|
import argparse
|
2018-08-02 18:56:45 +00:00
|
|
|
import traceback
|
2017-06-22 18:14:50 +00:00
|
|
|
|
|
|
|
try:
|
|
|
|
import jsonschema as validator
|
|
|
|
except ImportError:
|
|
|
|
print('Could not find jsonschema module.')
|
|
|
|
raise
|
|
|
|
|
|
|
|
|
|
|
|
def parse_file(filename, schema_filename):
|
2018-05-29 17:13:11 +00:00
|
|
|
try:
|
|
|
|
with open(schema_filename, 'r') as schemafile:
|
|
|
|
schema = json.load(schemafile)
|
|
|
|
with open(filename, 'r') as benchfile:
|
|
|
|
bench = json.load(benchfile)
|
|
|
|
validator.validate(bench, schema)
|
|
|
|
return bench
|
2018-08-02 18:56:45 +00:00
|
|
|
except:
|
|
|
|
print(traceback.format_exc(limit=1))
|
2018-05-29 17:13:11 +00:00
|
|
|
sys.exit(os.EX_NOINPUT)
|
2017-06-22 18:14:50 +00:00
|
|
|
|
|
|
|
def draw_graph(f, v, ifuncs, results):
|
|
|
|
"""Plot graphs for functions
|
|
|
|
|
|
|
|
Plot line graphs for each of the ifuncs
|
|
|
|
|
|
|
|
Args:
|
|
|
|
f: Function name
|
|
|
|
v: Benchmark variant for the function.
|
|
|
|
ifuncs: List of ifunc names
|
|
|
|
results: Dictionary of results for each test criterion
|
|
|
|
"""
|
2017-09-16 09:53:59 +00:00
|
|
|
print('Generating graph for %s, variant \'%s\'' % (f, v))
|
2017-06-22 18:14:50 +00:00
|
|
|
xkeys = results.keys()
|
|
|
|
|
|
|
|
pylab.clf()
|
|
|
|
fig = pylab.figure(frameon=False)
|
|
|
|
fig.set_size_inches(32, 18)
|
|
|
|
pylab.ylabel('Performance improvement from base')
|
|
|
|
X = range(len(xkeys))
|
|
|
|
pylab.xticks(X, xkeys)
|
|
|
|
|
|
|
|
i = 0
|
|
|
|
|
|
|
|
while i < len(ifuncs):
|
|
|
|
Y = [results[k][i] for k in xkeys]
|
|
|
|
lines = pylab.plot(X, Y, label=':'+ifuncs[i])
|
|
|
|
i = i + 1
|
|
|
|
|
|
|
|
pylab.legend()
|
|
|
|
pylab.grid()
|
|
|
|
pylab.savefig('%s-%s.png' % (f, v), bbox_inches='tight')
|
|
|
|
|
|
|
|
|
2018-06-12 16:10:28 +00:00
|
|
|
def process_results(results, attrs, funcs, base_func, graph, no_diff, no_header):
|
2017-06-22 18:14:50 +00:00
|
|
|
""" Process results and print them
|
|
|
|
|
|
|
|
Args:
|
|
|
|
results: JSON dictionary of results
|
|
|
|
attrs: Attributes that form the test criteria
|
2018-06-12 16:10:28 +00:00
|
|
|
funcs: Functions that are selected
|
2017-06-22 18:14:50 +00:00
|
|
|
"""
|
|
|
|
|
|
|
|
for f in results['functions'].keys():
|
2018-05-23 16:23:14 +00:00
|
|
|
|
2017-09-16 09:53:12 +00:00
|
|
|
v = results['functions'][f]['bench-variant']
|
|
|
|
|
2018-06-12 16:10:28 +00:00
|
|
|
selected = {}
|
|
|
|
index = 0
|
2017-08-07 19:25:12 +00:00
|
|
|
base_index = 0
|
2018-06-12 16:10:28 +00:00
|
|
|
if funcs:
|
|
|
|
ifuncs = []
|
|
|
|
first_func = True
|
|
|
|
for i in results['functions'][f]['ifuncs']:
|
|
|
|
if i in funcs:
|
|
|
|
if first_func:
|
|
|
|
base_index = index
|
|
|
|
first_func = False
|
|
|
|
selected[index] = 1
|
|
|
|
ifuncs.append(i)
|
|
|
|
else:
|
|
|
|
selected[index] = 0
|
|
|
|
index += 1
|
|
|
|
else:
|
|
|
|
ifuncs = results['functions'][f]['ifuncs']
|
|
|
|
for i in ifuncs:
|
|
|
|
selected[index] = 1
|
|
|
|
index += 1
|
|
|
|
|
2017-08-07 19:25:12 +00:00
|
|
|
if base_func:
|
2018-05-29 17:13:11 +00:00
|
|
|
try:
|
|
|
|
base_index = results['functions'][f]['ifuncs'].index(base_func)
|
|
|
|
except ValueError:
|
|
|
|
sys.stderr.write('Invalid -b "%s" parameter. Options: %s.\n' %
|
|
|
|
(base_func, ', '.join(results['functions'][f]['ifuncs'])))
|
|
|
|
sys.exit(os.EX_DATAERR)
|
2017-08-07 19:25:12 +00:00
|
|
|
|
2018-05-23 16:23:14 +00:00
|
|
|
if not no_header:
|
|
|
|
print('Function: %s' % f)
|
|
|
|
print('Variant: %s' % v)
|
2018-06-12 16:10:28 +00:00
|
|
|
print("%36s%s" % (' ', '\t'.join(ifuncs)))
|
2018-05-23 16:23:14 +00:00
|
|
|
print("=" * 120)
|
|
|
|
|
2017-06-22 18:14:50 +00:00
|
|
|
graph_res = {}
|
|
|
|
for res in results['functions'][f]['results']:
|
2018-05-29 17:13:11 +00:00
|
|
|
try:
|
|
|
|
attr_list = ['%s=%s' % (a, res[a]) for a in attrs]
|
|
|
|
except KeyError as ke:
|
|
|
|
sys.stderr.write('Invalid -a %s parameter. Options: %s.\n'
|
|
|
|
% (ke, ', '.join([a for a in res.keys() if a != 'timings'])))
|
|
|
|
sys.exit(os.EX_DATAERR)
|
2017-08-07 19:25:12 +00:00
|
|
|
i = 0
|
2017-09-16 09:53:12 +00:00
|
|
|
key = ', '.join(attr_list)
|
|
|
|
sys.stdout.write('%36s: ' % key)
|
2017-06-22 18:14:50 +00:00
|
|
|
graph_res[key] = res['timings']
|
|
|
|
for t in res['timings']:
|
2018-06-12 16:10:28 +00:00
|
|
|
if selected[i]:
|
|
|
|
sys.stdout.write ('%12.2f' % t)
|
|
|
|
if not no_diff:
|
|
|
|
if i != base_index:
|
|
|
|
base = res['timings'][base_index]
|
|
|
|
diff = (base - t) * 100 / base
|
|
|
|
sys.stdout.write (' (%6.2f%%)' % diff)
|
|
|
|
sys.stdout.write('\t')
|
2017-08-07 19:25:12 +00:00
|
|
|
i = i + 1
|
2017-06-22 18:14:50 +00:00
|
|
|
print('')
|
2017-09-16 09:53:59 +00:00
|
|
|
|
|
|
|
if graph:
|
|
|
|
draw_graph(f, v, results['functions'][f]['ifuncs'], graph_res)
|
2017-06-22 18:14:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
def main(args):
|
|
|
|
"""Program Entry Point
|
|
|
|
|
|
|
|
Take a string benchmark output file and compare timings.
|
|
|
|
"""
|
|
|
|
|
2017-08-07 19:25:12 +00:00
|
|
|
base_func = None
|
2017-09-16 06:17:32 +00:00
|
|
|
filename = args.input
|
|
|
|
schema_filename = args.schema
|
|
|
|
base_func = args.base
|
|
|
|
attrs = args.attributes.split(',')
|
2018-06-12 16:10:28 +00:00
|
|
|
if args.functions:
|
|
|
|
funcs = args.functions.split(',')
|
|
|
|
if base_func and not base_func in funcs:
|
|
|
|
print('Baseline function (%s) not found.' % base_func)
|
|
|
|
sys.exit(os.EX_DATAERR)
|
|
|
|
else:
|
|
|
|
funcs = None
|
2017-09-16 06:17:32 +00:00
|
|
|
|
|
|
|
results = parse_file(args.input, args.schema)
|
2018-06-12 16:10:28 +00:00
|
|
|
process_results(results, attrs, funcs, base_func, args.graph, args.no_diff, args.no_header)
|
2018-05-29 17:13:11 +00:00
|
|
|
return os.EX_OK
|
2017-06-22 18:14:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2017-09-16 06:17:32 +00:00
|
|
|
parser = argparse.ArgumentParser()
|
|
|
|
|
|
|
|
# The required arguments.
|
|
|
|
req = parser.add_argument_group(title='required arguments')
|
|
|
|
req.add_argument('-a', '--attributes', required=True,
|
|
|
|
help='Comma separated list of benchmark attributes.')
|
|
|
|
req.add_argument('-i', '--input', required=True,
|
|
|
|
help='Input JSON benchmark result file.')
|
|
|
|
req.add_argument('-s', '--schema', required=True,
|
|
|
|
help='Schema file to validate the result file.')
|
|
|
|
|
|
|
|
# Optional arguments.
|
2018-06-12 16:10:28 +00:00
|
|
|
parser.add_argument('-f', '--functions',
|
|
|
|
help='Comma separated list of functions.')
|
2017-09-16 06:17:32 +00:00
|
|
|
parser.add_argument('-b', '--base',
|
|
|
|
help='IFUNC variant to set as baseline.')
|
2017-09-16 09:53:59 +00:00
|
|
|
parser.add_argument('-g', '--graph', action='store_true',
|
|
|
|
help='Generate a graph from results.')
|
2018-05-23 16:23:14 +00:00
|
|
|
parser.add_argument('--no-diff', action='store_true',
|
|
|
|
help='Do not print the difference from baseline.')
|
|
|
|
parser.add_argument('--no-header', action='store_true',
|
|
|
|
help='Do not print the header.')
|
2017-09-16 06:17:32 +00:00
|
|
|
|
|
|
|
args = parser.parse_args()
|
2018-05-29 17:13:11 +00:00
|
|
|
sys.exit(main(args))
|