Fixed control problems (probably)

Extended functional tests for 15 cycles (slow, but more checking)
Fixed s_en to be gated AFTER the RBL.

compiler/characterizer/functional.py

@@ -51,11 +51,12 @@ class functional(simulation):
         self.initialize_wmask()
 
         # Number of checks can be changed
-        self.num_cycles = 2
+        self.num_cycles = 15
         self.stored_words = {}      
         self.write_check = []
         self.read_check = []
 
+
     def initialize_wmask(self):
         self.wmask = ""
         if self.write_size is not None:
@@ -294,9 +295,7 @@ class functional(simulation):
         self.stim = stimuli(self.sf,self.corner)
 
         #Write include statements
-        self.sram_sp_file = "{}sram.sp".format(OPTS.openram_temp)
-        shutil.copy(self.sp_file, self.sram_sp_file)
-        self.stim.write_include(self.sram_sp_file)
+        self.stim.write_include(self.sp_file)
 
         #Write Vdd/Gnd statements
         self.sf.write("\n* Global Power Supplies\n")