Merge https://github.com/parallaxsw/OpenSTA/pull/258

Anticipating the merge to the upstream and trying to stabilize the OR CI.

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

include/sta/Bdd.hh

@@ -34,7 +34,7 @@ struct DdManager;
 
 namespace sta {
 
-typedef std::map<const LibertyPort*, DdNode*> BddPortVarMap;
+typedef std::map<const LibertyPort*, DdNode*, LibertyPortLess> BddPortVarMap;
 typedef std::map<unsigned, const LibertyPort*> BddVarIdxPortMap;
 
 class Bdd : public StaState

include/sta/LibertyClass.hh

@@ -145,6 +145,12 @@ enum class TableAxisVariable {
 enum class PathType { clk, data, clk_and_data };
 const int path_type_count = 2;
 
+class LibertyPortLess
+{
+public:
+  bool operator()(const LibertyPort *port1, const LibertyPort *port2) const;
+};
+
 class LibertyPortNameLess
 {
 public:

liberty/Liberty.cc

@@ -2818,6 +2818,13 @@ sortByName(const LibertyPortSet *set)
   return ports;
 }
 
+bool
+LibertyPortLess::operator()(const LibertyPort *port1,
+                            const LibertyPort *port2) const
+{
+  return LibertyPort::less(port1, port2);
+}
+
 bool
 LibertyPortNameLess::operator()(const LibertyPort *port1,
 				const LibertyPort *port2) const

liberty/LibertyBuilder.cc

@@ -692,10 +692,10 @@ LibertyBuilder::makeMinPulseWidthArcs(LibertyCell *cell,
     from_port = to_port;
   TimingArcSet *arc_set = makeTimingArcSet(cell, from_port, to_port, related_out,
                                            role, attrs);
-  for (auto to_rf : RiseFall::range()) {
-    TimingModel *model = attrs->model(to_rf);
+  for (const RiseFall *from_rf : RiseFall::range()) {
+    TimingModel *model = attrs->model(from_rf);
     if (model)
-      makeTimingArc(arc_set, to_rf->opposite(), to_rf, model);
+      makeTimingArc(arc_set, from_rf, from_rf->opposite(), model);
   }
   return arc_set;
 }

liberty/LibertyReader.cc

@@ -2029,8 +2029,8 @@ LibertyReader::makeMinPulseWidthArcs(LibertyPort *port,
         attrs = make_shared<TimingArcAttrs>();
         attrs->setTimingType(TimingType::min_pulse_width);
       }
-      // rise/fall_constraint model is on the trailing edge of the pulse.
-      const RiseFall *model_rf = hi_low->opposite();
+      // rise/fall_constraint model is on the leading edge of the pulse.
+      const RiseFall *model_rf = hi_low;
       TimingModel *check_model =
         makeScalarCheckModel(min_width, ScaleFactorType::min_pulse_width, model_rf);
       attrs->setModel(model_rf, check_model);

liberty/LibertyWriter.cc

@@ -426,8 +426,13 @@ LibertyWriter::writeTimingArcSet(const TimingArcSet *arc_set)
 
   for (const RiseFall *rf : RiseFall::range()) {
     TimingArc *arc = arc_set->arcTo(rf);
-    if (arc)
-      writeTimingModels(arc, rf);
+    if (arc) {
+      // Min pulse width arcs are wrt to the leading edge of the pulse.
+      const RiseFall *model_rf = (arc_set->role() == TimingRole::width())
+        ? rf->opposite()
+        : rf;
+      writeTimingModels(arc, model_rf);
+    }
   }
 
   fprintf(stream_, "      }\n");