Merge remote-tracking branch 'bvhoof/dev' into dev

compiler/characterizer/delay.py

@@ -170,10 +170,10 @@ class delay(simulation):
                                                            meas.targ_name_no_port))
             self.dout_volt_meas[-1].meta_str = meas.meta_str
 
-            if not OPTS.use_pex:
-                self.sen_meas = delay_measure("delay_sen", self.clk_frmt, self.sen_name + "{}", "FALL", "RISE", measure_scale=1e9)
-            else:
+            if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre':
                 self.sen_meas = delay_measure("delay_sen", self.clk_frmt, self.sen_name, "FALL", "RISE", measure_scale=1e9)
+            else:
+                self.sen_meas = delay_measure("delay_sen", self.clk_frmt, self.sen_name + "{}", "FALL", "RISE", measure_scale=1e9)
 
         self.sen_meas.meta_str = sram_op.READ_ZERO
         self.sen_meas.meta_add_delay = True
@@ -220,13 +220,14 @@ class delay(simulation):
         storage_names = cell_inst.mod.get_storage_net_names()
         debug.check(len(storage_names) == 2, ("Only inverting/non-inverting storage nodes"
                                               "supported for characterization. Storage nets={}").format(storage_names))
-        if not OPTS.use_pex:
-            q_name = cell_name + '.' + str(storage_names[0])
-            qbar_name = cell_name + '.' + str(storage_names[1])
-        else:
+
+        if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre':
             bank_num = self.sram.get_bank_num(self.sram.name, bit_row, bit_col)
             q_name = "bitcell_Q_b{0}_r{1}_c{2}".format(bank_num, bit_row, bit_col)
             qbar_name = "bitcell_Q_bar_b{0}_r{1}_c{2}".format(bank_num, bit_row, bit_col)
+        else:
+            q_name = cell_name + '.' + str(storage_names[0])
+            qbar_name = cell_name + '.' + str(storage_names[1])
 
         # Bit measures, measurements times to be defined later. The measurement names must be unique
         # but they is enforced externally. {} added to names to differentiate between ports allow the

compiler/characterizer/simulation.py

@@ -467,7 +467,7 @@ class simulation():
         """
 
         port = self.read_ports[0]
-        if not OPTS.use_pex:
+        if not OPTS.use_pex or (OPTS.use_pex and OPTS.pex_exe[0] == 'calibre'):
             self.graph.get_all_paths('{}{}'.format("clk", port),
                                      '{}{}_{}'.format(self.dout_name, port, self.probe_data))
 
@@ -523,7 +523,7 @@ class simulation():
         debug.check(len(sa_mods) == 1, "Only expected one type of Sense Amp. Cannot perform s_en checks.")
         enable_name = sa_mods[0].get_enable_name()
         sen_name = self.get_alias_in_path(paths, enable_name, sa_mods[0])
-        if OPTS.use_pex:
+        if OPTS.use_pex and (OPTS.pex_exe[0] != 'calibre'):
             sen_name = sen_name.split('.')[-1]
         return sen_name
 
@@ -581,7 +581,7 @@ class simulation():
         exclude_set = self.get_bl_name_search_exclusions()
         for int_net in [cell_bl, cell_br]:
             bl_names.append(self.get_alias_in_path(paths, int_net, cell_mod, exclude_set))
-        if OPTS.use_pex:
+        if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre':
             for i in range(len(bl_names)):
                 bl_names[i] = bl_names[i].split('.')[-1]
         return bl_names[0], bl_names[1]

compiler/characterizer/stimuli.py

@@ -52,7 +52,7 @@ class stimuli():
     def inst_model(self, pins, model_name):
         """ Function to instantiate a generic model with a set of pins """
 
-        if OPTS.use_pex:
+        if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre':
             self.inst_pex_model(pins, model_name)
         else:
             self.sf.write("X{0} ".format(model_name))