luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network bus brkts use library values

This commit is contained in:
James Cherry 2019-06-28 11:51:43 -07:00
parent d108a15c56
commit 88331ab9b1
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network/ConcreteLibrary.cc
View File

@ -355,9 +355,11 @@ BusPort::setTo(int to)
typedef Map<const char*, BusPort*, CharPtrLess> BusPortMap;
void
ConcreteCell::groupBusPorts(const char *bus_brkts_left,
const char *bus_brkts_right)
ConcreteCell::groupBusPorts(const char bus_brkt_left,
const char bus_brkt_right)
{
const char bus_brkts_left[2]{bus_brkt_left, '\0'};
const char bus_brkts_right[2]{bus_brkt_right, '\0'};
BusPortMap port_map;
// Find ungrouped bus ports.
// Remove bus bit ports from the ports_ vector during the scan by
@ -370,7 +372,8 @@ ConcreteCell::groupBusPorts(const char *bus_brkts_left,
const char *port_name = port->name();
char *bus_name;
int index;
parseBusName(port_name, bus_brkts_left, bus_brkts_right, bus_name, index);
parseBusName(port_name, bus_brkts_left, bus_brkts_right,
bus_name, index);
if (bus_name) {
if (!port->isBusBit()) {
BusPort *bus_port = port_map.findKey(bus_name);

4
network/ConcreteLibrary.hh
View File

@ -112,8 +112,8 @@ public:
ConcretePort *makeBundlePort(const char *name,
ConcretePortSeq *members);
// Group previously defined bus bit ports together.
void groupBusPorts(const char *bus_brkts_left,
const char *bus_brkts_right);
void groupBusPorts(const char bus_brkt_left,
const char bus_brkt_right);
size_t portCount() const;
void setName(const char *name);
virtual void addPort(ConcretePort *port);

4
network/ConcreteNetwork.cc
View File

@ -626,8 +626,10 @@ ConcreteNetwork::makeBusPort(Cell *cell,
void
ConcreteNetwork::groupBusPorts(Cell *cell)
{
Library *lib = library(cell);
ConcreteLibrary *clib = reinterpret_cast<ConcreteLibrary*>(lib);
ConcreteCell *ccell = reinterpret_cast<ConcreteCell*>(cell);
ccell->groupBusPorts(bus_brkts_left_, bus_brkts_right_);
ccell->groupBusPorts(clib->busBrktLeft(), clib->busBrktRight());
}
Port *

12
network/Network.cc
View File

@ -27,9 +27,7 @@ namespace sta {
Network::Network() :
default_liberty_(nullptr),
divider_('/'),
escape_('\\'),
bus_brkts_left_("["),
bus_brkts_right_("]")
escape_('\\')
{
}
@ -1050,14 +1048,6 @@ Network::setPathEscape(char escape)
escape_ = escape;
}
void
Network::setBusBrkts(char bus_brkt_left,
char bus_brkt_right)
{
bus_brkts_left_ = new char[2]{bus_brkt_left, '\0'};
bus_brkts_right_ = new char[2]{bus_brkt_right, '\0'};
}
////////////////////////////////////////////////////////////////
typedef Vector<InstanceChildIterator *> InstanceChildIteratorSeq;

7
network/Network.hh
View File

@ -425,11 +425,6 @@ public:
// Escape prefix for path dividers in path names.
virtual char pathEscape() const { return escape_; }
virtual void setPathEscape(char escape);
// Multiple brakets are supported but generally there is only one.
virtual void setBusBrkts(char bus_brkt_left,
char bus_brkt_right);
virtual const char *busBrktsRight() const { return bus_brkts_right_; }
virtual const char *busBrktsLeft() const { return bus_brkts_left_; }
protected:
Pin *findPinLinear(const Instance *instance,
@ -474,8 +469,6 @@ protected:
LibertyLibrary *default_liberty_;
char divider_;
char escape_;
const char *bus_brkts_left_;
const char *bus_brkts_right_;
NetDrvrPinsMap net_drvr_pin_map_;
private: