riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Suppress all static attributes & methods from Anabatic::NetBuilder.

This commit is contained in:
Jean-Paul Chaput 2017-12-17 12:51:04 +01:00
parent 4c57b0651a
commit e17a50ca0b
2 changed files with 54 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
anabatic/src/NetBuilder.cpp
View File

@ -92,18 +92,6 @@ namespace Anabatic {
// -------------------------------------------------------------------
// Class : "NetBuilder".
map<Component*,AutoSegment*> NetBuilder::_routingPadAutoSegments;
vector<AutoSegment*> NetBuilder::_toFixSegments;
unsigned int NetBuilder::_degree = 0;
map<Component*,AutoSegment*>& NetBuilder::getRpLookup ()
{ return _routingPadAutoSegments; }
void NetBuilder::clearRpLookup ()
{ _routingPadAutoSegments.clear(); }
void NetBuilder::getPositions ( Component* anchor, Point& source, Point& target )
{
@ -187,21 +175,6 @@ namespace Anabatic {
}
void NetBuilder::fixSegments ()
{
for ( size_t i=0 ; i<_toFixSegments.size() ; ++i )
_toFixSegments[i]->setFlags( AutoSegment::SegFixed );
_toFixSegments.clear();
}
void NetBuilder::init ( unsigned int degree )
{
_degree = degree;
_toFixSegments.clear();
}
NetBuilder::NetBuilder ()
: _forks ()
, _connexity ()
@ -216,6 +189,9 @@ namespace Anabatic {
, _norths ()
, _souths ()
, _routingPads ()
, _routingPadAutoSegments()
, _toFixSegments ()
, _degree (0)
{ }
@ -233,6 +209,16 @@ namespace Anabatic {
_norths .clear();
_souths .clear();
_routingPads .clear();
_toFixSegments .clear();
_routingPadAutoSegments.clear();
}
void NetBuilder::fixSegments ()
{
for ( size_t i=0 ; i<_toFixSegments.size() ; ++i )
_toFixSegments[i]->setFlags( AutoSegment::SegFixed );
_toFixSegments.clear();
}
@ -2653,9 +2639,6 @@ namespace Anabatic {
Hook* sourceHook = NULL;
AutoContact* sourceContact = NULL;
clearRpLookup();
RoutingPads routingPads = net->getRoutingPads();
size_t degree = routingPads.getSize();
@ -2676,7 +2659,7 @@ namespace Anabatic {
size_t unconnecteds = 0;
size_t connecteds = 0;
init( degree );
setDegree( degree );
cdebug_log(145,0) << "Start RoutingPad Ring" << endl;
for ( RoutingPad* startRp : routingPads ) {
@ -2745,7 +2728,6 @@ namespace Anabatic {
cdebug_log(145,0) << "Popping (to) " << sourceContact << endl;
}
clearRpLookup();
Session::revalidate();
//Breakpoint::stop( 0, "After construct" );

15
anabatic/src/anabatic/NetBuilder.h
View File

@ -122,8 +122,6 @@ namespace Anabatic {
public:
template< typename BuilderT >
static void load ( AnabaticEngine*, Net* );
static void init ( unsigned int degree );
static void fixSegments ();
static void getPositions ( Component* anchor, Point& source, Point& target );
static uint64_t checkRoutingPadSize ( Component* anchor );
static Hook* getSegmentOppositeHook ( Hook* hook );
@ -132,6 +130,8 @@ namespace Anabatic {
NetBuilder ();
virtual ~NetBuilder ();
void clear ();
inline void setDegree ( unsigned int degree );
void fixSegments ();
NetBuilder& startFrom ( AnabaticEngine*
, Hook* fromHook
, AutoContact* sourceContact=NULL );
@ -142,14 +142,13 @@ namespace Anabatic {
inline GCell* getGCell () const;
inline ForkStack& getForks ();
inline vector<RoutingPad*>& getRoutingPads ();
static map<Component*,AutoSegment*>& getRpLookup ();
inline map<Component*,AutoSegment*>& getRpLookup ();
inline unsigned int getTopology () const;
inline Hook* north ( size_t i=0 ) const;
inline Hook* south ( size_t i=0 ) const;
inline Hook* east ( size_t i=0 ) const;
inline Hook* west ( size_t i=0 ) const;
inline void setBothCornerContacts ( AutoContact* );
static void clearRpLookup ();
bool push ( Hook* to, AutoContact* contact, uint64_t flags=0 );
virtual void doRp_AutoContacts ( GCell*, Component*, AutoContact*& source, AutoContact*& target, uint64_t flags ) = 0;
virtual AutoContact* doRp_Access ( GCell*, Component*, uint64_t flags ) = 0;
@ -270,9 +269,6 @@ namespace Anabatic {
// Attributes.
private:
static map<Component*,AutoSegment*> _routingPadAutoSegments;
static vector<AutoSegment*> _toFixSegments;
static unsigned int _degree;
ForkStack _forks;
UConnexity _connexity;
unsigned int _topology;
@ -287,6 +283,9 @@ namespace Anabatic {
vector<Hook*> _norths;
vector<Hook*> _souths;
vector<RoutingPad*> _routingPads;
map<Component*,AutoSegment*> _routingPadAutoSegments;
vector<AutoSegment*> _toFixSegments;
unsigned int _degree;
// Sort classes.
public:
@ -331,10 +330,12 @@ namespace Anabatic {
inline Net* NetBuilder::getNet () const { return _net; }
inline unsigned int NetBuilder::getTopology () const { return _topology; }
inline vector<RoutingPad*>& NetBuilder::getRoutingPads () { return _routingPads; }
inline map<Component*,AutoSegment*>& NetBuilder::getRpLookup () { return _routingPadAutoSegments; }
inline Hook* NetBuilder::north ( size_t i ) const { return (i<_norths.size()) ? _norths[i] : NULL; }
inline Hook* NetBuilder::south ( size_t i ) const { return (i<_souths.size()) ? _souths[i] : NULL; }
inline Hook* NetBuilder::east ( size_t i ) const { return (i<_easts .size()) ? _easts [i] : NULL; }
inline Hook* NetBuilder::west ( size_t i ) const { return (i<_wests .size()) ? _wests [i] : NULL; }
inline void NetBuilder::setDegree ( unsigned int degree ) { _degree = degree; }
inline void NetBuilder::setBothCornerContacts ( AutoContact* ac ) { _southWestContact = _northEastContact = ac; }
template< typename BuilderT >