From 6321be7857fcc43b563a46dbdd75b3ac2a359b11 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 19 Sep 2018 12:05:40 -0700 Subject: [PATCH] timfuz: make csv_group2flat deterministic Signed-off-by: John McMaster --- fuzzers/007-timing/csv_group2flat.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fuzzers/007-timing/csv_group2flat.py b/fuzzers/007-timing/csv_group2flat.py index 403b2991..a80c11ac 100644 --- a/fuzzers/007-timing/csv_group2flat.py +++ b/fuzzers/007-timing/csv_group2flat.py @@ -39,18 +39,10 @@ def gen_flat(fns_in, sub_json, corner=None): yield zero, zero_row -def run(fns_in, fnout, sub_json, corner=None, sort=False, verbose=False): - ''' - if sort: - sortf = sorted - else: - sortf = lambda x: x - ''' - +def run(fns_in, fnout, sub_json, corner=None, verbose=False): with open(fnout, 'w') as fout: fout.write('ico,fast_max fast_min slow_max slow_min,rows...\n') - #for name, corners in sortf(gen_flat(fnin, sub_json)): - for name, corners in gen_flat(fns_in, sub_json, corner=corner): + for name, corners in sorted(list(gen_flat(fns_in, sub_json, corner=corner))): row_ico = 1 items = [str(row_ico), corners2csv(corners)] items.append('%u %s' % (1, name)) @@ -64,7 +56,6 @@ def main(): description='Substitute .csv to ungroup correlated variables') parser.add_argument('--verbose', action='store_true', help='') - #parser.add_argument('--sort', action='store_true', help='') parser.add_argument('--sub-csv', help='') parser.add_argument( '--sub-json', @@ -87,7 +78,6 @@ def main(): args.fns_in, args.out, sub_json=sub_json, - #sort=args.sort, verbose=args.verbose, corner=args.corner) finally: