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

In Anabatic::antennaProtect(), error in computing the diode GCell location.

This commit is contained in:
Jean-Paul Chaput 2021-03-29 19:03:26 +02:00
parent 109b2e4dee
commit 2140737e10
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
anabatic/src/AntennaProtect.cpp
View File

@ -257,13 +257,17 @@ namespace {
<< " distance=" << distance << endl; << " distance=" << distance << endl;
GCell* neighbor = gcell; GCell* neighbor = gcell;
for ( uint32_t i=0 ; i<distance and neighbor ; ++i ) { GCell* current = gcell;
if (side.contains(Flags::WestSide )) neighbor = neighbor->getWest(); uint32_t i = 0;
else if (side.contains(Flags::EastSide )) neighbor = neighbor->getEast(); while ( i<distance ) {
else if (side.contains(Flags::NorthSide)) neighbor = neighbor->getNorth(); if (side.contains(Flags::WestSide )) current = current->getWest();
else if (side.contains(Flags::SouthSide)) neighbor = neighbor->getSouth(); else if (side.contains(Flags::EastSide )) current = current->getEast();
else if (side.contains(Flags::NorthSide)) current = current->getNorth();
else if (side.contains(Flags::SouthSide)) current = current->getSouth();
if (not current) break;
neighbor = current;
++i;
} }
if (not neighbor) return NULL;
DbU::Unit xHint = 0; DbU::Unit xHint = 0;
if (side.contains(Flags::WestSide )) xHint = neighbor->getBoundingBox().getXMax(); if (side.contains(Flags::WestSide )) xHint = neighbor->getBoundingBox().getXMax();
@ -275,6 +279,10 @@ namespace {
Instance* diode = area->createDiodeUnder( getRefRp(), bb, xHint ); Instance* diode = area->createDiodeUnder( getRefRp(), bb, xHint );
if (diode) { if (diode) {
_diodes.push_back( diode ); _diodes.push_back( diode );
Transformation trans = getRefRp()->getPlugOccurrence().getPath().getTransformation();
Point center = diode->getAbutmentBox().getCenter();
trans.applyOn( center );
neighbor = _anabatic->getGCellUnder( center );
cdebug_log(147,0) << "> GCell area (neighbor): " << bb << endl; cdebug_log(147,0) << "> GCell area (neighbor): " << bb << endl;
Contact* sourceContact = gcell->breakGoThrough( getTopNet() ); Contact* sourceContact = gcell->breakGoThrough( getTopNet() );
Contact* targetContact = neighbor->hasGContact( getTopNet() ); Contact* targetContact = neighbor->hasGContact( getTopNet() );
@ -282,8 +290,10 @@ namespace {
if (not targetContact) { if (not targetContact) {
bool hasGoThrough = (neighbor->hasGoThrough(getTopNet()) != NULL); bool hasGoThrough = (neighbor->hasGoThrough(getTopNet()) != NULL);
targetContact = neighbor->breakGoThrough( getTopNet() ); targetContact = neighbor->breakGoThrough( getTopNet() );
cdebug_log(147,0) << "| breakGoThrough(), targetContact= " << targetContact << endl;
if (not hasGoThrough) { if (not hasGoThrough) {
cdebug_log(147,0) << "| Target GCell do not have a go-through, connecting. " << endl;
if (side & Flags::Horizontal) { if (side & Flags::Horizontal) {
if (sourceContact->getX() > targetContact->getX()) if (sourceContact->getX() > targetContact->getX())
std::swap( sourceContact, targetContact ); std::swap( sourceContact, targetContact );