Merge tolerance change from master.

This commit is contained in:
Matt Guthaus 2017-12-19 09:17:43 -08:00
parent 9059a15ceb
commit 40465d6518
1 changed files with 17 additions and 17 deletions

View File

@ -47,25 +47,25 @@ class timing_sram_test(unittest.TestCase):
slews = [tech.spice["rise_time"]*2] slews = [tech.spice["rise_time"]*2]
data = d.analyze(probe_address, probe_data,slews,loads) data = d.analyze(probe_address, probe_data,slews,loads)
if OPTS.tech_name == "freepdk45": if OPTS.tech_name == "freepdk45":
golden_data = {'read1_power': 0.02813208, golden_data = {'read1_power': 0.026660760000000002,
'read0_power': 0.02856409, 'read0_power': 0.02711731,
'write0_power': 0.02578581, 'write0_power': 0.02501428,
'delay1': [0.050279449999999996], 'delay1': [0.04867702],
'delay0': [0.1417553], 'delay0': [0.1423633],
'min_period': 0.332, 'min_period': 0.332,
'write1_power': 0.02516402, 'write1_power': 0.024162890000000003,
'slew0': [0.02729188], 'slew0': [0.02733451],
'slew1': [0.02057544]} 'slew1': [0.02121624]}
elif OPTS.tech_name == "scn3me_subm": elif OPTS.tech_name == "scn3me_subm":
golden_data = {'read1_power': 4.324345, golden_data = {'read1_power': 4.250786000000001,
'read0_power': 4.168978, 'read0_power': 4.093461,
'write0_power': 2.828746, 'write0_power': 2.762675,
'delay1': [0.8929376], 'delay1': [0.920068],
'delay0': [2.01039], 'delay0': [2.051821],
'min_period': 6.563, 'min_period': 6.563,
'write1_power': 2.526374, 'write1_power': 2.4545719999999998,
'slew0': [1.342036], 'slew0': [1.342015],
'slew1': [1.041426]} 'slew1': [1.040868]}
else: else:
self.assertTrue(False) # other techs fail self.assertTrue(False) # other techs fail
@ -77,7 +77,7 @@ class timing_sram_test(unittest.TestCase):
for i in range(len(data[k])): for i in range(len(data[k])):
self.assertTrue(isclose(data[k][i],golden_data[k][i],0.15)) self.assertTrue(isclose(data[k][i],golden_data[k][i],0.15))
else: else:
self.assertTrue(isclose(data[k],golden_data[k]),0.15) self.assertTrue(isclose(data[k],golden_data[k],0.15))
# reset these options # reset these options
OPTS.check_lvsdrc = True OPTS.check_lvsdrc = True