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

Remove control structure from ngspice. Add probe for ngspice too since it doesn't hurt. Unskip delay test.

This commit is contained in:
Matt Guthaus 2016-11-11 13:22:01 -08:00
parent 5211be5ffc
commit 5e33781268
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/characterizer/delay.py
View File

@ -263,22 +263,9 @@ class delay():
# run until the last cycle time # run until the last cycle time
end_time = self.cycle_times[-1] end_time = self.cycle_times[-1]
self.sf.write(".TRAN 5p {0}n\n".format(end_time)) self.sf.write(".TRAN 5p {0}n\n".format(end_time))
self.sf.write(".OPTIONS POST=1 PROBE\n")
if OPTS.spice_version == "hspice": # create plots for all signals
# create plots for all signals self.sf.write(".probe V(*)\n")
self.sf.write(".OPTIONS POST=1 PROBE\n")
self.sf.write(".probe V(*)\n")
# end the stimulus file
self.sf.write(".end\n")
self.sf.close()
else:
pass
# This is only needed for ngspice <26
# self.sf.write(".control\n")
# self.sf.write("run\n")
# self.sf.write("quit\n")
# self.sf.write(".endc\n")
# end the stimulus file # end the stimulus file
self.sf.write(".end\n") self.sf.write(".end\n")

14
compiler/characterizer/setup_hold.py
View File

@ -167,18 +167,8 @@ class setup_hold():
end_time = 2 * period end_time = 2 * period
self.sf.write(".TRAN 5p {0}n\n".format(end_time)) self.sf.write(".TRAN 5p {0}n\n".format(end_time))
self.sf.write(".OPTIONS POST=1 PROBE\n") self.sf.write(".OPTIONS POST=1 PROBE\n")
# create plots for all signals
if OPTS.spice_version == "hspice": self.sf.write(".probe V(*)\n")
self.sf.write(".probe V(*)\n")
else:
pass
# This is only needed for ngspice <26
# self.sf.write(".control\n")
# self.sf.write("run\n")
# self.sf.write("* plot clk_buf data_buf doutrun\n")
# self.sf.write("quit\n")
# self.sf.write(".endc\n")
# end the stimulus file # end the stimulus file
self.sf.write(".end\n") self.sf.write(".end\n")

4
compiler/tests/21_ngspice_delay_test.py
View File

@ -13,7 +13,7 @@ import calibre
OPTS = globals.get_opts() OPTS = globals.get_opts()
@unittest.skip("SKIPPING 21_ngspice_delay_test") #@unittest.skip("SKIPPING 21_ngspice_delay_test")
class timing_sram_test(unittest.TestCase): class timing_sram_test(unittest.TestCase):
def runTest(self): def runTest(self):
@ -53,7 +53,7 @@ class timing_sram_test(unittest.TestCase):
self.assertTrue(isclose(data['min_period1'],0.078582763671875)) self.assertTrue(isclose(data['min_period1'],0.078582763671875))
self.assertTrue(isclose(data['min_period0'],0.25543212890625)) self.assertTrue(isclose(data['min_period0'],0.25543212890625))
elif OPTS.tech_name == "scn3me_subm": elif OPTS.tech_name == "scn3me_subm":
self.assertTrue(isclose(data['delay1'],1.618362)) self.assertTrue(isclose(data['delay1'],1.66442871094)) # diff than hspice
self.assertTrue(isclose(data['delay0'],2.2635000000000005)) self.assertTrue(isclose(data['delay0'],2.2635000000000005))
self.assertTrue(isclose(data['min_period1'],1.53564453125)) self.assertTrue(isclose(data['min_period1'],1.53564453125))
self.assertTrue(isclose(data['min_period0'],2.998046875)) self.assertTrue(isclose(data['min_period0'],2.998046875))