Rebase analog fixes

.github/workflows/regression.yml

@@ -58,7 +58,7 @@ jobs:
        run: |
          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
          cd ${{ github.workspace }}/coriolis-2.x/src/coriolis
-         make -f Makefile.LIP6 install install_alliance
+         make -f Makefile.LIP6 SRC_DIR=${{ github.workspace }}/coriolis-2.x/src install install_alliance
      - name: Check for binaries
        run: ls -1 ${{ github.workspace }}/coriolis-2.x/release/install/bin
      - name: Run the reference set of designs

.gitignore

@@ -3,6 +3,7 @@
 *.pyc
 *.log
 *.bak
+.#*
 
 TAGS
 GTAGS
@@ -24,6 +25,7 @@ build/
 venv/
 coriolis.egg-info/
 .pdm-python
+.doit.db
 
 bootstrap/coriolis2.spec
 

Makefile.LIP6

@@ -63,11 +63,19 @@ $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm: $(HOME)/.local/bin/pdm
 	@$(localpath) pdm install --no-self -d --plugins
 
 
+wipe:
+	@$(localpath) pdm run meson setup ${BUILDDIR} --wipe -Dpython.install_env=prefix -Donly-docs=false
+
+
+setup:
+	@$(localpath) pdm run meson setup ${BUILDDIR} --prefix=$(PREFIX) -Dpython.install_env=prefix -Donly-docs=false
+
+
 configure:
-	@$(localpath) pdm run meson setup ${BUILDDIR} --prefix=$(PREFIX) -Dpython.install_env=prefix
+	@$(localpath) pdm run meson configure ${BUILDDIR} --prefix=$(PREFIX) -Dpython.install_env=prefix
 
 
-install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm configure
+install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm setup configure
 	@$(localpath) pdm run meson install -C $(BUILDDIR)
 	@echo "";                                                                             \
 	 echo "============================================================================"; \
@@ -80,7 +88,6 @@ install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm configure
 
 install_docs: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm configure
 	@$(localpath) pdm run meson configure ${BUILDDIR} --prefix=$(PREFIX) \
-	                                                  -Donly-docs=true   \
 	                                                  -Ddocs=true
 	@$(localpath) pdm run meson install -C $(BUILDDIR)
 
@@ -92,10 +99,10 @@ install_alliance:
 	 sed -i 's,dirs="\\$$newdirs documentation",dirs="$$newdirs",' ./autostuff; \
 	 ./autostuff clean; \
 	 ./autostuff; \
- 	 mkdir -p $(BUILDDIR); \
+	 mkdir -p $(BUILDDIR); \
 	 cd $(BUILDDIR); \
 	 $(ALLIANCE_SRC)/configure --prefix=$(PREFIX) --enable-alc-shared; \
- 	 make -j1 install
+	 make -j1 install
 
 
 clean_build: check_dir

anabatic/src/AnabaticEngine.cpp

@@ -1177,7 +1177,10 @@ namespace Anabatic {
     }
     cleanupGlobal();
 
-    if (not _configuration->isTwoMetals()) relaxOverConstraineds();
+    if (not _configuration->isTwoMetals()) {
+      if (_configuration->getDirection((size_t)0) & Flags::Vertical)
+        relaxOverConstraineds();
+    }
 
     _state = EngineActive;
   }
@@ -1776,7 +1779,8 @@ namespace Anabatic {
     UpdateSession::open();
 
     for ( auto rp : rps ) {
-      if (not _configuration->selectRpComponent(rp))
+      bool ongrid = _configuration->selectRpComponent(rp);
+      if (not ongrid and not _configuration->isM1Offgrid())
         cerr << Warning( "AnabaticEngine::computeEdgeCapacities(): %s has no components on grid.", getString(rp).c_str() ) << endl;
 
       Point  center = rp->getBoundingBox().getCenter();

anabatic/src/AutoContact.cpp

@@ -392,38 +392,39 @@ namespace Anabatic {
 
   void  AutoContact::showTopologyError ( const std::string& message, Flags flags )
   {
-    Component*    anchor      = NULL;
-    Horizontal**  horizontals = new Horizontal* [10];
-    Vertical**    verticals   = new Vertical*   [10];
-
-    if (not (flags & Flags::CParanoid)) cparanoid.setStreamMask( mstream::PassThrough );
+    Component*     anchor      = NULL;
+    Horizontal**   horizontals = new Horizontal* [10];
+    Vertical**     verticals   = new Vertical*   [10];
+    ostringstream  strError;
 
+    strError << "In topology of " << this << "\n";
     _getTopology ( base(), anchor, horizontals, verticals, 10 );
 
-    cparanoid << Error("In topology of %s",getString(this).c_str()) << endl;
-    if (anchor) cparanoid << "        A: " << anchor << endl;
+    if (anchor) strError << "        A: " << anchor << "\n";
 
     for ( size_t i=0 ; (i<10) and (horizontals[i] != NULL); ++i ) {
       AutoSegment* autoSegment = Session::lookup ( horizontals[i] );
       if (autoSegment != NULL)
-        cparanoid << "        " << (autoSegment->isGlobal()?'G':'L') << ": " << autoSegment << endl; 
+        strError << "        " << (autoSegment->isGlobal()?'G':'L') << ": " << autoSegment << "\n"; 
       else
-        cparanoid << "        ?: " << horizontals[i] << endl; 
+        strError << "        ?: " << horizontals[i] << "\n"; 
     }
 
     for ( size_t i=0 ; (i<10) and (verticals[i] != NULL); ++i ) {
       AutoSegment* autoSegment = Session::lookup ( verticals[i] );
       if (autoSegment != NULL)
-        cparanoid << "        " << (autoSegment->isGlobal()?'G':'L') << ": " << autoSegment << endl; 
+        strError << "        " << (autoSegment->isGlobal()?'G':'L') << ": " << autoSegment << "\n"; 
       else
-        cparanoid << "        ?: " << verticals[i] << endl; 
+        strError << "        ?: " << verticals[i] << "\n"; 
     }
 
-    cparanoid << "        " << message  << endl;
-    if (not (flags & Flags::CParanoid)) cparanoid.unsetStreamMask( mstream::PassThrough );
-
+    strError << "        " << message  << "\n";
+    Error  error ( strError.str().c_str() );
+    
     delete [] horizontals;
     delete [] verticals;
+
+    throw error;
   }
 
 

anabatic/src/AutoContactTerminal.cpp

@@ -464,6 +464,8 @@ namespace Anabatic {
 
     ostringstream message;
     if (not hasBadTopology()) {
+      if (getAnchor()->getLayer() == getLayer()) setFlags  ( CntMetalOnly );
+      else                                       unsetFlags( CntMetalOnly );
       Box anchorBb = getAnchor()->getBoundingBox();
       anchorBb.inflate( Session::getViaWidth (getAnchor()->getLayer())
                       - Session::getWireWidth(getAnchor()->getLayer()) );
@@ -475,6 +477,25 @@ namespace Anabatic {
           setHeight( _segment->getContactWidth() );
         }
 
+        if (canDrag()) {
+          AutoContact* opposite      = _segment->getOppositeAnchor(this);
+          AutoSegment* perpandicular = opposite->getPerpandicular( _segment );
+          if (perpandicular) {
+            cdebug_log(145,0) << "Draging H interval ["
+                              << DbU::getValueString(getCBXMin()) << " "
+                              << DbU::getValueString(getCBXMax()) << "]" << endl;
+            Point onGrid = Session::getNearestGridPoint( Point(perpandicular->getAxis(),getY())
+                                                       , getConstraintBox() );
+            DbU::Unit x = onGrid.getX();
+            x = std::min( x, getCBXMax() );
+            x = std::max( x, getCBXMin() );
+            setX( x );
+            cdebug_log(145,0) << "Dragging to X @" << DbU::getValueString(x)
+                              << " pitched:" << DbU::getValueString(onGrid.getX())
+                              << " " << getConstraintBox() << endl;
+          }
+        }
+
         if (not getUConstraints(Flags::Vertical).contains(axis)) {
           cdebug_log(145,0) << "Cached: " << _segment << endl;
           message << "Terminal horizontal segment Y " << DbU::getValueString(axis)
@@ -503,7 +524,7 @@ namespace Anabatic {
           AutoContact* opposite      = _segment->getOppositeAnchor(this);
           AutoSegment* perpandicular = opposite->getPerpandicular( _segment );
           if (perpandicular) {
-            cdebug_log(145,0) << "Draging V interval ["
+            cdebug_log(145,0) << "Dragging V interval ["
                               << DbU::getValueString(getCBYMin()) << " "
                               << DbU::getValueString(getCBYMax()) << "]" << endl;
             DbU::Unit y = perpandicular->getAxis();

anabatic/src/AutoHorizontal.cpp

@@ -386,13 +386,13 @@ namespace Anabatic {
       int       nativeSlack        = nativeConstraints.getSize() / getPitch();
 
       cdebug_log(149,0) << "Source constraint: " << constraints
-                  << " slack:"        << slack
-                  << " native slack:" << nativeSlack << endl;
+                        << " slack:"        << slack
+                        << " native slack:" << nativeSlack << endl;
       cdebug_log(149,0) << "Perpand constraints on target: " << perpandConstraints << endl; 
     // Ugly: GCell's track number is hardwired.
       if (isNonPrefSource or (nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
         cdebug_log(149,0) << "Slackening from Source: " << source << endl;
-        _makeDogleg( source->getGCell(), Flags::NoFlags );
+        _makeDogleg( source->getGCell(), Flags::DoglegDown );
         sourceSlackened = true;
       } else if (slack < 10) {
         halfSlackened = true;
@@ -430,7 +430,7 @@ namespace Anabatic {
                   << " native slack:" << nativeSlack << endl;
       if (isNonPrefTarget or (nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
         cdebug_log(149,0) << "Slackening from Target: " << target << endl;
-        parallel->_makeDogleg( target->getGCell(), Flags::NoFlags );
+        parallel->_makeDogleg( target->getGCell(), Flags::DoglegDown );
         targetSlackened = true;
       } else if (slack < 10) {
         halfSlackened = true;
@@ -541,6 +541,11 @@ namespace Anabatic {
   {
     _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
     _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
+    if (isNonPref()) {
+      DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) -1;
+      _sourcePosition -= halfCap;
+      _targetPosition += halfCap;
+    }
   }
 
 
@@ -562,6 +567,11 @@ namespace Anabatic {
     bool      coherency      = true;
     DbU::Unit sourcePosition = _horizontal->getSource()->getX() - getExtensionCap(Flags::Source);
     DbU::Unit targetPosition = _horizontal->getTarget()->getX() + getExtensionCap(Flags::Target);
+    if (isNonPref()) {
+      DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) -1;
+      sourcePosition -= halfCap;
+      targetPosition += halfCap;
+    }
 
     if ( _sourcePosition != sourcePosition ) {
       cerr << "extensionCap: " << DbU::getValueString(getExtensionCap(Flags::Source)) << endl;
@@ -879,7 +889,10 @@ namespace Anabatic {
     } else if (Session::getRoutingGauge()->isVH()) {
       upLayer = (depth < 2);
     } else {
-      upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
+      if ((depth > 0) and (flags & Flags::DoglegDown))
+        upLayer = not (Session::getConfiguration()->isUsable( depth-1 ));
+      else
+        upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
     }
 
     size_t  doglegDepth  = depth + ((upLayer)?1:-1);

anabatic/src/AutoSegment.cpp

@@ -789,23 +789,29 @@ namespace Anabatic {
           // cdebug_log(150,0) << "-> Custom cap (-duSource):" << DbU::getValueString(cap) << endl;
         }
       }
-    }
-
-    if (flags & Flags::Target) {
-      if      (getFlags() & SegTargetTop   ) cap = getViaToTopCap   (depth);
-      else if (getFlags() & SegTargetBottom) cap = getViaToBottomCap(depth);
-      else                                   cap = getViaToSameCap  (depth);
-      // cdebug_log(150,0) << "getExtensionCap(): (target) flags:" << getFlags()
-      //                   << " VIA cap:" << DbU::getValueString(cap)
-      //                   << " t:" << (getFlags() & SegSourceBottom)
-      //                   << " b:" << (getFlags() & SegSourceTop)
-      //                   << endl;
-      if (not (flags & Flags::NoSegExt)) {
-        // cdebug_log(150,0) << "duTarget=" << DbU::getValueString(getDuTarget()) << endl;
-        if (getDuTarget() > cap) {
-          cap = getDuTarget();
-          // cdebug_log(150,0) << "-> Custom cap (+duTarget):" << DbU::getValueString(cap) << endl;
+    } else {
+      if (flags & Flags::Target) {
+        if      (getFlags() & SegTargetTop   ) cap = getViaToTopCap   (depth);
+        else if (getFlags() & SegTargetBottom) cap = getViaToBottomCap(depth);
+        else                                   cap = getViaToSameCap  (depth);
+        // cdebug_log(150,0) << "getExtensionCap(): (target) flags:" << getFlags()
+        //                   << " VIA cap:" << DbU::getValueString(cap)
+        //                   << " t:" << (getFlags() & SegSourceBottom)
+        //                   << " b:" << (getFlags() & SegSourceTop)
+        //                   << endl;
+        if (not (flags & Flags::NoSegExt)) {
+          // cdebug_log(150,0) << "duTarget=" << DbU::getValueString(getDuTarget()) << endl;
+          if (getDuTarget() > cap) {
+            cap = getDuTarget();
+            // cdebug_log(150,0) << "-> Custom cap (+duTarget):" << DbU::getValueString(cap) << endl;
+          }
         }
+      } else {
+      //cap = getViaToBottomCap( depth );
+        cap = getViaToSameCap( depth );
+        // cdebug_log(150,0) << "getExtensionCap(): (force bottom) flags:" << getFlags()
+        //                   << " VIA cap:" << DbU::getValueString(cap)
+        //                   << endl;
       }
     }
 
@@ -823,6 +829,7 @@ namespace Anabatic {
 
     if (getLayer()->isSymbolic() and (cap < getWidth()/2)) cap  = getWidth()/2;
     if (not (flags & Flags::LayerCapOnly))                 cap += getLayer()->getMinimalSpacing()/2;
+    // cdebug_log(150,0) << "getExtensionCap(): cap=" << DbU::getValueString(cap) << endl;
     return cap;
   }
 
@@ -2544,7 +2551,7 @@ namespace Anabatic {
 
     cdebug_log(149,0) << "isSource:" << isSource << endl;
 
-    makeDogleg( from->getGCell(), Flags::NoCheckLayer );
+    makeDogleg( from->getGCell(), Flags::NoCheckLayer|Flags::NoCheckGCell );
     if (doglegs.size() == index) {
       cdebug_tabw(149,-1);
       return NULL;
@@ -2697,7 +2704,7 @@ namespace Anabatic {
       return 0;
     }
 
-    if (doglegGCell->getSide(getDirection()).intersect(getSpanU())) {
+    if ((flags & Flags::NoCheckGCell) or doglegGCell->getSide(getDirection()).intersect(getSpanU())) {
       cdebug_log(149,0) << "Dogleg in " << this << " spanU:" << getSpanU() << endl;
       rflags = _makeDogleg( doglegGCell, flags );
     } else {
@@ -2822,7 +2829,7 @@ namespace Anabatic {
     DbU::Unit    verticalWidth   = Session::getDVerticalWidth();
     if (not Session::getAnabatic()->getConfiguration()->isGMetal(hurricaneSegment->getLayer())) {
       size_t depth = Session::getAnabatic()->getConfiguration()->getLayerDepth( hurricaneSegment->getLayer() );
-      if (depth > 2) {
+      if ((depth == 0) or (depth > 2)) {
         horizontalLayer = verticalLayer = hurricaneSegment->getLayer();
         horizontalWidth = Session::getAnabatic()->getConfiguration()->getWireWidth( depth );
         verticalWidth   = Session::getAnabatic()->getConfiguration()->getPWireWidth( depth );
@@ -3066,9 +3073,10 @@ namespace Anabatic {
     } else
       throw Error( badSegment, getString(source).c_str(), getString(target).c_str() );
 
-    if (wPitch > 1) segment->setFlags( SegWide );
-    if (source->canDrag() or target->canDrag()) segment->setFlags( SegDrag );
-    if (dir & Flags::UseNonPref)  segment->setFlags( SegNonPref );
+    if (wPitch > 1)                                      segment->setFlags( SegWide );
+    if (source->canDrag() or target->canDrag())          segment->setFlags( SegDrag );
+    if (dir & Flags::UseNonPref)                         segment->setFlags( SegNonPref );
+    if (dir & Flags::Unbreakable)                        segment->setFlags( SegUnbreakable );
     if (dir.contains(Flags::UseNonPref|Flags::OnVSmall)) segment->setFlags( SegOnVSmall );
 
     return segment;

anabatic/src/AutoVertical.cpp

@@ -317,7 +317,7 @@ namespace Anabatic {
 
     // Ugly: GCell's track number is hardwired.
       if ((slack < lowSlack) or (nativeSlack - slack < 3)) {
-        _makeDogleg( source->getGCell(), Flags::NoFlags );
+        _makeDogleg( source->getGCell(), Flags::DoglegDown );
         sourceSlackened = true;
       } else if (slack < 10) {
         halfSlackened = true;
@@ -348,7 +348,7 @@ namespace Anabatic {
 
     // Ugly: GCell's track number is hardwired.
       if ((slack < lowSlack) or (nativeSlack - slack < 3)) {
-        _makeDogleg( target->getGCell(), Flags::NoFlags );
+        _makeDogleg( target->getGCell(), Flags::DoglegDown );
         targetSlackened = true;
       } else if (slack < 10) {
         halfSlackened = true;
@@ -432,6 +432,11 @@ namespace Anabatic {
   {
     _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
     _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
+    if (isNonPref()) {
+      DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) - 1;
+      _sourcePosition -= halfCap;
+      _targetPosition += halfCap;
+    }
   }
 
 
@@ -453,6 +458,11 @@ namespace Anabatic {
     bool      coherency      = true;
     DbU::Unit sourcePosition = _vertical->getSource()->getY() - getExtensionCap(Flags::Source);
     DbU::Unit targetPosition = _vertical->getTarget()->getY() + getExtensionCap(Flags::Target);
+    if (isNonPref()) {
+      DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) - 1;
+      sourcePosition -= halfCap;
+      targetPosition += halfCap;
+    }
 
     if ( _sourcePosition != sourcePosition ) {
       cerr << Error ( "%s\n        Source position incoherency: "
@@ -740,7 +750,10 @@ namespace Anabatic {
     } else if (Session::getRoutingGauge()->isVH()) {
       upLayer = (depth < 2);
     } else {
-      upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
+      if ((depth > 0) and (flags & Flags::DoglegDown))
+        upLayer = not (Session::getConfiguration()->isUsable( depth-1 ));
+      else
+        upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
     }
 
     size_t  doglegDepth  = depth + ((upLayer)?1:-1);