From e9005add1417628c819debc5ab80863c37313a16 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Thu, 14 Dec 2017 15:43:05 -0800 Subject: [PATCH] Fix tests that were failing. --- compiler/tests/21_hspice_delay_test.py | 16 ++++++------- compiler/tests/21_ngspice_delay_test.py | 19 +++++++-------- .../tests/golden/sram_2_16_1_scn3me_subm.lib | 24 +++++++++---------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/compiler/tests/21_hspice_delay_test.py b/compiler/tests/21_hspice_delay_test.py index 65ebe508..6a6dd94f 100644 --- a/compiler/tests/21_hspice_delay_test.py +++ b/compiler/tests/21_hspice_delay_test.py @@ -62,15 +62,15 @@ class timing_sram_test(unittest.TestCase): 'slew0': [0.026966], 'slew1': [0.019338]} elif OPTS.tech_name == "scn3me_subm": - golden_data = {'read1_power': 3.1765, - 'read0_power': 3.1929, - 'write0_power': 2.874, - 'delay1': [0.8900045999999999], - 'delay0': [1.9975000000000003], + golden_data = {'read1_power': 4.3678, + 'read0_power': 4.3914, + 'write0_power': 2.9394, + 'delay1': [0.8901521], + 'delay0': [2.001], 'min_period': 5.781, - 'write1_power': 2.6611, - 'slew0': [1.2993000000000001], - 'slew1': [0.9903856]} + 'write1_power': 2.7163, + 'slew0': [1.3044000000000002], + 'slew1': [0.9904079]} else: self.assertTrue(False) # other techs fail # Check if no too many or too few results diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py index 2c333ad5..31025044 100644 --- a/compiler/tests/21_ngspice_delay_test.py +++ b/compiler/tests/21_ngspice_delay_test.py @@ -46,7 +46,6 @@ class timing_sram_test(unittest.TestCase): loads = [tech.spice["FF_in_cap"]*4] slews = [tech.spice["rise_time"]*2] data = d.analyze(probe_address, probe_data,slews,loads) - if OPTS.tech_name == "freepdk45": golden_data = {'read1_power': 0.02527215, 'read0_power': 0.02573022, @@ -58,15 +57,15 @@ class timing_sram_test(unittest.TestCase): 'slew0': [0.0273352], 'slew1': [0.021216870000000002]} elif OPTS.tech_name == "scn3me_subm": - golden_data = {'read1_power': 3.244839, - 'read0_power': 3.088234, - 'write0_power': 2.6857420000000003, - 'delay1': [0.9200643], - 'delay0': [2.0509399999999998], + golden_data = {'read1_power': 4.250786000000001, + 'read0_power': 4.093461, + 'write0_power': 2.762675, + 'delay1': [0.920068], + 'delay0': [2.051821], 'min_period': 6.563, - 'write1_power': 2.378355, - 'slew0': [1.342019], - 'slew1': [1.040885]} + 'write1_power': 2.4545719999999998, + 'slew0': [1.342015], + 'slew1': [1.040868]} else: self.assertTrue(False) # other techs fail @@ -78,7 +77,7 @@ class timing_sram_test(unittest.TestCase): for i in range(len(data[k])): self.assertTrue(isclose(data[k][i],golden_data[k][i],0.10)) else: - self.assertTrue(isclose(data[k],golden_data[k]),0.10) + self.assertTrue(isclose(data[k],golden_data[k],0.10)) # reset these options OPTS.check_lvsdrc = True diff --git a/compiler/tests/golden/sram_2_16_1_scn3me_subm.lib b/compiler/tests/golden/sram_2_16_1_scn3me_subm.lib index 0d4fe452..e68148e1 100644 --- a/compiler/tests/golden/sram_2_16_1_scn3me_subm.lib +++ b/compiler/tests/golden/sram_2_16_1_scn3me_subm.lib @@ -92,10 +92,10 @@ cell (sram_2_16_1_scn3me_subm){ internal_power(){ when : "OEb & !clk"; rise_power(scalar){ - values("3.1588"); + values("3.1581"); } fall_power(scalar){ - values("3.4922"); + values("3.4945"); } } timing(){ @@ -129,10 +129,10 @@ cell (sram_2_16_1_scn3me_subm){ internal_power(){ when : "!OEb & !clk"; rise_power(scalar){ - values("3.9389"); + values("5.0577"); } fall_power(scalar){ - values("3.9642"); + values("5.0831"); } } timing(){ @@ -141,23 +141,23 @@ cell (sram_2_16_1_scn3me_subm){ timing_type : falling_edge; cell_rise(CELL_TABLE) { values("0.542, 0.626, 1.298",\ - "0.545, 0.628, 1.304",\ + "0.544, 0.627, 1.304",\ "0.594, 0.674, 1.35"); } cell_fall(CELL_TABLE) { - values("1.532, 1.634, 2.6",\ - "1.536, 1.639, 2.607",\ - "1.587, 1.69, 2.657"); + values("1.535, 1.637, 2.604",\ + "1.54, 1.641, 2.612",\ + "1.59, 1.693, 2.662"); } rise_transition(CELL_TABLE) { - values("0.191, 0.337, 1.884",\ + values("0.191, 0.337, 1.883",\ "0.193, 0.338, 1.885",\ "0.195, 0.341, 1.884"); } fall_transition(CELL_TABLE) { - values("0.255, 0.448, 2.467",\ - "0.256, 0.447, 2.468",\ - "0.256, 0.447, 2.454"); + values("0.252, 0.446, 2.468",\ + "0.253, 0.448, 2.448",\ + "0.253, 0.447, 2.454"); } } }