From aece850a6c2b7e5631d7bdee010ade98178de15c Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Fri, 5 Mar 2021 00:43:24 +0100
Subject: [PATCH] Fix bugs in power supply obstacle management.

* Bug: In PowerRailsPlanes::Rail::doLayout(), in case of non-blockage but
    fixed segments (that is, power lines), expand the segment box of one
    picth to put blockage on too close neigboring tracks.
* Change: In Manipulator::avoidBlockage(), more accurate computation of
    the blocked area for pushing aside the terminal & turn of the non-pref
    segment.
---
 katana/src/Manipulator.cpp | 76 +++++++++++++++++++++++---------------
 katana/src/PowerRails.cpp  |  4 +-
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/katana/src/Manipulator.cpp b/katana/src/Manipulator.cpp
index 0b8c3f1d..67cfaeb4 100644
--- a/katana/src/Manipulator.cpp
+++ b/katana/src/Manipulator.cpp
@@ -1697,14 +1697,10 @@ namespace Katana {
       return false;
     }
 
-    AutoContact* terminal         = _segment->base()->getAutoSource();
-    AutoContact* turn             = _segment->base()->getAutoTarget();
-    bool         isSourceTerminal = true;
+    AutoContact* terminal = _segment->base()->getAutoSource();
+    AutoContact* turn     = _segment->base()->getAutoTarget();
 
-    if (not terminal->isTerminal()) {
-      std::swap( terminal, turn );
-      isSourceTerminal = false;
-    }
+    if (not terminal->isTerminal()) std::swap( terminal, turn );
 
     TrackElement*  perpandicular = _event->getPerpandiculars()[0];
     DataNegociate* data          = perpandicular->getDataNegociate();
@@ -1716,30 +1712,52 @@ namespace Katana {
 
     Box termConstraints ( terminal->getConstraintBox() );
     Box turnConstraints ( turn    ->getConstraintBox() );
+    Interval axisRange = terminal->getUConstraints( Flags::Vertical );
 
-    if (isSourceTerminal) {
-      terminal->setConstraintBox( Box( termConstraints.getXMin()
-                                     , termConstraints.getYMin()
-                                     , termConstraints.getXMax()
-                                     , perpandicular->getAxis() - perpandicular->getPitch()
-                                     ) );
-      turn->setConstraintBox( Box( turnConstraints.getXMin()
-                                 , turnConstraints.getYMin()
-                                 , turnConstraints.getXMax()
-                                 , perpandicular->getAxis() - perpandicular->getPitch()
-                                 ) );
-    } else {
-      terminal->setConstraintBox( Box( termConstraints.getXMin()
-                                     , perpandicular->getAxis() + perpandicular->getPitch()
-                                     , termConstraints.getXMax()
-                                     , termConstraints.getYMax()
-                                     ) );
-      turn->setConstraintBox( Box( turnConstraints.getXMin()
-                                 , perpandicular->getAxis() + perpandicular->getPitch()
-                                 , turnConstraints.getXMax()
-                                 , turnConstraints.getYMax()
-                                 ) );
+    size_t offset      = Track::npos;
+    size_t minBlockage = Track::npos;
+    size_t maxBlockage = Track::npos;
+    RoutingPlane* plane = Session::getKatanaEngine()->getRoutingPlaneByLayer(_segment->getLayer());
+    for ( Track* track : Tracks_Range::get(plane,axisRange) ) {
+      if (offset == Track::npos) offset = track->getIndex();
+      TrackElement* element = track->getSegment( terminal->getX() );
+      if (element and (element->isBlockage() or element->isFixed())) {
+        if (track->getIndex() == offset) {
+          minBlockage = track->getIndex();
+          continue;
+        }
+        if ((minBlockage != Track::npos) and (minBlockage+1 == track->getIndex())) {
+          minBlockage = track->getIndex();
+          continue;
+        }
+        maxBlockage = track->getIndex();
+        break;
+      }
     }
+    Interval nonBlocked ( (minBlockage == Track::npos) ? terminal->getGCell()->getYMin()
+                                                       : plane->getTrackByIndex(minBlockage)->getAxis()
+                        , (maxBlockage == Track::npos) ? terminal->getGCell()->getYMax()
+                                                       : plane->getTrackByIndex(maxBlockage)->getAxis() );
+    cdebug_log(159,0) << "Non blocked vertical " << nonBlocked << endl;
+    Interval turnVConstraints = Interval( turn    ->getUConstraints(Flags::Vertical) );
+    Interval termVConstraints = Interval( terminal->getUConstraints(Flags::Vertical) );
+    turnVConstraints.inflate( perpandicular->getPitch() );
+    turnVConstraints.intersection( nonBlocked );
+    termVConstraints.intersection( nonBlocked );
+
+    cdebug_log(159,0) << "Using: pitch=" << DbU::getValueString(perpandicular->getPitch())
+                      << " axis=" << DbU::getValueString(perpandicular->getAxis())
+                      << " pp=" << perpandicular << endl;
+    terminal->setConstraintBox( Box( termConstraints.getXMin()
+                                   , termVConstraints.getVMin()
+                                   , termConstraints.getXMax()
+                                   , termVConstraints.getVMax()
+                                   ) );
+    turn->setConstraintBox( Box( turnConstraints.getXMin()
+                               , turnVConstraints.getVMin()
+                               , turnConstraints.getXMax()
+                               , turnVConstraints.getVMax()
+                               ) );
 
     cdebug_log(159,0) << "Restrict: " << terminal << " to " << terminal->getConstraintBox() << endl;
     cdebug_log(159,0) << "Restrict: " << turn     << " to " << turn    ->getConstraintBox() << endl;
diff --git a/katana/src/PowerRails.cpp b/katana/src/PowerRails.cpp
index dae8bdef..180ddcf6 100644
--- a/katana/src/PowerRails.cpp
+++ b/katana/src/PowerRails.cpp
@@ -522,6 +522,8 @@ namespace {
       if (AllianceFramework::get()->getCellGauge()->getName() == Name("FlexLib")) {
         if (_width >= DbU::fromPhysical( 10.0, DbU::UnitPower::Micro )) {
           delta = 2 * plane->getLayerGauge()->getPitch();
+        } else {
+          delta = plane->getLayerGauge()->getPitch();
         }
       }
     }
@@ -595,7 +597,7 @@ namespace {
       list<Interval>::iterator ichunk = _chunks.begin();
       for ( ; ichunk != _chunks.end() ; ichunk++ ) {
         cdebug_log(159,0) << "  chunk: [" << DbU::getValueString((*ichunk).getVMin())
-                    << ":" << DbU::getValueString((*ichunk).getVMax()) << "]" << endl;
+                          << ":" << DbU::getValueString((*ichunk).getVMax()) << "]" << endl;
 
         segment = Vertical::create ( net
                                    , layer