Plumbed API for stream-based LibertyParser to LibertyReader.

Signed-off-by: Ted Hong <tedhong@google.com>

Author: hongted

include/sta/Sta.hh

@@ -1,29 +1,30 @@
 // 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
 
+#include <iosfwd>
 #include <map>
 #include <string>
 #include <string_view>
@@ -76,19 +77,20 @@ class StaSimObserver;
 class LevelizeObserver;
 class GraphLoop;
 
-using ModeNameMap = std::map<std::string, Mode*, std::less<>>;
-using SceneNameMap = std::map<std::string, Scene*>;
-using SlowDrvrIterator = Iterator<Instance*>;
+using ModeNameMap = std::map<std::string, Mode *, std::less<>>;
+using SceneNameMap = std::map<std::string, Scene *>;
+using SlowDrvrIterator = Iterator<Instance *>;
 using CheckError = StringSeq;
-using CheckErrorSeq = std::vector<CheckError*>;
+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)>;
+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();
+void
+initSta();
 
 // Call before exit to make leak detection simpler for purify and valgrind.
 void
@@ -148,10 +150,25 @@ public:
   ModeSeq findModes(const std::string &mode_name) const;
   Sdc *cmdSdc() const;
 
+  // Parse a Liberty file from a file.
+  //
+  // filename should be the path to the file, if ZLIB is included it may be
+  // either compressed or uncompressed.
   virtual LibertyLibrary *readLiberty(std::string_view filename,
                                       Scene *scene,
                                       const MinMaxAll *min_max,
                                       bool infer_latches);
+  // Read a Liberty file from an input stream.
+  //
+  // filename is used only as a label in diagnostic messages; it may but need
+  // not correspond to a file on disk.
+  //
+  // The input stream should provide uncompressed text.
+  virtual LibertyLibrary *readLiberty(std::istream &stream,
+                                      std::string_view filename,
+                                      Scene *scene,
+                                      const MinMaxAll *min_max,
+                                      bool infer_latches);
   // tmp public
   void readLibertyAfter(LibertyLibrary *liberty,
                         Scene *scene,
@@ -602,9 +619,9 @@ public:
                      float delay,
                      Sdc *sdc);
   void removeInputDelay(const Pin *pin,
-                        const RiseFallBoth *rf, 
+                        const RiseFallBoth *rf,
                         const Clock *clk,
-                        const RiseFall *clk_rf, 
+                        const RiseFall *clk_rf,
                         const MinMaxAll *min_max,
                         Sdc *sdc);
   void setOutputDelay(const Pin *pin,
@@ -619,9 +636,9 @@ public:
                       float delay,
                       Sdc *sdc);
   void removeOutputDelay(const Pin *pin,
-                         const RiseFallBoth *rf, 
+                         const RiseFallBoth *rf,
                          const Clock *clk,
-                         const RiseFall *clk_rf, 
+                         const RiseFall *clk_rf,
                          const MinMaxAll *min_max,
                          Sdc *sdc);
   void makeFalsePath(ExceptionFrom *from,
@@ -656,7 +673,7 @@ public:
                      Sdc *sdc);
   // Deprecated 10/24/2025
   bool isGroupPathName(std::string_view group_name,
-                       const Sdc *sdc) __attribute__ ((deprecated));
+                       const Sdc *sdc) __attribute__((deprecated));
   bool isPathGroupName(std::string_view group_name,
                        const Sdc *sdc) const;
   StringSeq pathGroupNames(const Sdc *sdc) const;
@@ -729,33 +746,30 @@ public:
                        bool thru_disabled,
                        bool thru_constants,
                        const Mode *mode);
-  InstanceSet
-  findFaninInstances(PinSeq *to,
-                     bool flat,
-                     bool startpoints_only,
-                     int inst_levels,
-                     int pin_levels,
-                     bool thru_disabled,
-                     bool thru_constants,
-                     const Mode *mode);
-  PinSet
-  findFanoutPins(PinSeq *from,
-                 bool flat,
-                 bool endpoints_only,
-                 int inst_levels,
-                 int pin_levels,
-                 bool thru_disabled,
-                 bool thru_constants,
-                 const Mode *mode);
-  InstanceSet
-  findFanoutInstances(PinSeq *from,
-                      bool flat,
-                      bool endpoints_only,
-                      int inst_levels,
-                      int pin_levels,
-                      bool thru_disabled,
-                      bool thru_constants,
-                      const Mode *mode);
+  InstanceSet findFaninInstances(PinSeq *to,
+                                 bool flat,
+                                 bool startpoints_only,
+                                 int inst_levels,
+                                 int pin_levels,
+                                 bool thru_disabled,
+                                 bool thru_constants,
+                                 const Mode *mode);
+  PinSet findFanoutPins(PinSeq *from,
+                        bool flat,
+                        bool endpoints_only,
+                        int inst_levels,
+                        int pin_levels,
+                        bool thru_disabled,
+                        bool thru_constants,
+                        const Mode *mode);
+  InstanceSet findFanoutInstances(PinSeq *from,
+                                  bool flat,
+                                  bool endpoints_only,
+                                  int inst_levels,
+                                  int pin_levels,
+                                  bool thru_disabled,
+                                  bool thru_constants,
+                                  const Mode *mode);
 
   // The set of clocks that arrive at vertex in the clock network.
   ClockSet clocks(const Pin *pin,
@@ -784,11 +798,11 @@ public:
                  float &slack,
                  const RiseFall *&rf,
                  const Scene *&Scene);
-  void maxSlewCheck(// Return values.
-                    const Pin *&pin,
-                    Slew &slew,
-                    float &slack,
-                    float &limit);
+  void maxSlewCheck(  // Return values.
+      const Pin *&pin,
+      Slew &slew,
+      float &slack,
+      float &limit);
   void findSlewLimit(const LibertyPort *port,
                      const Scene *scene,
                      const MinMax *min_max,
@@ -845,11 +859,11 @@ public:
                         float &slack,
                         const RiseFall *&rf,
                         const Scene *&scene);
-  void maxCapacitanceCheck(// Return values.
-                           const Pin *&pin,
-                           float &capacitance,
-                           float &slack,
-                           float &limit);
+  void maxCapacitanceCheck(  // Return values.
+      const Pin *&pin,
+      float &capacitance,
+      float &slack,
+      float &limit);
 
   ////////////////////////////////////////////////////////////////
   void reportMinPulseWidthChecks(const Net *net,
@@ -871,7 +885,7 @@ public:
                            bool violators,
                            bool verbose,
                            const SceneSeq &scenes);
-  
+
   ////////////////////////////////////////////////////////////////
   // User visible but non SDC commands.
 
@@ -1188,7 +1202,7 @@ public:
   TagGroupIndex tagGroupCount() const;
   int clkInfoCount() const;
   int pathCount() const;
-  int vertexPathCount(Vertex  *vertex) const;
+  int vertexPathCount(Vertex *vertex) const;
   Vertex *maxPathCountVertex() const;
 
   // Propagate liberty constant functions and pins tied high/low through
@@ -1498,7 +1512,7 @@ protected:
   virtual void makeArcDelayCalc();
   virtual void makeGraphDelayCalc();
   virtual void makeSearch();
-  virtual void makeLatches(); 
+  virtual void makeLatches();
   virtual void makeCheckTiming();
   virtual void makeCheckSlews();
   virtual void makeCheckFanouts();
@@ -1516,6 +1530,11 @@ protected:
                                   Scene *scene,
                                   const MinMaxAll *min_max,
                                   bool infer_latches);
+  LibertyLibrary *readLibertyFile(std::istream &stream,
+                                  std::string_view filename,
+                                  Scene *scene,
+                                  const MinMaxAll *min_max,
+                                  bool infer_latches);
   void delayCalcPreamble();
   void delaysInvalidFrom(const Port *port);
   void delaysInvalidFromFanin(const Port *port);
@@ -1596,7 +1615,7 @@ protected:
                       SearchPred *pred,
                       int inst_level,
                       int pin_level,
-                     const Mode *mode);
+                      const Mode *mode);
   void findRegisterPreamble(const Mode *mode);
   bool crossesHierarchy(Edge *edge) const;
   void powerPreamble();
@@ -1652,4 +1671,4 @@ protected:
   inline static Sta *sta_{nullptr};
 };
 
-} // namespace sta
+}  // namespace sta

liberty/LibertyParser.cc

@@ -56,12 +56,11 @@ parseLibertyFile(std::string_view filename,
 }
 
 void
-parseLibertyFile(std::istream& file_contents,
+parseLibertyFile(std::istream &file_contents,
                  std::string_view filename,
                  LibertyGroupVisitor *library_visitor,
                  Report *report)
 {
- 
   LibertyParser reader(filename, library_visitor, report);
   LibertyScanner scanner(&file_contents, filename, &reader, report);
   LibertyParse parser(&scanner, &reader);
@@ -102,8 +101,7 @@ LibertyParser::makeDefine(const LibertyAttrValueSeq *values,
     delete values;
   }
   else
-    report_->fileWarn(24, filename_, line,
-                      "define does not have three arguments.");
+    report_->fileWarn(24, filename_, line, "define does not have three arguments.");
   return define;
 }
 
@@ -145,11 +143,8 @@ LibertyParser::groupBegin(std::string &&type,
                           LibertyAttrValueSeq *params,
                           int line)
 {
-  LibertyGroup *group = new LibertyGroup(std::move(type),
-                                         params
-                                         ? std::move(*params)
-                                         : LibertyAttrValueSeq(),
-                                         line);
+  LibertyGroup *group = new LibertyGroup(
+      std::move(type), params ? std::move(*params) : LibertyAttrValueSeq(), line);
   delete params;
   LibertyGroup *parent_group = group_stack_.empty() ? nullptr : group_stack_.back();
   group_visitor_->begin(group, parent_group);
@@ -205,7 +200,8 @@ LibertyParser::makeComplexAttr(std::string &&name,
     return nullptr;  // Define is not a complex attr; already added to group
   }
   else {
-    LibertyComplexAttr *attr = new LibertyComplexAttr(std::move(name), *values, line);
+    LibertyComplexAttr *attr =
+        new LibertyComplexAttr(std::move(name), *values, line);
     delete values;
     LibertyGroup *group = this->group();
     group->addAttr(attr);
@@ -276,8 +272,8 @@ LibertyScanner::includeBegin()
         return true;
       }
       else {
-        report_->fileWarn(25, filename_, yylineno,
-                          "cannot open include file {}.", filename);
+        report_->fileWarn(25, filename_, yylineno, "cannot open include file {}.",
+                          filename);
         delete stream;
       }
     }
@@ -591,7 +587,8 @@ LibertyAttrValue::isString() const
   return !string_value_.empty();
 }
 
-std::pair<float, bool>
+std::pair<float,
+          bool>
 LibertyAttrValue::floatValue() const
 {
   if (string_value_.empty())