Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ set(STA_SOURCE
liberty/GeneratedClock.cc
liberty/InternalPower.cc
liberty/LeakagePower.cc
liberty/LibDbReader.cc
liberty/LibDbWriter.cc
liberty/Liberty.cc
liberty/LibertyBuilder.cc
liberty/LibExprReader.cc
Expand Down Expand Up @@ -218,6 +216,15 @@ set(STA_SOURCE
spice/WriteSpice.cc
spice/Xyce.cc

stadb/StaDbCodec.cc
stadb/StaDbCounters.cc
stadb/StaDbFile.cc
stadb/StaDbGraph.cc
stadb/StaDbReader.cc
stadb/StaDbSearch.cc
stadb/StaDbSdc.cc
stadb/StaDbWriter.cc

tcl/TclTypeHelpers.cc

util/Debug.cc
Expand Down Expand Up @@ -275,6 +282,7 @@ set(STA_TCL_FILES
sdf/Sdf.tcl
search/Search.tcl
spice/WriteSpice.tcl
stadb/StaDb.tcl
verilog/Verilog.tcl
)

Expand Down Expand Up @@ -494,6 +502,7 @@ set(SWIG_FILES
${STA_HOME}/search/Property.i
${STA_HOME}/search/Search.i
${STA_HOME}/spice/WriteSpice.i
${STA_HOME}/stadb/StaDb.i
${STA_HOME}/tcl/Exception.i
${STA_HOME}/tcl/Collections.i
${STA_HOME}/tcl/StaTclTypes.i
Expand Down
1 change: 1 addition & 0 deletions app/StaApp.i
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
%include "search/Property.i"
%include "util/Util.i"
%include "spice/WriteSpice.i"
%include "stadb/StaDb.i"
%include "verilog/Verilog.i"
2 changes: 2 additions & 0 deletions dcalc/GraphDelayCalc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include "Scene.hh"
#include "SearchPred.hh"
#include "Stats.hh"
#include "stadb/StaDbCounters.hh"
#include "TimingArc.hh"
#include "TimingRole.hh"
#include "Variables.hh"
Expand Down Expand Up @@ -679,6 +680,7 @@ void
GraphDelayCalc::findVertexDelay(Vertex *vertex,
ArcDelayCalc *arc_delay_calc)
{
staDbCounters().dcalc_vertices_computed++;
const Pin *pin = vertex->pin();
debugPrint(debug_, "delay_calc", 2, "find delays {} ({})",
vertex->to_string(this),
Expand Down
4 changes: 4 additions & 0 deletions graph/Graph.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "TimingRole.hh"
#include "Transition.hh"
#include "Variables.hh"
#include "stadb/StaDbCounters.hh"

namespace sta {

Expand Down Expand Up @@ -423,6 +424,9 @@ Graph::makePinVertices(Pin *pin,
PortDirection *dir = network_->direction(pin);
if (!dir->isPowerGround()) {
bool is_reg_clk = network_->isRegClkPin(pin);
// Counted here rather than in makeVertex so that it measures vertices
// built from the network. A stadb restore makes its vertices directly.
staDbCounters().graph_vertices_made++;
vertex = makeVertex(pin, false, is_reg_clk);
network_->setVertexId(pin, id(vertex));
if (dir->isBidirect()) {
Expand Down
2 changes: 2 additions & 0 deletions include/sta/Graph.hh
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ protected:
VertexSet reg_clk_vertices_;
DcalcAPIndex ap_count_;

friend class DbGraphReader;
friend class DbGraphWriter;
friend class Vertex;
friend class VertexIterator;
friend class VertexInEdgeIterator;
Expand Down
2 changes: 2 additions & 0 deletions include/sta/GraphDelayCalc.hh
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ protected:
// delays to be recomputed during incremental delay calculation.
float incremental_delay_tolerance_{0.0};

friend class DbGraphReader;
friend class DbGraphWriter;
friend class FindVertexDelays;
friend class MultiDrvrNet;
};
Expand Down
4 changes: 4 additions & 0 deletions include/sta/Sdc.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,10 @@ protected:

private:
friend class WriteSdc;
// The stadb codec reads and writes the same private constraint maps as
// WriteSdc, for the same reason: several of them have no public iterator.
friend class DbSdcWriter;
friend class DbSdcReader;
friend class FindNetCaps;
friend class GroupPathIterator;
};
Expand Down
3 changes: 3 additions & 0 deletions include/sta/Search.hh
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,9 @@ protected:
std::vector<Path*> enum_paths_;

VisitPathEnds *visit_path_ends_;

friend class DbSearchReader;
friend class DbSearchWriter;
GatedClk *gated_clk_;
CheckCrpr *check_crpr_;
};
Expand Down
6 changes: 2 additions & 4 deletions include/sta/Sta.hh
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,6 @@ public:
Scene *scene,
const MinMaxAll *min_max,
bool infer_latches);
// Compiled NLDM-only form of readLiberty
virtual LibertyLibrary *readLibDb(std::string_view filename);
void writeLibDb(LibertyLibrary *library,
std::string_view filename);
// tmp public
void readLibertyAfter(LibertyLibrary *liberty,
Scene *scene,
Expand Down Expand Up @@ -1556,6 +1552,8 @@ public:

Properties &properties() { return properties_; }

friend class DbGraphReader;

protected:
// Default constructors that are called by makeComponents in the Sta
// constructor. These can be redefined by a derived class to
Expand Down
207 changes: 0 additions & 207 deletions liberty/LibDb.hh

This file was deleted.

Loading
Loading