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

Merge branch 'devel_anabatic' of ssh://bop.soc.lip6.fr/users/largo2/git/coriolis into devel_anabatic

This commit is contained in:
EricLaoGitHub 2017-05-11 11:37:44 +02:00
parent 86df627d01 bf7e2fdd2d
commit ef0971075d
46 changed files with 841 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
anabatic/src/AutoSegment.cpp
View File

@ -822,7 +822,7 @@ namespace Anabatic {
DbU::Unit optimalMax = min( max(getOptimalMax(),constraintMin), constraintMax ); DbU::Unit optimalMax = min( max(getOptimalMax(),constraintMin), constraintMax );
cdebug_log(149,0) << "optimal:[" << DbU::getValueString(optimalMin) cdebug_log(149,0) << "optimal:[" << DbU::getValueString(optimalMin)
<< " " << DbU::getValueString(optimalMin) << "]" << endl; << " " << DbU::getValueString(optimalMax) << "]" << endl;
if (getAxis() < optimalMin) { if (getAxis() < optimalMin) {
setAxis( optimalMin, flags ); setAxis( optimalMin, flags );
@ -973,19 +973,8 @@ namespace Anabatic {
if (perpandMin < minGCell) attractors.addAttractor( minGCell ); if (perpandMin < minGCell) attractors.addAttractor( minGCell );
if (perpandMax > maxGCell) attractors.addAttractor( maxGCell ); if (perpandMax > maxGCell) attractors.addAttractor( maxGCell );
} else if (autoSegment->isLongLocal()) {
cdebug_log(145,0) << "| Used as long global attractor." << endl;
DbU::Unit perpandMin = autoSegment->getSourceU();
DbU::Unit perpandMax = autoSegment->getTargetU();
if (perpandMin != perpandMax) {
if (perpandMin == getAxis()) attractors.addAttractor( perpandMax );
if (perpandMax == getAxis()) attractors.addAttractor( perpandMin );
}
} else if (autoSegment->isLocal()) { } else if (autoSegment->isLocal()) {
if (not autoSegment->isStrongTerminal()) { cdebug_tabw(145,-1); continue; } if (autoSegment->isStrongTerminal()) {
DbU::Unit terminalMin; DbU::Unit terminalMin;
DbU::Unit terminalMax; DbU::Unit terminalMax;
@ -998,6 +987,17 @@ namespace Anabatic {
if (terminalMin != terminalMax) if (terminalMin != terminalMax)
attractors.addAttractor( terminalMax ); attractors.addAttractor( terminalMax );
} }
} else if (autoSegment->isLongLocal()) {
cdebug_log(145,0) << "| Used as long global attractor." << endl;
DbU::Unit perpandMin = autoSegment->getSourceU();
DbU::Unit perpandMax = autoSegment->getTargetU();
if (perpandMin != perpandMax) {
if (perpandMin == getAxis()) attractors.addAttractor( perpandMax );
if (perpandMax == getAxis()) attractors.addAttractor( perpandMin );
}
}
} }
cdebug_tabw(145,-1); cdebug_tabw(145,-1);
} }

2
anabatic/src/Configuration.cpp
View File

@ -328,6 +328,8 @@ namespace Anabatic {
void Configuration::print ( Cell* cell ) const void Configuration::print ( Cell* cell ) const
{ {
if (not cmess1.enabled()) return;
string topLayerName = "UNKOWN"; string topLayerName = "UNKOWN";
const Layer* topLayer = _rg->getRoutingLayer( _allowedDepth ); const Layer* topLayer = _rg->getRoutingLayer( _allowedDepth );
if (topLayer) if (topLayer)

6
anabatic/src/Edge.cpp
View File

@ -88,9 +88,9 @@ namespace Anabatic {
Edge* edge = new Edge ( source, target, flags ); Edge* edge = new Edge ( source, target, flags );
edge->_postCreate(); edge->_postCreate();
cdebug_log(110,1) << "Edge::create(): " << (void*)edge << ":" << edge << endl; cdebug_log(110,1) << "Edge::create(): " << /*(void*)edge << ":" <<*/ edge << endl;
cdebug_log(110,0) << "source:" << (void*)source << ":" << edge->getSource() << endl; cdebug_log(110,0) << "source:" << /*(void*)source << ":" <<*/ edge->getSource() << endl;
cdebug_log(110,0) << "target:" << (void*)target << ":" << edge->getTarget() << endl; cdebug_log(110,0) << "target:" << /*(void*)target << ":" <<*/ edge->getTarget() << endl;
cdebug_tabw(110,-1); cdebug_tabw(110,-1);
return edge; return edge;
} }

2
bootstrap/coriolisEnv.py
View File

@ -147,7 +147,7 @@ def guessShell ():
#if os.environ.has_key('SHELL'): return os.environ['SHELL'] #if os.environ.has_key('SHELL'): return os.environ['SHELL']
psCommand = subprocess.Popen ( ['ps', '-p', str(os.getppid()) ], stdout=subprocess.PIPE ) psCommand = subprocess.Popen ( ['ps', '-p', str(os.getppid()) ], stdout=subprocess.PIPE )
shell = psCommand.stdout.readlines()[1][:-1].split()[-1] shell = psCommand.stdout.readlines()[1][:-1].split()[-1].lstrip('-')
whichCommand = subprocess.Popen ( ['which', shell ], stdout=subprocess.PIPE ) whichCommand = subprocess.Popen ( ['which', shell ], stdout=subprocess.PIPE )
shellPath = whichCommand.stdout.readlines()[0][:-1] shellPath = whichCommand.stdout.readlines()[0][:-1]

2
crlcore/etc/common/display.conf
View File

@ -192,7 +192,7 @@ stylesTable = \
, (Drawing, 'gmetalv' , { 'color':'200,200,255', 'pattern':'light_antihash1.8', 'border':1 }) , (Drawing, 'gmetalv' , { 'color':'200,200,255', 'pattern':'light_antihash1.8', 'border':1 })
, (Drawing, 'gcut' , { 'color':'255,255,190', 'border':1 }) , (Drawing, 'gcut' , { 'color':'255,255,190', 'border':1 })
, (Drawing, 'Anabatic::Edge' , { 'color':'255,255,190', 'pattern':'0000000000000000', 'border':4, 'threshold':0.02*scale }) , (Drawing, 'Anabatic::Edge' , { 'color':'255,255,190', 'pattern':'0000000000000000', 'border':4, 'threshold':0.02*scale })
, (Drawing, 'Anabatic::GCell', { 'color':'128,128,128', 'pattern':'0000000000000000', 'border':4, 'threshold':0.10*scale }) , (Drawing, 'Anabatic::GCell', { 'color':'255,255,190', 'pattern':'0000000000000000', 'border':4, 'threshold':0.10*scale })
) )
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------

2
crlcore/src/cyclop/Cyclop.cpp
View File

@ -77,7 +77,7 @@ namespace CRL {
_stressDisplayAction->setStatusTip ( tr("Intensive use of display redrawing") ); _stressDisplayAction->setStatusTip ( tr("Intensive use of display redrawing") );
connect ( _stressDisplayAction, SIGNAL(triggered()), this, SLOT(stressDisplay()) ); connect ( _stressDisplayAction, SIGNAL(triggered()), this, SLOT(stressDisplay()) );
debugMenu->addAction ( _stressDisplayAction ); //debugMenu->addAction ( _stressDisplayAction );
getCellWidget()->addDrawExtensionGo ( DemoGo::staticGetName() getCellWidget()->addDrawExtensionGo ( DemoGo::staticGetName()
, DemoGo::initDrawDemoGo , DemoGo::initDrawDemoGo

65
hurricane/src/hurricane/Component.cpp
View File

@ -408,58 +408,50 @@ void Component::_postCreate()
void Component::_preDestroy() void Component::_preDestroy()
// ************************* // *************************
{ {
cdebug_log(18,1) << "entering Component::_Predestroy: " << this << endl; cdebug_log(18,1) << "entering Component::_preDestroy: " << this << endl;
clearProperties(); clearProperties();
set<Component*> componentSet; set<Component*,Entity::CompareById> components;
getSlaveComponents().fill(componentSet); getSlaveComponents().fill( components );
components.insert( this );
set<Hook*> masterHookSet; vector<Hook*> masterHooks;
componentSet.insert(this);
for_each_component(component, getCollection(componentSet)) { for ( Component* component : components ) {
component->unmaterialize(); component->unmaterialize();
for_each_hook(hook, component->getHooks()) { for ( Hook* chook : component->getHooks() ) {
for_each_hook(hook, hook->getHooks()) { for ( Hook* shook : chook->getHooks() ) {
if (hook->isMaster() && (componentSet.find(hook->getComponent()) == componentSet.end())) if (shook->isMaster() and (components.find(shook->getComponent()) == components.end()) )
masterHookSet.insert(hook); masterHooks.push_back( shook );
end_for;
} }
if (!hook->isMaster()) hook->detach(); if (not chook->isMaster()) chook->detach();
end_for;
} }
end_for;
} }
componentSet.erase(this); components.erase( this );
for_each_component(component, getCollection(componentSet)) { for ( Component* component : components ) component->destroy();
component->destroy();
end_for;
}
set<Rubber*> rubberSet; set<Rubber*,Entity::CompareById> rubbers;
set<Hook*> mainMasterHookSet; vector<Hook*> mainMasterHooks;
for_each_hook(hook, getCollection(masterHookSet)) {
Rubber* rubber = hook->getComponent()->getRubber(); for ( Hook* mhook : masterHooks ) {
if (!rubber) Rubber* rubber = mhook->getComponent()->getRubber();
mainMasterHookSet.insert(hook); if (not rubber)
mainMasterHooks.push_back( mhook );
else { else {
if (rubberSet.find(rubber) == rubberSet.end()) { if (rubbers.find(rubber) == rubbers.end()) {
rubberSet.insert(rubber); rubbers.insert( rubber );
mainMasterHookSet.insert(hook); mainMasterHooks.push_back( mhook );
} }
} }
end_for;
} }
Hook* masterHook = NULL; Hook* masterHook = NULL;
for_each_hook(hook, getCollection(mainMasterHookSet)) { for ( Hook* hook : mainMasterHooks ) {
if (!masterHook) if (not masterHook) masterHook = hook;
masterHook = hook; else hook->merge( masterHook );
else
hook->merge(masterHook);
end_for;
} }
/**/
_bodyHook.detach(); _bodyHook.detach();
@ -467,7 +459,6 @@ void Component::_preDestroy()
if (_net) _net->_getComponentSet()._remove(this); if (_net) _net->_getComponentSet()._remove(this);
cdebug_log(18,0) << "exiting Component::_Predestroy:" << endl; cdebug_log(18,0) << "exiting Component::_Predestroy:" << endl;
cdebug_tabw(18,-1); cdebug_tabw(18,-1);
} }

6
hurricane/src/hurricane/DBo.cpp
View File

@ -53,7 +53,9 @@ namespace Hurricane {
void DBo::_postCreate () void DBo::_postCreate ()
{ } {
cdebug_log(0,0) << "DBo::_postCreate() " << this << endl;
}
void DBo::_preDestroy () void DBo::_preDestroy ()
@ -64,7 +66,9 @@ namespace Hurricane {
void DBo::destroy () void DBo::destroy ()
{ {
cdebug_log(0,1) << "DBo::destroy() " << this << endl;
_preDestroy(); _preDestroy();
cdebug_tabw(0,-1);
delete this; delete this;
} }

5
hurricane/src/hurricane/DbU.cpp
View File

@ -323,7 +323,12 @@ namespace Hurricane {
case Kilo: unitPower = 'k'; break; case Kilo: unitPower = 'k'; break;
default: unitPower = '?'; break; default: unitPower = '?'; break;
} }
switch ( u ) {
case Min: os << "MIN:"; break;
case Max: os << "MAX:"; break;
default:
os << setprecision(3) << toPhysical(u,_stringModeUnitPower); os << setprecision(3) << toPhysical(u,_stringModeUnitPower);
}
} else { } else {
if (_stringMode != Db) if (_stringMode != Db)
cerr << "[ERROR] Unknown Unit representation mode: " << _stringMode << endl; cerr << "[ERROR] Unknown Unit representation mode: " << _stringMode << endl;

2
hurricane/src/hurricane/Hook.cpp
View File

@ -362,6 +362,8 @@ Hook* Hook::merge(Hook* hook)
if (hook == this) if (hook == this)
throw Error("Can't merge : itself"); throw Error("Can't merge : itself");
cdebug_log(0,0) << "Hook::merge() hook:" << hook->getComponent() << endl;
Hook* masterHook = hook->getPreviousMasterHook(); Hook* masterHook = hook->getPreviousMasterHook();
Hook* nextHook = masterHook->_nextHook; Hook* nextHook = masterHook->_nextHook;
masterHook->_nextHook = _nextHook; masterHook->_nextHook = _nextHook;

14
hurricane/src/hurricane/Net.cpp
View File

@ -748,9 +748,17 @@ void Net::_preDestroy()
string Net::_getString() const string Net::_getString() const
// *************************** // ***************************
{ {
string s = Inherit::_getString(); string bs = Inherit::_getString();
s.insert(s.length() - 1, " " + getString(_name)); string ds = "\"" + getString(_name) + "\" ";
return s; ds += ((_isExternal ) ? "e" : "-");
ds += ((_isGlobal ) ? "g" : "-");
ds += ((_isAutomatic) ? "a" : "-");
ds += " ";
ds += getString(_type ) + " ";
ds += getString(_direction);
bs.insert( bs.length() - 1, " " + ds );
return bs;
} }
Record* Net::_getRecord() const Record* Net::_getRecord() const

42
hurricane/src/hurricane/Property.cpp
View File

@ -226,25 +226,53 @@ namespace Hurricane {
void SharedProperty::_preDestroy () void SharedProperty::_preDestroy ()
{ {
Property::_preDestroy(); for ( size_t i=0 ; i<_ownerSet.size() ; ++i ) {
_ownerSet[i]->_onDestroyed(this);
_ownerSet[i] = NULL;
}
_ownerSet.clear();
while (!_ownerSet.empty()) { // while (!_ownerSet.empty()) {
DBo* owner = *_ownerSet.begin(); // DBo* owner = *_ownerSet.begin();
_ownerSet.erase(owner); // _ownerSet.erase(owner);
owner->_onDestroyed(this); // owner->_onDestroyed(this);
// }
Property::_preDestroy();
}
void SharedProperty::_erase ( DBo* owner )
{
for ( size_t i=0 ; i<_ownerSet.size() ; ++i ) {
if (_ownerSet[i] == owner) {
std::swap( _ownerSet[i], _ownerSet[_ownerSet.size()-1] );
_ownerSet.pop_back();
}
} }
} }
void SharedProperty::onCapturedBy ( DBo* owner ) void SharedProperty::onCapturedBy ( DBo* owner )
{ {
_ownerSet.insert(owner); for ( DBo* dbo : _ownerSet ) {
if (dbo == owner) return;
}
_ownerSet.push_back( owner );
//_ownerSet.insert(owner);
} }
void SharedProperty::onReleasedBy ( DBo* owner ) void SharedProperty::onReleasedBy ( DBo* owner )
{ {
_ownerSet.erase(owner); for ( size_t i=0 ; i<_ownerSet.size() ; ++i ) {
if (_ownerSet[i] == owner) {
std::swap( _ownerSet[i], _ownerSet[_ownerSet.size()-1] );
_ownerSet.pop_back();
}
}
//_ownerSet.erase(owner);
if (_ownerSet.empty()) onNotOwned(); if (_ownerSet.empty()) onNotOwned();
} }

3
hurricane/src/hurricane/Relation.cpp
View File

@ -99,7 +99,8 @@ DBos Relation::getSlaveOwners() const
void Relation::onReleasedBy(DBo* owner) void Relation::onReleasedBy(DBo* owner)
// ************************************ // ************************************
{ {
_getOwnerSet().erase(owner); _erase( owner );
//_getOwnerSet().erase(owner);
if (owner == _masterOwner) destroy(); if (owner == _masterOwner) destroy();
} }

8
hurricane/src/hurricane/hurricane/DebugSession.h
View File

@ -126,12 +126,12 @@ namespace Hurricane {
DebugSession* DebugSession::get () { return _singleton; } DebugSession* DebugSession::get () { return _singleton; }
bool DebugSession::isTraced ( const void* symbol ) { return _singleton->_isTraced(symbol); } bool DebugSession::isTraced ( const void* symbol ) { return _singleton->_isTraced(symbol); }
void DebugSession::addToTrace ( const void* symbol ) { _singleton->_addToTrace(symbol); } void DebugSession::addToTrace ( const void* symbol ) { _singleton->_addToTrace(symbol); }
void DebugSession::addToTrace ( const Net* net ) { _singleton->_addToTrace ( net ); } void DebugSession::addToTrace ( const Net* net ) { _singleton->_addToTrace(net); }
void DebugSession::addToTrace ( const Cell* cell void DebugSession::addToTrace ( const Cell* cell
, const Name& name ) { _singleton->_addToTrace ( cell, name ); } , const Name& name ) { _singleton->_addToTrace( cell, name ); }
bool DebugSession::_isTraced ( const void* symbol ) const { return _symbols.find(symbol) != _symbols.end(); } bool DebugSession::_isTraced ( const void* symbol ) const { return _symbols.find(symbol) != _symbols.end(); }
void DebugSession::_addToTrace ( const void* symbol ) { _symbols.insert ( symbol ); } void DebugSession::_addToTrace ( const void* symbol ) { _symbols.insert( symbol ); }
void DebugSession::_addToTrace ( const Net* net ) { _addToTrace ( static_cast<const void*>(net) ); } void DebugSession::_addToTrace ( const Net* net ) { _addToTrace( static_cast<const void*>(net) ); }

9
hurricane/src/hurricane/hurricane/IntrusiveSet.h
View File

@ -433,14 +433,23 @@ template<class Element> class IntrusiveSet {
_length = newLength; _length = newLength;
_array = new Element*[_length]; _array = new Element*[_length];
memset(_array, 0, _length * sizeof(Element*)); memset(_array, 0, _length * sizeof(Element*));
cdebug_log(0,0) << "IntrusiveSet::_resize() " << oldLength << " -> " << newLength << endl;
for (unsigned index = 0; index < oldLength; index++) { for (unsigned index = 0; index < oldLength; index++) {
Element* element = oldArray[index]; Element* element = oldArray[index];
if (not element)
cdebug_log(0,0) << "| bucket:" << setw(4) << index << " empty" << endl;
while (element) { while (element) {
Element* nextElement = _getNextElement(element); Element* nextElement = _getNextElement(element);
unsigned newIndex = (_getHashValue(element) / 8) % _length; unsigned newIndex = (_getHashValue(element) / 8) % _length;
_setNextElement(element, _array[newIndex]); _setNextElement(element, _array[newIndex]);
_array[newIndex] = element; _array[newIndex] = element;
element = nextElement; element = nextElement;
cdebug_log(0,0) << "| bucket:" << setw(4) << index
<< " -> " << setw(4) << newIndex
<< " + " << element << endl;
} }
} }
delete[] oldArray; delete[] oldArray;

3
hurricane/src/hurricane/hurricane/Property.h
View File

@ -396,7 +396,7 @@ namespace Hurricane {
unsigned int _count; unsigned int _count;
}; };
public: public:
typedef set<DBo*> DBoSet; typedef vector<DBo*> DBoSet;
typedef map<string,Orphaned> OrphanedMap; typedef map<string,Orphaned> OrphanedMap;
public: public:
static const OrphanedMap& getOrphaneds (); static const OrphanedMap& getOrphaneds ();
@ -411,6 +411,7 @@ namespace Hurricane {
virtual void onCapturedBy ( DBo* owner ); virtual void onCapturedBy ( DBo* owner );
virtual void onReleasedBy ( DBo* owner ); virtual void onReleasedBy ( DBo* owner );
virtual void onNotOwned (); virtual void onNotOwned ();
void _erase ( DBo* owner );
inline DBoSet& _getOwnerSet (); inline DBoSet& _getOwnerSet ();
virtual string _getString () const; virtual string _getString () const;
virtual Record* _getRecord () const; virtual Record* _getRecord () const;

12
katana/src/Configuration.cpp
View File

@ -40,12 +40,13 @@ namespace Katana {
Configuration::Configuration () Configuration::Configuration ()
: Anabatic::Configuration() : Anabatic::Configuration()
, _postEventCb () , _postEventCb ()
, _hTracksReservedLocal(Cfg::getParamInt("katana.hTracksReservedLocal", 3)->asInt()) , _hTracksReservedLocal(Cfg::getParamInt ("katana.hTracksReservedLocal", 3)->asInt())
, _vTracksReservedLocal(Cfg::getParamInt("katana.vTracksReservedLocal", 3)->asInt()) , _vTracksReservedLocal(Cfg::getParamInt ("katana.vTracksReservedLocal", 3)->asInt())
, _ripupLimits () , _ripupLimits ()
, _ripupCost (Cfg::getParamInt("katana.ripupCost" , 3)->asInt()) , _ripupCost (Cfg::getParamInt ("katana.ripupCost" , 3)->asInt())
, _eventsLimit (Cfg::getParamInt("katana.eventsLimit" ,4000000)->asInt()) , _eventsLimit (Cfg::getParamInt ("katana.eventsLimit" ,4000000)->asInt())
, _flags (0) , _flags (0)
, _profileEventCosts (Cfg::getParamBool("katana.profileEventCosts" ,false )->asBool())
{ {
_ripupLimits[StrapRipupLimit] = Cfg::getParamInt("katana.strapRipupLimit" ,16)->asInt(); _ripupLimits[StrapRipupLimit] = Cfg::getParamInt("katana.strapRipupLimit" ,16)->asInt();
_ripupLimits[LocalRipupLimit] = Cfg::getParamInt("katana.localRipupLimit" , 7)->asInt(); _ripupLimits[LocalRipupLimit] = Cfg::getParamInt("katana.localRipupLimit" , 7)->asInt();
@ -81,6 +82,7 @@ namespace Katana {
, _ripupLimits () , _ripupLimits ()
, _ripupCost (other._ripupCost) , _ripupCost (other._ripupCost)
, _eventsLimit (other._eventsLimit) , _eventsLimit (other._eventsLimit)
, _profileEventCosts (other._profileEventCosts)
{ {
_ripupLimits[StrapRipupLimit] = other._ripupLimits[StrapRipupLimit]; _ripupLimits[StrapRipupLimit] = other._ripupLimits[StrapRipupLimit];
_ripupLimits[LocalRipupLimit] = other._ripupLimits[LocalRipupLimit]; _ripupLimits[LocalRipupLimit] = other._ripupLimits[LocalRipupLimit];
@ -142,6 +144,8 @@ namespace Katana {
void Configuration::print ( Cell* cell ) const void Configuration::print ( Cell* cell ) const
{ {
if (not cmess1.enabled()) return;
cout << " o Configuration of ToolEngine<Katana> for Cell <" << cell->getName() << ">" << endl; cout << " o Configuration of ToolEngine<Katana> for Cell <" << cell->getName() << ">" << endl;
cout << Dots::asUInt (" - Global router H reserved local" ,_hTracksReservedLocal) << endl; cout << Dots::asUInt (" - Global router H reserved local" ,_hTracksReservedLocal) << endl;
cout << Dots::asUInt (" - Global router V reserved local" ,_vTracksReservedLocal) << endl; cout << Dots::asUInt (" - Global router V reserved local" ,_vTracksReservedLocal) << endl;

2
katana/src/DataNegociate.cpp
View File

@ -79,7 +79,7 @@ namespace Katana {
void DataNegociate::update () void DataNegociate::update ()
{ {
DebugSession::open( _trackSegment->getNet(), 150, 160 ); DebugSession::open( _trackSegment->getNet(), 156, 160 );
//cdebug_log(9000,0) << "Deter| DataNegociate::update() - " << _trackSegment << endl; //cdebug_log(9000,0) << "Deter| DataNegociate::update() - " << _trackSegment << endl;
cdebug_log(159,1) << "DataNegociate::update() - " << _trackSegment << endl; cdebug_log(159,1) << "DataNegociate::update() - " << _trackSegment << endl;

17
katana/src/DataSymmetric.cpp
View File

@ -15,6 +15,7 @@
#include "anabatic/AutoSegment.h" #include "anabatic/AutoSegment.h"
#include "katana/DataSymmetric.h" #include "katana/DataSymmetric.h"
#include "katana/Session.h"
namespace { namespace {
@ -124,6 +125,10 @@ namespace Katana {
const unsigned int mask = ~(AutoSegmentFlag::SegIsReduced); const unsigned int mask = ~(AutoSegmentFlag::SegIsReduced);
Message errors ( 0, "[ERROR]" ); Message errors ( 0, "[ERROR]" );
// Temporary hardwired: M2 (depth 1) for H pitch, M3 (depth 2) for V pitch.
DbU::Unit hPitch = Session::getPitch( 1 );
DbU::Unit vPitch = Session::getPitch( 2 );
size_t refs = 0; size_t refs = 0;
size_t syms = 0; size_t syms = 0;
for ( const array<AutoSegment*,2>& paired : _paireds ) { for ( const array<AutoSegment*,2>& paired : _paireds ) {
@ -162,7 +167,7 @@ namespace Katana {
_valid = false; _valid = false;
} }
if (2*getSymAxis() - paired[0]->getAxis() != paired[1]->getAxis()) { if (std::abs( 2*getSymAxis() - paired[0]->getAxis() - paired[1]->getAxis() ) > 2*vPitch ) {
errors.newline() << "Mirror axis mismatch @ [" << index << "] " errors.newline() << "Mirror axis mismatch @ [" << index << "] "
<< DbU::getValueString(paired[1]->getAxis()) << " (should be: " << DbU::getValueString(paired[1]->getAxis()) << " (should be: "
<< DbU::getValueString(2*getSymAxis() - paired[0]->getAxis()) << ")"; << DbU::getValueString(2*getSymAxis() - paired[0]->getAxis()) << ")";
@ -179,7 +184,7 @@ namespace Katana {
_valid = false; _valid = false;
} }
if (paired[0]->getAxis() != paired[1]->getAxis()) { if ( std::abs( paired[0]->getAxis() - paired[1]->getAxis() ) > 2*hPitch ) {
errors.newline() << "Axis mismatch index " << index << " " errors.newline() << "Axis mismatch index " << index << " "
<< DbU::getValueString(paired[1]->getAxis()) << " (should be:" << DbU::getValueString(paired[1]->getAxis()) << " (should be:"
<< DbU::getValueString(paired[0]->getAxis()) << ")"; << DbU::getValueString(paired[0]->getAxis()) << ")";
@ -190,7 +195,7 @@ namespace Katana {
} }
} else { } else {
if (paired[0]->isHorizontal()) { if (paired[0]->isHorizontal()) {
if (2*getSymAxis() - paired[0]->getAxis() != paired[1]->getAxis()) { if ( std::abs( 2*getSymAxis() - paired[0]->getAxis() - paired[1]->getAxis() ) > 2*hPitch ) {
errors.newline() << "Mirror axis mismatch index " << index << " " errors.newline() << "Mirror axis mismatch index " << index << " "
<< DbU::getValueString(paired[1]->getAxis()) << " (should be:" << DbU::getValueString(paired[1]->getAxis()) << " (should be:"
<< DbU::getValueString(2*getSymAxis() - paired[0]->getAxis()) << ")"; << DbU::getValueString(2*getSymAxis() - paired[0]->getAxis()) << ")";
@ -199,7 +204,7 @@ namespace Katana {
_valid = false; _valid = false;
} }
} else { } else {
if (paired[0]->getAxis() != paired[1]->getAxis()) { if ( std::abs( paired[0]->getAxis() != paired[1]->getAxis() ) > 2*vPitch ) {
errors.newline() << "Axis mismatch index " << index << " " errors.newline() << "Axis mismatch index " << index << " "
<< DbU::getValueString(paired[1]->getAxis()) << " (should be:" << DbU::getValueString(paired[1]->getAxis()) << " (should be:"
<< DbU::getValueString(paired[0]->getAxis()) << ")"; << DbU::getValueString(paired[0]->getAxis()) << ")";
@ -217,10 +222,10 @@ namespace Katana {
errors.newline(); errors.newline();
if (errors.size()) { if (errors.size()) {
cmess2 << " pairing failed." << endl; //cmess2 << " pairing failed." << endl;
errors.print( cmess2 ); errors.print( cmess2 );
} else { } else {
cmess2 << " paired." << endl; //cmess2 << " paired." << endl;
} }
return _valid; return _valid;

3
katana/src/GlobalRoute.cpp
View File

@ -25,6 +25,7 @@ namespace {
using std::cerr; using std::cerr;
using std::endl; using std::endl;
using std::setw; using std::setw;
using std::setfill;
using std::left; using std::left;
using std::right; using std::right;
using Hurricane::DbU; using Hurricane::DbU;
@ -162,7 +163,7 @@ namespace Katana {
size_t iteration = 0; size_t iteration = 0;
size_t netCount = 0; size_t netCount = 0;
do { do {
cmess2 << " [" << setw(3) << iteration << "] nets:"; cmess2 << " [" << setfill(' ') << setw(3) << iteration << "] nets:";
netCount = 0; netCount = 0;
for ( NetData* netData : getNetOrdering() ) { for ( NetData* netData : getNetOrdering() ) {

7
katana/src/GraphicKatanaEngine.cpp
View File

@ -194,8 +194,8 @@ namespace Katana {
katana = KatanaEngine::create( cell ); katana = KatanaEngine::create( cell );
katana->setPostEventCb( boost::bind(&GraphicKatanaEngine::postEvent,this) ); katana->setPostEventCb( boost::bind(&GraphicKatanaEngine::postEvent,this) );
katana->setViewer( _viewer ); katana->setViewer( _viewer );
katana->printConfiguration();
katana->digitalInit(); katana->digitalInit();
if (cmess1.enabled()) katana->printConfiguration();
} else } else
cerr << Warning( "%s already has a Katana engine.", getString(cell).c_str() ) << endl; cerr << Warning( "%s already has a Katana engine.", getString(cell).c_str() ) << endl;
@ -275,9 +275,10 @@ namespace Katana {
KatanaEngine* katana = getForFramework( NoFlags ); KatanaEngine* katana = getForFramework( NoFlags );
if (katana) { if (katana) {
katana->loadGlobalRouting( Anabatic::EngineLoadGrByNet ); katana->loadGlobalRouting( Anabatic::EngineLoadGrByNet );
katana->runTest(); // Now done through Horus.
//katana->runTest();
katana->runNegociate( Flags::SymmetricStage ); katana->runNegociate( Flags::SymmetricStage );
katana->runNegociate(); //katana->runNegociate();
} }
} }

28
katana/src/Manipulator.cpp
View File

@ -95,7 +95,7 @@ namespace Katana {
if (not _segment) if (not _segment)
throw Error( "Manipulator::Manipulator(): cannot build upon a NULL TrackElement." ); throw Error( "Manipulator::Manipulator(): cannot build upon a NULL TrackElement." );
DebugSession::open( _segment->getNet(), 149, 160 ); DebugSession::open( _segment->getNet(), 156, 160 );
_data = _segment->getDataNegociate(); _data = _segment->getDataNegociate();
if (_data) _event = _data->getRoutingEvent(); if (_data) _event = _data->getRoutingEvent();
@ -635,7 +635,8 @@ namespace Katana {
bool rightIntrication = false; bool rightIntrication = false;
bool success = true; bool success = true;
cdebug_log(159,0) << "Manipulator::insertInTrack() - " << toFree << endl; cdebug_log(159,1) << "Manipulator::insertInTrack(size_t) - " << toFree << endl;
cdebug_log(159,0) << _segment << endl;
for ( size_t i = begin ; success && (i < end) ; i++ ) { for ( size_t i = begin ; success && (i < end) ; i++ ) {
TrackElement* segment2 = track->getSegment(i); TrackElement* segment2 = track->getSegment(i);
@ -748,6 +749,10 @@ namespace Katana {
} }
} }
if ( shrinkLeft ) { if ( shrinkLeft ) {
cdebug_log(159,0) << "Move PP to right: "
<< DbU::getValueString(toFree.getVMax()) << " + "
<< DbU::getValueString(getPPitch()/2)
<< endl;
if ( not (success=Manipulator(segment3,_fsm) if ( not (success=Manipulator(segment3,_fsm)
.ripup( SegmentAction::OtherRipupPerpandAndPushAside .ripup( SegmentAction::OtherRipupPerpandAndPushAside
, toFree.getVMax() + getPPitch()/2 , toFree.getVMax() + getPPitch()/2
@ -763,8 +768,7 @@ namespace Katana {
} }
} else { } else {
if ( not (success=Manipulator(segment3,_fsm).ripup( SegmentAction::OtherRipup if ( not (success=Manipulator(segment3,_fsm).ripup( SegmentAction::OtherRipup
| SegmentAction::EventLevel3 | SegmentAction::EventLevel3 )) )
)) )
break; break;
} }
} }
@ -775,7 +779,7 @@ namespace Katana {
cdebug_log(159,0) << "Manipulator::insertInTrack() success" << endl; cdebug_log(159,0) << "Manipulator::insertInTrack() success" << endl;
_fsm.setState ( SegmentFsm::OtherRipup ); _fsm.setState ( SegmentFsm::OtherRipup );
_fsm.addAction ( _segment _fsm.addAction( _segment
, SegmentAction::SelfInsert|SegmentAction::MoveToAxis|SegmentAction::EventLevel4 , SegmentAction::SelfInsert|SegmentAction::MoveToAxis|SegmentAction::EventLevel4
, _fsm.getCost(itrack).getTrack()->getAxis() ); , _fsm.getCost(itrack).getTrack()->getAxis() );
@ -787,6 +791,7 @@ namespace Katana {
} else } else
_fsm.clearActions (); _fsm.clearActions ();
cdebug_tabw(159,-1);
return success; return success;
} }
@ -802,7 +807,7 @@ namespace Katana {
set<TrackElement*> canonicals; set<TrackElement*> canonicals;
bool success = true; bool success = true;
cdebug_log(159,0) << "Manipulator::forceToTrack() - " << toFree << endl; cdebug_log(159,1) << "Manipulator::forceToTrack(size_t) - " << toFree << endl;
for ( size_t i=begin ; success and (i < end) ; ++i ) { for ( size_t i=begin ; success and (i < end) ; ++i ) {
TrackElement* segment2 = track->getSegment(i); TrackElement* segment2 = track->getSegment(i);
@ -848,6 +853,7 @@ namespace Katana {
, _fsm.getCost(itrack).getTrack()->getAxis() ); , _fsm.getCost(itrack).getTrack()->getAxis() );
} }
cdebug_tabw(159,-1);
return success; return success;
} }
@ -926,15 +932,15 @@ namespace Katana {
{ {
cdebug_log(159,1) << "Manipulator::forceOverLocals()" << endl; cdebug_log(159,1) << "Manipulator::forceOverLocals()" << endl;
vector<TrackCost>& costs = _fsm.getCosts(); vector< array<TrackCost,2> >& costs = _fsm.getCosts();
size_t itrack = 0; size_t itrack = 0;
for ( ; itrack<costs.size() ; ++itrack ) { for ( ; itrack<costs.size() ; ++itrack ) {
cdebug_log(159,0) << "Trying itrack:" << itrack << endl; cdebug_log(159,0) << "Trying itrack:" << itrack << endl;
if ( costs[itrack].isFixed() if ( costs[itrack][0].isFixed()
or costs[itrack].isBlockage() or costs[itrack][0].isBlockage()
or costs[itrack].isInfinite() or costs[itrack][0].isInfinite()
or costs[itrack].isOverlapGlobal() ) or costs[itrack][0].isOverlapGlobal() )
continue; continue;
bool success = true; bool success = true;

22
katana/src/NegociateWindow.cpp
View File

@ -16,6 +16,7 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <fstream>
#include <iomanip> #include <iomanip>
#include "hurricane/Warning.h" #include "hurricane/Warning.h"
#include "hurricane/Bug.h" #include "hurricane/Bug.h"
@ -137,6 +138,7 @@ namespace {
namespace Katana { namespace Katana {
using std::ofstream;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
using std::setw; using std::setw;
@ -426,6 +428,10 @@ namespace Katana {
cmess1 << " o Negociation Stage." << endl; cmess1 << " o Negociation Stage." << endl;
unsigned long limit = _katana->getEventsLimit(); unsigned long limit = _katana->getEventsLimit();
bool profiling = _katana->profileEventCosts();
ofstream ofprofile;
if (profiling) ofprofile.open( "katana.profile.txt" );
_eventHistory.clear(); _eventHistory.clear();
_eventQueue.load( _segments ); _eventQueue.load( _segments );
@ -453,6 +459,21 @@ namespace Katana {
cmess2.flush(); cmess2.flush();
} }
if (ofprofile.is_open()) {
size_t depth = _katana->getConfiguration()->getLayerDepth( event->getSegment()->getLayer() );
if (depth < 6) {
ofprofile << setw(10) << right << count << " ";
for ( size_t i=0 ; i<6 ; ++i ) {
if (i == depth)
ofprofile << setw(10) << right << setprecision(2) << event->getPriority () << " ";
else
ofprofile << setw(10) << right << setprecision(2) << 0.0 << " ";
}
ofprofile << setw( 2) << right << event->getEventLevel() << endl;
}
}
event->process( _eventQueue, _eventHistory, _eventLoop ); event->process( _eventQueue, _eventHistory, _eventLoop );
count++; count++;
@ -519,6 +540,7 @@ namespace Katana {
cerr << Bug( "%d events remains after clear.", RoutingEvent::getAllocateds() ) << endl; cerr << Bug( "%d events remains after clear.", RoutingEvent::getAllocateds() ) << endl;
} }
if (ofprofile.is_open()) ofprofile.close();
_statistics.setEventsCount( eventsCount ); _statistics.setEventsCount( eventsCount );
cdebug_tabw(159,-1); cdebug_tabw(159,-1);

10
katana/src/PyKatanaEngine.cpp
View File

@ -167,14 +167,12 @@ extern "C" {
} }
PyObject* PyKatanaEngine_runGlobalRouter ( PyKatanaEngine* self, PyObject* args ) PyObject* PyKatanaEngine_runGlobalRouter ( PyKatanaEngine* self )
{ {
cdebug_log(40,0) << "PyKatanaEngine_runGlobalRouter()" << endl; cdebug_log(40,0) << "PyKatanaEngine_runGlobalRouter()" << endl;
HTRY HTRY
METHOD_HEAD("KatanaEngine.runGlobalRouter()") METHOD_HEAD("KatanaEngine.runGlobalRouter()")
unsigned int flags = 0;
if (PyArg_ParseTuple(args,"I:KatanaEngine.runGlobalRouter", &flags)) {
if (katana->getViewer()) { if (katana->getViewer()) {
if (ExceptionWidget::catchAllWrapper( std::bind(&KatanaEngine::runGlobalRouter,katana) )) { if (ExceptionWidget::catchAllWrapper( std::bind(&KatanaEngine::runGlobalRouter,katana) )) {
PyErr_SetString( HurricaneError, "KatanaEngine::runGlobalrouter() has thrown an exception (C++)." ); PyErr_SetString( HurricaneError, "KatanaEngine::runGlobalrouter() has thrown an exception (C++)." );
@ -183,10 +181,6 @@ extern "C" {
} else { } else {
katana->runGlobalRouter(); katana->runGlobalRouter();
} }
} else {
PyErr_SetString(ConstructorError, "KatanaEngine.runGlobalRouter(): Invalid number/bad type of parameter.");
return NULL;
}
HCATCH HCATCH
Py_RETURN_NONE; Py_RETURN_NONE;
@ -311,7 +305,7 @@ extern "C" {
, "Display on the console the configuration of Katana." } , "Display on the console the configuration of Katana." }
, { "getToolSuccess" , (PyCFunction)PyKatanaEngine_getToolSuccess , METH_NOARGS , { "getToolSuccess" , (PyCFunction)PyKatanaEngine_getToolSuccess , METH_NOARGS
, "Returns True if the detailed routing has been successful." } , "Returns True if the detailed routing has been successful." }
, { "runGlobalRouter" , (PyCFunction)PyKatanaEngine_runGlobalRouter , METH_VARARGS , { "runGlobalRouter" , (PyCFunction)PyKatanaEngine_runGlobalRouter , METH_NOARGS
, "Run the global router (Katana)." } , "Run the global router (Katana)." }
, { "loadGlobalRouting" , (PyCFunction)PyKatanaEngine_loadGlobalRouting , METH_VARARGS , { "loadGlobalRouting" , (PyCFunction)PyKatanaEngine_loadGlobalRouting , METH_VARARGS
, "Load global routing into the detailed router." } , "Load global routing into the detailed router." }

63
katana/src/RoutingEvent.cpp
View File

@ -15,6 +15,7 @@
#include <cstdlib> #include <cstdlib>
#include <cmath>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <algorithm> #include <algorithm>
@ -79,11 +80,11 @@ namespace Katana {
if (lhs._eventLevel < rhs._eventLevel) return true; if (lhs._eventLevel < rhs._eventLevel) return true;
// Process all M2 (terminal access) before any others. // Process all M2 (terminal access) before any others.
if ((lhs._layerDepth == 1) and (rhs._layerDepth != 1)) return false; //if ((lhs._layerDepth == 1) and (rhs._layerDepth != 1)) return false;
if ((lhs._layerDepth != 1) and (rhs._layerDepth == 1)) return true; //if ((lhs._layerDepth != 1) and (rhs._layerDepth == 1)) return true;
if (lhs._priority > rhs._priority) return false; if (lhs._priority > rhs._priority) return true;
if (lhs._priority < rhs._priority) return true; if (lhs._priority < rhs._priority) return false;
if (lhs._length > rhs._length) return false; if (lhs._length > rhs._length) return false;
if (lhs._length < rhs._length) return true; if (lhs._length < rhs._length) return true;
@ -311,15 +312,13 @@ namespace Katana {
RoutingEvent* fork = NULL; RoutingEvent* fork = NULL;
if ( (getStage() != Repair) and isUnimplemented() ) { if ( (getStage() != Repair) and isUnimplemented() ) {
cdebug_log(159,0) << "Reschedule: cancelled (Unimplemented) " cdebug_log(159,0) << "Reschedule: cancelled (Unimplemented) -> " << fork << endl;
<< " -> " << fork << endl;
return NULL; return NULL;
} }
if (not isProcessed()) { if (not isProcessed()) {
fork = this; fork = this;
cdebug_log(159,0) << "Reschedule/Self: " cdebug_log(159,0) << "Reschedule/Self: -> "
<< " -> "
<< eventLevel << ":" << fork << endl; << eventLevel << ":" << fork << endl;
} else { } else {
fork = clone(); fork = clone();
@ -327,8 +326,7 @@ namespace Katana {
_segment->getDataNegociate()->setRoutingEvent( fork ); _segment->getDataNegociate()->setRoutingEvent( fork );
cdebug_log(159,0) << "Reschedule/Fork: " cdebug_log(159,0) << "Reschedule/Fork: -> " << fork << endl;
<< " -> " << fork << endl;
} }
if (fork->_eventLevel < eventLevel) if (fork->_eventLevel < eventLevel)
@ -393,7 +391,7 @@ namespace Katana {
#endif #endif
} }
DebugSession::open( _segment->getNet(), 149, 160 ); DebugSession::open( _segment->getNet(), 156, 160 );
cdebug_log(9000,0) << "Deter| Event " cdebug_log(9000,0) << "Deter| Event "
<< getProcesseds() << getProcesseds()
@ -418,6 +416,9 @@ namespace Katana {
if ( isProcessed() or isDisabled() ) { if ( isProcessed() or isDisabled() ) {
cdebug_log(159,0) << "Already processed or disabled." << endl; cdebug_log(159,0) << "Already processed or disabled." << endl;
} else { } else {
if (_segment->hasSymmetric()) {
}
setProcessed(); setProcessed();
setTimeStamp( _processeds ); setTimeStamp( _processeds );
@ -460,7 +461,7 @@ namespace Katana {
cdebug_tabw(159,1); cdebug_tabw(159,1);
fsm.getData()->incRipupCount(); fsm.incRipupCount();
cdebug_log(159,0) << "| Candidate Tracks:" << endl; cdebug_log(159,0) << "| Candidate Tracks:" << endl;
size_t itrack = 0; size_t itrack = 0;
@ -468,22 +469,16 @@ namespace Katana {
cdebug_log(159,0) << "| " << itrack << ":" << fsm.getCost(itrack) << endl; cdebug_log(159,0) << "| " << itrack << ":" << fsm.getCost(itrack) << endl;
itrack = 0; itrack = 0;
if ( (not isOverConstrained()) and Manipulator(_segment,fsm).canRipup() ) { if ( (not isOverConstrained()) and fsm.canRipup() ) {
if (fsm.getCosts().size() and fsm.getCost(itrack).isFree()) { if (fsm.getCosts().size() and fsm.getCost(itrack).isFree()) {
cdebug_log(159,0) << "Insert in free space " << this << endl; cdebug_log(159,0) << "Insert in free space " << this << endl;
resetInsertState(); fsm.bindToTrack( itrack );
_axisHistory = _segment->getAxis();
_eventLevel = 0;
cdebug_log(9000,0) << "Deter| addInsertEvent() @" << fsm.getCost(itrack).getTrack() << endl;
Session::addInsertEvent( _segment, fsm.getCost(itrack).getTrack() );
fsm.setState( SegmentFsm::SelfInserted );
} else { } else {
// Do ripup. // Do ripup.
if (fsm.getState() == SegmentFsm::EmptyTrackList) { if (fsm.getState() == SegmentFsm::EmptyTrackList) {
Manipulator(_segment,fsm).ripupPerpandiculars(); fsm.ripupPerpandiculars();
} else { } else {
if (Manipulator(_segment,fsm).canRipup(Manipulator::NotOnLastRipup)) { if (fsm.canRipup(Manipulator::NotOnLastRipup)) {
if (cdebug.enabled(9000)) { if (cdebug.enabled(9000)) {
for ( itrack=0 ; itrack<fsm.getCosts().size() ; itrack++ ) { for ( itrack=0 ; itrack<fsm.getCosts().size() ; itrack++ ) {
cdebug_log(9000,0) << "Deter| | Candidate Track: " << fsm.getCost(itrack) << endl; cdebug_log(9000,0) << "Deter| | Candidate Track: " << fsm.getCost(itrack) << endl;
@ -506,7 +501,7 @@ namespace Katana {
// Ripup limit has been reached. // Ripup limit has been reached.
if (isOverConstrained()) { if (isOverConstrained()) {
cdebug_log(159,0) << "Immediate slackening due to overconstraint" << endl; cdebug_log(159,0) << "Immediate slackening due to overconstraint" << endl;
fsm.getData()->setState( DataNegociate::Slacken ); fsm.setDataState( DataNegociate::Slacken );
} }
if (not fsm.slackenTopology()) { if (not fsm.slackenTopology()) {
fsm.setState( SegmentFsm::SelfMaximumSlack ); fsm.setState( SegmentFsm::SelfMaximumSlack );
@ -545,8 +540,7 @@ namespace Katana {
and (fsm.getCost(0).getTrack() != _segment->getTrack()) ) { and (fsm.getCost(0).getTrack() != _segment->getTrack()) ) {
cerr << "_processPack(): move to " << fsm.getCost(0).getTrack() << endl; cerr << "_processPack(): move to " << fsm.getCost(0).getTrack() << endl;
Session::addMoveEvent( _segment, fsm.getCost(0).getTrack() ); fsm.moveToTrack( 0 );
fsm.setState( SegmentFsm::SelfInserted );
} }
} }
@ -563,6 +557,7 @@ namespace Katana {
SegmentFsm fsm ( this, queue, history ); SegmentFsm fsm ( this, queue, history );
if (fsm.getState() == SegmentFsm::MissingData ) return; if (fsm.getState() == SegmentFsm::MissingData ) return;
if (fsm.getState() == SegmentFsm::EmptyTrackList) return; if (fsm.getState() == SegmentFsm::EmptyTrackList) return;
if (fsm.isSymmetric()) return;
cdebug_tabw(159,1); cdebug_tabw(159,1);
for ( size_t i = 0 ; i < fsm.getCosts().size() ; i++ ) for ( size_t i = 0 ; i < fsm.getCosts().size() ; i++ )
@ -571,8 +566,7 @@ namespace Katana {
if (fsm.getCosts().size() and fsm.getCost(0).isFree()) { if (fsm.getCosts().size() and fsm.getCost(0).isFree()) {
cdebug_log(159,0) << "Insert in free space." << endl; cdebug_log(159,0) << "Insert in free space." << endl;
Session::addInsertEvent( _segment, fsm.getCost(0).getTrack() ); fsm.bindToTrack( 0 );
fsm.setState( SegmentFsm::SelfInserted );
} else { } else {
switch ( fsm.getData()->getStateCount() ) { switch ( fsm.getData()->getStateCount() ) {
case 1: case 1:
@ -599,7 +593,7 @@ namespace Katana {
void RoutingEvent::revalidate () void RoutingEvent::revalidate ()
{ {
DebugSession::open( _segment->getNet(), 150, 160 ); DebugSession::open( _segment->getNet(), 156, 160 );
cdebug_log(159,1) << "RoutingEvent::revalidate() - " << this << endl; cdebug_log(159,1) << "RoutingEvent::revalidate() - " << this << endl;
@ -656,9 +650,16 @@ namespace Katana {
and _segment->base()->getAutoTarget()->isTerminal(); and _segment->base()->getAutoTarget()->isTerminal();
} }
_priority double length = DbU::toLambda(_segment->getLength());
= (DbU::toLambda(_segment->getLength()) + 1.0)
* (DbU::toLambda(_segment->base()->getSlack()) + 1.0); // if (length > 200.0) length = 200.0 - std::log(length)*20.0;
// if (length < 0.0) length = 0.0;
_priority = (length + 1.0) * (DbU::toLambda(_segment->base()->getSlack()) + 1.0);
// if (_priority > 10000.0) cerr << "_priority:" << _priority
// << " length:" << DbU::toLambda(_segment->getLength())
// << " slack:" << DbU::toLambda(_segment->base()->getSlack()) << endl;
cdebug_log(159,0) << _segment << " has " << (int)_tracksNb << " choices " << perpandicular << endl; cdebug_log(159,0) << _segment << " has " << (int)_tracksNb << " choices " << perpandicular << endl;
cdebug_tabw(159,-1); cdebug_tabw(159,-1);

342
katana/src/SegmentFsm.cpp
View File

@ -36,6 +36,26 @@ namespace {
using namespace Katana; using namespace Katana;
// -------------------------------------------------------------------
// Class : "CompareCostArray".
class CompareCostArray {
public:
inline CompareCostArray ( unsigned int flags=0 );
inline bool operator() ( const array<TrackCost,2>& lhs, const array<TrackCost,2>& rhs );
private:
TrackCost::Compare _compare;
};
inline CompareCostArray::CompareCostArray ( unsigned int flags )
: _compare(flags)
{ }
inline bool CompareCostArray::operator() ( const array<TrackCost,2>& lhs, const array<TrackCost,2>& rhs )
{ return _compare( lhs[0], rhs[0] ); }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Class : "Cs1Candidate". // Class : "Cs1Candidate".
@ -363,7 +383,7 @@ namespace Katana {
// "_immediate" ripup flags was associated with "perpandicular", as they // "_immediate" ripup flags was associated with "perpandicular", as they
// must be re-inserted *before* any parallel. Must look to solve the redundancy. // must be re-inserted *before* any parallel. Must look to solve the redundancy.
DebugSession::open( _segment->getNet(), 150, 160 ); DebugSession::open( _segment->getNet(), 156, 160 );
if (_type & Perpandicular) { if (_type & Perpandicular) {
cdebug_log(159,0) << "* Riping Pp " << _segment << endl; cdebug_log(159,0) << "* Riping Pp " << _segment << endl;
@ -438,43 +458,87 @@ namespace Katana {
// Class : "SegmentFsm". // Class : "SegmentFsm".
SegmentFsm::SegmentFsm ( RoutingEvent* event, RoutingEventQueue& queue, RoutingEventHistory& history ) SegmentFsm::SegmentFsm ( RoutingEvent* event1
: _event (event) , RoutingEventQueue& queue
, RoutingEventHistory& history )
: _event1 (event1)
, _event2 (NULL)
, _queue (queue) , _queue (queue)
, _history (history) , _history (history)
, _state (0) , _state (0)
, _data (NULL) , _data1 (NULL)
, _data2 (NULL)
, _constraint () , _constraint ()
, _optimal () , _optimal ()
, _costs () , _costs ()
, _actions () , _actions ()
, _fullBlocked(true) , _fullBlocked(true)
, _sameAxis (false)
, _useEvent2 (false)
{ {
TrackElement* segment = _event->getSegment(); DataSymmetric* symData = NULL;
unsigned int depth = Session::getRoutingGauge()->getLayerDepth(segment->getLayer()); TrackElement* segment1 = _event1->getSegment();
_event->setTracksFree( 0 ); TrackElement* segment2 = segment1->getSymmetric();
unsigned int depth = Session::getRoutingGauge()->getLayerDepth(segment1->getLayer());
_event1->setTracksFree( 0 );
_data = segment->getDataNegociate(); _data1 = segment1->getDataNegociate();
if (not _data) { if (not _data1) {
_state = MissingData; _state = MissingData;
return; return;
} }
_data->update(); _data1->update();
_event->revalidate(); _event1->revalidate();
_constraint = _event->getConstraints(); if (segment2) {
_optimal = _event->getOptimal(); symData = Session::getKatanaEngine()->getDataSymmetric( segment1->getNet() );
const Interval& perpandicular = _event->getPerpandicularFree(); _data2 = segment2->getDataNegociate();
if (not _data2 or not symData) {
_state = MissingData;
return;
}
_event2 = _data2->getRoutingEvent();
_event2->setTracksFree( 0 );
cdebug_log(159,1) << "Coupled:" << _event2 << endl;
_data2->update();
_event2->revalidate();
cdebug_tabw(159,-1);
_sameAxis = (segment1->isVertical() xor symData->isSymVertical());
}
Interval perpandicular = _event1->getPerpandicularFree();
cdebug_log(159,0) << "* Perpandicular (master): " << perpandicular << endl;
_constraint = _event1->getConstraints();
_optimal = _event1->getOptimal();
if (_event2) {
if (_sameAxis) {
_constraint .intersection( _event2->getConstraints() );
perpandicular.intersection( _event2->getPerpandicularFree() );
cdebug_log(159,0) << "* Perpandicular (slave): same axis "
<< _event2->getPerpandicularFree() << endl;
} else {
_constraint .intersection( symData->getSymmetrical( _event2->getConstraints() ) );
perpandicular.intersection( symData->getSymmetrical( _event2->getPerpandicularFree() ) );
cdebug_log(159,0) << "* Perpandicular (slave): PP axis "
<< symData->getSymmetrical(_event2->getPerpandicularFree()) << endl;
}
}
cdebug_log(159,0) << "Anabatic intervals:" << endl; cdebug_log(159,0) << "Anabatic intervals:" << endl;
cdebug_log(159,0) << "* Optimal: " << _optimal << endl; cdebug_log(159,0) << "* Optimal: " << _optimal << endl;
cdebug_log(159,0) << "* Constraints: " << _constraint << endl; cdebug_log(159,0) << "* Constraints: " << _constraint << endl;
cdebug_log(159,0) << "* Perpandicular: " << perpandicular << endl; cdebug_log(159,0) << "* Perpandicular: " << perpandicular << endl;
cdebug_log(159,0) << "* AxisHint: " << DbU::getValueString(_event->getAxisHint()) << endl; cdebug_log(159,0) << "* AxisHint: " << DbU::getValueString(_event1->getAxisHint()) << endl;
if (_event->getTracksNb()) { if (_event1->getTracksNb()) {
if (_constraint.getIntersection(perpandicular).isEmpty()) { if (_constraint.getIntersection(perpandicular).isEmpty()) {
cdebug_log(159,0) << "Perpandicular free is too tight." << endl; cdebug_log(159,0) << "Perpandicular free is too tight." << endl;
_state = EmptyTrackList; _state = EmptyTrackList;
@ -489,44 +553,62 @@ namespace Katana {
cdebug_log(159,0) << "Negociate intervals:" << endl; cdebug_log(159,0) << "Negociate intervals:" << endl;
cdebug_log(159,0) << "* Optimal: " << _optimal << endl; cdebug_log(159,0) << "* Optimal: " << _optimal << endl;
cdebug_log(159,1) << "* Constraints: " << _constraint << endl; cdebug_log(159,0) << "* Constraints: " << _constraint << endl;
cdebug_log(159,1) << "* _sameAxis: " << _sameAxis << endl;
// if ( segment->isLocal() and (_data->getState() >= DataNegociate::MaximumSlack) ) // if ( segment->isLocal() and (_data->getState() >= DataNegociate::MaximumSlack) )
// _constraint.inflate ( 0, DbU::lambda(1.0) ); // _constraint.inflate ( 0, DbU::lambda(1.0) );
bool inLocalDepth = (depth < 3); bool inLocalDepth = (depth < 3);
bool isOneLocalTrack = (segment->isLocal()) bool isOneLocalTrack = (segment1->isLocal())
and (segment->base()->getAutoSource()->getGCell()->getGlobalsCount(depth) >= 9.0); and (segment1->base()->getAutoSource()->getGCell()->getGlobalsCount(depth) >= 9.0);
RoutingPlane* plane = Session::getKatanaEngine()->getRoutingPlaneByLayer(segment->getLayer()); RoutingPlane* plane = Session::getKatanaEngine()->getRoutingPlaneByLayer(segment1->getLayer());
for ( Track* track : Tracks_Range::get(plane,_constraint) ) { for ( Track* track1 : Tracks_Range::get(plane,_constraint) ) {
unsigned int costflags = 0; unsigned int costflags = 0;
costflags |= (segment->isLocal() and (depth >= 3)) ? TrackCost::LocalAndTopDepth : 0; costflags |= (segment1->isLocal() and (depth >= 3)) ? TrackCost::LocalAndTopDepth : 0;
if (not segment->isReduced()) Track* track2 = NULL;
_costs.push_back( track->getOverlapCost(segment,costflags) ); if (_event2) {
else track2 =
_costs.push_back( TrackCost(track,segment->getNet()) ); (_sameAxis) ? track1 : plane->getTrackByPosition( symData->getSymmetrical( track1->getAxis() ) );
_costs.back().setAxisWeight ( _event->getAxisWeight(track->getAxis()) );
_costs.back().incDeltaPerpand( _data->getWiringDelta(track->getAxis()) );
if (segment->isGlobal()) {
cdebug_log(9000,0) << "Deter| setForGlobal() on " << track << endl;
_costs.back().setForGlobal();
} }
if ( inLocalDepth and (_costs.back().getDataState() == DataNegociate::MaximumSlack) ) _costs.push_back( array<TrackCost,2>( { TrackCost(NULL), TrackCost(NULL) } ) );
_costs.back().setInfinite(); if (not segment1->isReduced()) {
_costs.back()[0] = track1->getOverlapCost(segment1,costflags);
if (_event2) _costs.back()[1] = track2->getOverlapCost(segment2,costflags);
} else {
_costs.back()[0] = TrackCost(track1);
if (_event2) _costs.back()[1] = TrackCost(track2);
}
_costs.back()[0].setAxisWeight ( _event1->getAxisWeight(track1->getAxis()) );
_costs.back()[0].incDeltaPerpand( _data1->getWiringDelta(track1->getAxis()) );
if (_event2) {
_costs.back()[1].setAxisWeight ( _event2->getAxisWeight(track2->getAxis()) );
_costs.back()[1].incDeltaPerpand( _data2->getWiringDelta(track2->getAxis()) );
_costs.back()[0].merge( _costs.back()[1] );
}
if (segment1->isGlobal()) {
cdebug_log(9000,0) << "Deter| setForGlobal() on " << track1 << endl;
_costs.back()[0].setForGlobal();
}
if ( inLocalDepth and (_costs.back()[0].getDataState() == DataNegociate::MaximumSlack) )
_costs.back()[0].setInfinite();
if ( isOneLocalTrack if ( isOneLocalTrack
and _costs.back().isOverlapGlobal() and _costs.back()[0].isOverlapGlobal()
and (_costs.back().getDataState() >= DataNegociate::ConflictSolveByHistory) ) and (_costs.back()[0].getDataState() >= DataNegociate::ConflictSolveByHistory) )
_costs.back().setInfinite(); _costs.back()[0].setInfinite();
_costs.back().consolidate(); _costs.back()[0].consolidate();
if ( _fullBlocked and (not _costs.back().isBlockage() and not _costs.back().isFixed()) ) if ( _fullBlocked and (not _costs.back()[0].isBlockage() and not _costs.back()[0].isFixed()) )
_fullBlocked = false; _fullBlocked = false;
cdebug_log(159,0) << "| " << _costs.back() << ((_fullBlocked)?" FB ": " -- ") << track << endl; cdebug_log(155,0) << "| " << _costs.back()[0] << ((_fullBlocked)?" FB ": " -- ") << track1 << endl;
} }
cdebug_tabw(159,-1); cdebug_tabw(159,-1);
@ -540,7 +622,7 @@ namespace Katana {
// << _constraint << " " << "." << endl; // << _constraint << " " << "." << endl;
} else { } else {
cerr << Bug( " %s Track_Range() failed to find Tracks in %s (they exists)." cerr << Bug( " %s Track_Range() failed to find Tracks in %s (they exists)."
, getString(segment).c_str() , getString(segment1).c_str()
, getString(_constraint).c_str() , getString(_constraint).c_str()
) << endl; ) << endl;
} }
@ -548,10 +630,10 @@ namespace Katana {
} }
unsigned int flags = 0; unsigned int flags = 0;
flags |= (segment->isStrap()) ? TrackCost::IgnoreAxisWeight : 0; flags |= (segment1->isStrap()) ? TrackCost::IgnoreAxisWeight : 0;
flags |= (segment->isLocal() flags |= (segment1->isLocal()
and (_data->getState() < DataNegociate::Minimize) and (_data1->getState() < DataNegociate::Minimize)
and (_data->getRipupCount() < 5)) and (_data1->getRipupCount() < 5))
? TrackCost::DiscardGlobals : 0; ? TrackCost::DiscardGlobals : 0;
flags |= (RoutingEvent::getStage() == RoutingEvent::Repair) ? TrackCost::IgnoreSharedLength : 0; flags |= (RoutingEvent::getStage() == RoutingEvent::Repair) ? TrackCost::IgnoreSharedLength : 0;
@ -559,11 +641,25 @@ namespace Katana {
cdebug_log(159,0) << "TrackCost::Compare() - DiscardGlobals" << endl; cdebug_log(159,0) << "TrackCost::Compare() - DiscardGlobals" << endl;
} }
sort( _costs.begin(), _costs.end(), TrackCost::Compare(flags) ); // FOR ANALOG ONLY.
//flags |= TrackCost::IgnoreSharedLength;
sort( _costs.begin(), _costs.end(), CompareCostArray(flags) );
size_t i=0; size_t i=0;
for ( ; (i<_costs.size()) and _costs[i].isFree() ; i++ ); for ( ; (i<_costs.size()) and _costs[i][0].isFree() ; i++ );
_event->setTracksFree ( i ); _event1->setTracksFree ( i );
if (_event2) {
for ( ; (i<_costs.size()) and _costs[i][1].isFree() ; i++ );
_event2->setTracksFree ( i );
}
}
void SegmentFsm::setDataState ( unsigned int state )
{
_data1->setState( state );
if (_data2) _data2->setState( state );
} }
@ -581,7 +677,7 @@ namespace Katana {
void SegmentFsm::doActions () void SegmentFsm::doActions ()
{ {
cdebug_log(159,0) << "SegmentFsm::doActions() - " << _actions.size() << endl; cdebug_log(159,1) << "SegmentFsm::doActions() - " << _actions.size() << endl;
bool ripupOthersParallel = false; bool ripupOthersParallel = false;
bool ripedByLocal = getEvent()->getSegment()->isLocal(); bool ripedByLocal = getEvent()->getSegment()->isLocal();
@ -597,7 +693,7 @@ namespace Katana {
if ( (_actions[i].getType() & SegmentAction::SelfInsert) and ripupOthersParallel ) if ( (_actions[i].getType() & SegmentAction::SelfInsert) and ripupOthersParallel )
_actions[i].setFlag ( SegmentAction::EventLevel3 ); _actions[i].setFlag ( SegmentAction::EventLevel3 );
DebugSession::open ( _actions[i].getSegment()->getNet(), 150, 160 ); DebugSession::open ( _actions[i].getSegment()->getNet(), 156, 160 );
if ( not _actions[i].doAction(_queue) ) { if ( not _actions[i].doAction(_queue) ) {
cinfo << "[INFO] Failed action on " << _actions[i].getSegment() << endl; cinfo << "[INFO] Failed action on " << _actions[i].getSegment() << endl;
} }
@ -605,36 +701,113 @@ namespace Katana {
} }
_actions.clear (); _actions.clear ();
cdebug_tabw(159,-1);
}
void SegmentFsm::incRipupCount ()
{
_data1->incRipupCount();
if (_data2) _data2->incRipupCount();
} }
bool SegmentFsm::insertInTrack ( size_t i ) bool SegmentFsm::insertInTrack ( size_t i )
{ {
cdebug_log(159,0) << "SegmentFsm::insertInTrack() istate:" << _event->getInsertState() cdebug_log(159,0) << "SegmentFsm::insertInTrack() istate:" << _event1->getInsertState()
<< " track:" << i << endl; << " track:" << i << endl;
_event->incInsertState(); bool success = true;
switch ( _event->getInsertState() ) {
_event1->incInsertState();
switch ( _event1->getInsertState() ) {
case 1: case 1:
if ( Manipulator(_event->getSegment(),*this).insertInTrack(i) ) return true; success = Manipulator(_event1->getSegment(),useEvent1()).insertInTrack(i);
_event->incInsertState(); success = success and (not _event2 or Manipulator(_event2->getSegment(),useEvent2()).insertInTrack(i));
if (success) break;
_event1->incInsertState();
clearActions();
case 2: case 2:
if ( Manipulator(_event->getSegment(),*this).shrinkToTrack(i) ) return true; success = Manipulator(_event1->getSegment(),useEvent1()).shrinkToTrack(i);
_event->incInsertState(); success = success and (not _event2 or Manipulator(_event2->getSegment(),useEvent2()).shrinkToTrack(i));
if (success) break;
_event1->incInsertState();
clearActions();
case 3: case 3:
if ( Manipulator(_event->getSegment(),*this).forceToTrack(i) ) return true; success = Manipulator(_event1->getSegment(),useEvent1()).forceToTrack(i);
_event->incInsertState(); success = success and (not _event2 or Manipulator(_event2->getSegment(),useEvent2()).forceToTrack(i));
} if (success) break;
return false; _event1->incInsertState();
clearActions();
} }
useEvent1();
if (_event2) _event2->setInsertState( _event1->getInsertState() );
return success;
}
void SegmentFsm::bindToTrack ( size_t i )
{
cdebug_log(159,0) << "SegmentFsm::bindToTrack() :" << " track:" << i << endl;
_event1->resetInsertState();
_event1->updateAxisHistory();
_event1->setEventLevel( 0 );
cdebug_log(9000,0) << "Deter| addInsertEvent() @" << getCost1(i).getTrack() << endl;
Session::addInsertEvent( getSegment1(), getCost1(i).getTrack() );
if (_event2) {
_event2->resetInsertState();
_event2->updateAxisHistory();
_event2->setEventLevel( 0 );
_event2->setProcessed( true );
cdebug_log(9000,0) << "Deter| addInsertEvent() @" << getCost1(i).getTrack() << endl;
Session::addInsertEvent( getSegment2(), getCost2(i).getTrack() );
}
setState( SegmentFsm::SelfInserted );
}
void SegmentFsm::moveToTrack ( size_t i )
{
cdebug_log(159,0) << "SegmentFsm::moveToTrack() :" << " track:" << i << endl;
Session::addMoveEvent( getSegment1(), getCost1(i).getTrack() );
if (_event2) {
cdebug_log(9000,0) << "Deter| addInsertEvent() @" << getCost1(i).getTrack() << endl;
Session::addMoveEvent( getSegment2(), getCost2(i).getTrack() );
}
setState( SegmentFsm::SelfInserted );
}
void SegmentFsm::ripupPerpandiculars ()
{
Manipulator(getSegment1(),*this).ripupPerpandiculars();
if (_event2)
Manipulator(getSegment2(),*this).ripupPerpandiculars();
}
bool SegmentFsm::canRipup ( unsigned int flags )
{
return Manipulator(getSegment1(),*this).canRipup(flags)
and (not _event2 or Manipulator(getSegment2(),*this).canRipup(flags));
}
bool SegmentFsm::conflictSolveByHistory () bool SegmentFsm::conflictSolveByHistory ()
{ {
bool success = false; bool success = false;
RipupHistory ripupHistory ( _event ); RipupHistory ripupHistory ( _event1 );
RoutingEvent* event; RoutingEvent* event;
TrackElement* segment = _event->getSegment(); TrackElement* segment = getEvent()->getSegment();
cdebug_log(159,0) << "SegmentFsm::conflictSolveByHistory()" << endl; cdebug_log(159,0) << "SegmentFsm::conflictSolveByHistory()" << endl;
@ -719,10 +892,10 @@ namespace Katana {
bool success = false; bool success = false;
Interval constraints; Interval constraints;
vector<Cs1Candidate> candidates; vector<Cs1Candidate> candidates;
TrackElement* segment = _event->getSegment(); TrackElement* segment = getEvent()->getSegment();
bool canMoveUp = (segment->isLocal()) ? segment->canPivotUp(0.5,Flags::NoFlags) : segment->canMoveUp(1.0,Flags::CheckLowDensity); // MARK 1 bool canMoveUp = (segment->isLocal()) ? segment->canPivotUp(0.5,Flags::NoFlags) : segment->canMoveUp(1.0,Flags::CheckLowDensity); // MARK 1
unsigned int relaxFlags = Manipulator::NoDoglegReuse unsigned int relaxFlags = Manipulator::NoDoglegReuse
| ((_data and (_data->getStateCount() < 2)) ? Manipulator::AllowExpand | ((_data1 and (_data1->getStateCount() < 2)) ? Manipulator::AllowExpand
: Manipulator::NoExpand); : Manipulator::NoExpand);
cdebug_log(159,0) << "SegmentFsm::conflictSolveByPlaceds()" << endl; cdebug_log(159,0) << "SegmentFsm::conflictSolveByPlaceds()" << endl;
@ -942,7 +1115,7 @@ namespace Katana {
size_t itrack = 0; size_t itrack = 0;
#if THIS_IS_DISABLED #if THIS_IS_DISABLED
TrackElement* segment = _event->getSegment(); TrackElement* segment = getEvent()->getSegment();
for ( ; itrack<getCosts().size() ; ++itrack ) { for ( ; itrack<getCosts().size() ; ++itrack ) {
cdebug_log(159,0) << "Trying track:" << itrack << endl; cdebug_log(159,0) << "Trying track:" << itrack << endl;
@ -996,7 +1169,6 @@ namespace Katana {
} }
bool SegmentFsm::_slackenStrap ( TrackElement*& segment, DataNegociate*& data, unsigned int flags ) bool SegmentFsm::_slackenStrap ( TrackElement*& segment, DataNegociate*& data, unsigned int flags )
{ {
cdebug_log(159,0) << "Strap segment Fsm." << endl; cdebug_log(159,0) << "Strap segment Fsm." << endl;
@ -1216,30 +1388,40 @@ namespace Katana {
bool SegmentFsm::slackenTopology ( unsigned int flags ) bool SegmentFsm::slackenTopology ( unsigned int flags )
{ {
bool success = false; bool success = false;
TrackElement* segment = getEvent()->getSegment(); TrackElement* segment1 = getSegment1();
DataNegociate* data = segment->getDataNegociate ();
unsigned int actionFlags = SegmentAction::SelfInsert|SegmentAction::EventLevel5; unsigned int actionFlags = SegmentAction::SelfInsert|SegmentAction::EventLevel5;
DebugSession::open( segment->getNet(), 150, 160 ); DebugSession::open( segment1->getNet(), 156, 160 );
cdebug_log(159,1) << "Slacken Topology for " << segment->getNet() cdebug_log(159,1) << "Slacken Topology for " << segment1->getNet()
<< " " << segment << endl; << " " << segment1 << endl;
if (not segment or not data) { cdebug_tabw(159,-1); DebugSession::close(); return false; } if (_data2) {
cdebug_log(159,0) << "Symmetric segments are not allowed to slacken (yet)" << endl;
cdebug_tabw(159,-1);
DebugSession::close();
return false;
}
_event->resetInsertState(); if (not segment1 or not _data1) { cdebug_tabw(159,-1); DebugSession::close(); return false; }
data->resetRipupCount();
if (segment->isStrap()) { success = _slackenStrap ( segment, data, flags ); } _event1->resetInsertState();
else if (segment->isLocal()) { success = _slackenLocal ( segment, data, flags ); } _data1->resetRipupCount();
else { success = _slackenGlobal( segment, data, flags ); } if (_event2) {
_event2->resetInsertState();
_data2->resetRipupCount();
}
if (segment1->isStrap()) { success = _slackenStrap ( segment1, _data1, flags ); }
else if (segment1->isLocal()) { success = _slackenLocal ( segment1, _data1, flags ); }
else { success = _slackenGlobal( segment1, _data1, flags ); }
if (success) { if (success) {
actionFlags |= SegmentAction::ResetRipup; actionFlags |= SegmentAction::ResetRipup;
addAction( segment, actionFlags ); addAction( segment1, actionFlags );
} else { } else {
clearActions(); clearActions();
if (data->getState() == DataNegociate::Unimplemented) { if (_data1->getState() == DataNegociate::Unimplemented) {
cinfo << "[UNSOLVED] " << segment << " unable to slacken topology." << endl; cinfo << "[UNSOLVED] " << segment1 << " unable to slacken topology." << endl;
} }
} }

43
katana/src/SymmetricRoute.cpp
View File

@ -50,8 +50,9 @@ namespace {
using Anabatic::AutoContactTerminal; using Anabatic::AutoContactTerminal;
using Anabatic::AutoSegment; using Anabatic::AutoSegment;
using Anabatic::AutoSegmentFlag; using Anabatic::AutoSegmentFlag;
using Katana::KatanaEngine; using Katana::TrackElement;
using Katana::DataSymmetric; using Katana::DataSymmetric;
using Katana::KatanaEngine;
using Katana::Session; using Katana::Session;
@ -111,6 +112,7 @@ namespace {
void _doDualPairing (); void _doDualPairing ();
AutoContactTerminal* _getSymmetricTerminal ( AutoContactTerminal* masterContact ); AutoContactTerminal* _getSymmetricTerminal ( AutoContactTerminal* masterContact );
Component* _findMiddleComponent (); Component* _findMiddleComponent ();
void _associate ();
private: private:
KatanaEngine* _katana; KatanaEngine* _katana;
AutoSegment* _seed; AutoSegment* _seed;
@ -138,16 +140,21 @@ namespace {
DebugSession::open( _data->getNet(), 144, 146 ); DebugSession::open( _data->getNet(), 144, 146 );
// Temporary.
_data->setSymAxis( _katana->getCell()->getAbutmentBox().getCenter().getX() );
cmess2 << " - Net: \"" << _data->getNet()->getName() << "\" "; cmess2 << " - Net: \"" << _data->getNet()->getName() << "\" ";
cmess2 << "@" << DbU::getValueString(_data->getSymAxis()) << " "; cmess2 << "@" << DbU::getValueString(_data->getSymAxis()) << " ";
cmess2 << (_data->isSymVertical() ? "Vertical" : "Horizontal") << " "; cmess2 << (_data->isSymVertical() ? "Vertical" : "Horizontal") << " ";
if (_data->getSymNet()) cmess2 << "(paired: \"" << _data->getSymNet()->getName() << "\")"; if (_data->getSymNet()) cmess2 << "(paired: \"" << _data->getSymNet()->getName() << "\")";
else cmess2 << "(self symmetric)"; else cmess2 << "(self symmetric)";
cmess2 << endl;
if (_data->getSymNet()) _doDualPairing(); if (_data->getSymNet()) _doDualPairing();
else _doSelfPairing(); else _doSelfPairing();
if (_data->isValid()) _data->checkPairing(); if (_data->isValid()) _data->checkPairing();
_associate();
DebugSession::close(); DebugSession::close();
@ -201,9 +208,7 @@ namespace {
AutoContactTerminal* TopologicalPairing::_getSymmetricTerminal ( AutoContactTerminal* masterContact ) AutoContactTerminal* TopologicalPairing::_getSymmetricTerminal ( AutoContactTerminal* masterContact )
{ {
Point mirror = masterContact->getCenter(); Point mirror = _data->getSymmetrical( masterContact->getCenter() );
_data->getSymmetrical( mirror );
GCell* mirrorGCell = _katana->getGCellUnder( mirror ); GCell* mirrorGCell = _katana->getGCellUnder( mirror );
if (not mirrorGCell) { if (not mirrorGCell) {
cerr << Error( "getSymmetricTerminal() No GCell under symmetric position (%s,%s)." cerr << Error( "getSymmetricTerminal() No GCell under symmetric position (%s,%s)."
@ -221,7 +226,10 @@ namespace {
} }
} }
cerr << Error( "getSymmetricTerminal() Missing terminal contact in symmetric GCell." cerr << Error( "getSymmetricTerminal() Missing terminal contact in symmetric GCell.\n"
" master:%s\n"
" mirror:%s"
, getString(masterContact).c_str(), getString(mirrorGCell).c_str()
) << endl; ) << endl;
_data->setValid( false ); _data->setValid( false );
@ -352,6 +360,30 @@ namespace {
} }
void TopologicalPairing::_associate ()
{
cdebug_log(144,1) << "TopologicalPairing::_associate()" << endl;
//cmess1 << " - Associating symmetrics." << endl;
if (not _data->isValid()) return;
const DataSymmetric::Paireds& paireds = _data->getPaireds();
for ( auto sympair : paireds ) {
if (not sympair[0]->isCanonical() or not sympair[1]->isCanonical()) continue;
TrackElement* trackSegment0 = Session::lookup( sympair[0] );
TrackElement* trackSegment1 = Session::lookup( sympair[1] );
if (not trackSegment0 or not trackSegment1) continue;
trackSegment0->setSymmetric( trackSegment1 );
trackSegment1->setSymmetric( trackSegment0 );
}
cdebug_tabw(144,-1);
}
} // Anonymous namespace. } // Anonymous namespace.
@ -363,6 +395,7 @@ namespace Katana {
void KatanaEngine::runSymmetricRouter () void KatanaEngine::runSymmetricRouter ()
{ {
for ( Net* net : getCell()->getNets() ) { for ( Net* net : getCell()->getNets() ) {
if (not NetRoutingExtension::isSymmetric(net)) continue;
TopologicalPairing(this,net).doPairing(); TopologicalPairing(this,net).doPairing();
} }
} }

7
katana/src/Track.cpp
View File

@ -172,10 +172,8 @@ namespace Katana {
TrackElement* Track::getPrevious ( size_t& index, Net* net ) const TrackElement* Track::getPrevious ( size_t& index, Net* net ) const
{ {
for ( index-- ; index != npos ; index-- ) { for ( index-- ; index != npos ; index-- ) {
if (cdebug.enabled()) { cdebug_log(140,0) << index << ":" << _segments[index] << endl;
cerr << tab << index << ":"; cerr.flush();
cerr << _segments[index] << endl;
}
if (_segments[index]->getNet() == net) continue; if (_segments[index]->getNet() == net) continue;
return _segments[index]; return _segments[index];
} }
@ -437,6 +435,7 @@ namespace Katana {
} }
} }
} }
cdebug_tabw(155,-1); cdebug_tabw(155,-1);
return Interval( minFree, getMaximalPosition(end,state) ); return Interval( minFree, getMaximalPosition(end,state) );

15
katana/src/TrackCost.cpp
View File

@ -31,7 +31,7 @@ namespace Katana {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Class : "TrackCost". // Class : "TrackCost".
TrackCost::TrackCost ( Track* track, Net* net ) TrackCost::TrackCost ( Track* track )
: _flags (ZeroCost) : _flags (ZeroCost)
, _track (track) , _track (track)
, _begin (Track::npos) , _begin (Track::npos)
@ -209,6 +209,19 @@ namespace Katana {
} }
void TrackCost::merge ( const TrackCost& other )
{
_terminals += other._terminals;
_delta += other._delta;
_deltaShared += other._deltaShared;
_deltaPerpand += other._deltaPerpand;
_axisWeight += other._axisWeight;
_distanceToFixed = std::min( _distanceToFixed, other._distanceToFixed );
_longuestOverlap = std::min( _longuestOverlap, other._longuestOverlap );
_dataState = std::max( _dataState, other._dataState );
}
string TrackCost::_getString () const string TrackCost::_getString () const
{ {
string s = "<" + _getTypeName(); string s = "<" + _getTypeName();

3
katana/src/TrackElement.cpp
View File

@ -145,6 +145,7 @@ namespace Katana {
bool TrackElement::isUTurn () const { return false; } bool TrackElement::isUTurn () const { return false; }
bool TrackElement::isUserDefined () const { return false; } bool TrackElement::isUserDefined () const { return false; }
// Predicates. // Predicates.
bool TrackElement::hasSymmetric () const { return false; }
bool TrackElement::canSlacken () const { return false; } bool TrackElement::canSlacken () const { return false; }
bool TrackElement::canPivotUp ( float, unsigned int ) const { return false; }; bool TrackElement::canPivotUp ( float, unsigned int ) const { return false; };
bool TrackElement::canPivotDown ( float, unsigned int ) const { return false; }; bool TrackElement::canPivotDown ( float, unsigned int ) const { return false; };
@ -168,8 +169,10 @@ namespace Katana {
TrackElement* TrackElement::getCanonical ( Interval& i ) { i=Interval(getSourceU(),getTargetU()); return this; } TrackElement* TrackElement::getCanonical ( Interval& i ) { i=Interval(getSourceU(),getTargetU()); return this; }
TrackElement* TrackElement::getSourceDogleg () { return NULL; } TrackElement* TrackElement::getSourceDogleg () { return NULL; }
TrackElement* TrackElement::getTargetDogleg () { return NULL; } TrackElement* TrackElement::getTargetDogleg () { return NULL; }
TrackElement* TrackElement::getSymmetric () { return NULL; }
// Mutators. // Mutators.
void TrackElement::setTrack ( Track* track ) { _track = track; } void TrackElement::setTrack ( Track* track ) { _track = track; }
void TrackElement::setSymmetric ( TrackElement* ) { }
void TrackElement::updateFreedomDegree () { } void TrackElement::updateFreedomDegree () { }
void TrackElement::setDoglegLevel ( unsigned int ) { } void TrackElement::setDoglegLevel ( unsigned int ) { }
void TrackElement::swapTrack ( TrackElement* ) { } void TrackElement::swapTrack ( TrackElement* ) { }

24
katana/src/TrackSegment.cpp
View File

@ -61,6 +61,7 @@ namespace Katana {
TrackSegment::TrackSegment ( AutoSegment* segment, Track* track ) TrackSegment::TrackSegment ( AutoSegment* segment, Track* track )
: TrackElement (track) : TrackElement (track)
, _base (segment) , _base (segment)
, _symmetric (NULL)
, _freedomDegree(0) , _freedomDegree(0)
, _ppitch (0) , _ppitch (0)
, _data (NULL) , _data (NULL)
@ -161,6 +162,7 @@ namespace Katana {
bool TrackSegment::isUserDefined () const { return _base->isUserDefined(); } bool TrackSegment::isUserDefined () const { return _base->isUserDefined(); }
bool TrackSegment::isUTurn () const { return _base->isUTurn(); } bool TrackSegment::isUTurn () const { return _base->isUTurn(); }
// Predicates. // Predicates.
bool TrackSegment::hasSymmetric () const { return _symmetric != NULL; }
// Accessors. // Accessors.
unsigned long TrackSegment::getId () const { return _base->getId(); } unsigned long TrackSegment::getId () const { return _base->getId(); }
Flags TrackSegment::getDirection () const { return _base->getDirection(); } Flags TrackSegment::getDirection () const { return _base->getDirection(); }
@ -174,6 +176,7 @@ namespace Katana {
Interval TrackSegment::getSourceConstraints () const { return _base->getSourceConstraints(); } Interval TrackSegment::getSourceConstraints () const { return _base->getSourceConstraints(); }
Interval TrackSegment::getTargetConstraints () const { return _base->getTargetConstraints(); } Interval TrackSegment::getTargetConstraints () const { return _base->getTargetConstraints(); }
TrackElement* TrackSegment::getCanonical ( Interval& i ) { return Session::lookup( _base->getCanonical(i)->base() ); } TrackElement* TrackSegment::getCanonical ( Interval& i ) { return Session::lookup( _base->getCanonical(i)->base() ); }
TrackElement* TrackSegment::getSymmetric () { return _symmetric; }
TrackElements TrackSegment::getPerpandiculars () { return new TrackElements_Perpandiculars(this); } TrackElements TrackSegment::getPerpandiculars () { return new TrackElements_Perpandiculars(this); }
// Mutators. // Mutators.
void TrackSegment::invalidate () { setFlags( TElemInvalidated ); _base->invalidate(); } void TrackSegment::invalidate () { setFlags( TElemInvalidated ); _base->invalidate(); }
@ -231,22 +234,22 @@ namespace Katana {
GCell* sourceGCell = base()->getAutoSource()->getGCell(); GCell* sourceGCell = base()->getAutoSource()->getGCell();
GCell* targetGCell = base()->getAutoTarget()->getGCell(); GCell* targetGCell = base()->getAutoTarget()->getGCell();
cdebug_log(159,0) << "getGCells(): sourceGCell: " << sourceGCell << endl; cdebug_log(155,0) << "getGCells(): sourceGCell: " << sourceGCell << endl;
cdebug_log(159,0) << "getGCells(): targetGCell: " << targetGCell << endl; cdebug_log(155,0) << "getGCells(): targetGCell: " << targetGCell << endl;
for ( AutoSegment* segment : base()->getAligneds() ) { for ( AutoSegment* segment : base()->getAligneds() ) {
cdebug_log(159,0) << "| " << segment << endl; cdebug_log(155,0) << "| " << segment << endl;
Anabatic::GCell* gcell = segment->getAutoSource()->getGCell(); Anabatic::GCell* gcell = segment->getAutoSource()->getGCell();
if (isLess(gcell,sourceGCell,direction)) { if (isLess(gcell,sourceGCell,direction)) {
sourceGCell = gcell; sourceGCell = gcell;
cdebug_log(159,0) << "getGCells(): new sourceGCell: " << sourceGCell << endl; cdebug_log(155,0) << "getGCells(): new sourceGCell: " << sourceGCell << endl;
} }
gcell = segment->getAutoTarget()->getGCell(); gcell = segment->getAutoTarget()->getGCell();
if (isGreater(gcell,targetGCell,direction)) { if (isGreater(gcell,targetGCell,direction)) {
targetGCell = gcell; targetGCell = gcell;
cdebug_log(159,0) << "getGCells(): new targetGCell: " << targetGCell << endl; cdebug_log(155,0) << "getGCells(): new targetGCell: " << targetGCell << endl;
} }
} }
@ -256,12 +259,12 @@ namespace Katana {
Flags side = (direction & Flags::Horizontal) ? Flags::EastSide : Flags::NorthSide; Flags side = (direction & Flags::Horizontal) ? Flags::EastSide : Flags::NorthSide;
DbU::Unit axis = getAxis(); DbU::Unit axis = getAxis();
cdebug_log(159,0) << "* dir:" << side._getString() << " @" << DbU::getValueString(axis) << endl; cdebug_log(155,0) << "* dir:" << side._getString() << " @" << DbU::getValueString(axis) << endl;
gcells.push_back( sourceGCell ); gcells.push_back( sourceGCell );
while ( sourceGCell != targetGCell ) { while ( sourceGCell != targetGCell ) {
sourceGCell = sourceGCell->getNeighborAt( direction, axis ); sourceGCell = sourceGCell->getNeighborAt( direction, axis );
cdebug_log(159,0) << "| " << sourceGCell << endl; cdebug_log(155,0) << "| " << sourceGCell << endl;
if (not sourceGCell) break; if (not sourceGCell) break;
gcells.push_back( sourceGCell ); gcells.push_back( sourceGCell );
@ -315,6 +318,10 @@ namespace Katana {
{ TrackElement::setTrack( track ); } { TrackElement::setTrack( track ); }
void TrackSegment::setSymmetric ( TrackElement* segment )
{ _symmetric = dynamic_cast<TrackSegment*>( segment ); }
void TrackSegment::detach () void TrackSegment::detach ()
{ {
cdebug_log(159,0) << "TrackSegment::detach() - <id:" << getId() << ">" << endl; cdebug_log(159,0) << "TrackSegment::detach() - <id:" << getId() << ">" << endl;
@ -880,7 +887,8 @@ namespace Katana {
Record* TrackSegment::_getRecord () const Record* TrackSegment::_getRecord () const
{ {
Record* record = TrackElement::_getRecord(); Record* record = TrackElement::_getRecord();
record->add( getSlot( "_base", _base ) ); record->add( getSlot( "_base" , _base ) );
record->add( getSlot( "_symmetric", _symmetric ) );
return record; return record;
} }

2
katana/src/TrackSegmentCost.cpp
View File

@ -73,7 +73,7 @@ namespace Katana {
void TrackSegmentCost::update ( TrackElement* trackSegment ) void TrackSegmentCost::update ( TrackElement* trackSegment )
{ {
DebugSession::open ( trackSegment->getNet(), 150, 160 ); DebugSession::open ( trackSegment->getNet(), 156, 160 );
cdebug_log(159,1) << "TrackSegmentCost::update() - " << trackSegment << endl; cdebug_log(159,1) << "TrackSegmentCost::update() - " << trackSegment << endl;

26
katana/src/Tracks.cpp
View File

@ -38,15 +38,15 @@ namespace Katana {
: Hurricane::Locator<Track*>() : Hurricane::Locator<Track*>()
, _constraints (constraints) , _constraints (constraints)
{ {
cdebug_log(159,0) << "Tracks_Range::Locator()" << endl; cdebug_log(155,0) << "Tracks_Range::Locator()" << endl;
cdebug_log(159,0) << "* Constraints: " << _constraints << endl; cdebug_log(155,0) << "* Constraints: " << _constraints << endl;
_track = routingPlane->getTrackByPosition ( _constraints.getVMin() ); _track = routingPlane->getTrackByPosition ( _constraints.getVMin() );
if ( _track and (_track->getAxis() < _constraints.getVMin()) ) _track = _track->getNextTrack(); if ( _track and (_track->getAxis() < _constraints.getVMin()) ) _track = _track->getNextTrack();
if ( _track and (_track->getAxis() > _constraints.getVMax()) ) _track = NULL; if ( _track and (_track->getAxis() > _constraints.getVMax()) ) _track = NULL;
cdebug_log(159,0) << "_track: " << _track << endl;; cdebug_log(155,0) << "_track: " << _track << endl;;
} }
@ -147,9 +147,9 @@ namespace Katana {
, _inMinOptimal(true) , _inMinOptimal(true)
, _inMaxOptimal(true) , _inMaxOptimal(true)
{ {
cdebug_log(159,0) << "Tracks_Spiral::Locator()" << endl; cdebug_log(155,0) << "Tracks_Spiral::Locator()" << endl;
cdebug_log(159,0) << "* Optimal: " << _optimal << endl; cdebug_log(155,0) << "* Optimal: " << _optimal << endl;
cdebug_log(159,0) << "* Constraints: " << _constraints << endl; cdebug_log(155,0) << "* Constraints: " << _constraints << endl;
_minTrack = _maxTrack = routingPlane->getTrackByPosition ( _optimal.getCenter() ); _minTrack = _maxTrack = routingPlane->getTrackByPosition ( _optimal.getCenter() );
@ -169,8 +169,8 @@ namespace Katana {
if ( _minTrack && (_minTrack->getAxis() < _optimal.getVMin()) ) _inMinOptimal = false; if ( _minTrack && (_minTrack->getAxis() < _optimal.getVMin()) ) _inMinOptimal = false;
if ( _maxTrack && (_maxTrack->getAxis() > _optimal.getVMax()) ) _inMaxOptimal = false; if ( _maxTrack && (_maxTrack->getAxis() > _optimal.getVMax()) ) _inMaxOptimal = false;
cdebug_log(159,0) << "_minTrack: " << _minTrack << endl;; cdebug_log(155,0) << "_minTrack: " << _minTrack << endl;;
cdebug_log(159,0) << "_maxTrack: " << _maxTrack << endl;; cdebug_log(155,0) << "_maxTrack: " << _maxTrack << endl;;
} }
@ -210,13 +210,13 @@ namespace Katana {
void Tracks_Spiral::Locator::progress () void Tracks_Spiral::Locator::progress ()
{ {
cdebug_log(159,1) << "Track_Spiral::progress() - State:" << endl; cdebug_log(155,1) << "Track_Spiral::progress() - State:" << endl;
cdebug_log(159,0) << _onMin cdebug_log(155,0) << _onMin
<< " " << _minTrack << " " << _minTrack
<< " " << _maxTrack << endl; << " " << _maxTrack << endl;
if ( !isValid() ) { if ( !isValid() ) {
cdebug_tabw(159,-1); cdebug_tabw(155,-1);
return; return;
} }
@ -245,10 +245,10 @@ namespace Katana {
} }
} }
cdebug_log(159,0) << _onMin cdebug_log(155,0) << _onMin
<< " " << _minTrack << " " << _minTrack
<< " " << _maxTrack << endl; << " " << _maxTrack << endl;
cdebug_tabw(159,-1); cdebug_tabw(155,-1);
} }

5
katana/src/katana/Configuration.h
View File

@ -60,6 +60,7 @@ namespace Katana {
~Configuration (); ~Configuration ();
// Decorateds. // Decorateds.
inline bool useClockTree () const; inline bool useClockTree () const;
inline bool profileEventCosts () const;
// Methods. // Methods.
inline Anabatic::Configuration* base (); inline Anabatic::Configuration* base ();
inline const Anabatic::Configuration* base () const; inline const Anabatic::Configuration* base () const;
@ -77,6 +78,7 @@ namespace Katana {
void setVTracksReservedLocal ( size_t ); void setVTracksReservedLocal ( size_t );
inline void setFlags ( unsigned int ); inline void setFlags ( unsigned int );
inline void unsetFlags ( unsigned int ); inline void unsetFlags ( unsigned int );
inline void setProfileEventCosts ( bool );
virtual void print ( Cell* ) const; virtual void print ( Cell* ) const;
virtual Record* _getRecord () const; virtual Record* _getRecord () const;
virtual string _getString () const; virtual string _getString () const;
@ -90,6 +92,7 @@ namespace Katana {
unsigned int _ripupCost; unsigned int _ripupCost;
unsigned long _eventsLimit; unsigned long _eventsLimit;
unsigned int _flags; unsigned int _flags;
bool _profileEventCosts;
private: private:
Configuration ( const Configuration& other ); Configuration ( const Configuration& other );
Configuration& operator= ( const Configuration& ); Configuration& operator= ( const Configuration& );
@ -108,8 +111,10 @@ namespace Katana {
inline void Configuration::setPostEventCb ( PostEventCb_t cb ) { _postEventCb = cb; } inline void Configuration::setPostEventCb ( PostEventCb_t cb ) { _postEventCb = cb; }
inline void Configuration::setEventsLimit ( unsigned long limit ) { _eventsLimit = limit; } inline void Configuration::setEventsLimit ( unsigned long limit ) { _eventsLimit = limit; }
inline bool Configuration::useClockTree () const { return _flags & UseClockTree; } inline bool Configuration::useClockTree () const { return _flags & UseClockTree; }
inline bool Configuration::profileEventCosts () const { return _profileEventCosts; }
inline void Configuration::setFlags ( unsigned int flags ) { _flags |= flags; } inline void Configuration::setFlags ( unsigned int flags ) { _flags |= flags; }
inline void Configuration::unsetFlags ( unsigned int flags ) { _flags &= ~flags; } inline void Configuration::unsetFlags ( unsigned int flags ) { _flags &= ~flags; }
inline void Configuration::setProfileEventCosts ( bool state ) { _profileEventCosts = state; }

36
katana/src/katana/DataSymmetric.h
View File

@ -37,6 +37,7 @@ namespace Katana {
using Hurricane::Record; using Hurricane::Record;
using Hurricane::DbU; using Hurricane::DbU;
using Hurricane::Point; using Hurricane::Point;
using Hurricane::Interval;
using Hurricane::Net; using Hurricane::Net;
using Hurricane::NetRoutingState; using Hurricane::NetRoutingState;
using Hurricane::NetRoutingExtension; using Hurricane::NetRoutingExtension;
@ -44,6 +45,8 @@ namespace Katana {
class DataSymmetric { class DataSymmetric {
public:
typedef std::vector< std::array<AutoSegment*,2> > Paireds;
public: public:
static DataSymmetric* create ( Net* ); static DataSymmetric* create ( Net* );
public: public:
@ -52,11 +55,15 @@ namespace Katana {
inline Net* getNet () const; inline Net* getNet () const;
inline DbU::Unit getSymAxis () const; inline DbU::Unit getSymAxis () const;
inline Net* getSymNet () const; inline Net* getSymNet () const;
inline Point& getSymmetrical ( Point& ) const; inline const Paireds& getPaireds () const;
inline DbU::Unit getSymmetrical ( DbU::Unit ) const;
inline Point getSymmetrical ( const Point& ) const;
inline Interval getSymmetrical ( const Interval& ) const;
AutoSegment* getSymmetrical ( AutoSegment* ) const; AutoSegment* getSymmetrical ( AutoSegment* ) const;
void addSymmetrical ( AutoSegment* ); void addSymmetrical ( AutoSegment* );
inline void addReference ( AutoSegment* ); inline void addReference ( AutoSegment* );
inline void setValid ( bool ); inline void setValid ( bool );
inline void setSymAxis ( DbU::Unit );
bool checkPairing (); bool checkPairing ();
void print ( std::ostream& ) const; void print ( std::ostream& ) const;
Record* _getRecord () const; Record* _getRecord () const;
@ -68,24 +75,41 @@ namespace Katana {
Net* _net; Net* _net;
Net* _symNet; Net* _symNet;
NetRoutingState* _state; NetRoutingState* _state;
std::vector< std::array<AutoSegment*,2> > _paireds; Paireds _paireds;
size_t _symIndex; size_t _symIndex;
}; };
inline bool DataSymmetric::isValid () const { return _valid; } inline bool DataSymmetric::isValid () const { return _valid; }
inline bool DataSymmetric::isSymVertical () const { return _state->isSymVertical(); } inline bool DataSymmetric::isSymVertical () const { return _state->isSymVertical(); }
inline const DataSymmetric::Paireds& DataSymmetric::getPaireds () const { return _paireds; }
inline Net* DataSymmetric::getNet () const { return _net; } inline Net* DataSymmetric::getNet () const { return _net; }
inline DbU::Unit DataSymmetric::getSymAxis () const { return _state->getSymAxis(); } inline DbU::Unit DataSymmetric::getSymAxis () const { return _state->getSymAxis(); }
inline void DataSymmetric::setSymAxis ( DbU::Unit axis ) { _state->setSymAxis(axis); }
inline Net* DataSymmetric::getSymNet () const { return _symNet; } inline Net* DataSymmetric::getSymNet () const { return _symNet; }
inline void DataSymmetric::addReference ( AutoSegment* segment ) { _paireds.push_back( {segment,NULL} ); } inline void DataSymmetric::addReference ( AutoSegment* segment ) { _paireds.push_back( {segment,NULL} ); }
inline void DataSymmetric::setValid ( bool state ) { _valid = state; } inline void DataSymmetric::setValid ( bool state ) { _valid = state; }
inline Point& DataSymmetric::getSymmetrical ( Point& point ) const inline DbU::Unit DataSymmetric::getSymmetrical ( DbU::Unit pos ) const
{ return 2*getSymAxis() - pos; }
inline Point DataSymmetric::getSymmetrical ( const Point& point ) const
{ {
if (_state->isSymVertical()) point.setX( 2*getSymAxis() - point.getX() ); Point symPoint ( point );
else point.setY( 2*getSymAxis() - point.getY() ); if (_state->isSymVertical()) symPoint.setX( 2*getSymAxis() - point.getX() );
return point; else symPoint.setY( 2*getSymAxis() - point.getY() );
return symPoint;
}
inline Interval DataSymmetric::getSymmetrical ( const Interval& interval ) const
{
DbU::Unit vmin = interval.getVMin();
if ( (vmin != DbU::Min) and (vmin != DbU::Max) ) vmin = 2*getSymAxis() - vmin;
DbU::Unit vmax = interval.getVMax();
if ( (vmax != DbU::Max) and (vmax != DbU::Max) ) vmax = 2*getSymAxis() - vmax;
return Interval( vmin, vmax );
} }

6
katana/src/katana/KatanaEngine.h
View File

@ -78,6 +78,7 @@ namespace Katana {
inline unsigned int getRipupCost () const; inline unsigned int getRipupCost () const;
inline size_t getHTracksReservedLocal () const; inline size_t getHTracksReservedLocal () const;
inline size_t getVTracksReservedLocal () const; inline size_t getVTracksReservedLocal () const;
inline bool profileEventCosts () const;
virtual const Name& getName () const; virtual const Name& getName () const;
inline Configuration::PostEventCb_t& inline Configuration::PostEventCb_t&
getPostEventCb (); getPostEventCb ();
@ -87,6 +88,8 @@ namespace Katana {
RoutingPlane* getRoutingPlaneByLayer ( const Layer* ) const; RoutingPlane* getRoutingPlaneByLayer ( const Layer* ) const;
Track* getTrackByPosition ( const Layer*, DbU::Unit axis, unsigned int mode=Constant::Nearest ) const; Track* getTrackByPosition ( const Layer*, DbU::Unit axis, unsigned int mode=Constant::Nearest ) const;
DataSymmetric* getDataSymmetric ( Net* ); DataSymmetric* getDataSymmetric ( Net* );
inline const std::map<Net*,DataSymmetric*>&
getSymmetrics () const;
inline void printConfiguration () const; inline void printConfiguration () const;
void printCompletion () const; void printCompletion () const;
void dumpMeasures ( std::ostream& ) const; void dumpMeasures ( std::ostream& ) const;
@ -161,6 +164,9 @@ namespace Katana {
inline size_t KatanaEngine::getHTracksReservedLocal () const { return _configuration->getHTracksReservedLocal(); } inline size_t KatanaEngine::getHTracksReservedLocal () const { return _configuration->getHTracksReservedLocal(); }
inline size_t KatanaEngine::getVTracksReservedLocal () const { return _configuration->getVTracksReservedLocal(); } inline size_t KatanaEngine::getVTracksReservedLocal () const { return _configuration->getVTracksReservedLocal(); }
inline unsigned int KatanaEngine::getRipupLimit ( unsigned int type ) const { return _configuration->getRipupLimit(type); } inline unsigned int KatanaEngine::getRipupLimit ( unsigned int type ) const { return _configuration->getRipupLimit(type); }
inline bool KatanaEngine::profileEventCosts () const { return _configuration->profileEventCosts(); }
inline const std::map<Net*,DataSymmetric*>&
KatanaEngine::getSymmetrics () const { return _symmetrics; }
inline NegociateWindow* KatanaEngine::getNegociateWindow () { return _negociateWindow; } inline NegociateWindow* KatanaEngine::getNegociateWindow () { return _negociateWindow; }
inline size_t KatanaEngine::getRoutingPlanesSize () const { return _routingPlanes.size(); } inline size_t KatanaEngine::getRoutingPlanesSize () const { return _routingPlanes.size(); }
inline void KatanaEngine::setViewer ( CellViewer* viewer ) { _viewer=viewer; } inline void KatanaEngine::setViewer ( CellViewer* viewer ) { _viewer=viewer; }

1
katana/src/katana/NegociateWindow.h
View File

@ -115,6 +115,7 @@ namespace Katana {
void run ( unsigned int flags ); void run ( unsigned int flags );
void printStatistics () const; void printStatistics () const;
void _createRouting ( Anabatic::GCell* ); void _createRouting ( Anabatic::GCell* );
void _associateSymmetrics ();
void _pack ( size_t& count, bool last ); void _pack ( size_t& count, bool last );
size_t _negociate (); size_t _negociate ();
Hurricane::Record* _getRecord () const; Hurricane::Record* _getRecord () const;

4
katana/src/katana/RoutingEvent.h
View File

@ -152,6 +152,8 @@ namespace Katana {
inline void setForcedToHint ( bool state = true ); inline void setForcedToHint ( bool state = true );
void setAxisHint ( DbU::Unit ); void setAxisHint ( DbU::Unit );
void setAxisHintFromParent (); void setAxisHintFromParent ();
inline void updateAxisHistory ();
inline void setInsertState ( unsigned int );
inline void incInsertState (); inline void incInsertState ();
inline void resetInsertState (); inline void resetInsertState ();
inline void setEventLevel ( unsigned int ); inline void setEventLevel ( unsigned int );
@ -234,6 +236,8 @@ namespace Katana {
inline void RoutingEvent::setRipedByLocal ( bool state ) { _ripedByLocal = state; } inline void RoutingEvent::setRipedByLocal ( bool state ) { _ripedByLocal = state; }
inline void RoutingEvent::setTracksFree ( unsigned int nb ) { _tracksFree = nb; } inline void RoutingEvent::setTracksFree ( unsigned int nb ) { _tracksFree = nb; }
inline void RoutingEvent::setForcedToHint ( bool state ) { _forceToHint = state; } inline void RoutingEvent::setForcedToHint ( bool state ) { _forceToHint = state; }
inline void RoutingEvent::updateAxisHistory () { _axisHistory = _segment->getAxis(); }
inline void RoutingEvent::setInsertState ( unsigned int state ) { _insertState = state; }
inline void RoutingEvent::incInsertState () { _insertState++; } inline void RoutingEvent::incInsertState () { _insertState++; }
inline void RoutingEvent::resetInsertState () { _insertState = 0; } inline void RoutingEvent::resetInsertState () { _insertState = 0; }
inline void RoutingEvent::setEventLevel ( unsigned int level ) { _eventLevel = level; } inline void RoutingEvent::setEventLevel ( unsigned int level ) { _eventLevel = level; }

56
katana/src/katana/SegmentFsm.h
View File

@ -17,10 +17,12 @@
#ifndef KATANA_SEGMENT_FSM_H #ifndef KATANA_SEGMENT_FSM_H
#define KATANA_SEGMENT_FSM_H #define KATANA_SEGMENT_FSM_H
#include <array>
#include "katana/TrackCost.h" #include "katana/TrackCost.h"
namespace Katana { namespace Katana {
using std::array;
class TrackElement; class TrackElement;
class DataNegociate; class DataNegociate;
class RoutingEvent; class RoutingEvent;
@ -110,20 +112,30 @@ namespace Katana {
, RoutingEventHistory& , RoutingEventHistory&
); );
inline bool isFullBlocked () const; inline bool isFullBlocked () const;
inline bool isSymmetric () const;
inline RoutingEvent* getEvent () const; inline RoutingEvent* getEvent () const;
inline RoutingEvent* getEvent1 () const;
inline RoutingEvent* getEvent2 () const;
inline RoutingEventQueue& getQueue () const; inline RoutingEventQueue& getQueue () const;
inline RoutingEventHistory& getHistory () const; inline RoutingEventHistory& getHistory () const;
inline TrackElement* getSegment1 () const;
inline TrackElement* getSegment2 () const;
inline unsigned int getState () const; inline unsigned int getState () const;
inline DataNegociate* getData (); inline DataNegociate* getData ();
inline DataNegociate* getData1 ();
inline DataNegociate* getData2 ();
inline Interval& getConstraint (); inline Interval& getConstraint ();
inline Interval& getOptimal (); inline Interval& getOptimal ();
inline vector<TrackCost>& getCosts (); inline vector< array<TrackCost,2> >& getCosts ();
inline TrackCost& getCost ( size_t ); inline TrackCost& getCost ( size_t );
inline TrackCost& getCost1 ( size_t );
inline TrackCost& getCost2 ( size_t );
inline Track* getTrack ( size_t ); inline Track* getTrack ( size_t );
inline size_t getBegin ( size_t ); inline size_t getBegin ( size_t );
inline size_t getEnd ( size_t ); inline size_t getEnd ( size_t );
inline vector<SegmentAction>& getActions (); inline vector<SegmentAction>& getActions ();
inline void setState ( unsigned int ); inline void setState ( unsigned int );
void setDataState ( unsigned int );
void addAction ( TrackElement* void addAction ( TrackElement*
, unsigned int type , unsigned int type
, DbU::Unit axisHint=0 , DbU::Unit axisHint=0
@ -131,7 +143,14 @@ namespace Katana {
); );
void doActions (); void doActions ();
inline void clearActions (); inline void clearActions ();
inline SegmentFsm& useEvent1 ();
inline SegmentFsm& useEvent2 ();
void incRipupCount ();
bool insertInTrack ( size_t ); bool insertInTrack ( size_t );
void bindToTrack ( size_t );
void moveToTrack ( size_t );
void ripupPerpandiculars ();
bool canRipup ( unsigned int flags=0 );
bool conflictSolveByHistory (); bool conflictSolveByHistory ();
bool conflictSolveByPlaceds (); bool conflictSolveByPlaceds ();
bool solveTerminalVsGlobal (); bool solveTerminalVsGlobal ();
@ -149,35 +168,50 @@ namespace Katana {
, DataNegociate*& , DataNegociate*&
, unsigned int flags ); , unsigned int flags );
private: private:
RoutingEvent* _event; RoutingEvent* _event1;
RoutingEvent* _event2;
RoutingEventQueue& _queue; RoutingEventQueue& _queue;
RoutingEventHistory& _history; RoutingEventHistory& _history;
unsigned int _state; unsigned int _state;
DataNegociate* _data; DataNegociate* _data1;
DataNegociate* _data2;
Interval _constraint; Interval _constraint;
Interval _optimal; Interval _optimal;
vector<TrackCost> _costs; vector< array<TrackCost,2> > _costs;
vector<SegmentAction> _actions; vector<SegmentAction> _actions;
bool _fullBlocked; bool _fullBlocked;
bool _sameAxis;
bool _useEvent2;
}; };
inline bool SegmentFsm::isSymmetric () const { return _event2 != NULL; }
inline bool SegmentFsm::isFullBlocked () const { return _fullBlocked and _costs.size(); } inline bool SegmentFsm::isFullBlocked () const { return _fullBlocked and _costs.size(); }
inline RoutingEvent* SegmentFsm::getEvent () const { return _event; } inline RoutingEvent* SegmentFsm::getEvent () const { return (_useEvent2) ? _event2 : _event1; }
inline RoutingEvent* SegmentFsm::getEvent1 () const { return _event1; }
inline RoutingEvent* SegmentFsm::getEvent2 () const { return _event2; }
inline RoutingEventQueue& SegmentFsm::getQueue () const { return _queue; } inline RoutingEventQueue& SegmentFsm::getQueue () const { return _queue; }
inline RoutingEventHistory& SegmentFsm::getHistory () const { return _history; } inline RoutingEventHistory& SegmentFsm::getHistory () const { return _history; }
inline unsigned int SegmentFsm::getState () const { return _state; } inline unsigned int SegmentFsm::getState () const { return _state; }
inline DataNegociate* SegmentFsm::getData () { return _data; } inline TrackElement* SegmentFsm::getSegment1 () const { return _event1->getSegment(); }
inline TrackElement* SegmentFsm::getSegment2 () const { return (_event2) ? _event2->getSegment() : NULL; }
inline DataNegociate* SegmentFsm::getData () { return (_useEvent2) ? _data2 : _data1; }
inline DataNegociate* SegmentFsm::getData1 () { return _data1; }
inline DataNegociate* SegmentFsm::getData2 () { return _data2; }
inline Interval& SegmentFsm::getConstraint () { return _constraint; } inline Interval& SegmentFsm::getConstraint () { return _constraint; }
inline Interval& SegmentFsm::getOptimal () { return _optimal; } inline Interval& SegmentFsm::getOptimal () { return _optimal; }
inline vector<TrackCost>& SegmentFsm::getCosts () { return _costs; } inline vector< array<TrackCost,2> >& SegmentFsm::getCosts () { return _costs; }
inline TrackCost& SegmentFsm::getCost ( size_t i ) { return _costs[i]; } inline TrackCost& SegmentFsm::getCost ( size_t i ) { return _costs[i][0]; }
inline Track* SegmentFsm::getTrack ( size_t i ) { return _costs[i].getTrack(); } inline TrackCost& SegmentFsm::getCost1 ( size_t i ) { return _costs[i][0]; }
inline size_t SegmentFsm::getBegin ( size_t i ) { return _costs[i].getBegin(); } inline TrackCost& SegmentFsm::getCost2 ( size_t i ) { return _costs[i][1]; }
inline size_t SegmentFsm::getEnd ( size_t i ) { return _costs[i].getEnd(); } inline Track* SegmentFsm::getTrack ( size_t i ) { return (_useEvent2) ? _costs[i][1].getTrack() : _costs[i][0].getTrack(); }
inline size_t SegmentFsm::getBegin ( size_t i ) { return (_useEvent2) ? _costs[i][1].getBegin() : _costs[i][0].getBegin(); }
inline size_t SegmentFsm::getEnd ( size_t i ) { return (_useEvent2) ? _costs[i][1].getEnd () : _costs[i][0].getEnd (); }
inline vector<SegmentAction>& SegmentFsm::getActions () { return _actions; } inline vector<SegmentAction>& SegmentFsm::getActions () { return _actions; }
inline void SegmentFsm::setState ( unsigned int state ) { _state = state; } inline void SegmentFsm::setState ( unsigned int state ) { _state = state; }
inline void SegmentFsm::clearActions () { _actions.clear(); } inline void SegmentFsm::clearActions () { _actions.clear(); }
inline SegmentFsm& SegmentFsm::useEvent1 () { _useEvent2 = false; return *this; }
inline SegmentFsm& SegmentFsm::useEvent2 () { _useEvent2 = true ; return *this; }
} // Katana namespace. } // Katana namespace.

5
katana/src/katana/TrackCost.h
View File

@ -61,9 +61,7 @@ namespace Katana {
}; };
public: public:
TrackCost ( Track* track TrackCost ( Track* track );
, Net* net
);
TrackCost ( Track* track TrackCost ( Track* track
, const Interval& interval , const Interval& interval
, size_t begin , size_t begin
@ -113,6 +111,7 @@ namespace Katana {
inline void setLonguestOverlap ( DbU::Unit ); inline void setLonguestOverlap ( DbU::Unit );
inline void mergeRipupCount ( int ); inline void mergeRipupCount ( int );
inline void mergeDataState ( unsigned int ); inline void mergeDataState ( unsigned int );
void merge ( const TrackCost& );
void consolidate (); void consolidate ();
Record* _getRecord () const; Record* _getRecord () const;
string _getString () const; string _getString () const;

3
katana/src/katana/TrackElement.h
View File

@ -111,6 +111,7 @@ namespace Katana {
inline bool isBlockage () const; inline bool isBlockage () const;
inline bool isLocked () const; inline bool isLocked () const;
inline bool isRouted () const; inline bool isRouted () const;
virtual bool hasSymmetric () const;
inline bool hasSourceDogleg () const; inline bool hasSourceDogleg () const;
inline bool hasTargetDogleg () const; inline bool hasTargetDogleg () const;
inline bool canRipple () const; inline bool canRipple () const;
@ -151,6 +152,7 @@ namespace Katana {
virtual unsigned int getDoglegLevel () const; virtual unsigned int getDoglegLevel () const;
virtual TrackElement* getSourceDogleg (); virtual TrackElement* getSourceDogleg ();
virtual TrackElement* getTargetDogleg (); virtual TrackElement* getTargetDogleg ();
virtual TrackElement* getSymmetric ();
virtual TrackElements getPerpandiculars (); virtual TrackElements getPerpandiculars ();
// Mutators. // Mutators.
inline void setFlags ( unsigned int ); inline void setFlags ( unsigned int );
@ -158,6 +160,7 @@ namespace Katana {
inline void setRouted (); inline void setRouted ();
virtual void setTrack ( Track* ); virtual void setTrack ( Track* );
inline void setIndex ( size_t ); inline void setIndex ( size_t );
virtual void setSymmetric ( TrackElement* );
virtual void updateFreedomDegree (); virtual void updateFreedomDegree ();
virtual void setDoglegLevel ( unsigned int ); virtual void setDoglegLevel ( unsigned int );
virtual void swapTrack ( TrackElement* ); virtual void swapTrack ( TrackElement* );

4
katana/src/katana/TrackSegment.h
View File

@ -72,6 +72,7 @@ namespace Katana {
virtual bool isUTurn () const; virtual bool isUTurn () const;
virtual bool isUserDefined () const; virtual bool isUserDefined () const;
// Predicates. // Predicates.
virtual bool hasSymmetric () const;
virtual bool canDogleg (); virtual bool canDogleg ();
virtual bool canDogleg ( Interval ); virtual bool canDogleg ( Interval );
virtual bool canDogleg ( Anabatic::GCell*, unsigned int flags=0 ); virtual bool canDogleg ( Anabatic::GCell*, unsigned int flags=0 );
@ -100,10 +101,12 @@ namespace Katana {
virtual size_t getGCells ( vector<GCell*>& ) const; virtual size_t getGCells ( vector<GCell*>& ) const;
virtual TrackElement* getSourceDogleg (); virtual TrackElement* getSourceDogleg ();
virtual TrackElement* getTargetDogleg (); virtual TrackElement* getTargetDogleg ();
virtual TrackElement* getSymmetric ();
virtual TrackElements getPerpandiculars (); virtual TrackElements getPerpandiculars ();
virtual size_t getPerpandicularsBound ( set<TrackElement*>& ); virtual size_t getPerpandicularsBound ( set<TrackElement*>& );
// Mutators. // Mutators.
virtual void setTrack ( Track* ); virtual void setTrack ( Track* );
virtual void setSymmetric ( TrackElement* );
virtual void updateFreedomDegree (); virtual void updateFreedomDegree ();
virtual void setDoglegLevel ( unsigned int ); virtual void setDoglegLevel ( unsigned int );
virtual void swapTrack ( TrackElement* ); virtual void swapTrack ( TrackElement* );
@ -133,6 +136,7 @@ namespace Katana {
// Attributes. // Attributes.
static size_t _allocateds; static size_t _allocateds;
AutoSegment* _base; AutoSegment* _base;
TrackSegment* _symmetric;
unsigned long _freedomDegree; unsigned long _freedomDegree;
DbU::Unit _ppitch; DbU::Unit _ppitch;
DataNegociate* _data; DataNegociate* _data;

10
kite/src/Configuration.cpp
View File

@ -41,12 +41,13 @@ namespace Kite {
: Katabatic::Configuration() : Katabatic::Configuration()
, _base (base) , _base (base)
, _postEventCb () , _postEventCb ()
, _hTracksReservedLocal(Cfg::getParamInt("kite.hTracksReservedLocal", 3)->asInt()) , _hTracksReservedLocal(Cfg::getParamInt ("kite.hTracksReservedLocal", 3)->asInt())
, _vTracksReservedLocal(Cfg::getParamInt("kite.vTracksReservedLocal", 3)->asInt()) , _vTracksReservedLocal(Cfg::getParamInt ("kite.vTracksReservedLocal", 3)->asInt())
, _ripupLimits () , _ripupLimits ()
, _ripupCost (Cfg::getParamInt("kite.ripupCost" , 3)->asInt()) , _ripupCost (Cfg::getParamInt ("kite.ripupCost" , 3)->asInt())
, _eventsLimit (Cfg::getParamInt("kite.eventsLimit" ,4000000)->asInt()) , _eventsLimit (Cfg::getParamInt ("kite.eventsLimit" ,4000000)->asInt())
, _flags (0) , _flags (0)
, _profileEventCosts (Cfg::getParamBool("kite.profileEventCosts" ,false )->asBool())
{ {
_ripupLimits[StrapRipupLimit] = Cfg::getParamInt("kite.strapRipupLimit" ,16)->asInt(); _ripupLimits[StrapRipupLimit] = Cfg::getParamInt("kite.strapRipupLimit" ,16)->asInt();
_ripupLimits[LocalRipupLimit] = Cfg::getParamInt("kite.localRipupLimit" , 7)->asInt(); _ripupLimits[LocalRipupLimit] = Cfg::getParamInt("kite.localRipupLimit" , 7)->asInt();
@ -83,6 +84,7 @@ namespace Kite {
, _ripupLimits () , _ripupLimits ()
, _ripupCost (other._ripupCost) , _ripupCost (other._ripupCost)
, _eventsLimit (other._eventsLimit) , _eventsLimit (other._eventsLimit)
, _profileEventCosts (other._profileEventCosts)
{ {
if ( _base == NULL ) _base = other._base->clone(); if ( _base == NULL ) _base = other._base->clone();

20
kite/src/NegociateWindow.cpp
View File

@ -430,6 +430,10 @@ namespace Kite {
cmess1 << " o Negociation Stage." << endl; cmess1 << " o Negociation Stage." << endl;
unsigned long limit = _kite->getEventsLimit(); unsigned long limit = _kite->getEventsLimit();
bool profiling = _kite->profileEventCosts();
ofstream ofprofile;
if (profiling) ofprofile.open( "kite.profile.txt" );
_eventHistory.clear(); _eventHistory.clear();
_eventQueue.load( _segments ); _eventQueue.load( _segments );
@ -457,6 +461,21 @@ namespace Kite {
cmess2.flush(); cmess2.flush();
} }
if (ofprofile.is_open()) {
size_t depth = _kite->getConfiguration()->getLayerDepth( event->getSegment()->getLayer() );
if (depth < 6) {
ofprofile << setw(10) << right << count << " ";
for ( size_t i=0 ; i<6 ; ++i ) {
if (i == depth)
ofprofile << setw(10) << right << setprecision(2) << event->getPriority () << " ";
else
ofprofile << setw(10) << right << setprecision(2) << 0.0 << " ";
}
ofprofile << setw( 2) << right << event->getEventLevel() << endl;
}
}
event->process( _eventQueue, _eventHistory, _eventLoop ); event->process( _eventQueue, _eventHistory, _eventLoop );
count++; count++;
@ -523,6 +542,7 @@ namespace Kite {
cerr << Bug( "%d events remains after clear.", RoutingEvent::getAllocateds() ) << endl; cerr << Bug( "%d events remains after clear.", RoutingEvent::getAllocateds() ) << endl;
} }
if (ofprofile.is_open()) ofprofile.close();
_statistics.setEventsCount( eventsCount ); _statistics.setEventsCount( eventsCount );
cdebug_tabw(159,-1); cdebug_tabw(159,-1);

5
kite/src/kite/Configuration.h
View File

@ -60,6 +60,7 @@ namespace Kite {
virtual bool isGMetal ( const Layer* ) const; virtual bool isGMetal ( const Layer* ) const;
virtual bool isGContact ( const Layer* ) const; virtual bool isGContact ( const Layer* ) const;
inline bool useClockTree () const; inline bool useClockTree () const;
inline bool profileEventCosts () const;
virtual size_t getDepth () const; virtual size_t getDepth () const;
virtual size_t getAllowedDepth () const; virtual size_t getAllowedDepth () const;
virtual DbU::Unit getSliceHeight () const; virtual DbU::Unit getSliceHeight () const;
@ -89,6 +90,7 @@ namespace Kite {
virtual void setSaturateRatio ( float ); virtual void setSaturateRatio ( float );
virtual void setSaturateRp ( size_t ); virtual void setSaturateRp ( size_t );
virtual void setGlobalThreshold ( DbU::Unit ); virtual void setGlobalThreshold ( DbU::Unit );
inline void setProfileEventCosts ( bool );
virtual void print ( Cell* ) const; virtual void print ( Cell* ) const;
// Methods. // Methods.
inline Katabatic::Configuration* base (); inline Katabatic::Configuration* base ();
@ -119,6 +121,7 @@ namespace Kite {
unsigned int _ripupCost; unsigned int _ripupCost;
unsigned long _eventsLimit; unsigned long _eventsLimit;
unsigned int _flags; unsigned int _flags;
bool _profileEventCosts;
private: private:
Configuration ( const Configuration& other, Katabatic::Configuration* base=NULL ); Configuration ( const Configuration& other, Katabatic::Configuration* base=NULL );
Configuration& operator= ( const Configuration& ); Configuration& operator= ( const Configuration& );
@ -136,8 +139,10 @@ namespace Kite {
inline void Configuration::setPostEventCb ( PostEventCb_t cb ) { _postEventCb = cb; } inline void Configuration::setPostEventCb ( PostEventCb_t cb ) { _postEventCb = cb; }
inline void Configuration::setEventsLimit ( unsigned long limit ) { _eventsLimit = limit; } inline void Configuration::setEventsLimit ( unsigned long limit ) { _eventsLimit = limit; }
inline bool Configuration::useClockTree () const { return _flags & UseClockTree; } inline bool Configuration::useClockTree () const { return _flags & UseClockTree; }
inline bool Configuration::profileEventCosts () const { return _profileEventCosts; }
inline void Configuration::setFlags ( unsigned int flags ) { _flags |= flags; } inline void Configuration::setFlags ( unsigned int flags ) { _flags |= flags; }
inline void Configuration::unsetFlags ( unsigned int flags ) { _flags &= ~flags; } inline void Configuration::unsetFlags ( unsigned int flags ) { _flags &= ~flags; }
inline void Configuration::setProfileEventCosts ( bool state ) { _profileEventCosts = state; }

2
kite/src/kite/KiteEngine.h
View File

@ -78,6 +78,7 @@ namespace Kite {
inline unsigned int getRipupCost () const; inline unsigned int getRipupCost () const;
inline size_t getHTracksReservedLocal () const; inline size_t getHTracksReservedLocal () const;
inline size_t getVTracksReservedLocal () const; inline size_t getVTracksReservedLocal () const;
inline bool profileEventCosts () const;
virtual const Name& getName () const; virtual const Name& getName () const;
inline Configuration::PostEventCb_t& inline Configuration::PostEventCb_t&
getPostEventCb (); getPostEventCb ();
@ -161,6 +162,7 @@ namespace Kite {
inline unsigned int KiteEngine::getRipupCost () const { return _configuration->getRipupCost(); } inline unsigned int KiteEngine::getRipupCost () const { return _configuration->getRipupCost(); }
inline size_t KiteEngine::getHTracksReservedLocal () const { return _configuration->getHTracksReservedLocal(); } inline size_t KiteEngine::getHTracksReservedLocal () const { return _configuration->getHTracksReservedLocal(); }
inline size_t KiteEngine::getVTracksReservedLocal () const { return _configuration->getVTracksReservedLocal(); } inline size_t KiteEngine::getVTracksReservedLocal () const { return _configuration->getVTracksReservedLocal(); }
inline bool KiteEngine::profileEventCosts () const { return _configuration->profileEventCosts(); }
inline unsigned int KiteEngine::getRipupLimit ( unsigned int type ) const { return _configuration->getRipupLimit(type); } inline unsigned int KiteEngine::getRipupLimit ( unsigned int type ) const { return _configuration->getRipupLimit(type); }
inline NegociateWindow* KiteEngine::getNegociateWindow () { return _negociateWindow; } inline NegociateWindow* KiteEngine::getNegociateWindow () { return _negociateWindow; }
inline size_t KiteEngine::getRoutingPlanesSize () const { return _routingPlanes.size(); } inline size_t KiteEngine::getRoutingPlanesSize () const { return _routingPlanes.size(); }