Various fixes for IHP SG13G2 node.

.gitignore

@@ -12,6 +12,7 @@ GRTAGS
 .dir-locals.el
 .projectile
 .vscode
+.venv
 
 lefdef/src/lef/lef/lef.tab.h
 lefdef/src/def/def/def.tab.h

Makefile.LIP6

@@ -1,6 +1,6 @@
 
 
- venv = source .venv/bin/activate;
+ venv = . .venv/bin/activate;
 
  REGRESSION_DIR = 
  ifneq ($(findstring nightly,$(shell pwd)),)
@@ -14,25 +14,53 @@
  ifneq ($(shell which nproc 2> /dev/null),)
    SMP_FLAGS = -j$(shell nproc)
  endif
- ifeq ($(findstring abuild/rpmbuild,$(shell pwd)),)
-   $(info Using LIP6 build directory tree scheme)
-   SRC_DIR      = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/src
-   CORIOLIS_SRC = ${SRC_DIR}/coriolis
-   ALLIANCE_SRC = ${SRC_DIR}/alliance/alliance/src
-   BUILDTYPE    = release
-   BUILDDIR     = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/$(BUILDTYPE)/build
-   PREFIX       = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/$(BUILDTYPE)/install
- else
-   $(info Using rpmbuild directory tree scheme)
-   SRC_DIR      = ${HOME}/rpmbuild/BUILD
+
+ USE_VENV = Yes
+ ifneq ($(findstring abuild/rpmbuild,$(shell pwd)),)
+   $(info Using RPM directory tree scheme)
+   PYTHON_BIN   = python3
+   ifneq ($(findstring coriolis-eda-2.5.5-build,$(shell pwd)),)
+     SRC_DIR    = ${HOME}/rpmbuild/BUILD/coriolis-eda-2.5.5-build
+   else
+     SRC_DIR    = ${HOME}/rpmbuild/BUILD
+   endif
    CORIOLIS_SRC = ${SRC_DIR}/coriolis-eda-2.5.5
    ALLIANCE_SRC = ${SRC_DIR}/alliance/alliance/src
    BUILDDIR     = ${CORIOLIS_SRC}/build
    PREFIX       = /usr
+ else
+   ifneq ($(findstring packages/BUILD,$(shell pwd)),)
+     $(info Using DEB directory tree scheme)
+     PYTHON_BIN   = python3
+     SRC_DIR      = /usr/src/packages/BUILD
+     CORIOLIS_SRC = ${SRC_DIR}
+     ALLIANCE_SRC = ${SRC_DIR}
+     BUILDDIR     = ${CORIOLIS_SRC}/build
+     PREFIX       = /usr
+   else
+     $(info Using LIP6 build directory tree scheme)
+#    PYTHON_BIN   = /usr/bin/python3.11
+     PYTHON_BIN   = python3
+     SRC_DIR      = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/src
+     CORIOLIS_SRC = ${SRC_DIR}/coriolis
+     ALLIANCE_SRC = ${SRC_DIR}/alliance/alliance/src
+     BUILDTYPE    = release
+     BUILDDIR     = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/$(BUILDTYPE)/build
+     PREFIX       = ${HOME}$(REGRESSION_DIR)/coriolis-2.x/$(BUILDTYPE)/install
+   endif
+ endif
+
+ ifeq ($(USE_VENV),Yes)
+   PDM_BIN     = $(CORIOLIS_SRC)/.venv/bin/pdm
+   MESON_BIN   = $(CORIOLIS_SRC)/.venv/bin/meson
+   PELICAN_BIN = $(CORIOLIS_SRC)/.venv/bin/pelican
+   DOIT_BIN    = $(CORIOLIS_SRC)/.venv/bin/doit
+ else
+   PDM_BIN     = /usr/bin/pdm
+   MESON_BIN   = /usr/bin/meson
+   PELICAN_BIN = /usr/bin/pelican
+   DOIT_BIN    = /usr/bin/doit
  endif
- PDM_BIN     = $(CORIOLIS_SRC)/.venv/bin/pdm
- MESON_BIN   = $(CORIOLIS_SRC)/.venv/bin/meson
- PELICAN_BIN = $(CORIOLIS_SRC)/.venv/bin/pelican
 
 
 
@@ -71,7 +99,7 @@ check_dir:
 
 
 $(CORIOLIS_SRC)/.venv:
-	python3 -m venv .venv
+	$(PYTHON_BIN) -m venv .venv
 
 
 $(MESON_BIN): $(CORIOLIS_SRC)/.venv
@@ -82,13 +110,17 @@ $(PELICAN_BIN): $(CORIOLIS_SRC)/.venv
 	$(venv) if [ ! -x "$(PELICAN_BIN)" ]; then pip install pelican; fi
 
 
+$(DOIT_BIN): $(CORIOLIS_SRC)/.venv
+	$(venv) if [ ! -x "$(DOIT_BIN)" ]; then pip install doit==0.33.1; fi
+
+
 ifeq ($(USE_SYSTEM_PDM),)
 
 $(PDM_BIN): $(CORIOLIS_SRC)/.venv
 	$(venv) if [ ! -x "$(PDM_BIN)" ]; then pip install pdm; pdm install --no-self -d --plugins; fi
 
 
-install_venv: $(PDM_BIN) $(MESON_BIN) $(PELICAN_BIN)
+install_venv: $(PDM_BIN) $(MESON_BIN) $(PELICAN_BIN) #$(DOIT_BIN)
 
 else
 

anabatic/src/AntennaProtect.cpp

@@ -983,7 +983,7 @@ namespace Anabatic {
       if (netData) {
         for ( auto item : clusterSegments ) {
           cdebug_log(147,0) << "No move up: " << item.first << endl;
-          netData->setNoMoveUp( item.first );
+        //netData->setNoMoveUp( item.first );
         }
       }
 
@@ -1158,9 +1158,9 @@ namespace Anabatic {
     cmess2 << Dots::asString    ( "     - Antenna gate maximum WL"   , DbU::getValueString(etesian->getAntennaGateMaxWL()) ) << endl;
     cmess2 << Dots::asString    ( "     - Antenna diode maximum WL"  , DbU::getValueString(etesian->getAntennaDiodeMaxWL()) ) << endl;
     cmess2 << Dots::asString    ( "     - Antenna segment maximum WL", DbU::getValueString(segmentMaxWL) ) << endl;
-    cmess2 << Dots::asInt       ( "     - Total needed diodes", total  ) << endl;
-    cmess2 << Dots::asInt       ( "     - Failed to allocate" , failed ) << endl;
-    cmess2 << Dots::asPercentage( "     - Success ratio"      , (float)(total-failed)/(float)total ) << endl;
+    cmess1 << Dots::asInt       ( "     - Total needed diodes", total  ) << endl;
+    cmess1 << Dots::asInt       ( "     - Failed to allocate" , failed ) << endl;
+    cmess1 << Dots::asPercentage( "     - Success ratio"      , (float)(total-failed)/(float)total ) << endl;
 
     stopMeasures();
     printMeasures( "antennas" );

anabatic/src/AutoHorizontal.cpp

@@ -134,6 +134,11 @@ namespace Anabatic {
   void  AutoHorizontal::setDuSource ( DbU::Unit du )
   {
     _horizontal->setDxSource(du);
+    if (du > 0)
+      cerr << Warning( "AutoHorizontal::setDuSource(): Positive du=%s (should always be negative)\n"
+                       "          On %s"
+                     , DbU::getValueString(du).c_str()
+                     , getString(this).c_str() ) << endl;
     if (abs(du) > getPitch())
       cerr << Warning( "AutoHorizontal::setDuSource(): Suspiciously big du=%s (should not exceed routing pitch %s)\n"
                        "          On %s"
@@ -146,6 +151,11 @@ namespace Anabatic {
   void  AutoHorizontal::setDuTarget ( DbU::Unit du )
   {
     _horizontal->setDxTarget(du);
+    if (du < 0)
+      cerr << Warning( "AutoHorizontal::setDuTarget(): Negative du=%s (should always be positive)\n"
+                       "          On %s"
+                     , DbU::getValueString(du).c_str()
+                     , getString(this).c_str() ) << endl;
     if (abs(du) > getPitch())
       cerr << Warning( "AutoHorizontal::setDuTarget(): Suspiciously big du=%s (should not exceed routing pitch %s)\n"
                        "          On %s"
@@ -538,16 +548,16 @@ namespace Anabatic {
   }
 
 
-  void  AutoHorizontal::updatePositions ()
-  {
-    _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
-    _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
-    if (isNonPref()) {
-      DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) -1;
-      _sourcePosition -= halfCap;
-      _targetPosition += halfCap;
-    }
-  }
+  // void  AutoHorizontal::updatePositions ()
+  // {
+  //   _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
+  //   _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
+  //   if (isNonPref()) {
+  //     DbU::Unit halfCap = getExtensionCap( Flags::NoFlags ) -1;
+  //     _sourcePosition -= halfCap;
+  //     _targetPosition += halfCap;
+  //   }
+  // }
 
 
   void  AutoHorizontal::updateNativeConstraints ()
@@ -563,42 +573,42 @@ namespace Anabatic {
   }
 
 
-  bool  AutoHorizontal::checkPositions () const
-  {
-    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;
-      cerr << "ppitch:       " << DbU::getValueString(getPPitch()) << endl;
-      cerr << "via width:    " << DbU::getValueString(Session::getViaWidth(getLayer())) << endl;
-      cerr << Error ( "%s\n        Source position incoherency: "
-                      "shadow: %s, real: %s."
-                    , _getString().c_str() 
-                    , DbU::getValueString(_sourcePosition).c_str()
-                    , DbU::getValueString( sourcePosition).c_str()
-                    ) << endl;
-      coherency = false;
-    }
-
-    if ( _targetPosition != targetPosition ) {
-      cerr << Error ( "%s\n        Target position incoherency: "
-                      "shadow: %s, real: %s."
-                    , _getString().c_str() 
-                    , DbU::getValueString(_targetPosition).c_str()
-                    , DbU::getValueString( targetPosition).c_str()
-                    ) << endl;
-      coherency = false;
-    }
-
-    return coherency;
-  }
+  // bool  AutoHorizontal::checkPositions () const
+  // {
+  //   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;
+  //     cerr << "ppitch:       " << DbU::getValueString(getPPitch()) << endl;
+  //     cerr << "via width:    " << DbU::getValueString(Session::getViaWidth(getLayer())) << endl;
+  //     cerr << Error ( "%s\n        Source position incoherency: "
+  //                     "shadow: %s, real: %s."
+  //                   , _getString().c_str() 
+  //                   , DbU::getValueString(_sourcePosition).c_str()
+  //                   , DbU::getValueString( sourcePosition).c_str()
+  //                   ) << endl;
+  //     coherency = false;
+  //   }
+
+  //   if ( _targetPosition != targetPosition ) {
+  //     cerr << Error ( "%s\n        Target position incoherency: "
+  //                     "shadow: %s, real: %s."
+  //                   , _getString().c_str() 
+  //                   , DbU::getValueString(_targetPosition).c_str()
+  //                   , DbU::getValueString( targetPosition).c_str()
+  //                   ) << endl;
+  //     coherency = false;
+  //   }
+
+  //   return coherency;
+  // }
 
 
   bool  AutoHorizontal::checkConstraints () const