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

In Etesian::Placement, reduce the number of warnings in case of misaligned block.

This commit is contained in:
Jean-Paul Chaput 2021-04-24 12:56:32 +02:00
parent 496cc00304
commit 8d54a9cc29
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
etesian/src/Placement.cpp
View File

@ -131,18 +131,6 @@ namespace Etesian {
void Slice::merge ( const Occurrence& occurrence, const Box& flatAb ) void Slice::merge ( const Occurrence& occurrence, const Box& flatAb )
{ {
DbU::Unit modulo = (flatAb.getXMin() - getXMin()) % getEtesian()->getSliceStep();
if (modulo) {
cerr << "Misaligned instance " << occurrence << endl;
cerr << " y=" << DbU::getValueString(flatAb.getYMin()) << " (" << flatAb.getYMin() << ") "
<< " x=" << DbU::getValueString(flatAb.getXMin()) << " (" << flatAb.getXMin() << ") "
<< " modulo=" << DbU::getValueString(modulo)
<< " getXMin()=" << DbU::getValueString(getXMin())
<< " sliceStep=" << DbU::getValueString(getEtesian()->getSliceStep())
<< " (" << getEtesian()->getSliceStep() << ")"
<< endl;
}
if (_tiles.empty() or (_tiles.front().getXMin() > flatAb.getXMin())) { if (_tiles.empty() or (_tiles.front().getXMin() > flatAb.getXMin())) {
_tiles.insert( _tiles.begin(), Tile(flatAb.getXMin(), flatAb.getWidth(), occurrence) ); _tiles.insert( _tiles.begin(), Tile(flatAb.getXMin(), flatAb.getWidth(), occurrence) );
return; return;
@ -242,12 +230,12 @@ namespace Etesian {
DbU::Unit modulo = (xmin - getXMin()) % getEtesian()->getSliceStep(); DbU::Unit modulo = (xmin - getXMin()) % getEtesian()->getSliceStep();
if (modulo) { if (modulo) {
xtie += getEtesian()->getSliceStep() - modulo; xtie += getEtesian()->getSliceStep() - modulo;
cerr << "Misaligned hole @" << yspin // cerr << "Misaligned hole @" << yspin
<< " ybottom=" << DbU::getValueString(ybottom) // << " ybottom=" << DbU::getValueString(ybottom)
<< " xmin=" << DbU::getValueString(xmin) // << " xmin=" << DbU::getValueString(xmin)
<< " modulo=" << DbU::getValueString(modulo) // << " modulo=" << DbU::getValueString(modulo)
<< " getXMin()=" << DbU::getValueString(getXMin()) // << " getXMin()=" << DbU::getValueString(getXMin())
<< endl; // << endl;
} }
while ( true ) { while ( true ) {
@ -431,6 +419,19 @@ namespace Etesian {
return; return;
} }
DbU::Unit modulo = (flatAb.getXMin() - getXMin()) % getEtesian()->getSliceStep();
if (modulo) {
cerr << Warning( "Area::merge(): Misaligned instance %s\n"
" y=%s (%d) x=%d (%d) area.getXMin()=%s sliceStep=%s (%d)"
, occurrence.getCompactString().c_str()
, DbU::getValueString(flatAb.getYMin()).c_str(), flatAb.getYMin()
, DbU::getValueString(flatAb.getXMin()).c_str(), flatAb.getXMin()
, DbU::getValueString(getXMin()).c_str()
, DbU::getValueString(getEtesian()->getSliceStep()).c_str()
, getEtesian()->getSliceStep()
) << endl;
}
size_t ibegin = (flatAb.getYMin()-_placeArea.getYMin()) / _sliceHeight; size_t ibegin = (flatAb.getYMin()-_placeArea.getYMin()) / _sliceHeight;
size_t iend = (flatAb.getYMax()-_placeArea.getYMin()) / _sliceHeight; size_t iend = (flatAb.getYMax()-_placeArea.getYMin()) / _sliceHeight;