luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timfuz: --sub-csv => --bounds-csv 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-09-19 11:41:55 -07:00
parent 744c61e4a6
commit 7c0828e6c2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/007-timing/projects/corner.mk
View File

@ -32,7 +32,7 @@ build/$(CORNER)/leastsq.csv: build/sub.json build/grouped.csv build/checksub bui
build/$(CORNER)/linprog.csv: build/$(CORNER)/leastsq.csv build/grouped.csv build/$(CORNER)/linprog.csv: build/$(CORNER)/leastsq.csv build/grouped.csv
# Tweak rough timing model, making sure all constraints are satisfied # Tweak rough timing model, making sure all constraints are satisfied
ALLOW_ZERO_EQN=$(ALLOW_ZERO_EQN) python3 $(TIMFUZ_DIR)/solve_linprog.py --sub-json build/sub.json --sub-csv build/$(CORNER)/leastsq.csv --massage build/grouped.csv --corner $(CORNER) --out build/$(CORNER)/linprog.csv.tmp ALLOW_ZERO_EQN=$(ALLOW_ZERO_EQN) python3 $(TIMFUZ_DIR)/solve_linprog.py --sub-json build/sub.json --bounds-csv build/$(CORNER)/leastsq.csv --massage build/grouped.csv --corner $(CORNER) --out build/$(CORNER)/linprog.csv.tmp
mv build/$(CORNER)/linprog.csv.tmp build/$(CORNER)/linprog.csv mv build/$(CORNER)/linprog.csv.tmp build/$(CORNER)/linprog.csv
build/$(CORNER)/flat.csv: build/$(CORNER)/linprog.csv build/$(CORNER)/flat.csv: build/$(CORNER)/linprog.csv

4
fuzzers/007-timing/solve_linprog.py
View File

@ -192,7 +192,7 @@ def main():
parser.add_argument('--verbose', action='store_true', help='') parser.add_argument('--verbose', action='store_true', help='')
parser.add_argument('--massage', action='store_true', help='') parser.add_argument('--massage', action='store_true', help='')
parser.add_argument('--sub-csv', help='') parser.add_argument('--bounds-csv', help='Previous solve result starting point')
parser.add_argument( parser.add_argument(
'--sub-json', help='Group substitutions to make fully ranked') '--sub-json', help='Group substitutions to make fully ranked')
parser.add_argument('--corner', required=True, default="slow_max", help='') parser.add_argument('--corner', required=True, default="slow_max", help='')
@ -215,7 +215,7 @@ def main():
timfuz_solve.run( timfuz_solve.run(
run_corner=run_corner, run_corner=run_corner,
sub_json=sub_json, sub_json=sub_json,
sub_csv=args.sub_csv, bounds_csv=args.bounds_csv,
fns_in=fns_in, fns_in=fns_in,
corner=args.corner, corner=args.corner,
massage=args.massage, massage=args.massage,

2
fuzzers/007-timing/tile_annotate.py
View File

@ -51,7 +51,7 @@ def main():
default='build/timgrid-vc.json', default='build/timgrid-vc.json',
help='tilegrid timing delay values at corner (timgrid-vc.json)') help='tilegrid timing delay values at corner (timgrid-vc.json)')
parser.add_argument( parser.add_argument(
'fn_ins', nargs='+', help='Input flattened timing csv (flat.json)') 'fn_ins', nargs='+', help='Input flattened timing csv (flat.csv)')
args = parser.parse_args() args = parser.parse_args()
run(args.fn_ins, args.out, args.timgrid_s, verbose=False) run(args.fn_ins, args.out, args.timgrid_s, verbose=False)

6
fuzzers/007-timing/timfuz_solve.py
View File

@ -98,7 +98,7 @@ def run(
corner, corner,
run_corner, run_corner,
sub_json=None, sub_json=None,
sub_csv=None, bounds_csv=None,
dedup=True, dedup=True,
massage=False, massage=False,
outfn=None, outfn=None,
@ -132,8 +132,8 @@ def run(
Special .csv containing one variable per line Special .csv containing one variable per line
Used primarily for multiple optimization passes, such as different algorithms or additional constraints Used primarily for multiple optimization passes, such as different algorithms or additional constraints
''' '''
if sub_csv: if bounds_csv:
Ads2, b2 = loadc_Ads_b([sub_csv], corner, ico=True) Ads2, b2 = loadc_Ads_b([bounds_csv], corner, ico=True)
bounds = Ads2bounds(Ads2, b2) bounds = Ads2bounds(Ads2, b2)
assert len(bounds), 'Failed to load bounds' assert len(bounds), 'Failed to load bounds'
rows_old = len(Ads) rows_old = len(Ads)