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

moving to string instead of std::string 

Signed-off-by: Ethan Mahintorabi <ethanmoon@google.com>
This commit is contained in:
Ethan Mahintorabi 2024-03-13 00:00:47 +00:00
parent d9244a7289
commit 8b3e49188c
No known key found for this signature in database
GPG Key ID: 824E41B920BEA252
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sta/ConcreteLibrary.hh
View File

@ -38,7 +38,7 @@ class LibertyCell;
class LibertyPort; class LibertyPort;
typedef Map<const char*, ConcreteCell*, CharPtrLess> ConcreteCellMap; typedef Map<const char*, ConcreteCell*, CharPtrLess> ConcreteCellMap;
typedef Map<std::string, std::string> AttributeMap; typedef Map<string, string> AttributeMap;
typedef Vector<ConcretePort*> ConcretePortSeq; typedef Vector<ConcretePort*> ConcretePortSeq;
typedef Map<const char*, ConcretePort*, CharPtrLess> ConcretePortMap; typedef Map<const char*, ConcretePort*, CharPtrLess> ConcretePortMap;
typedef ConcreteCellMap::ConstIterator ConcreteLibraryCellIterator; typedef ConcreteCellMap::ConstIterator ConcreteLibraryCellIterator;
@ -106,9 +106,9 @@ public:
ConcreteCellPortBitIterator *portBitIterator() const; ConcreteCellPortBitIterator *portBitIterator() const;
bool isLeaf() const { return is_leaf_; } bool isLeaf() const { return is_leaf_; }
void setIsLeaf(bool is_leaf); void setIsLeaf(bool is_leaf);
void setAttribute(const std::string &key, void setAttribute(const string &key,
const std::string &value); const string &value);
std::string getAttribute(const std::string &key) const; string getAttribute(const string &key) const;
// Cell acts as port factory. // Cell acts as port factory.
ConcretePort *makePort(const char *name); ConcretePort *makePort(const char *name);

24
include/sta/ConcreteNetwork.hh
View File

@ -38,7 +38,7 @@ class ConcreteBindingTbl;
class ConcreteLibertyLibraryIterator; class ConcreteLibertyLibraryIterator;
typedef Vector<ConcreteLibrary*> ConcreteLibrarySeq; typedef Vector<ConcreteLibrary*> ConcreteLibrarySeq;
typedef Map<std::string, std::string> AttributeMap; typedef Map<string, string> AttributeMap;
typedef Map<const char*, ConcreteLibrary*, CharPtrLess> ConcreteLibraryMap; typedef Map<const char*, ConcreteLibrary*, CharPtrLess> ConcreteLibraryMap;
typedef ConcreteLibrarySeq::ConstIterator ConcreteLibraryIterator; typedef ConcreteLibrarySeq::ConstIterator ConcreteLibraryIterator;
typedef Map<const char *, ConcreteInstance*, typedef Map<const char *, ConcreteInstance*,
@ -75,8 +75,8 @@ public:
const PatternMatch *pattern) const override; const PatternMatch *pattern) const override;
const char *name(const Cell *cell) const override; const char *name(const Cell *cell) const override;
std::string getAttribute(const Cell *cell, string getAttribute(const Cell *cell,
const std::string &key) const override; const string &key) const override;
ObjectId id(const Cell *cell) const override; ObjectId id(const Cell *cell) const override;
Library *library(const Cell *cell) const override; Library *library(const Cell *cell) const override;
LibertyCell *libertyCell(Cell *cell) const override; LibertyCell *libertyCell(Cell *cell) const override;
@ -111,8 +111,8 @@ public:
PortMemberIterator *memberIterator(const Port *port) const override; PortMemberIterator *memberIterator(const Port *port) const override;
const char *name(const Instance *instance) const override; const char *name(const Instance *instance) const override;
std::string getAttribute(const Instance *inst, string getAttribute(const Instance *inst,
const std::string &key) const override; const string &key) const override;
ObjectId id(const Instance *instance) const override; ObjectId id(const Instance *instance) const override;
Cell *cell(const Instance *instance) const override; Cell *cell(const Instance *instance) const override;
Instance *parent(const Instance *instance) const override; Instance *parent(const Instance *instance) const override;
@ -181,8 +181,8 @@ public:
void setIsLeaf(Cell *cell, void setIsLeaf(Cell *cell,
bool is_leaf) override; bool is_leaf) override;
void setAttribute(Cell *cell, void setAttribute(Cell *cell,
const std::string &key, const string &key,
const std::string &value) override; const string &value) override;
Port *makePort(Cell *cell, Port *makePort(Cell *cell,
const char *name) override; const char *name) override;
Port *makeBusPort(Cell *cell, Port *makeBusPort(Cell *cell,
@ -215,8 +215,8 @@ public:
LibertyPort *port, LibertyPort *port,
Net *net) override; Net *net) override;
void setAttribute(Instance *inst, void setAttribute(Instance *inst,
const std::string &key, const string &key,
const std::string &value) override; const string &value) override;
void disconnectPin(Pin *pin) override; void disconnectPin(Pin *pin) override;
void deletePin(Pin *pin) override; void deletePin(Pin *pin) override;
Net *makeNet(const char *name, Net *makeNet(const char *name,
@ -296,9 +296,9 @@ public:
InstanceNetIterator *netIterator() const; InstanceNetIterator *netIterator() const;
Instance *findChild(const char *name) const; Instance *findChild(const char *name) const;
InstanceChildIterator *childIterator() const; InstanceChildIterator *childIterator() const;
void setAttribute(const std::string &key, void setAttribute(const string &key,
const std::string &value); const string &value);
std::string getAttribute(const std::string &key) const; string getAttribute(const string &key) const;
void addChild(ConcreteInstance *child); void addChild(ConcreteInstance *child);
void deleteChild(ConcreteInstance *child); void deleteChild(ConcreteInstance *child);
void addPin(ConcretePin *pin); void addPin(ConcretePin *pin);

16
include/sta/Network.hh
View File

@ -145,8 +145,8 @@ public:
// Filename may return null. // Filename may return null.
virtual const char *filename(const Cell *cell) = 0; virtual const char *filename(const Cell *cell) = 0;
// Attributes can be null // Attributes can be null
virtual std::string getAttribute(const Cell *cell, virtual string getAttribute(const Cell *cell,
const std::string &key) const = 0; const string &key) const = 0;
// Name can be a simple, bundle, bus, or bus bit name. // Name can be a simple, bundle, bus, or bus bit name.
virtual Port *findPort(const Cell *cell, virtual Port *findPort(const Cell *cell,
const char *name) const = 0; const char *name) const = 0;
@ -209,8 +209,8 @@ public:
const PatternMatch *pattern) const; const PatternMatch *pattern) const;
virtual InstanceSeq findInstancesHierMatching(const Instance *instance, virtual InstanceSeq findInstancesHierMatching(const Instance *instance,
const PatternMatch *pattern) const; const PatternMatch *pattern) const;
virtual std::string getAttribute(const Instance *inst, virtual string getAttribute(const Instance *inst,
const std::string &key) const = 0; const string &key) const = 0;
// Hierarchical path name. // Hierarchical path name.
virtual const char *pathName(const Instance *instance) const; virtual const char *pathName(const Instance *instance) const;
bool pathNameLess(const Instance *inst1, bool pathNameLess(const Instance *inst1,
@ -550,11 +550,11 @@ public:
virtual void setIsLeaf(Cell *cell, virtual void setIsLeaf(Cell *cell,
bool is_leaf) = 0; bool is_leaf) = 0;
virtual void setAttribute(Cell *cell, virtual void setAttribute(Cell *cell,
const std::string &key, const string &key,
const std::string &value) = 0; const string &value) = 0;
virtual void setAttribute(Instance *instance, virtual void setAttribute(Instance *instance,
const std::string &key, const string &key,
const std::string &value) = 0; const string &value) = 0;
virtual Port *makePort(Cell *cell, virtual Port *makePort(Cell *cell,
const char *name) = 0; const char *name) = 0;
virtual Port *makeBusPort(Cell *cell, virtual Port *makeBusPort(Cell *cell,

8
include/sta/SdcNetwork.hh
View File

@ -45,8 +45,8 @@ public:
const PatternMatch *pattern) const override; const PatternMatch *pattern) const override;
const char *name(const Cell *cell) const override; const char *name(const Cell *cell) const override;
std::string getAttribute(const Cell *cell, string getAttribute(const Cell *cell,
const std::string &key) const override; const string &key) const override;
ObjectId id(const Cell *cell) const override; ObjectId id(const Cell *cell) const override;
Library *library(const Cell *cell) const override; Library *library(const Cell *cell) const override;
LibertyCell *libertyCell(Cell *cell) const override; LibertyCell *libertyCell(Cell *cell) const override;
@ -82,8 +82,8 @@ public:
bool hasMembers(const Port *port) const override; bool hasMembers(const Port *port) const override;
ObjectId id(const Instance *instance) const override; ObjectId id(const Instance *instance) const override;
std::string getAttribute(const Instance *inst, string getAttribute(const Instance *inst,
const std::string &key) const override; const string &key) const override;
Instance *topInstance() const override; Instance *topInstance() const override;
Cell *cell(const Instance *instance) const override; Cell *cell(const Instance *instance) const override;
Instance *parent(const Instance *instance) const override; Instance *parent(const Instance *instance) const override;

8
network/ConcreteLibrary.cc
View File

@ -269,14 +269,14 @@ ConcreteCell::setIsLeaf(bool is_leaf)
} }
void void
ConcreteCell::setAttribute(const std::string &key, ConcreteCell::setAttribute(const string &key,
const std::string &value) const string &value)
{ {
attribute_map_.insert(key, value); attribute_map_.insert(key, value);
} }
std::string string
ConcreteCell::getAttribute(const std::string &key) const ConcreteCell::getAttribute(const string &key) const
{ {
if (attribute_map_.hasKey(key)) { if (attribute_map_.hasKey(key)) {
return attribute_map_.findKey(key); return attribute_map_.findKey(key);

24
network/ConcreteNetwork.cc
View File

@ -559,8 +559,8 @@ ConcreteNetwork::setIsLeaf(Cell *cell,
void void
ConcreteNetwork::setAttribute(Cell *cell, ConcreteNetwork::setAttribute(Cell *cell,
const std::string &key, const string &key,
const std::string &value) const string &value)
{ {
ConcreteCell *ccell = reinterpret_cast<ConcreteCell*>(cell); ConcreteCell *ccell = reinterpret_cast<ConcreteCell*>(cell);
ccell->setAttribute(key, value); ccell->setAttribute(key, value);
@ -606,9 +606,9 @@ ConcreteNetwork::filename(const Cell *cell)
return ccell->filename(); return ccell->filename();
} }
std::string string
ConcreteNetwork::getAttribute(const Cell *cell, ConcreteNetwork::getAttribute(const Cell *cell,
const std::string &key) const const string &key) const
{ {
const ConcreteCell *ccell = reinterpret_cast<const ConcreteCell*>(cell); const ConcreteCell *ccell = reinterpret_cast<const ConcreteCell*>(cell);
return ccell->getAttribute(key); return ccell->getAttribute(key);
@ -938,9 +938,9 @@ ConcreteNetwork::id(const Instance *instance) const
return inst->id(); return inst->id();
} }
std::string string
ConcreteNetwork::getAttribute(const Instance *inst, ConcreteNetwork::getAttribute(const Instance *inst,
const std::string &key) const const string &key) const
{ {
const ConcreteInstance *cinst = reinterpret_cast<const ConcreteInstance*>(inst); const ConcreteInstance *cinst = reinterpret_cast<const ConcreteInstance*>(inst);
return cinst->getAttribute(key); return cinst->getAttribute(key);
@ -1352,8 +1352,8 @@ ConcreteNetwork::connect(Instance *inst,
void void
ConcreteNetwork::setAttribute(Instance *inst, ConcreteNetwork::setAttribute(Instance *inst,
const std::string &key, const string &key,
const std::string &value) const string &value)
{ {
ConcreteInstance *cinst = reinterpret_cast<ConcreteInstance*>(inst); ConcreteInstance *cinst = reinterpret_cast<ConcreteInstance*>(inst);
cinst->setAttribute(key, value); cinst->setAttribute(key, value);
@ -1683,14 +1683,14 @@ ConcreteInstance::childIterator() const
} }
void void
ConcreteInstance::setAttribute(const std::string &key, ConcreteInstance::setAttribute(const string &key,
const std::string &value) const string &value)
{ {
attribute_map_.insert(key, value); attribute_map_.insert(key, value);
} }
std::string string
ConcreteInstance::getAttribute(const std::string &key) const ConcreteInstance::getAttribute(const string &key) const
{ {
if (attribute_map_.hasKey(key)) { if (attribute_map_.hasKey(key)) {
return attribute_map_.findKey(key); return attribute_map_.findKey(key);

8
network/SdcNetwork.cc
View File

@ -122,9 +122,9 @@ NetworkNameAdapter::id(const Cell *cell) const
return network_->id(cell); return network_->id(cell);
} }
std::string string
NetworkNameAdapter::getAttribute(const Cell *cell, NetworkNameAdapter::getAttribute(const Cell *cell,
const std::string &key) const const string &key) const
{ {
return network_->getAttribute(cell, key); return network_->getAttribute(cell, key);
} }
@ -334,9 +334,9 @@ NetworkNameAdapter::cell(const Instance *instance) const
return network_->cell(instance); return network_->cell(instance);
} }
std::string string
NetworkNameAdapter::getAttribute(const Instance *inst, NetworkNameAdapter::getAttribute(const Instance *inst,
const std::string &key) const const string &key) const
{ {
return network_->getAttribute(inst, key); return network_->getAttribute(inst, key);
} }