Merged and addressed conflict in delay.py

This commit is contained in:
Hunter Nichols
2021-01-06 01:37:16 -08:00
86 changed files with 916 additions and 17029 deletions
+2
View File
@@ -66,7 +66,9 @@ class model_delay_test(openram_test):
# Only compare the delays
spice_delays = {key:value for key, value in spice_data.items() if 'delay' in key}
spice_delays['min_period'] = spice_data['min_period']
model_delays = {key:value for key, value in model_data.items() if 'delay' in key}
model_delays['min_period'] = model_data['min_period']
debug.info(1,"Spice Delays={}".format(spice_delays))
debug.info(1,"Model Delays={}".format(model_delays))