Removed windows EOL characters.

compiler/characterizer/cacti.py

@@ -73,9 +73,13 @@ class cacti(simulation):
             # Calculate delay based on slew and load
             # Calculations expect Farad, input is Femto-Farad
             load_farad = load*1e-12
+            load_farad = 0.052275e-12
+            slew = 0
             path_delays = self.graph.get_timing(bl_path, self.corner, slew, load_farad, self.params)
 
             total_delay = self.sum_delays(path_delays)
+            debug.info(0, "total_delay={}".format(total_delay))
+            sys.exit()
             delay_ns = total_delay.delay/1e-9
             slew_ns = total_delay.slew/1e-9
             max_delay = max(max_delay, total_delay.delay)

compiler/characterizer/elmore.py

@@ -26,10 +26,17 @@ class elmore(simulation):
         # else:
             # self.num_wmasks = 0
         #self.set_load_slew(0, 0)
+        self.set_params()
         self.set_corner(corner)
         self.create_signal_names()
         self.add_graph_exclusions()
     
+    def set_params(self):    
+        """Set parameters specific to the corner being simulated"""
+        self.params = {}
+        # Set the specific functions to use for timing defined in the SRAM module
+        self.params["model_name"] = OPTS.model_name
+    
     def get_lib_values(self, load_slews):
         """
         Return the analytical model results for the SRAM.
@@ -58,7 +65,7 @@ class elmore(simulation):
         max_delay = 0.0
         for load,slew in load_slews:
             # Calculate delay based on slew and load
-            path_delays = self.graph.get_timing(bl_path, self.corner, slew, load)
+            path_delays = self.graph.get_timing(bl_path, self.corner, slew, load, self.params)
             
             total_delay = self.sum_delays(path_delays)
             max_delay = max(max_delay, total_delay.delay)