jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't skip fixed instances in Etesian, stupid! 

* Bug: In Etesian::toColoquinte(), inadvertently stopped taking into
    account fixed instances... Compute correctly the number of
    instances to place (all instances minus fixed ones..).
This commit is contained in:
Jean-Paul Chaput 2020-08-03 21:58:38 +02:00
parent 79c5f4db58
commit e3515ab900
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etesian/src/EtesianEngine.cpp
View File

@ -559,7 +559,7 @@ namespace Etesian {
Cell* masterCell = instance->getMasterCell(); Cell* masterCell = instance->getMasterCell();
string instanceName = occurrence.getCompactString(); string instanceName = occurrence.getCompactString();
if (masterCell->getAbutmentBox().getHeight() != getSliceHeight()) if (masterCell->getAbutmentBox().getHeight() != getSliceHeight()) {
cmess2 << " - Using as block: " << instanceName << "." << endl; cmess2 << " - Using as block: " << instanceName << "." << endl;
if (instance->getPlacementStatus() != Instance::PlacementStatus::FIXED) { if (instance->getPlacementStatus() != Instance::PlacementStatus::FIXED) {
@ -567,6 +567,7 @@ namespace Etesian {
, getString(instance->getName()).c_str() ) << endl; , getString(instance->getName()).c_str() ) << endl;
} }
} }
}
Dots dots ( cmess2, " ", 80, 1000 ); Dots dots ( cmess2, " ", 80, 1000 );
if (not cmess2.enabled()) dots.disable(); if (not cmess2.enabled()) dots.disable();
@ -577,17 +578,18 @@ namespace Etesian {
topTransformation.applyOn( topAb ); topTransformation.applyOn( topAb );
size_t instancesNb = 0; size_t instancesNb = 0;
size_t fixedNb = 0;
for ( Occurrence occurrence : getCell()->getTerminalNetlistInstanceOccurrences(getBlockInstance()) ) { for ( Occurrence occurrence : getCell()->getTerminalNetlistInstanceOccurrences(getBlockInstance()) ) {
++instancesNb;
Instance* instance = static_cast<Instance*>(occurrence.getEntity()); Instance* instance = static_cast<Instance*>(occurrence.getEntity());
if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED) if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED)
continue; ++fixedNb;
++instancesNb;
} }
if (not instancesNb) { if (instancesNb <= fixedNb) {
cerr << Error( "EtesianEngine::toColoquinte(): \"%s\" has no instance to place, doing nothing." cerr << Error( "EtesianEngine::toColoquinte(): \"%s\" has no instance to place, doing nothing."
, getString(getCell()->getName()).c_str() , getString(getCell()->getName()).c_str()
) << endl; ) << endl;
return instancesNb; return 0;
} }
// Coloquinte circuit description data-structures. // Coloquinte circuit description data-structures.
@ -625,9 +627,6 @@ namespace Etesian {
throw Error( "EtesianEngine::toColoquinte(): Feed instance \"%s\" found." throw Error( "EtesianEngine::toColoquinte(): Feed instance \"%s\" found."
, instanceName.c_str() ); , instanceName.c_str() );
} }
if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED)
continue;
Box instanceAb = _bloatCells.getAb( occurrence ); Box instanceAb = _bloatCells.getAb( occurrence );
@ -659,7 +658,7 @@ namespace Etesian {
instances[instanceId].area = static_cast<capacity_t>(xsize) * static_cast<capacity_t>(ysize); instances[instanceId].area = static_cast<capacity_t>(xsize) * static_cast<capacity_t>(ysize);
positions[instanceId] = point<int_t>( xpos, ypos ); positions[instanceId] = point<int_t>( xpos, ypos );
if ( not instance->isFixed() and instance->isTerminal() ) { if ( not instance->isFixed() and instance->isTerminalNetlist() ) {
instances[instanceId].attributes = coloquinte::XMovable instances[instanceId].attributes = coloquinte::XMovable
|coloquinte::YMovable |coloquinte::YMovable
|coloquinte::XFlippable |coloquinte::XFlippable
@ -792,7 +791,7 @@ namespace Etesian {
_placementLB.orientations_ = orientations; _placementLB.orientations_ = orientations;
_placementUB = _placementLB; _placementUB = _placementLB;
return instancesNb; return instancesNb-fixedNb;
} }