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

Added symmetric support in NetRoutingProperty. 

* New: In Hurricane::NetRoutingProperty, added various flags for
    symmetric support, axis and slave net (if any).
      Json support is not complete yet: have to remember how to
    get the slave net when present.
This commit is contained in:
Jean-Paul Chaput 2017-02-22 23:09:12 +01:00
parent 0925afa188
commit fe14547b62
2 changed files with 106 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hurricane/src/hurricane/NetRoutingProperty.cpp
View File

@ -37,6 +37,10 @@ namespace Hurricane {
s += (isUnconnected ()) ? 'u' : '-'; s += (isUnconnected ()) ? 'u' : '-';
s += (isManualGlobalRoute ()) ? 'm' : '-'; s += (isManualGlobalRoute ()) ? 'm' : '-';
s += (isAutomaticGlobalRoute()) ? 'a' : '-'; s += (isAutomaticGlobalRoute()) ? 'a' : '-';
s += (isSymmetric ()) ? 'S' : '-';
s += (isSymHorizontal ()) ? 'h' : '-';
s += (isSymVertical ()) ? 'v' : '-';
s += (isSymMaster ()) ? 'M' : '-';
return s; return s;
} }
@ -116,6 +120,7 @@ namespace Hurricane {
w->startObject(); w->startObject();
jsonWrite( w, "@typename", _getTypeName() ); jsonWrite( w, "@typename", _getTypeName() );
jsonWrite( w, "_state" , _state._getString() ); jsonWrite( w, "_state" , _state._getString() );
jsonWrite( w, "_axis" , _state.getSymAxis() );
w->endObject(); w->endObject();
} }
@ -157,6 +162,10 @@ namespace Hurricane {
flags |= (sflags[2] == 'u') ? NetRoutingState::Unconnected : 0; flags |= (sflags[2] == 'u') ? NetRoutingState::Unconnected : 0;
flags |= (sflags[3] == 'm') ? NetRoutingState::ManualGlobalRoute : 0; flags |= (sflags[3] == 'm') ? NetRoutingState::ManualGlobalRoute : 0;
flags |= (sflags[4] == 'a') ? NetRoutingState::AutomaticGlobalRoute : 0; flags |= (sflags[4] == 'a') ? NetRoutingState::AutomaticGlobalRoute : 0;
flags |= (sflags[5] == 'S') ? NetRoutingState::Symmetric : 0;
flags |= (sflags[6] == 'h') ? NetRoutingState::Horizontal : 0;
flags |= (sflags[7] == 'v') ? NetRoutingState::Vertical : 0;
flags |= (sflags[8] == 'M') ? NetRoutingState::SymmetricMaster : 0;
NetRoutingProperty* property = NULL; NetRoutingProperty* property = NULL;
DBo* dbo = stack.back_dbo(); DBo* dbo = stack.back_dbo();
@ -170,10 +179,12 @@ namespace Hurricane {
) << endl; ) << endl;
NetRoutingState* state = property->getState(); NetRoutingState* state = property->getState();
state->unsetFlags( (unsigned int)-1 ); state->unsetFlags( (unsigned int)-1 );
state->setFlags( flags ); state->setFlags ( flags );
state->setSymAxis( DbU::fromDb( get<int64_t>(stack,"_axis") ) );
} else { } else {
property = NetRoutingProperty::create( net ); property = NetRoutingProperty::create( net );
property->getState()->setFlags( flags ); property->getState()->setFlags ( flags );
property->getState()->setSymAxis( DbU::fromDb( get<int64_t>(stack,"_axis") ) );
net->put( property ); net->put( property );
} }
} else { } else {

100
hurricane/src/hurricane/hurricane/NetRoutingProperty.h
View File

@ -38,12 +38,16 @@ namespace Hurricane {
friend class NetRoutingExtension; friend class NetRoutingExtension;
public: public:
enum State { Excluded = 0x0001 enum State { Excluded = (1<< 0)
, Fixed = 0x0002 , Fixed = (1<< 1)
, Unconnected = 0x0004 , Unconnected = (1<< 2)
, ManualGlobalRoute = 0x0008 , ManualGlobalRoute = (1<< 3)
, AutomaticGlobalRoute = 0x0010 , AutomaticGlobalRoute = (1<< 4)
, MixedPreRoute = Fixed|ManualGlobalRoute , MixedPreRoute = Fixed|ManualGlobalRoute
, Horizontal = (1<< 4)
, Vertical = (1<< 5)
, Symmetric = (1<< 6)
, SymmetricMaster = (1<< 7)
}; };
public: public:
inline bool isExcluded () const; inline bool isExcluded () const;
@ -52,10 +56,18 @@ namespace Hurricane {
inline bool isManualGlobalRoute () const; inline bool isManualGlobalRoute () const;
inline bool isAutomaticGlobalRoute () const; inline bool isAutomaticGlobalRoute () const;
inline bool isMixedPreRoute () const; inline bool isMixedPreRoute () const;
inline bool isSymmetric () const;
inline bool isSymHorizontal () const;
inline bool isSymVertical () const;
inline bool isSymMaster () const;
inline Net* getNet () const;
inline Net* getSymNet () const;
inline DbU::Unit getSymAxis () const;
inline unsigned int getFlags () const; inline unsigned int getFlags () const;
inline void setSymNet ( Net* );
inline void setSymAxis ( DbU::Unit );
inline void setFlags ( unsigned int mask ); inline void setFlags ( unsigned int mask );
inline void unsetFlags ( unsigned int mask ); inline void unsetFlags ( unsigned int mask );
inline Net* getNet () const;
std::string _getString () const; std::string _getString () const;
Record* _getRecord () const; Record* _getRecord () const;
private: private:
@ -64,11 +76,13 @@ namespace Hurricane {
inline void setNet ( Net* ); inline void setNet ( Net* );
private: private:
Net* _net; Net* _net;
Net* _symNet;
unsigned int _flags; unsigned int _flags;
DbU::Unit _axis;
}; };
inline NetRoutingState::NetRoutingState ( Net* net, unsigned int flags ) : _net(net), _flags(flags) { } inline NetRoutingState::NetRoutingState ( Net* net, unsigned int flags ) : _net(net), _symNet(NULL), _flags(flags), _axis(0) { }
inline bool NetRoutingState::isExcluded () const { return _flags & Excluded; }; inline bool NetRoutingState::isExcluded () const { return _flags & Excluded; };
inline bool NetRoutingState::isFixed () const { return _flags & Fixed; }; inline bool NetRoutingState::isFixed () const { return _flags & Fixed; };
@ -76,11 +90,19 @@ namespace Hurricane {
inline bool NetRoutingState::isManualGlobalRoute () const { return _flags & ManualGlobalRoute; }; inline bool NetRoutingState::isManualGlobalRoute () const { return _flags & ManualGlobalRoute; };
inline bool NetRoutingState::isAutomaticGlobalRoute () const { return _flags & AutomaticGlobalRoute; }; inline bool NetRoutingState::isAutomaticGlobalRoute () const { return _flags & AutomaticGlobalRoute; };
inline bool NetRoutingState::isMixedPreRoute () const { return _flags & MixedPreRoute; }; inline bool NetRoutingState::isMixedPreRoute () const { return _flags & MixedPreRoute; };
inline bool NetRoutingState::isSymmetric () const { return _flags & Symmetric; }
inline bool NetRoutingState::isSymHorizontal () const { return _flags & Horizontal; }
inline bool NetRoutingState::isSymVertical () const { return _flags & Vertical; }
inline bool NetRoutingState::isSymMaster () const { return _flags & SymmetricMaster; }
inline Net* NetRoutingState::getSymNet () const { return _symNet; }
inline DbU::Unit NetRoutingState::getSymAxis () const { return _axis; }
inline unsigned int NetRoutingState::getFlags () const { return _flags; }; inline unsigned int NetRoutingState::getFlags () const { return _flags; };
inline Net* NetRoutingState::getNet () const { return _net; } inline Net* NetRoutingState::getNet () const { return _net; }
inline void NetRoutingState::setFlags ( unsigned int mask ) { _flags |= mask; } inline void NetRoutingState::setFlags ( unsigned int mask ) { _flags |= mask; }
inline void NetRoutingState::unsetFlags ( unsigned int mask ) { _flags &= ~mask; } inline void NetRoutingState::unsetFlags ( unsigned int mask ) { _flags &= ~mask; }
inline void NetRoutingState::setNet ( Net* net ) { _net = net; } inline void NetRoutingState::setNet ( Net* net ) { _net = net; }
inline void NetRoutingState::setSymNet ( Net* symNet ) { _symNet = symNet; }
inline void NetRoutingState::setSymAxis ( DbU::Unit axis ) { _axis = axis; }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -138,7 +160,15 @@ namespace Hurricane {
static inline bool isManualGlobalRoute ( const Net* ); static inline bool isManualGlobalRoute ( const Net* );
static inline bool isAutomaticGlobalRoute ( const Net* ); static inline bool isAutomaticGlobalRoute ( const Net* );
static inline bool isMixedPreRoute ( const Net* ); static inline bool isMixedPreRoute ( const Net* );
static inline bool isSymmetric ( const Net* );
static inline bool isSymHorizontal ( const Net* );
static inline bool isSymVertical ( const Net* );
static inline bool isSymMaster ( const Net* );
static inline unsigned int getFlags ( const Net* ); static inline unsigned int getFlags ( const Net* );
static inline Net* getSymNet ( const Net* );
static inline DbU::Unit getSymAxis ( const Net* );
static inline void setSymNet ( const Net*, Net* );
static inline void setSymAxis ( const Net*, DbU::Unit );
static inline void setFlags ( const Net*, unsigned int mask ); static inline void setFlags ( const Net*, unsigned int mask );
static inline void unsetFlags ( const Net*, unsigned int mask ); static inline void unsetFlags ( const Net*, unsigned int mask );
static NetRoutingState* get ( const Net* ); static NetRoutingState* get ( const Net* );
@ -184,6 +214,34 @@ namespace Hurricane {
} }
inline bool NetRoutingExtension::isSymmetric ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? false : state->isSymmetric();
}
inline bool NetRoutingExtension::isSymHorizontal ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? false : state->isSymHorizontal();
}
inline bool NetRoutingExtension::isSymVertical ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? false : state->isSymVertical();
}
inline bool NetRoutingExtension::isSymMaster ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? false : state->isSymMaster();
}
inline unsigned int NetRoutingExtension::getFlags ( const Net* net ) inline unsigned int NetRoutingExtension::getFlags ( const Net* net )
{ {
NetRoutingState* state = get( net ); NetRoutingState* state = get( net );
@ -191,6 +249,20 @@ namespace Hurricane {
} }
inline Net* NetRoutingExtension::getSymNet ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? NULL : state->getSymNet();
}
inline DbU::Unit NetRoutingExtension::getSymAxis ( const Net* net )
{
NetRoutingState* state = get( net );
return (state == NULL) ? 0 : state->getSymAxis();
}
inline void NetRoutingExtension::setFlags ( const Net* net, unsigned int mask ) inline void NetRoutingExtension::setFlags ( const Net* net, unsigned int mask )
{ {
NetRoutingState* state = get( net ); NetRoutingState* state = get( net );
@ -198,6 +270,20 @@ namespace Hurricane {
} }
inline void NetRoutingExtension::setSymNet ( const Net* net, Net* symNet )
{
NetRoutingState* state = get( net );
if (state != NULL) state->setSymNet( symNet );
}
inline void NetRoutingExtension::setSymAxis ( const Net* net, DbU::Unit axis )
{
NetRoutingState* state = get( net );
if (state != NULL) state->setSymAxis( axis );
}
inline void NetRoutingExtension::unsetFlags ( const Net* net, unsigned int mask ) inline void NetRoutingExtension::unsetFlags ( const Net* net, unsigned int mask )
{ {
NetRoutingState* state = get( net ); NetRoutingState* state = get( net );