Merge pull request #363 from The-OpenROAD-Project-staging/sta_update_latest_0514

Sta update latest 0514

Author: maliberty

.gitignore

@@ -31,6 +31,5 @@ doc/messages.txt
 # clangd turds
 .cache/
 
-# test artifacts
-*/test/*.log
-**/Testing/
+# openroad ctest turds
+cmake_test*

include/sta/LevelizeObserver.hh

@@ -0,0 +1,59 @@
+// OpenSTA, Static Timing Analyzer
+// Copyright (c) 2026, Parallax Software, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+//
+// The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software.
+//
+// Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// This notice may not be removed or altered from any source distribution.
+
+#pragma once
+
+namespace sta {
+
+class Vertex;
+class Search;
+class GraphDelayCalc;
+
+// Observer fired by Levelize during (re)levelization. Downstream consumers
+// override the two hooks to invalidate caches that depend on vertex levels.
+class LevelizeObserver
+{
+public:
+  virtual ~LevelizeObserver() = default;
+  virtual void levelsChangedBefore() = 0;
+  virtual void levelChangedBefore(Vertex *vertex) = 0;
+};
+
+// Default observer installed by Sta::makeObservers. Forwards level-change
+// events to Search and GraphDelayCalc so their internal caches stay
+// consistent. Subclass and override to extend (call the base methods first,
+// then add your own invalidation).
+class StaLevelizeObserver : public LevelizeObserver
+{
+public:
+  StaLevelizeObserver(Search *search, GraphDelayCalc *graph_delay_calc);
+  void levelsChangedBefore() override;
+  void levelChangedBefore(Vertex *vertex) override;
+
+private:
+  Search *search_;
+  GraphDelayCalc *graph_delay_calc_;
+};
+
+} // namespace sta

include/sta/Sta.hh

@@ -73,6 +73,7 @@ class ClkSkews;
 class ReportField;
 class EquivCells;
 class StaSimObserver;
+class LevelizeObserver;
 class GraphLoop;
 
 using ModeNameMap = std::map<std::string, Mode*, std::less<>>;
@@ -83,6 +84,8 @@ using CheckErrorSeq = std::vector<CheckError*>;
 enum class CmdNamespace { sta, sdc };
 using ParasiticsNameMap = std::map<std::string, Parasitics*, std::less<>>;
 using GraphLoopSeq = std::vector<GraphLoop*>;
+using ReportFieldGetValue = std::function<std::string (const Path *path,
+                                                       const StaState *sta)>;
 
 // Initialize sta functions that are not part of the Sta class.
 void initSta();
@@ -982,16 +985,16 @@ public:
                           bool clk_gating_hold);
   void setReportPathFormat(ReportPathFormat format);
   void setReportPathFieldOrder(const StringSeq &field_names);
-  void setReportPathFields(bool report_input_pin,
-                           bool report_hier_pins,
-                           bool report_net,
-                           bool report_cap,
-                           bool report_slew,
-                           bool report_fanout,
-                           bool report_variation,
-                           bool report_src_attr,
-                           bool report_orig_name);
+  void setReportPathFields(const StringSeq &fields);
   ReportField *findReportPathField(std::string_view name);
+  ReportField *findReportPathFieldAbrev(std::string_view name);
+  void makeReportPathField(std::string_view name,
+                           std::string_view name_abrev,
+                           std::string_view title,
+                           size_t width,
+                           bool left_justify,
+                           Unit *unit,
+                           const ReportFieldGetValue &get_value);
   void setReportPathDigits(int digits);
   void setReportPathNoSplit(bool no_split);
   void reportPathEnd(PathEnd *end);
@@ -1327,6 +1330,10 @@ public:
   // Ensure a network has been read, linked and liberty libraries exist.
   Network *ensureLibLinked();
   void ensureLevelized();
+  // Replace the Levelize observer. Takes ownership; deletes any prior
+  // observer. Subclass StaLevelizeObserver to extend the default behavior
+  // (Search + GraphDelayCalc forwarding) without re-implementing it.
+  void setLevelizeObserver(LevelizeObserver *observer);
   // Ensure that the timing graph has been built.
   Graph *ensureGraph();
   void ensureClkArrivals();

include/sta/StringUtil.hh

@@ -91,6 +91,9 @@ stringEqual(std::string_view s1,
 
 std::pair<float, bool>
 stringFloat(const std::string &str);
+std::pair<long long, bool>
+stringLong(const std::string &str,
+          int base = 10);
 
 bool
 isDigits(const char *str);

liberty/LibertyParse.yy

@@ -62,7 +62,7 @@ sta::LibertyParse::error(const location_type &loc,
 %define api.parser.class {LibertyParse}
 %define api.value.type variant
 
-%expect 2
+%expect 0
 
 %token <std::string> STRING KEYWORD
 %token <float> FLOAT
@@ -75,8 +75,8 @@ sta::LibertyParse::error(const location_type &loc,
 %type <void *> statement complex_attr simple_attr variable group file
 %type <sta::LibertyAttrValueSeq *> attr_values
 %type <sta::LibertyAttrValue *> attr_value
-%type <std::string> string expr expr_term expr_term1 volt_expr
-%type <char> expr_op volt_op
+%type <std::string> string expr expr_term expr_term1
+%type <char> expr_op
 
 %start file
 
@@ -157,36 +157,8 @@ string:
 	;
 
 attr_value:
-	FLOAT
-	{ $$ = reader->makeAttrValueFloat($1); }
-|       expr
+	expr
 	{ $$ = reader->makeAttrValueString(std::move($1)); }
-|	volt_expr
-	{ $$ = reader->makeAttrValueString(std::move($1)); }
-	;
-
-/* Voltage expressions are ignored. */
-/* Crafted to avoid conflicts with expr */
-volt_expr:
-        FLOAT volt_op FLOAT
-	{ $$ = sta::format("{}{}{}", $1, $2, $3); }
-|       string volt_op FLOAT
-	{ $$ = sta::format("{}{}{}", $1, $2, $3); }
-|       FLOAT volt_op string
-	{ $$ = sta::format("{}{}{}", $1, $2, $3); }
-|       volt_expr volt_op FLOAT
-	{ $$ = sta::format("{}{}{}", $1, $2, $3); }
-        ;
-
-volt_op:
-	'+'
-        { $$ = '+'; }
-|	'-'
-        { $$ = '-'; }
-|	'*'
-        { $$ = '*'; }
-|	'/'
-        { $$ = '/'; }
 	;
 
 expr:
@@ -197,6 +169,8 @@ expr:
 
 expr_term:
 	string
+|	FLOAT
+	{ $$ = sta::format("{}", $1); }
 |	'0'
 	{ $$ = std::string("0"); }
 |	'1'
@@ -224,6 +198,10 @@ expr_op:
         { $$ = '&'; }
 |	'^'
         { $$ = '^'; }
+|	'-'
+        { $$ = '-'; }
+|	'/'
+        { $$ = '/'; }
 	;
 
 semi_opt:

liberty/LibertyParser.cc

@@ -513,6 +513,13 @@ LibertyGroup::findAttrInt(std::string_view attr_name,
       exists = exists1;
       return;
     }
+    else {
+      const std::string &int_str = attr_value.stringValue();
+      auto [value1, valid1] = stringLong(int_str);
+      value = value1;
+      exists = valid1;
+      return;
+    }
   }
   exists = false;
 }

liberty/LibertyReader.cc

@@ -2344,16 +2344,13 @@ LibertyReader::readReceiverCapacitance(const LibertyGroup *timing_group,
   std::string cap_group_name1 = sta::format("{}_{}", cap_group_name, rf->to_string());
   const LibertyGroup *cap_group = timing_group->findSubgroup(cap_group_name1);
   if (cap_group) {
-    const LibertySimpleAttr *segment_attr = cap_group->findSimpleAttr("segment");
-    if (segment_attr) {
-      // For receiver_capacitance groups with mulitiple segments this
-      // overrides the index passed in beginReceiverCapacitance1Rise/Fall.
-      int segment;
-      bool exists;
-      getAttrInt(segment_attr, segment, exists);
-      if (exists)
-        index = segment;
-    }
+    // For receiver_capacitance groups with mulitiple segments this
+    // overrides the index passed in beginReceiverCapacitance1Rise/Fall.
+    int segment;
+    bool exists;
+    cap_group->findAttrInt("segment", segment, exists);
+    if (exists)
+      index = segment;
     TableModel *model = readTableModel(cap_group, rf, TableTemplateType::delay,
                                        cap_scale_, ScaleFactorType::pin_cap);
     if (ReceiverModel::checkAxes(model)) {
@@ -3224,24 +3221,6 @@ LibertyReader::makeFloatTable(const LibertyComplexAttr *values_attr,
 
 ////////////////////////////////////////////////////////////////
 
-void
-LibertyReader::getAttrInt(const LibertySimpleAttr *attr,
-                          // Return values.
-                          int &value,
-                          bool &exists)
-{
-  value = 0;
-  exists = false;
-  const LibertyAttrValue &attr_value = attr->value();
-  if (attr_value.isFloat()) {
-    auto [float_val, valid] = attr_value.floatValue();
-    value = static_cast<int>(float_val);
-    exists = true;
-  }
-  else
-    warn(1268, attr, "{} attribute is not an integer.", attr->name());
-}
-
 // Get two floats in a complex attribute.
 //  attr(float1, float2);
 void

liberty/LibertyReaderPvt.hh

@@ -418,10 +418,6 @@ protected:
   StateInternalValues parseStateInternalValues(StringSeq &states,
                                                const LibertySimpleAttr *attr);
 
-  void getAttrInt(const LibertySimpleAttr *attr,
-                  // Return values.
-                  int &value,
-                  bool &exists);
   void getAttrFloat2(const LibertyComplexAttr *attr,
                      // Return values.
                      float &value1,

network/Network.i

@@ -655,6 +655,15 @@ get_attribute(const char *key)
   return Sta::sta()->ensureLinked()->getAttribute(self, key);
 }
 
+void
+set_attribute(const char *key,
+              const char *value)
+{
+  sta::Sta *sta = Sta::sta();
+  sta->ensureLinked();
+  sta->networkReader()->setAttribute(self, key, value);
+}
+
 } // Instance methods
 
 %extend InstanceChildIterator {
@@ -813,4 +822,3 @@ bool has_next() { return self->hasNext(); }
 const Pin *next() { return self->next(); }
 void finish() { delete self; }
 } // NetConnectedPinIterator methods
-

search/Levelize.hh

@@ -30,11 +30,11 @@
 
 #include "Graph.hh"
 #include "StaState.hh"
+#include "sta/LevelizeObserver.hh"
 
 namespace sta {
 
 class SearchPred;
-class LevelizeObserver;
 class GraphLoop;
 
 using VertexEdgeIterPair = std::pair<Vertex*,VertexOutEdgeIterator*>;
@@ -133,12 +133,4 @@ private:
   EdgeSeq *edges_;
 };
 
-class LevelizeObserver
-{
-public:
-  virtual ~LevelizeObserver() = default;
-  virtual void levelsChangedBefore() = 0;
-  virtual void levelChangedBefore(Vertex *vertex) = 0;
-};
-
 } // namespace sta