Fix bugs in AutoSegment::isMiddleStack() and canReduce().

* Bug: In AutoSegment::canReduce(), in the repair stage, segments are
    allowed to go beyond their GCell bondaries, so global segments can
    end up in zero length. So now allow globals less than one P-Pitch
    to be flagged as reduced.
* Bug: In AutoSegment::isMiddleStack(), systematically reject non-canonical
    segment. If it is non-canonical, then is aligned with a canonical one.
    Then we will perform the check on it.
      There seems to be another porblem of update of the length of the
    associated TrackElement, the increase of size of the non-canonical is
    not taken into account. This is enough to prevent the problem to
    arise but we should invsetigate further.
* Hack: In AutoSegment::canMoveUp(), prevent segment id:6378409 to be
    moved up so the last antenna effect is avoided. This is not a clean
    way to do it.

.gitignore

@@ -8,9 +8,10 @@ TAGS
 GTAGS
 GPATH
 GRTAGS
-dir-locals.el
+.dir-locals.el
 .projectile
 
+lefdef/src/lef/lef/lef.tab.h
 
 man/
 rtf/
@@ -36,3 +37,6 @@ documentation/RDS/RDS.pdf
 documentation/RDS/RDS.tex
 documentation/RDS/RDS.toc
 
+cumulus/src/plugins/CoreToChip_c35b4.py
+cumulus/src/plugins/core2chip/c35b4.py
+

Makefile

@@ -1,15 +1,16 @@
 
- UNAME_S          = $(shell uname -s)
- UNAME_R          = $(shell uname -r)
+ UNAME_S            = $(shell uname -s)
+ UNAME_R            = $(shell uname -r)
+ DEVTOOLSET_VERSION = 7
 
-# We must use devtoolset-2 only under RHEL6 & clones.
+# We must use devtoolset only under RHEL6 & clones.
  DEVTOOLSET_OPTION =
  ifeq ($(UNAME_S),Linux)
-   ifneq ($(findstring .el6.,$(UNAME_R)),)
-     DEVTOOLSET_OPTION = --devtoolset-2
+   ifneq ($(findstring .el7.,$(UNAME_R)),)
+     DEVTOOLSET_OPTION = --devtoolset=$(DEVTOOLSET_VERSION)
    endif
    ifneq ($(findstring .slsoc6.,$(UNAME_R)),)
-     DEVTOOLSET_OPTION = --devtoolset-2
+     DEVTOOLSET_OPTION = --devtoolset=$(DEVTOOLSET_VERSION)
    endif
  endif
 
@@ -56,7 +57,6 @@ check_dir:
 
 install: check_dir
 	@./bootstrap/ccb.py $(DEVTOOLSET_OPTION) --project=support --project=coriolis --make="$(SMP_FLAGS) install"
-	@./bootstrap/ccb.py $(DEVTOOLSET_OPTION) --project=support --project=coriolis --make="-j1 install" --doc
 	@echo "";                                                                             \
 	 echo "============================================================================"; \
 	 echo "Coriolis has been successfully built";                                         \

README.rst

@@ -5,20 +5,19 @@
 Coriolis README
 ===============
 
-
-Coriolis is a free database, placement tool and routing tool for VLSI designs.
+Coriolis is a free database, placement tool and routing tool for VLSI design.
 
 
 Purpose
 =======
 
 Coriolis provides several tools to perform the layout of VLSI circuits.  Its
-main components are the Hurricane database, the Etesian placer and the Kite
+main components are the Hurricane database, the Etesian placer and the Katana
 router, but other tools can use the Hurricane database and the parsers
 provided.
 
 The user interface <cgt> is the prefered way to use Coriolis, but all
-Coriolis tools are Python modules and thus scriptables.
+Coriolis tools are Python modules and thus scriptable.
 
 
 Documentation
@@ -26,14 +25,14 @@ Documentation
 
 The complete documentation is available here, both in pdf & html:
 
-   ./documentation/_build/html/index.html
+   ./documentation/output/html
    ./documentation/UsersGuide/UsersGuide.pdf
 
 The documentation of the latest *stable* version is also
 available online. It may be quite outdated from the *devel*
 version.
 
-    https://soc-extras.lip6.fr/en/coriolis/coriolis2-users-guide/
+    https://www-soc.lip6.fr/sesi-docs/coriolis2-docs/coriolis2/en/latex/users-guide/UsersGuide.pdf
 
 
 Building Coriolis
@@ -85,8 +84,8 @@ The Coriolis main interface can be launched with the command: ::
 
     ego@home:~: ~/coriolis-2.x/<OS>.<DISTRIB>/Release.Shared/install/bin/coriolis
 
-The ``coriolis`` script is tasked to guess it's location and setup appropriatly
-the UNIX environment, then lauch ``cgt`` (or *any* command, with the
+The ``coriolis`` script detects its location and setups the UNIX
+environment appropriately, then lauches ``cgt`` (or *any* command, with the
 ``--run=<COMMAND>`` option).
 
 Conversely, you can setup the current shell environement for Coriolis by 

anabatic/CMakeLists.txt

@@ -3,6 +3,8 @@
  set(CMAKE_LEGACY_CYGWIN_WIN32 0)
  project(ANABATIC)
 
+ set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}")
+
  option(BUILD_DOC      "Build the documentation (doxygen)" OFF)
  option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF)
  
@@ -13,25 +15,21 @@
  setup_project_paths(CORIOLIS)
  
  set_cmake_policies()
- set_lib_link_mode()
  setup_boost()
  setup_qt()
  
  find_package(PythonLibs 2 REQUIRED)
  find_package(PythonSitePackages REQUIRED)
+ find_package(FLUTE REQUIRED)
  find_package(VLSISAPD REQUIRED)
  find_package(HURRICANE REQUIRED)
  find_package(CORIOLIS REQUIRED)
+ find_package(ETESIAN REQUIRED)
+ find_package(Doxygen)
  
  add_subdirectory(src)
  add_subdirectory(cmake_modules)
-
-#if(BUILD_DOC)
-#  find_package(Doxygen)
-#  if(DOXYGEN_FOUND)
-#    add_subdirectory(doc)
-#  endif()
-#endif()
+#add_subdirectory(doc)
 
  if(CHECK_DATABASE)
    add_definitions(-DCHECK_DATABASE)

anabatic/cmake_modules/FindANABATIC.cmake

@@ -26,7 +26,7 @@ IF(UNIX)
   FIND_LIBRARY(ANABATIC_LIBRARY_PATH
     NAMES anabatic
     PATHS ${CORIOLIS_DIR_SEARCH}
-    PATH_SUFFIXES lib${LIB_SUFFIX}
+    PATH_SUFFIXES lib64 lib
     # Help the user find it if we cannot.
     DOC "The ${ANABATIC_INCLUDE_PATH_DESCRIPTION}"
   )

anabatic/doc/NetBuilder.dox

@@ -0,0 +1,346 @@
+
+// -*- C++ -*-
+  
+namespace Anabatic {
+
+/*! \defgroup     LoadGlobalRouting  Global Routing Loading
+ *  \brief        Translation rules to build detailed routing from global
+ *
+ *                This module documents how the global routing built by \c Knik is
+ *                loaded into the \c Anabatic data-base. It is intented for developpers
+ *                only.
+ */
+
+//! \addtogroup   LoadGlobalRouting
+//! \{
+
+//! \enum         LocalFunctionFlag
+//!               A set of flags for all functions of the LoadGlobalRouting module.
+//!               They can be combined to form the \e flags argument of functions.
+//!               the functions will ignore flags that are not intended to them.
+//!
+//!               For \c HSmall, \c VSmall & \c Punctual see checkRoutingPadSize().
+
+//! \var          LocalFunctionFlag::NoFlags
+//!               A simple alias over zero to explicitly tell that no flag at all is
+//!               passed to the function.
+
+//! \var          LocalFunctionFlag::HAccess
+//!               The constructed topology will be accessed through an horizontal
+//!               segment. The absence of this flag tell that the access will be done
+//!               trough a vertical.
+
+//! \var          LocalFunctionFlag::VSmall
+//!               The RoutingPad vertically covers a very small number of access points,
+//!               so it is likely overconstrained for direct horizontal connexion.
+
+//! \var          LocalFunctionFlag::HSmall
+//!               The RoutingPad horizontally covers a very small number of access points,
+//!               so it is likely overconstrained for direct vertical connexion.
+
+//! \var          LocalFunctionFlag::Punctual
+//!               The RoutingPad covers only an access point in either direction.
+
+//! \var          LocalFunctionFlag::DoSourceContact
+//!               When creating Anabatic::AutoContactTerminal on non-punctual RoutingPad, this flag
+//!               request the creation of a contact <em>on the source point</em>.
+
+//! \var          LocalFunctionFlag::DoTargetContact
+//!               When creating Anabatic::AutoContactTerminal on non-punctual RoutingPad, this flag
+//!               request the creation of a contact <em>on the target point</em>.
+
+
+//! \function     uint64_t  checkRoutingPadSize ( Component* rp );
+//!
+//!               Look at the geometrical size of the Component and assess if
+//!               it's span is too narrow either horizontally or vertically.
+//!               Return a combination of flags indicating it's state:
+//!                 - HSmall : less than 3 pitches in horizontal direction.
+//!                 - VSmall : less than 3 pitches in vertical direction.
+//!                 - Punctual : one pitch in either directions.
+//!
+//!               The component can be a RoutingPad, a Vertical or an Horizontal.
+//!
+//!               \image html  checkRoutingPadSize.png "checkRoutingPadSize()"
+
+/*! \class        NetBuilder
+ *
+ *  \brief        Build the wiring for a Net inside a GCell (\b internal).
+ *
+ *                As this class is called to initially construct the Anabatic wiring,
+ *                it must build a \b connex wiring. That is without gaps in layer depth,
+ *                because the topology restauration mechanism (AutoContact::updateTopology())
+ *                of the AutoContact cannot work until all AutoSegments are revalidated at
+ *                least once. The topology restauration work by creating doglegs which in turn,
+ *                call the canonization, which needs all the caches to be up to date.
+ */
+
+//! \function     void  NetBuilder::doRp_AutoContacts ( GCell* gcell, Component* rp, AutoContact*& source, AutoContact*& target, uint64_t flags );
+//! \param        gcell   The GCell into which create the AutoContact.
+//! \param        rp      The Component we want to access.
+//! \param        source  The AutoContact created on the \c source (\e returned).
+//! \param        target  The AutoContact created on the \c target (\e returned).
+//! \param        flags   Managed by this function:
+//!                         - LocalFunctionFlag::DoSourceContact
+//!                         - LocalFunctionFlag::DoTargetContact
+//!
+//!               Create the AutoContact directly anchored on the Component (terminal).
+//!               Three cases are manageds:
+//!                 -# <b>Ordinary (non-punctual) \c METAL1 terminal</b>: an AutoContactTerminal
+//!                    is anchored on the RoutingPad.
+//!                 -# <b>Punctual \c METAL1 terminal</b>, the access must never be blocked
+//!                    by other routing. To ensure it, we create a fixed AutoSegment (anchored
+//!                    on two AutoContactTerminal) to cover it. The \e normal AutoContactTerminal
+//!                    is also created.
+//!                 -# <b>non \c METAL1 terminal</b>, as for the punctual \c METAL1, a
+//!                    fixed protection is added over the RoutingPad. If we access
+//!                    horizontally a vertical RoutingPad or vertically an horizontal
+//!                    one, an extra AutoContactTerminal is added (to allow is displacement
+//!                    along the RoutingPad).
+//!
+//!               To avoid creating a fixed protection over a RoutingPad multiple times,
+//!               the RoutingPad and it's associated protection is stored in a static
+//!               \c map : \c __routingPadAutoSegments.
+//!
+//!               Conversely, because an AutoContactTerminal can only be connected to one
+//!               segment, each time this function is called a new terminal will be created
+//!               (or maybe two in case of non-punctual terminals). If only one AutoContact
+//!               is requested, it is created centered on the RoutingPad. The initial
+//!               position of AutoContact <em>do not prevent them to move afterwards</em>,
+//!               even those created on source/target on a non-punctual RoutingPad.
+//!
+//! \remark       For clarity we describe the layer management of this function in term
+//!               of \c METAL, but it is the RoutingGauge depth which is actually used.
+//!
+//!               \image html  doRp_AutoContacts.png "doRp_AutoContacts()"
+
+//! \function     AutoContact* NetBuilder::doRp_Access ( GCell* gcell, Component* rp, uint64_t flags );
+//! \param        gcell   The GCell into which create the AutoContact.
+//! \param        rp      The Component onto which anchor the access contact.
+//! \param        flags   Relevant flags are:
+//!                         - HAccess, the terminal is to be accessed through an horizontal
+//!                           segment.
+//!                         - VSmall, force the terminal to be considered as small in the
+//!                           vertical direction.
+//!
+//!               If \c HAccess is set, the Component is to be accessed trough an horizontal
+//!               segment. If unset, the access is done vertically.
+//!
+//!               Create an AutoContact to access a Component (terminal). If the Component
+//!               is not to be accessed through an horizontal segment, and do not cover a
+//!               large span in the horizontal direction (flag \c VSmall), a local horizontal
+//!               AutoSegment is added to slacken the vertical constraints.
+//!
+//!               \image html  doRp_Access.png "doRp_Access()"
+
+//! \function     AutoContact*  NetBuilder::doRp_AccessPad ( RoutingPad* rp, uint64_t flags );
+//! \param        rp      The Component onto which anchor the access contact.
+//! \param        flags   Relevant flags are:
+//!                         - HAccess, the terminal is to be accessed through an horizontal
+//!                           segment.
+//!                         - VSmall, force the terminal to be considered as small in the
+//!                           vertical direction.
+//! \return       A Anabatic::AutoContactTerminal .
+//!
+//!               The Component \c rp is a RoutingPad which belongs to a pad cell. This case
+//!               occurs when we are routing a complete chip. This method build, from the
+//!               \c rp a stack of articulated punctual segments and contacts to reach the
+//!               default H/V routing layers (usually \c METAL2 & \c METAL3). This may be
+//!               needed when the pad terminal is in \c METAL5, for instance.
+//!
+//!               The returned AutoContactTerminal is anchored on the last punctual segment
+//!               build.
+//!
+//!               The GCell into which the AutoContactTerminal is created may be under the
+//!               pads area. However, it will be right on the border of the GCell.
+//!               The global router vertexes of GCell under the pad area are marked as
+//!               blocked so will never be used for routing.
+//!
+//! \remark       The segments and contacts added to ensure the layer connexity are not
+//!               put into the Anabatic database. They are plain Hurricane objects, invisibles
+//!               from it.
+
+//! \function     void  NetBuilder::doRp_StairCaseH ( GCell* gcell, Component* rp1, Component* rp2 );
+//!
+//!               Build the wiring to connect to horizontal Component. Two cases:
+//!                 - The Component are aligneds, then only a straight wire is created.
+//!                 - They are \e not aligned, then a complete dogleg is created.
+//!
+//!               \image html  doRp_StairCaseH.png "doRp_StairCaseH()"
+
+//! \function     void  NetBuilder::doRp_StairCaseV ( GCell* gcell, Component* rp1, Component* rp2 );
+//!
+//!               Build the wiring to connect to vertical Components. Two cases:
+//!                 - The Components are aligneds, then only a straight wire is created.
+//!                 - They are \e not aligned, then a complete dogleg is created.
+//!
+//!               \image html  doRp_StairCaseV.png "doRp_StairCaseV()"
+
+//! \function     void  NetBuilder::_do_xG_1Pad ();
+//!
+//!               Construct the topology, when there is only global wires and one local
+//!               terminal, but coming from a Pad. As thoses connectors will always be
+//!               on one border of the GCell they can be considered as a kind of global.
+//!
+//!               So this method mostly calls NetBuilder::doRp_AccessPad() to create
+//!               the AutoContactTerminal, then calls NetBuilder::_do_xG(), except
+//!               for straight lines which are managed directly.
+
+//! \function     void  NetBuilder::_do_xG ();
+//!
+//!               Construct the topology, when there is only global wires (no local terminals).
+//!               
+//!               Some topology are not handled because they must not be managed by this
+//!               function:
+//!               <ul>
+//!                 <li>One global: nonsensical because there also must be a terminal.
+//!                 <li>Two aligned globals: in that case we do a straight wire whithout
+//!                     any AutoContact (handled by the source/target of the wire).
+//!               </ul>
+//!
+//!               \image html  _do_xG.png "_do_xG()"
+
+//! \function     void  NetBuilder::_do_1G_1M1 ();
+//!
+//!               Construct a topology where there is \e one global and one RoutingPad
+//!               in \c METAL1. The \c METAL1 is assumed to be vertical.
+//!
+//! \remark       When accessing the RoutingPad through an horizontal global segment
+//!               and the vertical extension of the segment is small, the global is
+//!               still directly attached to the terminal, inducing a high constraint
+//!               on it. We left to job of slackening it to the router.
+//!
+//!               \image html  _do_1G_1M1.png "_do_1G_1M1()"
+
+//! \function     void  NetBuilder::_do_1G_xM1 ();
+//!
+//!               Construct a topology where there is \e one global and any number of
+//!               RoutingPad in \c METAL1. The \c METAL1 is assumed to be vertical.
+//!
+//!               The RoutingPads are linked together two by two. If the horizontal
+//!               segments are not aligned by the router, part of the routage will be
+//!               done through the RoutingPad itself. The global incoming segment will
+//!               connected to the leftmost, rightmost or centermost RoutingPad according
+//!               from wich side it comes from.
+//!
+//!               \image html  _do_1G_xM1.png "_do_1G_xM1()"
+
+//! \function     void  NetBuilder::_do_xG_1M1_1M2 ();
+//!
+//!               Construct a topology where there is at least one global (and up to 4),
+//!               one \c METAL1 RoutingPad (assumed V) and one \c METAL2 RoutingPad (assumed H).
+//!
+//!               In this topology, we want to try to reuse the \c METAL2 RoutingPad as a
+//!               feedtrough in the horizontal routage. Thus:
+//!                 - The \c METAL1 and \c METAL2 RoutingPad are connected through a separate wiring.
+//!                 - The south & west global wiring is attached to the leftmost contact of
+//!                   the \c METAL2.
+//!                 - The north & east global wiring is attached to the rightmost contact of
+//!                   the \c METAL2.
+//!
+//!               South/west and north/south can be build independantly. Depending on the number
+//!               of globals, they can consist of:
+//!                 - Nothing (no south nor west).
+//!                 - An AutoContact (west present).
+//!                 - An horizontal plus a turn (south present).
+//!                 - An horizontal plus a HTee (south & west present).
+//!
+//! \remark       Not all configurations are represented below.
+//!
+//!               \image html  _do_xG_1M1_1M2.png "_do_xG_1M1_1M2()"
+
+//! \function     void  NetBuilder::_do_xG_xM1_xM3 ();
+//!
+//!               Construct a topology where there is at least one global (and up to 4),
+//!               at least one \c METAL1 RoutingPad (assumed V) and at least one \c METAL3
+//!               RoutingPad (assumed V).
+//!
+//!               In this topology, we want to try to reuse the \c METAL3 RoutingPad as a
+//!               feedtrough in the vertical routage. Thus:
+//!                 - The \c METAL1 and \c METAL3 RoutingPad are connected through a separate
+//!                   wiring made of separate horizontals.
+//!                 - The south-west global wiring is attached to the leftmost RoutingPad
+//!                   if there isn't south or to the first \c METAL3 otherwise.
+//!                 - The north-east global wiring is attached to the rightmost RoutingPad
+//!                   if there isn't north or to the first \c METAL3 otherwise.
+//!
+//!               South/west and north/south can be build independantly. Depending on the number
+//!               of globals, they can consist of:
+//!                 - Nothing (no south nor west).
+//!                 - An AutoContact on the leftmost RoutingPad (west present).
+//!                 - An AutoContact on the first \c METAL3 (only south present).
+//!                 - An AutoContact plus a vertical plus a VTee (south & west present).
+//!
+//!               \image html  _do_xG_xM1_xM3.png "_do_xG_xM1_xM3()"
+
+//! \function     void  NetBuilder::_do_xG_xM2 ();
+//!
+//!               Construct a topology where there is at least one global (and up to 4),
+//!               and any number of \c METAL2 RoutingPads (assumeds H).
+//!
+//!               In this topology, we want to try to reuse the \c METAL2 RoutingPad as a
+//!               feedtrough in the horizontal routage. Thus:
+//!                 - The RoutingPad are connecteds trough a separate staircase (or
+//!                   straight wire if aligneds).
+//!                 - The south-west global wiring is attached to the leftmost RoutingPad
+//!                   if there isn't south or to the biggest horizontal RoutingPad otherwise.
+//!                 - The north-east global wiring is attached to the rightmost RoutingPad
+//!                   if there isn't south or to the biggest horizontal RoutingPad otherwise.
+//!
+//!               \image html  _do_xG_xM2.png "_do_xG_xM2()"
+
+//! \function     void  NetBuilder::_do_1G_1M3 ();
+//!
+//!               Construct a topology where there is one global and one \c METAL3 RoutingPad
+//!               (assumeds V).
+//!
+//!               In this topology, we reuse the \c METAL3 RoutingPad as a feedtrough in the
+//!               vertical routage. Thus:
+//!                 - If the global is either north or south, we directly connect to the
+//!                   north end or south end of the RoutingPad. \red{The vertical global will}
+//!                   \red{have no slack at all we assume that METAL3 terminals are only from}
+//!                   \red{blocks and are aligneds vertically.}
+//!                 - If the global is east or west \e and the RoutingPad is sufficiently
+//!                   extended in the vertical direction, we connect an horizontal in the
+//!                   normal way.
+//!                 - If the global is not sufficiently extended, we add a turn to give some
+//!                   slack to the global.
+//!
+//!
+//!               \image html  _do_1G_1M3.png "_do_1G_1M3()"
+
+//! \function     void  NetBuilder::_do_xG_xM3 ();
+//!
+//!               Construct a topology where there at least one global and two \c METAL3 RoutingPad
+//!               (assumed V).
+//!
+//!               In this topology, we reuse the \c METAL3 RoutingPad as a feedtrough in the
+//!               vertical routage. \red{We assume that the most likely relative position}
+//!               \red{of the RoutingPads is to be aligned vertically}.
+//!               Thus:
+//!                 - All RoutingPads are linked two by two trough vertical staircases.
+//!                 - The south-west global wiring is attached to the bottommost RoutingPad
+//!                   (without vertical slack). If a misalignment is detected, then a
+//!                   dogleg is added.
+//!                 - The north-east global wiring is attached to the topmost RoutingPad
+//!                   (without vertical slack).
+//!
+//!               South/west and north/south can be build independantly. Depending on the number
+//!               of globals, they can consist of:
+//!                 - Nothing (no south nor west).
+//!                 - An sliding AutoContact on the bottommost RoutingPad (west present).
+//!                 - An fixed AutoContact on the bottommost RoutingPad (only south present).
+//!                 - An fixed AutoContact plus a vertical plus a VTee (south & west present).
+//!
+//!               \image html  _do_xG_xM3.png "_do_xG_xM3()"
+
+//! \function     void  singleGCell ( AnabaticEngine* anbt, Net* net );
+//!
+//!               All the RoutingPads of the net are concentrated under a single
+//!               GCell. This function assumes that all the terminals are in
+//!               \c METAL1 (vertical), and link them two by two by horizontal
+//!               wires.
+
+//! \}
+
+}

anabatic/src/AutoContact.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -110,7 +110,7 @@ namespace Anabatic {
 
   void  AutoContact::_preDestroy ()
   {
-    DebugSession::open( _contact->getNet(), 140, 150 );
+    DebugSession::open( _contact->getNet(), 145, 150 );
 
     cdebug_log(145,0) << "AutoContact::_preDestroy() - <AutoContact id:" << _id << ">" << endl;
 
@@ -178,6 +178,7 @@ namespace Anabatic {
   AutoHorizontal* AutoContact::getHorizontal2   () const { return NULL; }
   AutoVertical*   AutoContact::getVertical1     () const { return NULL; }
   AutoVertical*   AutoContact::getVertical2     () const { return NULL; }
+  bool            AutoContact::isOnPin          () const { return false; }
 
 
   void  AutoContact::getDepthSpan ( size_t& minDepth, size_t& maxDepth ) const
@@ -198,6 +199,20 @@ namespace Anabatic {
   }
 
 
+  void  AutoContact::updateLayer ()
+  {
+    size_t minDepth = (size_t)-1;
+    size_t maxDepth = 0;
+
+    getDepthSpan( minDepth, maxDepth );
+    setLayerAndWidth( maxDepth-minDepth, minDepth );
+    // if (minDepth == maxDepth)
+    //   setLayer( Session::getRoutingGauge()->getRoutingLayer(minDepth) );
+    // else
+    //   setLayer( Session::getRoutingGauge()->getContactLayer(minDepth) );
+  }
+
+
   void  AutoContact::getLengths ( DbU::Unit* lengths, AutoSegment::DepthLengthSet& processeds )
   {
     DbU::Unit hSideLength = getGCell()->getSide( Flags::Horizontal ).getSize();
@@ -212,14 +227,17 @@ namespace Anabatic {
       size_t     depth  = Session::getRoutingGauge()->getLayerDepth(segment->getLayer());
       DbU::Unit  length;
       if (segment->isLocal()) {
-        length = segment->getLength();
+        length = segment->getAnchoredLength();
         lengths[depth] += length;
 
         DbU::Unit sideLength = (segment->isHorizontal()) ? hSideLength : vSideLength;
         if ( not segment->isUnbound() and (abs(length) > sideLength) )
-          cerr << Error("Suspicious length:%.2f of %s."
-                       ,DbU::getValueString(length).c_str()
-                       ,getString(segment).c_str()) << endl;
+          cerr << Error( "AutoContact::getLength(): Suspicious length %s (> %s) of %s.\n"
+                         "        (on: %s)"
+                       , DbU::getValueString(length).c_str()
+                       , DbU::getValueString(sideLength).c_str()
+                       , getString(segment).c_str()
+                       , getString(this).c_str()) << endl;
       } else {
         if (segment->isHorizontal()) {
           if (isSourceHook)
@@ -274,10 +292,11 @@ namespace Anabatic {
 
   void  AutoContact::invalidate ( Flags flags )
   {
+    if (flags & Flags::Topology ) setFlags( CntInvalidatedCache );
     if (not isInvalidated()) {
       cdebug_log(145,1) << "AutoContact::invalidate() - " << this << endl;
+      cdebug_log(145,0) << "flags:" << flags.asString(FlagsFunction) << endl;
       setFlags( CntInvalidated );
-      if (flags & Flags::Topology ) setFlags( CntInvalidatedCache );
       Session::invalidate( this );
 
       _invalidate( flags );
@@ -455,11 +474,13 @@ namespace Anabatic {
 
   void  AutoContact::setConstraintBox ( const Box& box )
   {
+    cdebug_log(149,0) << "setConstraintBox() " << this << " " << getConstraintBox()
+                      << " from:" << box << endl;
     setCBXMin ( box.getXMin() );
     setCBXMax ( box.getXMax() );
     setCBYMin ( box.getYMin() );
     setCBYMax ( box.getYMax() );
-    cdebug_log(149,0) << "setConstraintBox() - " << this << " " << getConstraintBox() << endl;
+    cdebug_log(149,0) << "setConstraintBox() " << this << " " << getConstraintBox() << endl;
     cdebug_log(149,0) << "* " << _gcell << endl;
   }
 
@@ -550,6 +571,30 @@ namespace Anabatic {
   }
 
 
+  void  AutoContact::setLayerAndWidth ( size_t delta, size_t depth )
+  {
+    cdebug_log(145,1) << "AutoContact::setLayerAndWidth() " << this << endl;
+    cdebug_log(145,0) << "delta:" << delta << " depth:" << depth << endl;
+
+    if (delta == 0) {
+      setLayer( Session::getRoutingLayer(depth) );
+      if (Session::getDirection(depth) & Flags::Horizontal) {
+        setSizes( Session::getPWireWidth(depth)
+                , Session::getWireWidth (depth) );
+      } else {
+        setSizes( Session::getWireWidth (depth)
+                , Session::getPWireWidth(depth) );
+      }
+    } else {
+      setLayer( Session::getContactLayer(depth) );
+      setSizes( Session::getViaWidth    (depth)
+              , Session::getViaWidth    (depth) );
+    }
+
+    cdebug_tabw(145,-1);
+  }
+
+
   AutoContact* AutoContact::createFrom ( Contact* hurricaneContact )
   {
     AutoContact* autoContact = NULL;
@@ -627,6 +672,7 @@ namespace Anabatic {
   //s.insert( 4, getString(_id) );
     s.insert( s.size()-1, (isFixed           ())?" F":" -" );
     s.insert( s.size()-1, (isTerminal        ())? "T": "-" );
+    s.insert( s.size()-1, (canDrag           ())? "D": "-" );
     s.insert( s.size()-1, (isHTee            ())? "h": "-" );
     s.insert( s.size()-1, (isVTee            ())? "v": "-" );
     s.insert( s.size()-1, (isInvalidated     ())? "i": "-" );

anabatic/src/AutoContactHTee.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -91,8 +91,11 @@ namespace Anabatic {
   }
 
 
-  AutoSegment* AutoContactHTee::getPerpandicular ( const AutoSegment* ) const
-  { return NULL; }
+  AutoSegment* AutoContactHTee::getPerpandicular ( const AutoSegment* from ) const
+  {
+    if ( (from == _horizontal1) or (from == _horizontal2) ) return _vertical1;
+    return NULL;
+  }
 
 
   AutoSegment* AutoContactHTee::getSegment ( unsigned int index ) const
@@ -115,14 +118,15 @@ namespace Anabatic {
   AutoVertical*    AutoContactHTee::getVertical1   () const { return _vertical1; };
 
 
-  void  AutoContactHTee::_invalidate ( Flags )
+  void  AutoContactHTee::_invalidate ( Flags flags )
   {
-    Flags flags = Flags::Propagate;
+    flags |= Flags::Propagate;
     if (_horizontal1 and _horizontal2) {
       if (_horizontal1->isInvalidated() xor _horizontal2->isInvalidated()) 
-        flags = Flags::NoFlags;
+        flags.reset( Flags::Propagate );
     }
 
+    cdebug_log(145,0) << "flags:" << flags.asString(FlagsFunction) << endl;
     if (_horizontal1) _horizontal1->invalidate( flags );
     if (_horizontal2) _horizontal2->invalidate( flags );
     if (_vertical1  ) _vertical1  ->invalidate();
@@ -196,7 +200,7 @@ namespace Anabatic {
 
   void  AutoContactHTee::updateCache ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateCache() " << this << endl;
 
@@ -245,7 +249,7 @@ namespace Anabatic {
 
   void  AutoContactHTee::updateGeometry ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateGeometry() " << this << endl;
 
@@ -273,7 +277,7 @@ namespace Anabatic {
 
   void  AutoContactHTee::updateTopology ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateTopology() " << this << endl;
 
@@ -305,10 +309,10 @@ namespace Anabatic {
         if (depthH1 == depthH2) {
         // Dogleg on the vertical.
           switch ( delta ) {
-            case 0: setLayer( rg->getRoutingLayer(minDepth) ); break;
-            case 1: setLayer( rg->getContactLayer(minDepth) ); break;
+            case 0:
+            case 1: setLayerAndWidth( delta, minDepth ); break;
             default:
-              setLayer( rg->getContactLayer( depthH1 + ((depthH1==minDepth)?0:-1) ) );
+              setLayerAndWidth( delta, depthH1 + ((depthH1==minDepth)?0:-1) );
               _vertical1 = static_cast<AutoVertical*>( _vertical1->makeDogleg(this) );
               break;
           }
@@ -318,12 +322,12 @@ namespace Anabatic {
           int deltaH2 = (int)depthH2 - (int)depthV1;
 
           if (std::abs(deltaH1) > std::abs(deltaH2)) {
-            setLayer( rg->getContactLayer( depthH2 + ((depthH2<depthV1)?0:-1) )  );
+            setLayerAndWidth( 2, depthH2 + ((depthH2<depthV1)?0:-1) );
           //_horizontal1 = static_cast<AutoHorizontal*>( _horizontal1->makeDogleg(this) );
             _horizontal1->makeDogleg(this);
             cdebug_log(145,0) << "New h1:" << _horizontal1 << endl;
           } else {
-            setLayer( rg->getContactLayer( depthH1 + ((depthH1<depthV1)?0:-1) )  );
+            setLayerAndWidth( 2, depthH1 + ((depthH1<depthV1)?0:-1) );
           //_horizontal2 = static_cast<AutoHorizontal*>( _horizontal2->makeDogleg(this) );
             _horizontal2->makeDogleg(this);
             cdebug_log(145,0) << "New h2:" << _horizontal2 << endl;

anabatic/src/AutoContactTerminal.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -29,6 +29,7 @@
 #include "hurricane/RoutingPad.h"
 #include "hurricane/Vertical.h"
 #include "hurricane/Horizontal.h"
+#include "hurricane/Pin.h"
 #include "hurricane/DebugSession.h"
 #include "crlcore/RoutingGauge.h"
 #include "anabatic/AutoContactTerminal.h"
@@ -46,6 +47,8 @@ namespace Anabatic {
   using Hurricane::DebugSession;
   using Hurricane::Transformation;
   using Hurricane::Entity;
+  using Hurricane::Occurrence;
+  using Hurricane::Pin;
 
 
 // -------------------------------------------------------------------
@@ -60,7 +63,7 @@ namespace Anabatic {
                                                    , DbU::Unit    height
                                                    )
   {
-    cdebug_log(145,1) << "AutoContactTerminal::create(... Point, ...)" << endl;
+    cdebug_log(145,1) << "AutoContactTerminal::create(... Point, ...) " << endl;
     cdebug_log(145,0)   << "@" << point << endl; 
 
     anchor->getBodyHook()->detach();
@@ -85,7 +88,7 @@ namespace Anabatic {
                                                    , const DbU::Unit  height
                                                    )
   {
-    cdebug_log(145,0) << "AutoContactTerminal::create(... x, y, ...)" << endl;
+    cdebug_log(145,0) << "AutoContactTerminal::create(... x, y, ...) " << endl;
     cdebug_log(145,0) << "@ x:" << DbU::getValueString(x) << " y:" << DbU::getValueString(y) << endl; 
 
     _preCreate( gcell, anchor->getNet(), layer );
@@ -128,6 +131,13 @@ namespace Anabatic {
   }
 
 
+  bool  AutoContactTerminal::isOnPin () const
+  {
+    RoutingPad* rp = dynamic_cast<RoutingPad*>( getAnchor() );
+    return (dynamic_cast<Pin*>(rp->getOccurrence().getEntity()) != NULL);
+  }
+
+
   AutoSegment* AutoContactTerminal::getOpposite ( const AutoSegment* ) const
   { return NULL; }
 
@@ -171,7 +181,34 @@ namespace Anabatic {
     if (component == NULL) {
       cerr << Error( "%s is not anchored.", getString(this).c_str() ) << endl;
       cdebug_tabw(145,-1);
-      return _gcell->getBoundingBox ();
+      return _gcell->getBoundingBox();
+    }
+
+    RoutingLayerGauge* lg       = Session::getLayerGauge( Session::getLayerDepth(component->getLayer()) );
+    DbU::Unit          xborder  = 0;
+    DbU::Unit          yborder  = 0;
+    const Layer*       viaLayer = Session::getContactLayer( lg->getDepth() );
+
+    if (viaLayer) {
+      if (lg->isHorizontal() and (lg->getDepth() != 0)) {
+        xborder = Session::getViaWidth( lg->getDepth() )/2
+                + viaLayer->getBottomEnclosure( Layer::EnclosureH );
+      } else {
+        yborder = Session::getViaWidth( lg->getDepth() )/2
+                + viaLayer->getBottomEnclosure( Layer::EnclosureV );
+        xborder = Session::getViaWidth( lg->getDepth() )/2
+                + viaLayer->getBottomEnclosure( Layer::EnclosureH );
+
+        if (Session::getRoutingGauge()->isSymbolic()) {
+        // SxLib bug: METAL1 terminal segments are 0.5 lambdas too shorts on
+        // their extremities. Should modificate all the standard cells layout...
+        // HARDCODED.
+          if (getString(Session::getRoutingGauge()->getName()).substr(0,6) == "msxlib")
+            yborder -= DbU::fromLambda( 1.0 );
+          else
+            yborder -= DbU::fromLambda( 0.5 );
+        }
+      }
     }
 
     DbU::Unit   xMin;
@@ -195,6 +232,42 @@ namespace Anabatic {
       xMin = xMax
            = vertical->getTargetPosition().getX();
     } else if ( (routingPad = dynamic_cast<RoutingPad*>(component)) ) {
+      Occurrence     occurrence     = routingPad->getOccurrence();
+      Transformation transformation = occurrence.getPath().getTransformation();
+      Horizontal*    horizontal     = dynamic_cast<Horizontal*>( occurrence.getEntity() );
+      Vertical*      vertical       = dynamic_cast<Vertical*  >( occurrence.getEntity() );
+
+      cdebug_log(145,0) << "Anchor: " << occurrence.getEntity() << endl;
+      cdebug_log(145,0) << "transf: " << transformation << endl;
+
+      if (horizontal or vertical) {
+        Box bb;
+      // Assume that transformation contains no rotations (for now).
+        if (horizontal) { bb = horizontal->getBoundingBox(); const_cast<AutoContactTerminal*>(this)->setFlags( CntOnHorizontal ); }
+        if (vertical)   { bb = vertical  ->getBoundingBox(); const_cast<AutoContactTerminal*>(this)->setFlags( CntOnVertical ); }
+
+        transformation.applyOn( bb );
+        cdebug_log(145,0) << "Shrink border x:" << DbU::getValueString(xborder)
+                          <<              " y:" << DbU::getValueString(yborder)
+                          << endl;
+
+      // HARDCODED.
+        if (   (Session::getRoutingGauge()->getName() == "sxlib")
+           and (bb.getWidth() == DbU::fromLambda(1.0)) ) {
+          bb.inflate( DbU::fromLambda(0.5), 0 );
+        }
+
+        bb.inflate( -xborder, -yborder );
+        xMin = bb.getXMin();
+        yMin = bb.getYMin();
+        xMax = bb.getXMax();
+        yMax = bb.getYMax();
+      } else {
+        xMin = xMax = component->getPosition().getX();
+        yMin = yMax = component->getPosition().getY();
+      }
+
+#if FOR_SYMBOLIC_LAYERS
       Entity*         entity = routingPad->getOccurrence().getEntity();
       Transformation  transf = routingPad->getOccurrence().getPath().getTransformation();
       cdebug_log(145,0) << "Anchor: " << routingPad << endl;
@@ -238,6 +311,7 @@ namespace Anabatic {
           yMin = yMax = routingPad->getPosition().getY();
           break;
       }
+#endif
     } else {
       xMin = xMax = component->getPosition().getX();
       yMin = yMax = component->getPosition().getY();
@@ -255,7 +329,7 @@ namespace Anabatic {
 
     cdebug_log(145,0) << "| Using (y): "
                       << DbU::getValueString(bb.getYMin()) << " "
-                      << DbU::getValueString(bb.getYMax()) << endl;
+                      << DbU::getValueString(bb.getYMax()) << " " << bb << endl;
 
     cdebug_tabw(145,-1);
     return bb;
@@ -264,36 +338,57 @@ namespace Anabatic {
 
   void  AutoContactTerminal::_invalidate ( Flags flags )
   {
-    if (_segment) _segment->invalidate();
+    cdebug_log(145,0) << "flags:" << flags.asString(FlagsFunction) << endl;
+    if (_segment) _segment->invalidate( flags|Flags::Propagate );
   }
 
 
   void  AutoContactTerminal::cacheDetach ( AutoSegment* segment )
   {
     if (_segment == segment) {
+    //_segment->unsetFlags( AutoSegment::SegAxisSet );
       _segment = NULL;
       setFlags( CntInvalidatedCache );
+      unsetFlags( CntDrag );
     }
   }
 
 
   void  AutoContactTerminal::cacheAttach ( AutoSegment* segment )
   {
+    DebugSession::open( getNet(), 145, 150 );
+
+    cdebug_log(145,1) << _getTypeName() << "::cacheAttach() " << this << endl;
+
     if (_segment) {
       cerr << Bug( "%s::cacheAttach() On %s,\n"
                    "      cache has not been cleared first, cancelled."
                  , _getTypeName().c_str(), getString(this).c_str()
                  ) << endl;
+      cdebug_tabw(145,-1);
+      DebugSession::close();
       return;
     }
     _segment = segment;
     unsetFlags( CntInvalidatedCache  );
+
+    if (  (dynamic_cast<AutoHorizontal*>(_segment) and (getFlags() & CntOnHorizontal))
+       or (dynamic_cast<AutoVertical*>  (_segment) and (getFlags() & CntOnVertical  )) ) {
+      _segment->setFlags( AutoSegment::SegDrag|AutoSegment::SegAxisSet );
+      setFlags( CntDrag );
+
+      cdebug_log(145,0) << "Drag Contact/Segment set" << endl;
+    }
+
+    cdebug_log(145,0) << "Cached:" << _segment << endl;
+    cdebug_tabw(145,-1);
+    DebugSession::close();
   }
 
 
   void  AutoContactTerminal::updateCache ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateCache() " << this << endl;
 
@@ -316,8 +411,16 @@ namespace Anabatic {
     }
     if (horizontals[0] != NULL ) {
       _segment = Session::lookup( horizontals[0] );
+      if (getFlags() & CntOnHorizontal) {
+        setFlags( CntDrag );
+        _segment->setFlags( AutoSegment::SegDrag|AutoSegment::SegFixedAxis );
+      }
     } else {
       _segment = Session::lookup( verticals[0] );
+      if (getFlags() & CntOnVertical) {
+        setFlags( CntDrag );
+        _segment->setFlags( AutoSegment::SegDrag|AutoSegment::SegFixedAxis );
+      }
     }
     if (_segment == NULL) {
       ostringstream os;
@@ -344,7 +447,7 @@ namespace Anabatic {
 
   void  AutoContactTerminal::updateGeometry ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateGeometry() " << this << endl;
 
@@ -396,9 +499,24 @@ namespace Anabatic {
           cdebug_log(145,0) << "Contact for wide segment." << endl;
         }
 
+        if (canDrag()) {
+          AutoContact* opposite      = _segment->getOppositeAnchor(this);
+          AutoSegment* perpandicular = opposite->getPerpandicular( _segment );
+          if (perpandicular) {
+            DbU::Unit y = perpandicular->getAxis();
+            y = std::min( y, getCBYMax() );
+            y = std::max( y, getCBYMin() );
+            Point onGrid = Session::getNearestGridPoint( Point(getX(),y), getConstraintBox() );
+            setY( onGrid.getY() );
+            cdebug_log(145,0) << "Draging to Y @" << DbU::getValueString(y)
+                              << " pitched:" << DbU::getValueString(onGrid.getY())
+                              << " " << getConstraintBox() << endl;
+          }
+        }
+
         if (not getUConstraints(Flags::Horizontal).contains(axis)) {
           cdebug_log(145,0) << "Cached: " << _segment << endl;
-          message << "Terminal vertical segment X" << DbU::getValueString(axis)
+          message << "Terminal vertical segment X " << DbU::getValueString(axis)
                   << " axis is outside RoutingPad " << getUConstraints(Flags::Horizontal) << ".";
 
           Flags flags = Flags::NoFlags;
@@ -416,7 +534,7 @@ namespace Anabatic {
 
   void  AutoContactTerminal::updateTopology ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateTopology() " << this << endl;
 
@@ -444,8 +562,8 @@ namespace Anabatic {
         cdebug_log(145,0) << "Update seg: " << _segment << endl;
         delta = abssub( anchorDepth, rg->getLayerDepth( _segment->getLayer() ) );
       }
-      else if (delta == 0) setLayer( rg->getRoutingLayer(anchorDepth) );
-      else if (delta == 1) setLayer( rg->getContactLayer(std::min(anchorDepth,segmentDepth)) );
+      else if (delta == 0) setLayerAndWidth( delta, anchorDepth );
+      else if (delta == 1) setLayerAndWidth( delta, std::min(anchorDepth,segmentDepth) );
     }
     _segment->invalidate( this );
 

anabatic/src/AutoContactTurn.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -88,8 +88,17 @@ namespace Anabatic {
 
   AutoSegment* AutoContactTurn::getPerpandicular ( const AutoSegment* reference ) const
   {
+    cdebug_log(149,0) << _getTypeName() << "::getPerpandicular() " << this
+                      << " to:" << reference << endl;
+    cdebug_log(149,0) << "| _horizontal1:" << _horizontal1 << endl;
+    cdebug_log(149,0) << "| _vertical1  :" << _vertical1   << endl;
+
     if (reference == _horizontal1) return _vertical1;
     if (reference == _vertical1  ) return _horizontal1;
+
+    cdebug_log(149,0) << _getTypeName() << "::getPerpandicular() " << this
+                      << " to:" << reference << " failed." << endl;
+
     return NULL;
   }
 
@@ -110,13 +119,16 @@ namespace Anabatic {
 
   void  AutoContactTurn::_invalidate ( Flags flags )
   {
-    if (_horizontal1) _horizontal1->invalidate();
-    if (_vertical1  ) _vertical1  ->invalidate();
+    if (_horizontal1) _horizontal1->invalidate( flags|Flags::Propagate );
+    if (_vertical1  ) _vertical1  ->invalidate( flags|Flags::Propagate );
   }
 
 
   void  AutoContactTurn::cacheDetach ( AutoSegment* segment )
   {
+    cdebug_log(149,0) << _getTypeName() << "::cacheDetach() " << this
+                      << " from:" << segment << endl;
+
     if      (segment == _horizontal1) _horizontal1 = NULL;
     else if (segment == _vertical1)   _vertical1   = NULL;
     else return;
@@ -127,6 +139,9 @@ namespace Anabatic {
 
   void  AutoContactTurn::cacheAttach ( AutoSegment* segment )
   {
+    cdebug_log(149,0) << _getTypeName() << "::cacheAttach() " << this
+                      << " to:" << segment << endl;
+
     if (segment->getDirection() == Flags::Horizontal) {
       if (_horizontal1) {
         cerr << Bug( "%s::cacheAttach() On %s,\n"
@@ -154,7 +169,7 @@ namespace Anabatic {
 
   void  AutoContactTurn::updateCache ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateCache() " << this << endl;
 
@@ -195,7 +210,7 @@ namespace Anabatic {
 
   void  AutoContactTurn::updateGeometry ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateGeometry() " << this << endl;
 
@@ -223,7 +238,7 @@ namespace Anabatic {
 
   void  AutoContactTurn::updateTopology ()
   {
-    DebugSession::open ( getNet(), 140, 150 );
+    DebugSession::open ( getNet(), 145, 150 );
 
     cdebug_log(145,1) << _getTypeName() << "::updateTopology() " << this << endl;
 
@@ -239,7 +254,7 @@ namespace Anabatic {
       RoutingGauge* rg           = Session::getRoutingGauge();
       size_t        depthH1      = rg->getLayerDepth( getHorizontal1()->getLayer() );
       size_t        depthV1      = rg->getLayerDepth( getVertical1  ()->getLayer() );
-      size_t        depthContact = (depthH1 < depthV1) ? depthH1 : depthH1-1;
+      size_t        depthContact = (depthH1 <= depthV1) ? depthH1 : depthH1-1;
       size_t        delta        = abssub ( depthH1, depthV1 );
 
       unsetFlags( CntWeakTerminal );
@@ -247,22 +262,23 @@ namespace Anabatic {
         showTopologyError( "Sheared Turn, layer delta exceed 3." );
         setFlags( CntBadTopology );
       } else {
-        if (delta == 3) {
+        if (delta > 1) {
           if (_horizontal1->isInvalidatedLayer()) {
           //_horizontal1 = static_cast<AutoHorizontal*>( _horizontal1->makeDogleg(this) );
             _horizontal1->makeDogleg(this);
-            depthH1 = rg->getLayerDepth( _horizontal1->getLayer() );
             cdebug_log(145,0) << "Update h1: " << _horizontal1 << endl;
           } else /*if (_vertical1->isInvalidatedLayer())*/ {
           //_vertical1 = static_cast<AutoVertical*>( _vertical1->makeDogleg(this) );
             _vertical1->makeDogleg(this);
-            depthV1 = rg->getLayerDepth( _vertical1->getLayer() );
             cdebug_log(145,0) << "Update v1: " << _vertical1 << endl;
           }
-          delta = abssub ( depthH1, depthV1 );
+          depthH1      = rg->getLayerDepth( _horizontal1->getLayer() );
+          depthV1      = rg->getLayerDepth( _vertical1->getLayer() );
+          depthContact = (depthH1 <= depthV1) ? depthH1 : depthH1-1;
+          delta        = abssub ( depthH1, depthV1 );
         }
 
-        setLayer ( (delta == 0) ? rg->getRoutingLayer(depthContact) : rg->getContactLayer(depthContact) );
+        setLayerAndWidth( delta, depthContact );
       }
 
       _horizontal1->invalidate( this );

anabatic/src/AutoContactVTee.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -91,8 +91,11 @@ namespace Anabatic {
   }
 
 
-  AutoSegment* AutoContactVTee::getPerpandicular ( const AutoSegment* ) const
-  { return NULL; }
+  AutoSegment* AutoContactVTee::getPerpandicular ( const AutoSegment* from ) const
+  {
+    if ( (from == _vertical1) or (from == _vertical2) ) return _horizontal1;
+    return NULL;
+  }
 
 
   AutoSegment* AutoContactVTee::getSegment ( unsigned int index ) const
@@ -111,12 +114,12 @@ namespace Anabatic {
   AutoVertical*   AutoContactVTee::getVertical2   () const { return _vertical2; };
 
 
-  void  AutoContactVTee::_invalidate ( Flags )
+  void  AutoContactVTee::_invalidate ( Flags flags )
   {
-    Flags flags = Flags::Propagate;
+    flags |= Flags::Propagate;
     if (_vertical1 and _vertical2) {
       if (_vertical1->isInvalidated() xor _vertical2->isInvalidated()) 
-        flags = Flags::NoFlags;
+        flags.reset( Flags::NoFlags );
     }
 
     if (_vertical1  ) _vertical1  ->invalidate( flags );
@@ -166,7 +169,7 @@ namespace Anabatic {
 
   void  AutoContactVTee::updateCache ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << "AutoContactVTee::updateCache() " << this << endl;
 
@@ -212,7 +215,7 @@ namespace Anabatic {
 
   void  AutoContactVTee::updateGeometry ()
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
 
     cdebug_log(145,1) << "AutoContactVTee::updateGeometry() " << this << endl;
 
@@ -240,7 +243,7 @@ namespace Anabatic {
 
   void  AutoContactVTee::updateTopology ()
   {
-    DebugSession::open ( getNet(), 140, 150 );
+    DebugSession::open ( getNet(), 145, 150 );
 
     cdebug_log(145,1) << "AutoContactVTee::updateTopology() " << this << endl;
 
@@ -275,11 +278,11 @@ namespace Anabatic {
           cdebug_log(145,0) << "depthV1 == depthV2 (" << depthV1 << ")" << endl;
         // Dogleg on the horizontal.
           switch ( delta ) {
-            case 0: setLayer( rg->getRoutingLayer(minDepth) ); break;
-            case 1: setLayer( rg->getContactLayer(minDepth) ); break;
+            case 0:
+            case 1: setLayerAndWidth( delta, minDepth ); break;
             default:
               cdebug_log(145,0) << "Restore connectivity: dogleg on h1." << endl;
-              setLayer( rg->getContactLayer( depthV1 + ((depthV1==minDepth)?0:-1) ) );
+              setLayerAndWidth( delta, depthV1 + ((depthV1==minDepth)?0:-1) );
               _horizontal1 = static_cast<AutoHorizontal*>( _horizontal1->makeDogleg(this) );
               break;
           }
@@ -289,11 +292,11 @@ namespace Anabatic {
           int deltaV2 = (int)depthV2 - (int)depthH1;
 
           if (std::abs(deltaV1) > std::abs(deltaV2)) {
-            setLayer( rg->getContactLayer( depthV2 + ((depthV2<depthH1)?0:-1) )  );
+            setLayerAndWidth( 2, depthV2 + ((depthV2<depthH1)?0:-1) );
           //_vertical1 = static_cast<AutoVertical*>( _vertical1->makeDogleg(this) );
             _vertical1->makeDogleg(this);
           } else {
-            setLayer( rg->getContactLayer( depthV1 + ((depthV1<depthH1)?0:-1) )  );
+            setLayerAndWidth( 2, depthV1 + ((depthV1<depthH1)?0:-1) );
           //_vertical2 = static_cast<AutoVertical*>( _vertical2->makeDogleg(this) );
             _vertical2->makeDogleg(this);
           }

anabatic/src/AutoHorizontal.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -18,6 +18,7 @@
 #include  "hurricane/Bug.h"
 #include  "hurricane/Error.h"
 #include  "hurricane/DebugSession.h"
+#include  "hurricane/ViaLayer.h"
 #include  "hurricane/RoutingPad.h"
 #include  "crlcore/RoutingGauge.h"
 #include  "anabatic/Configuration.h"
@@ -35,6 +36,7 @@ namespace Anabatic {
   using Hurricane::Error;
   using Hurricane::Bug;
   using Hurricane::DebugSession;
+  using Hurricane::ViaLayer;
   using Hurricane::RoutingPad;
 
 
@@ -45,8 +47,8 @@ namespace Anabatic {
   Segment*    AutoHorizontal::base          ()       { return _horizontal; }
   Segment*    AutoHorizontal::base          () const { return _horizontal; }
   Horizontal* AutoHorizontal::getHorizontal ()       { return _horizontal; }
-  DbU::Unit   AutoHorizontal::getSourceU    () const { return _horizontal->getSourceX(); }
-  DbU::Unit   AutoHorizontal::getTargetU    () const { return _horizontal->getTargetX(); }
+  DbU::Unit   AutoHorizontal::getSourceU    () const { return _horizontal->getSource()->getX(); }
+  DbU::Unit   AutoHorizontal::getTargetU    () const { return _horizontal->getTarget()->getX(); }
   DbU::Unit   AutoHorizontal::getDuSource   () const { return _horizontal->getDxSource(); }
   DbU::Unit   AutoHorizontal::getDuTarget   () const { return _horizontal->getDxTarget(); }
   Interval    AutoHorizontal::getSpanU      () const { return Interval(_horizontal->getSourceX(),_horizontal->getTargetX()); }
@@ -91,6 +93,14 @@ namespace Anabatic {
         mergeNativeMax( gcell->getConstraintYMax() );
       }
     }
+
+    // if (getId() == 1518590) {
+    //   cerr << "AutoHorizontal::_postCreate(): " << this << endl;
+    //   cerr << "| Source contact:" << source     << endl; 
+    //   cerr << "| Source GCell:  " << getGCell() << endl; 
+    //   cerr << "| Target contact:" << target     << endl; 
+    //   cerr << "| Target GCell:  " << target->getGCell() << endl; 
+    // }
   }
 
 
@@ -142,33 +152,58 @@ namespace Anabatic {
 
   bool  AutoHorizontal::getConstraints ( DbU::Unit& constraintMin, DbU::Unit& constraintMax ) const
   {
+    cdebug_log(155,1) << "getConstraints() " << this << endl;
+
     constraintMin = getNativeMin();
     constraintMax = getNativeMax();
 
-    cdebug_log(144,0) << "Native constraints: ["
+    cdebug_log(155,0) << "Native constraints: ["
                       << DbU::getValueString(constraintMin) << ":"
                       << DbU::getValueString(constraintMax) << "]"
                       << endl;
 
     constraintMin = std::max ( constraintMin, getAutoSource()->getCBYMin() );
     constraintMax = std::min ( constraintMax, getAutoSource()->getCBYMax() );
-    cdebug_log(144,0) << "Merge with source constraints: ["
+    cdebug_log(155,0) << "Merge with source constraints: ["
                       << DbU::getValueString(getAutoSource()->getCBYMin()) << ":"
                       << DbU::getValueString(getAutoSource()->getCBYMax()) << "]"
                       << endl;
 
-    constraintMin = std::max ( constraintMin, getUserConstraints().getVMin() );
-    constraintMax = std::min ( constraintMax, getUserConstraints().getVMax() );
-    cdebug_log(144,0) << "Merge with user constraints: ["
-                      << DbU::getValueString(getUserConstraints().getVMin()) << ":"
-                      << DbU::getValueString(getUserConstraints().getVMax()) << "]"
+    constraintMin = std::max ( constraintMin, getAutoTarget()->getCBYMin() );
+    constraintMax = std::min ( constraintMax, getAutoTarget()->getCBYMax() );
+    cdebug_log(155,0) << "Merge with target constraints: ["
+                      << DbU::getValueString(getAutoTarget()->getCBYMin()) << ":"
+                      << DbU::getValueString(getAutoTarget()->getCBYMax()) << "]"
                       << endl;
 
-    cdebug_log(145,0) << "Resulting constraints: " << " ["
+    Interval userConstraints = getUserConstraints();
+    if (not userConstraints.isEmpty()) {
+      constraintMin = std::max ( constraintMin, userConstraints.getVMin() );
+      constraintMax = std::min ( constraintMax, userConstraints.getVMax() );
+
+      cdebug_log(155,0) << "Merge with user constraints: ["
+                        << DbU::getValueString(userConstraints.getVMin()) << ":"
+                        << DbU::getValueString(userConstraints.getVMax()) << "]"
+                        << endl;
+    } else
+      cdebug_log(155,0) << "Empty user constraints" << endl;
+
+    cdebug_log(155,0) << "Resulting constraints: ["
                       << DbU::getValueString(constraintMin) << ":"
                       << DbU::getValueString(constraintMax) << "]"
                       << endl;
 
+    if (constraintMin > constraintMax)
+      cerr << Error( "AutoHorizontal::getConstraints(): Invalid interval [%s : %s] -> [%d : %d]\n"
+                     "        on %s"
+                   , DbU::getValueString(constraintMin).c_str()
+                   , DbU::getValueString(constraintMax).c_str()
+                   , constraintMin
+                   , constraintMax
+                   , getString(this).c_str()
+                   ) << endl;
+    
+    cdebug_tabw(155,-1);
     return true;
   }
 
@@ -177,13 +212,14 @@ namespace Anabatic {
   { return Flags::Horizontal; }
 
 
-  size_t  AutoHorizontal::getGCells ( vector<GCell*>& gcells ) const
+  bool  AutoHorizontal::getGCells ( vector<GCell*>& gcells ) const
   {
     vector<GCell*>().swap( gcells );
 
-    DbU::Unit yprobe = getY();
-    GCell*    gcell  = getAutoSource()->getGCell();
-    GCell*    end    = getAutoTarget()->getGCell();
+    bool      success = true;
+    DbU::Unit yprobe  = getY();
+    GCell*    gcell   = getAutoSource()->getGCell();
+    GCell*    end     = getAutoTarget()->getGCell();
 
     cdebug_log(144,0) << "yprobe: " << DbU::getValueString(yprobe) << endl;
 
@@ -195,20 +231,23 @@ namespace Anabatic {
     while ( gcell != end ) {
       gcell = gcell->getEast( yprobe );
       if (not gcell) {
-        cerr << Error( "AutoHorizontal::getGCells() : NULL GCell under %s\n"
-                       "        begin:%s\n"
-                       "        end:  %s"
-                     , getString(this).c_str()
-                     , getString(getAutoSource()->getGCell()).c_str()
-                     , getString(getAutoTarget()->getGCell()).c_str()
-                     ) << endl;
+        success = false;
+        if (not isCreated()) {
+          cerr << Error( "AutoHorizontal::getGCells() : NULL GCell under %s\n"
+                         "        begin:%s\n"
+                         "        end:  %s"
+                       , getString(this).c_str()
+                       , getString(getAutoSource()->getGCell()).c_str()
+                       , getString(getAutoTarget()->getGCell()).c_str()
+                       ) << endl;
+        }
         break;
       }
 
       gcells.push_back( gcell );
     }
 
-    return gcells.size();
+    return success;
   }
 
 
@@ -216,24 +255,35 @@ namespace Anabatic {
   {
     cdebug_tabw(149,1);
 
-    Interval sourceSide        = getAutoSource()->getGCell()->getSide( Flags::Vertical );
-    Interval targetSide        = getAutoTarget()->getGCell()->getSide( Flags::Vertical );
-    Interval sourceConstraints = Interval(getAutoSource()->getCBYMin(),getAutoSource()->getCBYMax());
-    Interval targetConstraints = Interval(getAutoTarget()->getCBYMin(),getAutoTarget()->getCBYMax());
+    AutoContact* source = getAutoSource();
+    AutoContact* target = getAutoTarget();
+    if (source->isOnPin() or target->isOnPin()) { cdebug_tabw(149,-1); return false; }
+
+    Interval     sourceSide        = source->getGCell()->getSide( Flags::Vertical );
+    Interval     targetSide        = target->getGCell()->getSide( Flags::Vertical );
+    Interval     sourceConstraints = Interval(source->getCBYMin(),source->getCBYMax());
+    Interval     targetConstraints = Interval(target->getCBYMin(),target->getCBYMax());
+    bool         sourceGoStraight  = source->getGCell()->isGoStraight();
+    bool         targetGoStraight  = target->getGCell()->isGoStraight();
 
   // Expand by a tiny amount for the "contains" to work for sure.
     sourceConstraints.inflate( 1 );
     targetConstraints.inflate( 1 );
 
-    cdebug_log(149,0) << "source " << getAutoSource() << endl;
+    cdebug_log(149,0) << "source " << source << endl;
     cdebug_log(149,0) << "source constraints: " << sourceConstraints
                 << " " << DbU::getValueString(sourceConstraints.getSize()) << endl;
-    cdebug_log(149,0) << "target " << getAutoTarget() << endl;
+    cdebug_log(149,0) << "target " << target << endl;
     cdebug_log(149,0) << "target constraints: " << targetConstraints
                 << " " << DbU::getValueString(targetConstraints.getSize()) << endl;
 
-    if (not sourceConstraints.contains(sourceSide)) { cdebug_tabw(149,-1); return true; }
-    if (not targetConstraints.contains(targetSide)) { cdebug_tabw(149,-1); return true; }
+    if (not sourceGoStraight and not sourceConstraints.contains(sourceSide)) { cdebug_tabw(149,-1); return true; }
+    if (not targetGoStraight and not targetConstraints.contains(targetSide)) { cdebug_tabw(149,-1); return true; }
+
+    if (not isUnbreakable()) {
+      if (source->isTurn() and (source->getPerpandicular(this)->getLayer() == getLayer())) { cdebug_tabw(149,-1); return true; }
+      if (target->isTurn() and (target->getPerpandicular(this)->getLayer() == getLayer())) { cdebug_tabw(149,-1); return true; }
+    }
 
     cdebug_tabw(149,-1);
     return false;
@@ -249,30 +299,52 @@ namespace Anabatic {
     const Configuration* configuration = Session::getConfiguration();
     const Layer*         metal2        = configuration->getRoutingLayer( 1 );
 
-    bool         success        = false;
-    bool         isMetal2Source = false;
-    bool         isMetal2Target = false;
-    DbU::Unit    height         = 0;
-    AutoContact* source         = getAutoSource();
-    AutoContact* target         = getAutoTarget();
+    bool         success         = false;
+    bool         isMetal2Source  = false;
+    bool         isMetal2Target  = false;
+    bool         isNonPrefSource = false;
+    bool         isNonPrefTarget = false;
+    DbU::Unit    height          = 0;
+    AutoContact* source          = getAutoSource();
+    AutoContact* target          = getAutoTarget();
+    bool         slackenSource   = false;
+    bool         slackenTarget   = false;
+
+    
     if (source->isTerminal()) {
       height = (static_cast<RoutingPad*>(source->getAnchor()))->getBoundingBox().getHeight();
       isMetal2Source = (source->getLayer() == metal2);
+      slackenSource  = true;
     }
     if (target->isTerminal()) {
       height = std::min( height, (static_cast<RoutingPad*>(target->getAnchor()))->getBoundingBox().getHeight() );
       isMetal2Target = (target->getLayer() == metal2);
+      slackenTarget  = true;
+    }
+    if (source->isTurn() and (source->getPerpandicular(this)->getLayer() == getLayer())) {
+      isNonPrefSource = true;
+      slackenSource   = true;
     }
 
-    if (height >= 4*getPitch()) {
-      if (not (_flags & (SegGlobal|SegWeakGlobal)) and (getLength() < 5*getPitch()))
-        return false;
+    cdebug_log(149,0) << "target:" << target << endl;
+    cdebug_log(149,0) << "target->getPerpandicular(this):" << target->getPerpandicular(this) << endl;
+    if (target->isTurn() and (target->getPerpandicular(this)->getLayer() == getLayer())) {
+      isNonPrefTarget = true;
+      slackenTarget   = true;
     }
 
     cdebug_tabw(149,1);
     cdebug_log(149,0) << "_flags:" << (_flags & (SegGlobal|SegWeakGlobal)) << endl;
-    cdebug_log(149,0) << "test:" << (getLength() < 5*getPitch()) << endl;
-    cdebug_log(149,0) << "length:" << DbU::getValueString(getLength()) << endl;
+    cdebug_log(149,0) << "test:" << (getAnchoredLength() < 5*getPitch()) << endl;
+    cdebug_log(149,0) << "length:" << DbU::getValueString(getAnchoredLength()) << endl;
+
+    if (height >= 4*getPitch()) {
+      if (not (_flags & (SegGlobal|SegWeakGlobal)) and (getAnchoredLength() < 5*getPitch())) {
+        cdebug_log(149,0) << "Too short terminal segment to slacken." << endl;
+        cdebug_tabw(149,-1);
+        return false;
+      }
+    }
 
     int          lowSlack        = (flags & Flags::HalfSlacken) ? 3 : 10;
     bool         sourceSlackened = false;
@@ -281,7 +353,7 @@ namespace Anabatic {
     DbU::Unit    targetPosition  = getTargetPosition();
     AutoSegment* parallel        = this;
 
-    if (source->isTerminal()) {
+    if (slackenSource) {
       Interval  perpandConstraints = getAutoTarget()->getUConstraints(Flags::Horizontal);
       Interval  constraints        = source->getUConstraints      (Flags::Vertical|Flags::NoGCellShrink);
       Interval  nativeConstraints  = source->getNativeUConstraints(Flags::Vertical|Flags::NoGCellShrink);
@@ -293,7 +365,7 @@ namespace Anabatic {
                   << " native slack:" << nativeSlack << endl;
       cdebug_log(149,0) << "Perpand constraints on target: " << perpandConstraints << endl; 
     // Ugly: GCell's track number is hardwired.
-      if ((nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
+      if (isNonPrefSource or (nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
         cdebug_log(149,0) << "Slackening from Source: " << source << endl;
         _makeDogleg( source->getGCell(), Flags::NoFlags );
         sourceSlackened = true;
@@ -303,7 +375,7 @@ namespace Anabatic {
 
       const vector<AutoSegment*>& doglegs = Session::getDoglegs();
       if (sourceSlackened and (doglegs.size() >= 2)) {
-        cdebug_log(149,0) << "AutoHorizontal::_slacken(): Source @" << DbU::getValueString(getSourcePosition()) << endl;
+        cdebug_log(149,0) << "Slackened from source @" << DbU::getValueString(getSourcePosition()) << endl;
         doglegs[doglegs.size()-2]->setAxis( getSourcePosition() );
         success = true;
 
@@ -321,7 +393,7 @@ namespace Anabatic {
 
     if (parallel) target = parallel->getAutoTarget();
 
-    if (target->isTerminal()) {
+    if (slackenTarget) {
       Interval  constraints       = target->getUConstraints      (Flags::Vertical|Flags::NoGCellShrink);
       Interval  nativeConstraints = target->getNativeUConstraints(Flags::Vertical|Flags::NoGCellShrink);
       int       slack             = constraints.getSize()       / getPitch();
@@ -331,7 +403,7 @@ namespace Anabatic {
       cdebug_log(149,0) << "Target constraint: " << constraints
                   << " slack:"        << slack
                   << " native slack:" << nativeSlack << endl;
-      if ((nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
+      if (isNonPrefTarget or (nativeSlack < lowSlack) or (nativeSlack - slack < 3)) {
         cdebug_log(149,0) << "Slackening from Target: " << target << endl;
         parallel->_makeDogleg( target->getGCell(), Flags::NoFlags );
         targetSlackened = true;
@@ -341,7 +413,15 @@ namespace Anabatic {
 
       const vector<AutoSegment*>& doglegs = Session::getDoglegs();
       if (targetSlackened and (doglegs.size() >= 2)) {
-        cdebug_log(149,0) << "AutoHorizontal::_slacken(): Target @" << DbU::getValueString(targetPosition) << endl;
+        GCell* targetGCell   = target->getGCell();
+        Box    constraintBox = target->getConstraintBox();
+        cdebug_log(149,0) << "slacken from Target @" << DbU::getValueString(targetPosition) << endl;
+        
+        if (targetPosition >= targetGCell->getXMax()) {
+          cdebug_log(149,0) << "On the rigthmost track, adjust of one P-pitch to the left." << endl;
+          targetPosition -= getPPitch();
+          constraintBox.inflate( getPPitch(), 0, 0, 0 );
+        }
         doglegs[doglegs.size()-2]->setAxis( targetPosition );
         success = true;
 
@@ -349,7 +429,7 @@ namespace Anabatic {
           cdebug_log(149,0) << "Fixing on target terminal contact: "
                       << doglegs[doglegs.size()-2]->getAutoTarget() << endl;
         //doglegs[doglegs.size()-2]->getAutoTarget()->setFlags( CntFixed );
-          doglegs[doglegs.size()-2]->getAutoTarget()->setConstraintBox( target->getConstraintBox() );
+          doglegs[doglegs.size()-2]->getAutoTarget()->setConstraintBox( constraintBox );
           doglegs[doglegs.size()-2]->getAutoTarget()->setFlags( CntUserNativeConstraints );
         }
       }
@@ -406,9 +486,18 @@ namespace Anabatic {
 
   void  AutoHorizontal::updateOrient ()
   {
-    if (_horizontal->getTargetX() < _horizontal->getSourceX()) {
+    if (_horizontal->getTarget()->getX() < _horizontal->getSource()->getX()) {
       cdebug_log(145,0) << "updateOrient() " << this << " (before S/T swap)" << endl;
-      _horizontal->invert();
+      if (isAtMinArea()) {
+        DbU::Unit sourceX = _horizontal->getSourceX();
+        DbU::Unit targetX = _horizontal->getTargetX();
+        _horizontal->invert();
+        setDuSource( sourceX - getSourceU() );
+        setDuTarget( targetX - getTargetU() );
+      } else {
+        _horizontal->invert();
+      }
+      cdebug_log(145,0) << "updateOrient() " << this << " (after S/T swap)" << endl;
 
       uint64_t spinFlags = _flags & SegDepthSpin;
       unsetFlags( SegDepthSpin );
@@ -432,8 +521,8 @@ namespace Anabatic {
 
   void  AutoHorizontal::updatePositions ()
   {
-    _sourcePosition = _horizontal->getSourceX() - getExtensionCap();
-    _targetPosition = _horizontal->getTargetX() + getExtensionCap();
+    _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
+    _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
   }
 
 
@@ -453,10 +542,13 @@ namespace Anabatic {
   bool  AutoHorizontal::checkPositions () const
   {
     bool      coherency      = true;
-    DbU::Unit sourcePosition = _horizontal->getSourceX() - getExtensionCap();
-    DbU::Unit targetPosition = _horizontal->getTargetX() + getExtensionCap();
+    DbU::Unit sourcePosition = _horizontal->getSource()->getX() - getExtensionCap(Flags::Source);
+    DbU::Unit targetPosition = _horizontal->getTarget()->getX() + getExtensionCap(Flags::Target);
 
     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() 
@@ -730,7 +822,7 @@ namespace Anabatic {
 
   Flags  AutoHorizontal::_makeDogleg ( GCell* doglegGCell, Flags flags )
   {
-    DebugSession::open( getNet(), 140, 150 );
+    DebugSession::open( getNet(), 145, 150 );
     cdebug_log(149,0) << "AutoHorizontal::_makeDogleg(GCell*) in " << doglegGCell << endl;
     cdebug_tabw(149,1);
 
@@ -741,6 +833,8 @@ namespace Anabatic {
     GCell*        begin           = autoSource->getGCell();
     GCell*        end             = autoTarget->getGCell();
 
+    if (not autoSource->canDrag()) unsetFlags( SegDrag );
+
     DbU::Unit doglegAxis = (doglegGCell->getXMax() + doglegGCell->getXMin()) / 2;
     if (isLocal())
       doglegAxis = (getSourceX() + getTargetX()) / 2;
@@ -759,10 +853,19 @@ namespace Anabatic {
       } while ( gcell and (gcell != end) );
     }
 
-    size_t       depth        = Session::getRoutingGauge()->getLayerDepth( _horizontal->getLayer() );
-    bool         upLayer      = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
-    Layer*       contactLayer = Session::getRoutingGauge()->getContactLayer( depth + ((upLayer)?0:-1) );
-    const Layer* doglegLayer  = Session::getRoutingGauge()->getRoutingLayer( depth + ((upLayer)?1:-1) );
+    size_t  depth   = Session::getRoutingGauge()->getLayerDepth( _horizontal->getLayer() );
+    bool    upLayer = true;
+
+    if (Session::getRoutingGauge()->isTwoMetals()) {
+      upLayer = (depth == 0);
+    } else if (Session::getRoutingGauge()->isVH()) {
+      upLayer = (depth < 2);
+    } else {
+      upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
+    }
+
+    size_t  doglegDepth  = depth + ((upLayer)?1:-1);
+    Layer*  contactLayer = Session::getRoutingGauge()->getContactLayer( depth + ((upLayer)?0:-1) );
 
     Session::dogleg( this );
     targetDetach();
@@ -771,7 +874,7 @@ namespace Anabatic {
     AutoContact* dlContact1 = AutoContactTurn::create( doglegGCell, _horizontal->getNet(), contactLayer );
     AutoContact* dlContact2 = AutoContactTurn::create( doglegGCell, _horizontal->getNet(), contactLayer );
     AutoSegment* segment1   = AutoSegment::create( dlContact1 , dlContact2, Flags::Vertical );
-    segment1->setLayer( doglegLayer );
+    segment1->setLayer( doglegDepth );
     segment1->_setAxis( doglegAxis );
     segment1->setFlags( SegDogleg|SegSlackened|SegCanonical|SegNotAligned );
 
@@ -782,32 +885,53 @@ namespace Anabatic {
     targetAttach( dlContact1 );
     AutoSegment* segment2 = AutoSegment::create( dlContact2 , autoTarget, Flags::Horizontal );
     autoTarget->cacheAttach( segment2 );
-    segment2->setLayer( getLayer() );
+    segment2->setLayer( depth );
     segment2->_setAxis( getY() );
     segment2->setFlags( (isSlackened()?SegSlackened:0) );
     Session::dogleg( segment2 );
 
-    if (autoSource->isTerminal()) {
-      segment1->setFlags( SegWeakTerminal1 );
-      segment2->setFlags( SegWeakTerminal1 );
+    if (autoSource->isTerminal() and autoTarget->isTerminal()) {
+      dlContact1->setFlags  ( CntWeakTerminal );
+      dlContact2->setFlags  ( CntWeakTerminal );
+
+      if (autoTarget->getGCell() == doglegGCell) dlContact1->migrateConstraintBox( autoTarget );
+      if (autoSource->getGCell() == doglegGCell) dlContact2->migrateConstraintBox( autoSource );
+    } else if (autoSource->isTerminal()) {
       autoTarget->unsetFlags( CntWeakTerminal );
       dlContact1->setFlags  ( CntWeakTerminal );
-      if (autoTarget->getGCell() == doglegGCell)
-        dlContact1->migrateConstraintBox( autoTarget );
+      if (autoTarget->getGCell() == doglegGCell) dlContact1->migrateConstraintBox( autoTarget );
     } else if (autoTarget->isTerminal()) {
       unsetFlags( SegTargetTerminal );
       setFlags( SegWeakTerminal1 );
-      segment1->setFlags( SegWeakTerminal1 );
-      segment2->setFlags( SegTargetTerminal );
       autoSource->unsetFlags( CntWeakTerminal );
       dlContact2->setFlags  ( CntWeakTerminal );
-      if (autoSource->getGCell() == doglegGCell)
-        dlContact2->migrateConstraintBox( autoSource );
-    } else if (isWeakTerminal()) {
+      if (autoSource->getGCell() == doglegGCell) dlContact2->migrateConstraintBox( autoSource );
+    } else  if (isWeakTerminal()) {
       segment1->setFlags( SegWeakTerminal1 );
       segment2->setFlags( SegWeakTerminal1 );
     }
 
+    // if (autoSource->isTerminal()) {
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegWeakTerminal1 );
+    //   autoTarget->unsetFlags( CntWeakTerminal );
+    //   dlContact1->setFlags  ( CntWeakTerminal );
+    //   if (autoTarget->getGCell() == doglegGCell)
+    //     dlContact1->migrateConstraintBox( autoTarget );
+    // } else if (autoTarget->isTerminal()) {
+    //   unsetFlags( SegTargetTerminal );
+    //   setFlags( SegWeakTerminal1 );
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegTargetTerminal );
+    //   autoSource->unsetFlags( CntWeakTerminal );
+    //   dlContact2->setFlags  ( CntWeakTerminal );
+    //   if (autoSource->getGCell() == doglegGCell)
+    //     dlContact2->migrateConstraintBox( autoSource );
+    // } else if (isWeakTerminal()) {
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegWeakTerminal1 );
+    // }
+
     if (isAnalog()) {
       segment1->setFlags( SegAnalog );
       segment2->setFlags( SegAnalog );
@@ -827,6 +951,18 @@ namespace Anabatic {
     updateNativeConstraints();
     segment2->updateNativeConstraints();
 
+    if (          isLocal()) autoSource->setFlags( AutoContactFlag::CntVDogleg );
+    if (segment2->isLocal()) autoTarget->setFlags( AutoContactFlag::CntVDogleg );
+
+    if (autoTarget->canDrag() and not autoSource->canDrag()) {
+      if (not autoTarget->getGCell()->isDevice() and (segment1->getGCell() == autoTarget->getGCell())) {
+        Interval dragConstraints = autoTarget->getNativeUConstraints(Flags::Horizontal);
+        segment1->mergeUserConstraints( dragConstraints );
+
+        cdebug_log(149,0) << "Perpandicular has drag constraints: " << dragConstraints << endl;
+      }
+    }
+
     cdebug_tabw(149,-1);
     DebugSession::close();
 

anabatic/src/AutoSegments.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -93,14 +93,12 @@ namespace Anabatic {
 
 
   bool  AutoSegments_OnContact::Locator::isValid () const
-  { return !_hook; }
+  { return _hook; }
 
 
   void  AutoSegments_OnContact::Locator::progress ()
   {
-    cdebug_log(145,0) << "AutoSegments_OnContact::Locator::progress()" << endl;
-
-    while (_hook and not _hook->isMaster()) {
+    while (_hook) {
       _hook    = _hook->getNextHook(); 
       _element = NULL;
 
@@ -108,7 +106,6 @@ namespace Anabatic {
 
       Segment* segment = dynamic_cast<Segment*>( _hook->getComponent() );
       if (segment) _element = Session::lookup( segment );
-
       if (not _element or (_element == _master)) continue;
 
       break;
@@ -147,7 +144,7 @@ namespace Anabatic {
 
   AutoSegments_OnRoutingPad::Locator::Locator ( RoutingPad* rp, const AutoContactTerminal* contact )
     : AutoSegmentHL()
-    , _elements    ({NULL,NULL,NULL,NULL})
+    , _elements    ({{NULL,NULL,NULL,NULL}})
     , _index       (0)
   {
     if (rp) {

anabatic/src/AutoVertical.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include "hurricane/Bug.h"
+#include "hurricane/ViaLayer.h"
 #include "hurricane/Vertical.h"
 #include "crlcore/RoutingGauge.h"
 #include "anabatic/Configuration.h"
@@ -30,6 +31,7 @@ namespace Anabatic {
   using std::max;
   using Hurricane::Error;
   using Hurricane::Bug;
+  using Hurricane::ViaLayer;
 
 
 // -------------------------------------------------------------------
@@ -39,8 +41,8 @@ namespace Anabatic {
   Segment*   AutoVertical::base         ()       { return _vertical; }
   Segment*   AutoVertical::base         () const { return _vertical; }
   Vertical*  AutoVertical::getVertical  ()       { return _vertical; }
-  DbU::Unit  AutoVertical::getSourceU   () const { return _vertical->getSourceY(); }
-  DbU::Unit  AutoVertical::getTargetU   () const { return _vertical->getTargetY(); }
+  DbU::Unit  AutoVertical::getSourceU   () const { return _vertical->getSource()->getY(); }
+  DbU::Unit  AutoVertical::getTargetU   () const { return _vertical->getTarget()->getY(); }
   DbU::Unit  AutoVertical::getDuSource  () const { return _vertical->getDySource(); }
   DbU::Unit  AutoVertical::getDuTarget  () const { return _vertical->getDyTarget(); }
   Interval   AutoVertical::getSpanU     () const { return Interval(_vertical->getSourceY(),_vertical->getTargetY()); }
@@ -137,6 +139,8 @@ namespace Anabatic {
 
   bool  AutoVertical::getConstraints ( DbU::Unit& constraintMin, DbU::Unit& constraintMax ) const
   {
+    cdebug_log(149,1) << "getConstraints() " << this << endl;
+
     constraintMin = getNativeMin();
     constraintMax = getNativeMax();
 
@@ -152,19 +156,39 @@ namespace Anabatic {
                       << DbU::getValueString(getAutoSource()->getCBXMax()) << "]"
                       << endl;
 
-    constraintMin = max ( constraintMin, getUserConstraints().getVMin() );
-    constraintMax = min ( constraintMax, getUserConstraints().getVMax() );
-
-    cdebug_log(149,0) << "Merge with user constraints: ["
-                      << DbU::getValueString(getUserConstraints().getVMin()) << ":"
-                      << DbU::getValueString(getUserConstraints().getVMax()) << "]"
+    constraintMin = std::max ( constraintMin, getAutoTarget()->getCBXMin() );
+    constraintMax = std::min ( constraintMax, getAutoTarget()->getCBXMax() );
+    cdebug_log(149,0) << "Merge with target constraints: ["
+                      << DbU::getValueString(getAutoTarget()->getCBXMin()) << ":"
+                      << DbU::getValueString(getAutoTarget()->getCBXMax()) << "]"
                       << endl;
 
-    cdebug_log(149,0) << "Resulting constraints: " << " ["
+    Interval userConstraints = getUserConstraints();
+    if (not userConstraints.isEmpty()) {
+      constraintMin = max ( constraintMin, userConstraints.getVMin() );
+      constraintMax = min ( constraintMax, userConstraints.getVMax() );
+
+      cdebug_log(149,0) << "Merge with user constraints: ["
+                        << DbU::getValueString(userConstraints.getVMin()) << ":"
+                        << DbU::getValueString(userConstraints.getVMax()) << "]"
+                        << endl;
+    } else
+      cdebug_log(155,0) << "Empty user constraints" << endl;
+
+    cdebug_log(149,0) << "Resulting constraints: ["
                       << DbU::getValueString(constraintMin) << ":"
                       << DbU::getValueString(constraintMax) << "]"
                       << endl;
 
+    if (constraintMin > constraintMax)
+      cerr << Error( "AutoVertical::getConstraints(): Invalid interval [%s : %s]\n"
+                     "        on %s"
+                   , DbU::getValueString(constraintMin).c_str()
+                   , DbU::getValueString(constraintMax).c_str()
+                   , getString(this).c_str()
+                   ) << endl;
+    
+    cdebug_tabw(149,-1);
     return true;
   }
 
@@ -173,13 +197,14 @@ namespace Anabatic {
   { return Flags::Vertical; }
 
 
-  size_t  AutoVertical::getGCells ( vector<GCell*>& gcells ) const
+  bool  AutoVertical::getGCells ( vector<GCell*>& gcells ) const
   {
     vector<GCell*>().swap( gcells );
 
-    DbU::Unit xprobe = getX();
-    GCell*    gcell  = getAutoSource()->getGCell();
-    GCell*    end    = getAutoTarget()->getGCell();
+    bool      success = true;
+    DbU::Unit xprobe  = getX();
+    GCell*    gcell   = getAutoSource()->getGCell();
+    GCell*    end     = getAutoTarget()->getGCell();
 
     cdebug_log(144,0) << "xprobe: " << DbU::getValueString(xprobe) << endl;
 
@@ -192,20 +217,23 @@ namespace Anabatic {
       gcell = gcell->getNorth( xprobe );
 
       if (not gcell) {
-        cerr << Error( "AutoVertical::getGCells() : NULL GCell under %s\n"
-                       "        begin:%s\n"
-                       "        end:  %s"
-                     , getString(this).c_str()
-                     , getString(getAutoSource()->getGCell()).c_str()
-                     , getString(getAutoTarget()->getGCell()).c_str()
-                     ) << endl;
+        success = false;
+        if (not isCreated()) {
+          cerr << Error( "AutoVertical::getGCells() : NULL GCell under %s\n"
+                         "        begin:%s\n"
+                         "        end:  %s"
+                       , getString(this).c_str()
+                       , getString(getAutoSource()->getGCell()).c_str()
+                       , getString(getAutoTarget()->getGCell()).c_str()
+                       ) << endl;
+        }
         break;
       }
 
       gcells.push_back( gcell );
     }
 
-    return gcells.size();
+    return success;
   }
 
 
@@ -213,17 +241,21 @@ namespace Anabatic {
   {
     cdebug_tabw(149,-1);
 
+    if (getAutoSource()->isOnPin() or getAutoTarget()->isOnPin()) { cdebug_tabw(149,-1); return false; }
+
     Interval sourceSide        = getAutoSource()->getGCell()->getSide( Flags::Horizontal );
     Interval targetSide        = getAutoTarget()->getGCell()->getSide( Flags::Horizontal );
     Interval sourceConstraints = Interval(getAutoSource()->getCBXMin(),getAutoSource()->getCBXMax());
     Interval targetConstraints = Interval(getAutoTarget()->getCBXMin(),getAutoTarget()->getCBXMax());
+    bool     sourceGoStraight  = getAutoSource()->getGCell()->isGoStraight();
+    bool     targetGoStraight  = getAutoTarget()->getGCell()->isGoStraight();
 
   // Expand by a tiny amount for the "contains" to work for sure.
     sourceConstraints.inflate( 1 );
     targetConstraints.inflate( 1 );
 
-    if (not sourceConstraints.contains(sourceSide)) { cdebug_tabw(149,-1); return true; }
-    if (not targetConstraints.contains(targetSide)) { cdebug_tabw(149,-1); return true; }
+    if (not sourceGoStraight and not sourceConstraints.contains(sourceSide)) { cdebug_tabw(149,-1); return true; }
+    if (not targetGoStraight and not targetConstraints.contains(targetSide)) { cdebug_tabw(149,-1); return true; }
 
     cdebug_tabw(149,-1);
     return false;
@@ -234,13 +266,15 @@ namespace Anabatic {
   {
     cdebug_log(149,1) << "AutoVertical::_slacken() " << this << endl;
 
-    if (   not isStrongTerminal()
-       or (not (_flags & (SegGlobal|SegWeakGlobal)) and (getLength() < getPitch()*5)) )
-      { cdebug_tabw(149,-1); return false; }
+    if (not isDrag()) {
+      if (   not isStrongTerminal()
+         or (not (_flags & (SegGlobal|SegWeakGlobal)) and (getAnchoredLength() < getPitch()*5)) )
+        { cdebug_tabw(149,-1); return false; }
+    }
 
     cdebug_log(149,0) << "_flags:" << (_flags & (SegGlobal|SegWeakGlobal)) << endl;
-    cdebug_log(149,0) << "test:" << (getLength() < getPitch()*5) << endl;
-    cdebug_log(149,0) << "length:" << DbU::getValueString(getLength()) << endl;
+    cdebug_log(149,0) << "test:" << (getAnchoredLength() < getPitch()*5) << endl;
+    cdebug_log(149,0) << "length:" << DbU::getValueString(getAnchoredLength()) << endl;
 
     bool         success         = false;
     bool         sourceSlackened = false;
@@ -348,6 +382,10 @@ namespace Anabatic {
     if (_vertical->getTargetY() < _vertical->getSourceY()) {
       cdebug_log(145,0) << "updateOrient() " << this << " (before S/T swap)" << endl;
       _vertical->invert();
+      DbU::Unit duSource = getDuSource();
+      DbU::Unit duTarget = getDuTarget();
+      setDuSource( -duTarget );
+      setDuTarget( -duSource );
 
       unsigned int spinFlags = _flags & SegDepthSpin;
       unsetFlags( SegDepthSpin );
@@ -371,8 +409,8 @@ namespace Anabatic {
 
   void  AutoVertical::updatePositions ()
   {
-    _sourcePosition = _vertical->getSourceY() - getExtensionCap();
-    _targetPosition = _vertical->getTargetY() + getExtensionCap();
+    _sourcePosition = getSourceU() - getExtensionCap(Flags::Source);
+    _targetPosition = getTargetU() + getExtensionCap(Flags::Target);
   }
 
 
@@ -392,8 +430,8 @@ namespace Anabatic {
   bool  AutoVertical::checkPositions () const
   {
     bool      coherency      = true;
-    DbU::Unit sourcePosition = _vertical->getSourceY() - getExtensionCap();
-    DbU::Unit targetPosition = _vertical->getTargetY() + getExtensionCap();
+    DbU::Unit sourcePosition = _vertical->getSource()->getY() - getExtensionCap(Flags::Source);
+    DbU::Unit targetPosition = _vertical->getTarget()->getY() + getExtensionCap(Flags::Target);
 
     if ( _sourcePosition != sourcePosition ) {
       cerr << Error ( "%s\n        Source position incoherency: "
@@ -650,12 +688,14 @@ namespace Anabatic {
   {
     cdebug_log(149,0) << "AutoVertical::_makeDogleg(GCell*)" << endl;
 
+  //Session::doglegReset();
+
     AutoContact*  autoSource = getAutoSource();
     AutoContact*  autoTarget = getAutoTarget();
     GCell*        begin      = autoSource->getGCell();
     GCell*        end        = autoTarget->getGCell();
 
-  //Session::doglegReset();
+    if (not autoSource->canDrag()) unsetFlags( SegDrag );
 
     DbU::Unit doglegAxis = (doglegGCell->getYMax() + doglegGCell->getYMin()) / 2;
     if (isLocal())
@@ -671,10 +711,19 @@ namespace Anabatic {
       } while ( gcell and (gcell != end) );
     }
 
-    size_t       depth        = Session::getRoutingGauge()->getLayerDepth ( _vertical->getLayer() );
-    bool         upLayer      = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
-    Layer*       contactLayer = Session::getRoutingGauge()->getContactLayer ( depth + ((upLayer)?0:-1) );
-    const Layer* doglegLayer  = Session::getRoutingGauge()->getRoutingLayer ( depth + ((upLayer)?1:-1) );
+    size_t  depth   = Session::getRoutingGauge()->getLayerDepth ( _vertical->getLayer() );
+    bool    upLayer = true;
+
+    if (Session::getRoutingGauge()->isTwoMetals()) {
+      upLayer = (depth == 0);
+    } else if (Session::getRoutingGauge()->isVH()) {
+      upLayer = (depth < 2);
+    } else {
+      upLayer = (depth+1 <= Session::getConfiguration()->getAllowedDepth());
+    }
+
+    size_t  doglegDepth  = depth + ((upLayer)?1:-1);
+    Layer*  contactLayer = Session::getRoutingGauge()->getContactLayer ( depth + ((upLayer)?0:-1) );
 
     Session::dogleg( this );
     targetDetach();
@@ -686,7 +735,7 @@ namespace Anabatic {
     cdebug_log(149,0) << dlContact2 << endl;
     AutoSegment* segment1   = AutoSegment::create( dlContact1 , dlContact2, Flags::Horizontal );
     cdebug_log(149,0) << segment1 << endl;
-    segment1->setLayer( doglegLayer );
+    segment1->setLayer( doglegDepth );
     segment1->_setAxis( doglegAxis );
     segment1->setFlags( SegDogleg|SegSlackened|SegCanonical|SegNotAligned );
     cdebug_log(149,0) << "New " << dlContact1->base() << "." << endl;
@@ -696,32 +745,53 @@ namespace Anabatic {
     targetAttach( dlContact1 );
     AutoSegment* segment2 = AutoVertical::create ( dlContact2, autoTarget, Flags::Vertical );
     autoTarget->cacheAttach( segment2 );
-    segment2->setLayer( getLayer() );
+    segment2->setLayer( depth );
     segment2->_setAxis( getX() );
     segment2->setFlags( (isSlackened()?SegSlackened:0) );
     Session::dogleg( segment2 );
 
-    if (isSourceTerminal()) {
-      segment1->setFlags( SegWeakTerminal1 );
-      segment2->setFlags( SegWeakTerminal1 );
+    if (autoSource->isTerminal() and autoTarget->isTerminal()) {
+      dlContact1->setFlags  ( CntWeakTerminal );
+      dlContact2->setFlags  ( CntWeakTerminal );
+
+      if (autoTarget->getGCell() == doglegGCell) dlContact1->migrateConstraintBox( autoTarget );
+      if (autoSource->getGCell() == doglegGCell) dlContact2->migrateConstraintBox( autoSource );
+    } else if (autoSource->isTerminal()) {
       autoTarget->unsetFlags( CntWeakTerminal );
       dlContact1->setFlags  ( CntWeakTerminal );
-      if (autoTarget->getGCell() == doglegGCell)
-        dlContact1->migrateConstraintBox( autoTarget );
-    } else if (isTargetTerminal()) {
+      if (autoTarget->getGCell() == doglegGCell) dlContact1->migrateConstraintBox( autoTarget );
+    } else if (autoTarget->isTerminal()) {
       unsetFlags( SegTargetTerminal );
       setFlags( SegWeakTerminal1 );
-      segment1->setFlags( SegWeakTerminal1 );
-      segment2->setFlags( SegTargetTerminal );
       autoSource->unsetFlags( CntWeakTerminal );
       dlContact2->setFlags  ( CntWeakTerminal );
-      if (autoSource->getGCell() == doglegGCell)
-        dlContact2->migrateConstraintBox( autoSource );
-    } else if (isWeakTerminal()) {
+      if (autoSource->getGCell() == doglegGCell) dlContact2->migrateConstraintBox( autoSource );
+    } else  if (isWeakTerminal()) {
       segment1->setFlags( SegWeakTerminal1 );
       segment2->setFlags( SegWeakTerminal1 );
     }
 
+    // if (isSourceTerminal()) {
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegWeakTerminal1 );
+    //   autoTarget->unsetFlags( CntWeakTerminal );
+    //   dlContact1->setFlags  ( CntWeakTerminal );
+    //   if (autoTarget->getGCell() == doglegGCell)
+    //     dlContact1->migrateConstraintBox( autoTarget );
+    // } else if (isTargetTerminal()) {
+    //   unsetFlags( SegTargetTerminal );
+    //   setFlags( SegWeakTerminal1 );
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegTargetTerminal );
+    //   autoSource->unsetFlags( CntWeakTerminal );
+    //   dlContact2->setFlags  ( CntWeakTerminal );
+    //   if (autoSource->getGCell() == doglegGCell)
+    //     dlContact2->migrateConstraintBox( autoSource );
+    // } else if (isWeakTerminal()) {
+    //   segment1->setFlags( SegWeakTerminal1 );
+    //   segment2->setFlags( SegWeakTerminal1 );
+    // }
+
     if (isAnalog()) {
       segment1->setFlags( SegAnalog );
       segment2->setFlags( SegAnalog );
@@ -741,6 +811,18 @@ namespace Anabatic {
     updateNativeConstraints();
     segment2->updateNativeConstraints();
 
+    if (          isLocal()) autoSource->setFlags( AutoContactFlag::CntHDogleg );
+    if (segment2->isLocal()) autoTarget->setFlags( AutoContactFlag::CntHDogleg );
+
+    if (autoTarget->canDrag() and not autoSource->canDrag()) {
+      if (not autoTarget->getGCell()->isDevice() and (segment1->getGCell() == autoTarget->getGCell())) {
+        Interval dragConstraints = autoTarget->getNativeUConstraints(Flags::Vertical);
+        segment1->mergeUserConstraints( dragConstraints );
+
+        cdebug_log(149,0) << "Perpandicular has drag constraints: " << dragConstraints << endl;
+      }
+    }
+
     return (upLayer) ? Flags::AboveLayer : Flags::BelowLayer;
   }
 

anabatic/src/CMakeLists.txt

@@ -8,6 +8,7 @@ endif ( CHECK_DETERMINISM )
                         ${CORIOLIS_INCLUDE_DIR} 
                         ${HURRICANE_INCLUDE_DIR} 
                         ${CONFIGURATION_INCLUDE_DIR} 
+                        ${FLUTE_INCLUDE_DIR} 
                         ${Boost_INCLUDE_DIRS}
                         ${QtX_INCLUDE_DIR}
                         ${PYTHON_INCLUDE_PATH}
@@ -15,6 +16,7 @@ endif ( CHECK_DETERMINISM )
                    set( includes     anabatic/Constants.h
                                      anabatic/Configuration.h
                                      anabatic/Matrix.h
+                                     anabatic/EdgeCapacity.h
                                      anabatic/Edge.h                 anabatic/Edges.h
                                      anabatic/GCell.h               #anabatic/GCells.h
                                      anabatic/AnabaticEngine.h
@@ -29,18 +31,21 @@ endif ( CHECK_DETERMINISM )
                                      anabatic/AutoHorizontal.h
                                      anabatic/AutoVertical.h
                                      anabatic/Session.h
+                                     anabatic/NetBuilder.h
+                                     anabatic/NetBuilderM2.h
+                                     anabatic/NetBuilderHV.h
+                                     anabatic/NetBuilderVH.h
                                      anabatic/ChipTools.h
                       )
                    set( pyIncludes   )
                    set( cpps         Constants.cpp
                                      Configuration.cpp
                                      Matrix.cpp
+                                     EdgeCapacity.cpp
                                      Edge.cpp
                                      Edges.cpp
                                      GCell.cpp
-                                     AnabaticEngine.cpp
                                      Dijkstra.cpp
-
                                      AutoContact.cpp
                                      AutoContactTerminal.cpp
                                      AutoContactTurn.cpp
@@ -52,15 +57,21 @@ endif ( CHECK_DETERMINISM )
                                      Session.cpp
                                      NetConstraints.cpp
                                      NetOptimals.cpp
-                                     LoadGlobalRouting.cpp
+                                     NetBuilder.cpp
+                                     NetBuilderM2.cpp
+                                     NetBuilderHV.cpp
+                                     NetBuilderVH.cpp
                                      ChipTools.cpp
                                      LayerAssign.cpp
+                                     AntennaProtect.cpp
                                      PreRouteds.cpp
+                                     AnabaticEngine.cpp
                       )
                    set( pyCpps       PyAnabatic.cpp
                       )
 
-                   set( depLibs      ${CORIOLIS_PYTHON_LIBRARIES}
+                   set( depLibs      ${ETESIAN_LIBRARIES}
+                                     ${CORIOLIS_PYTHON_LIBRARIES}
                                      ${CORIOLIS_LIBRARIES}
                                      ${HURRICANE_PYTHON_LIBRARIES}
                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
@@ -68,6 +79,7 @@ endif ( CHECK_DETERMINISM )
                                      ${CONFIGURATION_LIBRARY}
                                      ${CIF_LIBRARY}
                                      ${AGDS_LIBRARY}
+                                     ${FLUTE_LIBRARIES}
                                      ${LEFDEF_LIBRARIES}
                                      ${OA_LIBRARIES}
                                      ${QtX_LIBRARIES}

anabatic/src/ChipTools.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |

anabatic/src/Configuration.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Configuration.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -22,7 +22,11 @@
 #include "hurricane/Error.h"
 #include "hurricane/Technology.h"
 #include "hurricane/DataBase.h"
+#include "hurricane/BasicLayer.h"
 #include "hurricane/RegularLayer.h"
+#include "hurricane/RoutingPad.h"
+#include "hurricane/Pin.h"
+#include "hurricane/NetExternalComponents.h"
 #include "hurricane/Cell.h"
 #include "crlcore/Utilities.h"
 #include "crlcore/CellGauge.h"
@@ -46,9 +50,17 @@ namespace Anabatic {
   using  Hurricane::tab;
   using  Hurricane::Warning;
   using  Hurricane::Error;
+  using  Hurricane::Transformation;
   using  Hurricane::Technology;
   using  Hurricane::DataBase;
+  using  Hurricane::BasicLayer;
   using  Hurricane::RegularLayer;
+  using  Hurricane::Segment;
+  using  Hurricane::Pin;
+  using  Hurricane::Plug;
+  using  Hurricane::Path;
+  using  Hurricane::Occurrence;
+  using  Hurricane::NetExternalComponents;
   using  CRL::AllianceFramework;
   using  CRL::RoutingGauge;
   using  CRL::RoutingLayerGauge;
@@ -59,30 +71,49 @@ namespace Anabatic {
 
 
   Configuration::Configuration ( const CellGauge* cg, const RoutingGauge* rg )
-    : _cg             (NULL)
-    , _rg             (NULL)
-    , _extensionCaps  ()
-    , _saturateRatio  (Cfg::getParamPercentage("katabatic.saturateRatio",80.0)->asDouble())
-    , _saturateRp     (Cfg::getParamInt       ("katabatic.saturateRp"   ,8   )->asInt())
-    , _globalThreshold(0)
-    , _allowedDepth   (0)
-    , _edgeLength     (DbU::fromLambda(Cfg::getParamInt("anabatic.edgeLength",24)->asInt()))
-    , _edgeWidth      (DbU::fromLambda(Cfg::getParamInt("anabatic.edgeWidth" , 4)->asInt()))
-    , _edgeCostH      (Cfg::getParamDouble("anabatic.edgeCostH",  9.0)->asDouble())
-    , _edgeCostK      (Cfg::getParamDouble("anabatic.edgeCostK",-10.0)->asDouble())
-    , _edgeHInc       (Cfg::getParamDouble("anabatic.edgeHInc" , 1.5)->asDouble())
+    : _gdepthv          (ndepth)
+    , _gdepthh          (ndepth)
+    , _ddepthv          (ndepth)
+    , _ddepthh          (ndepth)
+    , _ddepthc          (ndepth)
+    , _cg               (NULL)
+    , _rg               (NULL)
+    , _extensionCaps    ()
+    , _saturateRatio    (Cfg::getParamPercentage("anabatic.saturateRatio",80.0)->asDouble())
+    , _saturateRp       (Cfg::getParamInt       ("anabatic.saturateRp"   ,8   )->asInt())
+    , _globalThreshold  (0)
+    , _allowedDepth     (0)
+    , _edgeLength       (DbU::fromLambda(Cfg::getParamInt("anabatic.edgeLength",24)->asInt()))
+    , _edgeWidth        (DbU::fromLambda(Cfg::getParamInt("anabatic.edgeWidth" , 4)->asInt()))
+    , _edgeCostH        (Cfg::getParamDouble("anabatic.edgeCostH"       ,      9.0)->asDouble())
+    , _edgeCostK        (Cfg::getParamDouble("anabatic.edgeCostK"       ,    -10.0)->asDouble())
+    , _edgeHInc         (Cfg::getParamDouble("anabatic.edgeHInc"        ,      1.5)->asDouble())
+    , _edgeHScaling     (Cfg::getParamDouble("anabatic.edgeHScaling"    ,      1.0)->asDouble())
+    , _globalIterations (Cfg::getParamInt   ("anabatic.globalIterations",     10  )->asInt())
+    , _diodeName        (Cfg::getParamString("etesian.diodeName"        , "dio_x0")->asString() )
+    , _antennaGateMaxWL (Cfg::getParamInt   ("etesian.antennaGateMaxWL" ,      0  )->asInt())
+    , _antennaDiodeMaxWL(Cfg::getParamInt   ("etesian.antennaDiodeMaxWL",      0  )->asInt())
   {
     GCell::setDisplayMode( Cfg::getParamEnumerate("anabatic.gcell.displayMode", GCell::Boundary)->asInt() );
 
-    if (cg == NULL) cg = AllianceFramework::get()->getCellGauge();
-    if (rg == NULL) rg = AllianceFramework::get()->getRoutingGauge();
+    string gaugeName = Cfg::getParamString("anabatic.routingGauge","sxlib")->asString();
+    if (cg == NULL) {
+      cg = AllianceFramework::get()->getCellGauge( gaugeName );
+      if (cg == NULL) 
+        throw Error( "AnabaticEngine::Configuration(): Unable to find default cell gauge." );
+    }
+
+    if (rg == NULL) {
+      rg = AllianceFramework::get()->getRoutingGauge( gaugeName );
+      if (rg == NULL) 
+        throw Error( "AnabaticEngine::Configuration(): No routing gauge named \"%s\"", gaugeName.c_str() );
+    }
     _cg = cg->getClone();
     _rg = rg->getClone();
 
-    if (Cfg::hasParameter("anabatic.topRoutingLayer")) {
+    _allowedDepth = rg->getDepth()-1;
+    if (Cfg::hasParameter("anabatic.topRoutingLayer"))
       _setTopRoutingLayer( Cfg::getParamString("anabatic.topRoutingLayer")->asString() );
-    } else
-      _allowedDepth = rg->getDepth()-1;
 
     _gmetalh  = DataBase::getDB()->getTechnology()->getLayer("gmetalh");
     _gmetalv  = DataBase::getDB()->getTechnology()->getLayer("gmetalv");
@@ -94,36 +125,75 @@ namespace Anabatic {
 
   //DbU::Unit sliceHeight = _cg->getSliceHeight();
 
+    _ddepthc = (_allowedDepth > 1) ? 1 : 0;
+
     const vector<RoutingLayerGauge*>& layerGauges = rg->getLayerGauges();
     for ( size_t depth=0 ; depth < layerGauges.size() ; ++depth ) {
+      if ( (_gdepthh == ndepth)
+         and  layerGauges[depth]->isHorizontal()
+         and (layerGauges[depth]->getType() == Constant::LayerGaugeType::Default) ) {
+        _gdepthh = depth;
+        _ddepthh = depth;
+      }
+
+      if ( (_gdepthv == ndepth)
+         and  layerGauges[depth]->isVertical()
+         and (layerGauges[depth]->getType() == Constant::LayerGaugeType::Default) ) {
+        _gdepthv = depth;
+        _ddepthv = depth;
+      }
+
       const RegularLayer* regularLayer = dynamic_cast<const RegularLayer*>( layerGauges[depth]->getLayer() );
       if (regularLayer)
         _extensionCaps.push_back( regularLayer->getExtentionCap() );
       else {
-        _extensionCaps.push_back( 0 );
-        cerr << Warning( "Routing layer at depth %d is *not* a RegularLayer, cannot guess extension cap.\n"
-                         "          (%s)"
-                       , depth
-                       , getString(layerGauges[depth]->getLayer()).c_str()
-                       ) << endl;
+        const BasicLayer* basicLayer = dynamic_cast<const BasicLayer*>( layerGauges[depth]->getLayer() );
+        if (basicLayer) {
+          _extensionCaps.push_back( layerGauges[depth]->getHalfWireWidth() );
+        } else {
+          _extensionCaps.push_back( 0 );
+          cerr << Warning( "Routing layer at depth %d is *not* a RegularLayer, cannot guess extension cap.\n"
+                           "          (%s)"
+                         , depth
+                         , getString(layerGauges[depth]->getLayer()).c_str()
+                         ) << endl;
+        }
       }
     }
+
+    if (_antennaGateMaxWL and not _antennaDiodeMaxWL) {
+      _antennaDiodeMaxWL = _antennaGateMaxWL;
+      cerr << Warning( "Anabatic::Configuration(): \"etesian.antennaGateMaxWL\" is defined but not \"etesian.antennaDiodeMaxWL\".\n"
+                      "          Setting both to %s"
+                     , DbU::getValueString(_antennaGateMaxWL).c_str()
+                     ) << endl;
+    }
   }
 
 
   Configuration::Configuration ( const Configuration& other )
-    : _gmetalh        (other._gmetalh)
-    , _gmetalv        (other._gmetalv)
-    , _gcontact       (other._gcontact)
-    , _cg             (NULL)
-    , _rg             (NULL)
-    , _extensionCaps  (other._extensionCaps)
-    , _saturateRatio  (other._saturateRatio)
-    , _globalThreshold(other._globalThreshold)
-    , _allowedDepth   (other._allowedDepth)
-    , _edgeCostH      (other._edgeCostH)
-    , _edgeCostK      (other._edgeCostK)
-    , _edgeHInc       (other._edgeHInc)
+    : _gmetalh          (other._gmetalh)
+    , _gmetalv          (other._gmetalv)
+    , _gcontact         (other._gcontact)
+    , _gdepthv          (other._gdepthv)
+    , _gdepthh          (other._gdepthh)
+    , _ddepthv          (other._ddepthv)
+    , _ddepthh          (other._ddepthh)
+    , _ddepthc          (other._ddepthc)
+    , _cg               (NULL)
+    , _rg               (NULL)
+    , _extensionCaps    (other._extensionCaps)
+    , _saturateRatio    (other._saturateRatio)
+    , _globalThreshold  (other._globalThreshold)
+    , _allowedDepth     (other._allowedDepth)
+    , _edgeCostH        (other._edgeCostH)
+    , _edgeCostK        (other._edgeCostK)
+    , _edgeHInc         (other._edgeHInc)
+    , _edgeHScaling     (other._edgeHScaling)
+    , _globalIterations (other._globalIterations)
+    , _diodeName        (other._diodeName)
+    , _antennaGateMaxWL (other._antennaGateMaxWL)
+    , _antennaDiodeMaxWL(other._antennaDiodeMaxWL)
   {
     GCell::setDisplayMode( Cfg::getParamEnumerate("anabatic.gcell.displayMode", GCell::Boundary)->asInt() );
 
@@ -144,6 +214,18 @@ namespace Anabatic {
   { return new Configuration(*this); }
 
 
+  bool  Configuration::isTwoMetals () const
+  { return _rg->isTwoMetals(); }
+  
+
+  bool  Configuration::isHV () const
+  { return _rg->isHV(); }
+  
+
+  bool  Configuration::isVH () const
+  { return _rg->isVH(); }
+
+
   bool  Configuration::isGMetal ( const Layer* layer ) const
   { return (layer and ((layer == _gmetalh) or (layer == _gmetalv))); }
 
@@ -151,15 +233,19 @@ namespace Anabatic {
   bool  Configuration::isGContact ( const Layer* layer ) const
   { return (layer and (layer == _gcontact)); }
 
+
   const Layer* Configuration::getGContactLayer () const
   { return _gcontact; }
 
+
   const Layer* Configuration::getGHorizontalLayer () const
   { return _gmetalh; }
 
+
   const Layer* Configuration::getGVerticalLayer () const
   { return _gmetalv; }
 
+
   size_t  Configuration::getDepth () const
   { return _rg->getDepth(); }
 
@@ -216,6 +302,10 @@ namespace Anabatic {
   { return getWireWidth( getLayerDepth(layer) ); }
 
 
+  DbU::Unit  Configuration::getPWireWidth ( const Layer* layer ) const
+  { return getPWireWidth( getLayerDepth(layer) ); }
+
+
   Flags  Configuration::getDirection ( const Layer* layer ) const
   { return getDirection( getLayerDepth(layer) ); }
 
@@ -267,6 +357,9 @@ namespace Anabatic {
   { return _rg->getLayerWireWidth(depth); }
 
 
+  DbU::Unit  Configuration::getPWireWidth ( size_t depth ) const
+  { return _rg->getLayerPWireWidth(depth); } 
+
   DbU::Unit  Configuration::getExtensionCap ( size_t depth ) const
   { return _extensionCaps[depth]; }
 
@@ -288,7 +381,7 @@ namespace Anabatic {
       }
     }
     cerr << Error( "In Configuration::Concrete::_setTopRoutingLayer():\n"
-                   "       The routing gauge <%s> has no layer named <%s>"
+                   "        The routing gauge <%s> has no layer named <%s>"
                  , getString(_rg->getName()).c_str()
                  , getString(name).c_str() ) << endl;
   }
@@ -326,6 +419,142 @@ namespace Anabatic {
   { return _edgeHInc; }
 
 
+  float  Configuration::getEdgeHScaling () const
+  { return _edgeHScaling; }
+
+
+  int  Configuration::getGlobalIterations () const
+  { return _globalIterations; }
+
+
+  DbU::Unit  Configuration::isOnRoutingGrid ( RoutingPad* rp ) const
+  {
+    Box   ab     = rp->getCell()->getBoundingBox();
+    Box   bb     = rp->getBoundingBox();
+    Point center = rp->getCenter();
+
+    RoutingLayerGauge* gauge = getLayerGauge( 1 );
+    if (gauge->isHorizontal()) return 0;
+
+    DbU::Unit nearestX = gauge->getTrackPosition( ab.getXMin(), ab.getXMax(), center.getX(), Constant::Nearest );
+    if ( (nearestX >= bb.getXMin()) and (nearestX <= bb.getXMax()) ) return 0;
+
+    return nearestX;
+  }
+
+
+  bool  Configuration::selectRpComponent ( RoutingPad* rp ) const
+  {
+    cdebug_log(112,1) << "selectRpComponent(): " << rp << endl;
+
+    if (rp->isAtTopLevel()) {
+      cdebug_log(112,0) << "> RP is at top level, must not change it." << endl;
+      cdebug_tabw(112,-1);
+      return true;
+    }
+
+#define BETTER_FOR_TSMC 0
+#if BETTER_FOR_TSMC
+    rp->setOnBestComponent( RoutingPad::BiggestArea );
+    cdebug_tabw(112,-1);
+    return true;
+#else
+    Box                ab             = rp->getCell()->getAbutmentBox();
+    const Layer*       metal1         = getLayerGauge( 0 )->getLayer();
+    RoutingLayerGauge* gauge          = getLayerGauge( 1 );
+    Occurrence         occurrence     = rp->getPlugOccurrence();
+    Plug*              plug           = dynamic_cast<Plug*>( occurrence.getEntity() );
+    Net*               masterNet      = plug->getMasterNet();
+    Path               path           = Path( occurrence.getPath(), plug->getInstance() );
+    Transformation     transformation = path.getTransformation();
+    Segment*           current        = dynamic_cast<Segment*>( rp->getOccurrence().getEntity() );
+
+    if (current and (current->getLayer()->getMask() != metal1->getMask())) {
+      cdebug_log(112,0) << "> using default non-metal1 segment." << endl;
+      cdebug_tabw(112,-1);
+      return true;
+    }
+
+    DbU::Unit  bestSpan      = 0;
+    Component* bestComponent = NULL;
+
+    cdebug_log(112,0) << "Looking into: " << masterNet->getCell() << endl;
+    for ( Component* component : masterNet->getComponents() ) {
+      cdebug_log(112,0) << "@ " << component << endl;
+      if (not NetExternalComponents::isExternal(component)) {
+        cdebug_log(112,0) << "  Not an external component, skip." << endl;
+        continue;
+      }
+
+      if (dynamic_cast<Pin*>(component)) {
+        cdebug_log(112,0) << "  Pins are always considered best candidates:" << component << endl;
+        bestComponent = component;
+        break;
+      }
+
+      Component* candidate = dynamic_cast<Segment*>(component);
+      if (not candidate
+         or  (candidate->getLayer()->getMask() != metal1->getMask()) )
+        candidate = dynamic_cast<Pin*>(component);
+      if (not candidate) continue;
+
+      Box        bb       = transformation.getBox( candidate->getBoundingBox() );
+      DbU::Unit  trackPos = 0;
+      DbU::Unit  minPos   = DbU::Max;
+      DbU::Unit  maxPos   = DbU::Min;
+      
+      if (gauge->isVertical()) {
+        trackPos = gauge->getTrackPosition( ab.getXMin()
+                                          , ab.getXMax()
+                                          , bb.getCenter().getX()
+                                          , Constant::Nearest );
+        minPos = bb.getXMin();
+        maxPos = bb.getXMax();
+
+        cdebug_log(112,0) << "Vertical gauge: " << gauge << endl;
+        cdebug_log(112,0) << "ab.getXMin():   " << DbU::getValueString(bb.getXMin()) << endl;
+        cdebug_log(112,0) << "ab.getXMax():   " << DbU::getValueString(bb.getXMax()) << endl;
+        cdebug_log(112,0) << "bb.getCenter(): " << DbU::getValueString(bb.getCenter().getX()) << endl;
+      } else {
+        trackPos = gauge->getTrackPosition( ab.getYMin()
+                                          , ab.getYMax()
+                                          , bb.getCenter().getY()
+                                          , Constant::Nearest );
+        minPos = bb.getYMin();
+        maxPos = bb.getYMax();
+
+        cdebug_log(112,0) << "Horizontal gauge: " << gauge << endl;
+        cdebug_log(112,0) << "ab.getYMin():   " << DbU::getValueString(bb.getYMin()) << endl;
+        cdebug_log(112,0) << "ab.getYMax():   " << DbU::getValueString(bb.getYMax()) << endl;
+        cdebug_log(112,0) << "bb.getCenter(): " << DbU::getValueString(bb.getCenter().getY()) << endl;
+      }
+
+      cdebug_log(112,0) << "| " << occurrence.getPath() << endl;
+      cdebug_log(112,0) << "| " << transformation << endl;
+      cdebug_log(112,0) << "| " << bb << " of:" << candidate << endl;
+      cdebug_log(112,0) << "| Nearest Pos: " << DbU::getValueString(trackPos) << endl;
+        
+      if ( (trackPos >= minPos) and (trackPos <= maxPos) ) {
+        if (not bestComponent or (bestSpan < maxPos-minPos)) {
+          bestComponent = component;
+          bestSpan      = maxPos - minPos;
+        }
+      }
+    }
+
+    if (bestComponent) {
+      rp->setExternalComponent( bestComponent );
+      cdebug_log(112,0) << "Using best candidate:" << bestComponent << endl;
+      cdebug_tabw(112,-1);
+      return true;
+    }
+
+    cdebug_tabw(112,-1);
+    return false;
+#endif
+  }
+  
+
   void  Configuration::print ( Cell* cell ) const
   {
     if (not cmess1.enabled()) return;
@@ -338,6 +567,7 @@ namespace Anabatic {
     cout << "  o  Configuration of ToolEngine<Anabatic> for Cell <" << cell->getName() << ">" << endl;
     cout << Dots::asIdentifier("     - Routing Gauge"               ,getString(_rg->getName())) << endl;
     cout << Dots::asString    ("     - Top routing layer"           ,topLayerName) << endl;
+    cout << Dots::asUInt      ("     - Maximum GR iterations"       ,_globalIterations) << endl;
   }
 
 
@@ -360,15 +590,22 @@ namespace Anabatic {
   Record* Configuration::_getRecord () const
   {
     Record* record = new Record ( _getString() );
-    record->add ( getSlot( "_rg"          ,  _rg          ) );
-    record->add ( getSlot( "_gmetalh"     , _gmetalh      ) );
-    record->add ( getSlot( "_gmetalv"     , _gmetalv      ) );
-    record->add ( getSlot( "_gcontact"    , _gcontact     ) );
-    record->add ( getSlot( "_allowedDepth", _allowedDepth ) );
-    record->add ( getSlot( "_edgeCostH"   , _edgeCostH    ) );
-    record->add ( getSlot( "_edgeCostK"   , _edgeCostK    ) );
+    record->add( getSlot( "_gdepthh"         , _gdepthh          ) );
+    record->add( getSlot( "_gdepthv"         , _gdepthv          ) );
+    record->add( getSlot( "_rg"              , _rg               ) );
+    record->add( getSlot( "_gmetalh"         , _gmetalh          ) );
+    record->add( getSlot( "_gmetalv"         , _gmetalv          ) );
+    record->add( getSlot( "_gcontact"        , _gcontact         ) );
+    record->add( getSlot( "_allowedDepth"    , _allowedDepth     ) );
+    record->add( getSlot( "_edgeCostH"       , _edgeCostH        ) );
+    record->add( getSlot( "_edgeCostK"       , _edgeCostK        ) );
+    record->add( getSlot( "_edgeHInc"        , _edgeHInc         ) );
+    record->add( getSlot( "_edgeHScaling"    , _edgeHScaling     ) );
+    record->add( getSlot( "_globalIterations", _globalIterations ) );
+    record->add( DbU::getValueSlot( "_antennaGateMaxWL" , &_antennaGateMaxWL  ) );
+    record->add( DbU::getValueSlot( "_antennaDiodeMaxWL", &_antennaDiodeMaxWL ) );
                                      
-    return ( record );
+    return record;
   }
 
 

anabatic/src/Constants.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Constants.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -39,6 +39,14 @@ namespace Anabatic {
   const BaseFlags  Flags::MatrixGCell         = (1L <<  9);
   const BaseFlags  Flags::IoPadGCell          = (1L << 10);
   const BaseFlags  Flags::Saturated           = (1L << 11);
+  const BaseFlags  Flags::StdCellRow          = (1L << 12);
+  const BaseFlags  Flags::ChannelRow          = (1L << 13);
+  const BaseFlags  Flags::HRailGCell          = (1L << 14);
+  const BaseFlags  Flags::VRailGCell          = (1L << 15);
+  const BaseFlags  Flags::GoStraight          = (1L << 16);
+// Flags for Edge objects states only.                      
+  const BaseFlags  Flags::NullCapacity        = (1L <<  5);
+  const BaseFlags  Flags::InfiniteCapacity    = (1L <<  6);
 // Flags for Anabatic objects states only.                      
   const BaseFlags  Flags::DemoMode            = (1L <<  5);
   const BaseFlags  Flags::WarnOnGCellOverload = (1L <<  6);
@@ -46,7 +54,11 @@ namespace Anabatic {
   const BaseFlags  Flags::DestroyBaseContact  = (1L <<  8);
   const BaseFlags  Flags::DestroyBaseSegment  = (1L <<  9);
 // Flags for NetDatas objects states only.                      
-  const BaseFlags  Flags::GlobalRouted        = (1L <<  5);
+  const BaseFlags  Flags::GlobalFixed         = (1L <<  5);
+  const BaseFlags  Flags::GlobalEstimated     = (1L <<  6);
+  const BaseFlags  Flags::GlobalRouted        = (1L <<  7);
+  const BaseFlags  Flags::DetailRouted        = (1L <<  8);
+  const BaseFlags  Flags::ExcludeRoute        = (1L <<  9);
 // Masks.                                      
   const BaseFlags  Flags::WestSide            = Horizontal|Target;
   const BaseFlags  Flags::EastSide            = Horizontal|Source;
@@ -56,7 +68,27 @@ namespace Anabatic {
   const BaseFlags  Flags::EndsMask            = Source|Target;
   const BaseFlags  Flags::DirectionMask       = Horizontal|Vertical;
   const BaseFlags  Flags::DestroyMask         = DestroyGCell|DestroyBaseContact|DestroyBaseSegment;
-  const BaseFlags  Flags::GCellTypeMask       = DeviceGCell|HChannelGCell|VChannelGCell|StrutGCell|MatrixGCell|IoPadGCell;
+  const BaseFlags  Flags::GCellTypeMask       = DeviceGCell
+                                              | HChannelGCell
+                                              | VChannelGCell
+                                              | StrutGCell
+                                              | MatrixGCell
+                                              | IoPadGCell
+                                              | StdCellRow
+                                              | ChannelRow
+                                              | HRailGCell
+                                              | VRailGCell;
+  const BaseFlags  Flags::RowGCellMask        = StdCellRow|ChannelRow;
+  const BaseFlags  Flags::AnalogGCellMask     = DeviceGCell
+                                              | HChannelGCell
+                                              | VChannelGCell
+                                              | StrutGCell
+                                              | HRailGCell
+                                              | VRailGCell;
+  const BaseFlags  Flags::EdgeCapacityMask    = Horizontal
+                                              | Vertical
+                                              | NullCapacity
+                                              | InfiniteCapacity ;
 // Flags for functions arguments only.           
   const BaseFlags  Flags::Create              = (1L <<  5);
   const BaseFlags  Flags::WithPerpands        = (1L <<  6);
@@ -86,6 +118,13 @@ namespace Anabatic {
   const BaseFlags  Flags::CheckLowDensity     = (1L << 30);
   const BaseFlags  Flags::CheckLowUpDensity   = (1L << 31);
   const BaseFlags  Flags::NoUpdate            = (1L << 32);
+  const BaseFlags  Flags::NorthPath           = (1L << 33);
+  const BaseFlags  Flags::UseNonPref          = (1L << 34);
+  const BaseFlags  Flags::Force               = (1L << 35);
+  const BaseFlags  Flags::LayerCapOnly        = (1L << 36);
+  const BaseFlags  Flags::NoMinLength         = (1L << 37);
+  const BaseFlags  Flags::NoSegExt            = (1L << 38);
+  const BaseFlags  Flags::NullLength          = (1L << 39);
 
 
   Flags::~Flags ()
@@ -139,6 +178,7 @@ namespace Anabatic {
     return s.str();
   }
 
+
   string  Flags::_getTypeName () const
   { return "Anabatic::Flags"; }
 
@@ -146,20 +186,25 @@ namespace Anabatic {
   string Flags::_getString () const
   {
     string s = "";
-    s += (_flags & (uint64_t)Horizontal   ) ? 'h'  : '-';
-    s += (_flags & (uint64_t)Vertical     ) ? 'v'  : '-';
-    s += (_flags & (uint64_t)Source       ) ? 'S'  : '-';
-    s += (_flags & (uint64_t)Target       ) ? 'T'  : '-';
-    s += (_flags & (uint64_t)DeviceGCell  ) ? 'd'  : '-';
+    s += (_flags & (uint64_t)Horizontal   ) ? 'h' : '-';
+    s += (_flags & (uint64_t)Vertical     ) ? 'v' : '-';
+    s += (_flags & (uint64_t)Source       ) ? 'S' : '-';
+    s += (_flags & (uint64_t)Target       ) ? 'T' : '-';
+    s += (_flags & (uint64_t)DeviceGCell  ) ? 'd' : '-';
     s += (_flags & (uint64_t)HChannelGCell) ? 'c' : '-';
     s += (_flags & (uint64_t)VChannelGCell) ? 'c' : '-';
-    s += (_flags & (uint64_t)StrutGCell   ) ? 's' : '-';
-    s += (_flags & (uint64_t)MatrixGCell  ) ? 'm'  : '-';
+    s += (_flags & (uint64_t)HRailGCell   ) ? 'H' : '-';
+    s += (_flags & (uint64_t)VRailGCell   ) ? 'V' : '-';
+    s += (_flags & (uint64_t)StrutGCell   ) ? 'S' : '-';
+    s += (_flags & (uint64_t)MatrixGCell  ) ? 'M' : '-';
+    s += (_flags & (uint64_t)StdCellRow   ) ? 'R' : '-';
+    s += (_flags & (uint64_t)ChannelRow   ) ? 'C' : '-';
+    s += (_flags & (uint64_t)GoStraight   ) ? 'g' : '-';
     s += ",";
-    s += (_flags & (uint64_t)Invalidated  ) ? 'i'  : '-';
-    s += (_flags & (uint64_t)DestroyGCell ) ? 'D'  : '-';
-    s += (_flags & (uint64_t)AboveLayer   ) ? 'A'  : '-';
-    s += (_flags & (uint64_t)BelowLayer   ) ? 'B'  : '-';
+    s += (_flags & (uint64_t)Invalidated  ) ? 'i' : '-';
+    s += (_flags & (uint64_t)DestroyGCell ) ? 'D' : '-';
+    s += (_flags & (uint64_t)AboveLayer   ) ? 'A' : '-';
+    s += (_flags & (uint64_t)BelowLayer   ) ? 'B' : '-';
 
     return s;
   }

anabatic/src/Edge.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Edge.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -17,6 +17,7 @@
 #include <iostream>
 #include "hurricane/Error.h"
 #include "hurricane/Segment.h"
+#include "hurricane/RoutingPad.h"
 #include "hurricane/DataBase.h"
 #include "hurricane/Technology.h"
 #include "anabatic/Edge.h"
@@ -24,11 +25,51 @@
 #include "anabatic/AnabaticEngine.h"
 
 
+namespace {
+
+  using namespace std;
+  using namespace Hurricane;
+  using Anabatic::NetData;
+  using Anabatic::AnabaticEngine;
+
+
+  class SortSegmentByLength {
+    public:
+      inline       SortSegmentByLength ( AnabaticEngine* );
+      inline bool  operator()          ( const Segment*, const Segment* );
+    private:
+      AnabaticEngine* _anabatic;
+  };
+
+
+  inline  SortSegmentByLength::SortSegmentByLength ( AnabaticEngine* anabatic )
+    : _anabatic(anabatic)
+  { }
+
+
+  inline bool  SortSegmentByLength::operator() ( const Segment* lhs, const Segment* rhs )
+  {
+    NetData* lhsNData = _anabatic->getNetData( lhs->getNet() );
+    NetData* rhsNData = _anabatic->getNetData( rhs->getNet() );
+    if (lhsNData->isGlobalFixed() and not  rhsNData->isGlobalFixed()) return true;
+    if (rhsNData->isGlobalFixed() and not  lhsNData->isGlobalFixed()) return false;
+
+    DbU::Unit delta = rhs->getLength() - lhs->getLength();
+    if (delta > 0) return true;
+    if (delta < 0) return false;
+    return (lhs->getId() < rhs->getId());
+  }
+
+  
+}  // Anonymous namespace.
+
+
 namespace Anabatic {
 
   using std::cerr;
   using std::endl;
   using Hurricane::Error;
+  using Hurricane::RoutingPad;
 
 
   Name       Edge::_extensionName = "Anabatic::Edge";
@@ -38,7 +79,8 @@ namespace Anabatic {
   Edge::Edge ( GCell* source, GCell* target, Flags flags )
     : Super(source->getCell())
     , _flags            (flags|Flags::Invalidated)
-    , _capacity         (0)
+    , _capacities       (NULL)
+    , _reservedCapacity (0)
     , _realOccupancy    (0)
     , _estimateOccupancy(0.0)
     , _historicCost     (0.0)
@@ -104,6 +146,7 @@ namespace Anabatic {
 
   void  Edge::_preDestroy ()
   {
+    _source->getAnabatic()->_unrefCapacity( _capacities );
     _source->_remove( this, _flags|Flags::Source );
     _target->_remove( this, _flags|Flags::Target );
 
@@ -169,7 +212,7 @@ namespace Anabatic {
     DbU::Unit dy           = targetCenter.getY() - sourceCenter.getY();
 
     if (dx < 0) dx = -dx;
-    if (dx)     dx += DbU::fromLambda( 0.1 );
+  //if (dx)     dx += DbU::fromLambda( 0.1 );
 
     return dx + ((dy > 0) ? dy : -dy);
   }
@@ -179,16 +222,18 @@ namespace Anabatic {
   {
     unsigned int occupancy = 0;
     if ((int)_realOccupancy + delta > 0) occupancy = _realOccupancy + delta;
-    if ((_realOccupancy <= _capacity) and (occupancy >  _capacity)) getAnabatic()->addOv   ( this );
-    if ((_realOccupancy >  _capacity) and (occupancy <= _capacity)) getAnabatic()->removeOv( this );
+    if ((_realOccupancy <= getCapacity()) and (occupancy >  getCapacity())) getAnabatic()->addOv   ( this );
+    if ((_realOccupancy >  getCapacity()) and (occupancy <= getCapacity())) getAnabatic()->removeOv( this );
     _realOccupancy = occupancy;
   }
 
+
   void  Edge::incRealOccupancy2 ( int value )
   {
     _realOccupancy += value;
   }
 
+
   Segment* Edge::getSegment ( const Net* owner ) const
   {
     for ( Segment* segment : _segments ) {
@@ -198,16 +243,81 @@ namespace Anabatic {
   }
 
 
+  bool  Edge::isEnding ( Segment* segment ) const
+  {
+    cdebug_log(112,0) << "Edge::isEnding() " << this << endl;
+    cdebug_log(112,0) << "| Sbb " << _source->getBoundingBox() << endl;
+    cdebug_log(112,0) << "| Tbb " << _target->getBoundingBox() << endl;
+    cdebug_log(112,0) << "| " << segment << endl;
+                                                        
+    if (Session::getRoutingGauge()->isTwoMetals()) {
+      Contact* contact = dynamic_cast<Contact*>( segment->getSource() );
+      cdebug_log(112,0) << "| source" << contact << endl;
+      if (contact) {
+        if (  (_source->isStdCellRow() and _source->getBoundingBox().contains(contact->getCenter()))
+           or (_target->isStdCellRow() and _target->getBoundingBox().contains(contact->getCenter())) )
+          return true;
+      }
+
+      contact = dynamic_cast<Contact*>( segment->getTarget() );
+      cdebug_log(112,0) << "| target" << contact << endl;
+      if (contact) {
+        if (  (_source->isStdCellRow() and _source->getBoundingBox().contains(contact->getCenter()))
+           or (_target->isStdCellRow() and _target->getBoundingBox().contains(contact->getCenter())) )
+          return true;
+      }
+    } else {
+    // This part is not used (yet). We don't call isEnding() when running
+    // in over-the-cell mode.
+      Contact* contact = dynamic_cast<Contact*>( segment->getSource() );
+      cdebug_log(112,0) << "| source" << contact << endl;
+      if (contact) {
+        for ( Hook* hook : contact->getBodyHook()->getHooks() ) {
+          if (dynamic_cast<RoutingPad*>(hook->getComponent())) {
+            if (  _source->getBoundingBox().contains(contact->getCenter())
+               or _target->getBoundingBox().contains(contact->getCenter()) )
+              return true;
+            break;
+          }
+        }
+      }
+
+      contact = dynamic_cast<Contact*>( segment->getTarget() );
+      cdebug_log(112,0) << "| target" << contact << endl;
+      if (contact) {
+        for ( Hook* hook : contact->getBodyHook()->getHooks() ) {
+          if (dynamic_cast<RoutingPad*>(hook->getComponent())) {
+            if (  _source->getBoundingBox().contains(contact->getCenter())
+               or _target->getBoundingBox().contains(contact->getCenter()) )
+              return true;
+            break;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+
   void  Edge::add ( Segment* segment )
   {
     _segments.push_back( segment );
     Horizontal* h = dynamic_cast<Horizontal*>(segment);
     Vertical*   v = dynamic_cast<Vertical*>(segment);
     DbU::Unit pitch = 0;
-    if (h) pitch = Session::getPitch(Hurricane::DataBase::getDB()->getTechnology()->getLayer("METAL2"));
-    if (v) pitch = Session::getPitch(Hurricane::DataBase::getDB()->getTechnology()->getLayer("METAL3"));
+    if (h) pitch = Session::getGHorizontalPitch();
+    if (v) pitch = Session::getGVerticalPitch();
 
-    incRealOccupancy( segment->getWidth()/pitch );  // Need to take the wire width into account.
+    int deltaOccupancy = 0;
+    
+    if (not Session::getRoutingGauge()->isTwoMetals()) deltaOccupancy = segment->getWidth()/pitch;
+    else {
+    // In channel routing, do not increase edge occupancy on terminals,
+    // because the capacity has already been decreased in annotedGlobalGraph (Katana).
+      if (not isEnding(segment)) deltaOccupancy = segment->getWidth()/pitch;
+    }
+
+    incRealOccupancy( deltaOccupancy ); 
   }
 
 
@@ -215,12 +325,35 @@ namespace Anabatic {
   {
     for ( size_t i=0 ; i<_segments.size() ; ++i ) {
       if (_segments[i] == segment) {
+        cdebug_log(110,0) << "On " << this << endl;
+        cdebug_log(110,0) << "| remove:" << segment << endl;
+
         std::swap( _segments[i], _segments[_segments.size()-1] );
         _segments.pop_back();
-        incRealOccupancy( -1 );  // Need to take the wire width into account.
+
+        Horizontal* h = dynamic_cast<Horizontal*>(segment);
+        Vertical*   v = dynamic_cast<Vertical*>(segment);
+        DbU::Unit pitch = 0;
+        if (h) pitch = Session::getGHorizontalPitch();
+        if (v) pitch = Session::getGVerticalPitch();
+
+        int deltaOccupancy = 0;
+    
+        if (not Session::getRoutingGauge()->isTwoMetals()) deltaOccupancy = segment->getWidth()/pitch;
+        else {
+        // In channel routing, do not increase edge occupancy on terminals,
+        // because the capacity has already been decreased in annotedGlobalGraph (Katana).
+          if (not isEnding(segment)) deltaOccupancy = segment->getWidth()/pitch;
+        }
+
+        incRealOccupancy( -deltaOccupancy );
         return;
       }
     }
+
+    cerr << Error( "On %s,\n        segment doesn't belong: %s"
+                 , getString(this).c_str()
+                 , getString(segment).c_str() ) << endl;
   }
 
 
@@ -237,19 +370,43 @@ namespace Anabatic {
 
   size_t  Edge::ripup ()
   {
-    AnabaticEngine* anabatic        = getAnabatic();
-    DbU::Unit       globalThreshold = Session::getSliceHeight()*3;
-    size_t          netCount        = 0;
+    AnabaticEngine* anabatic = getAnabatic();
+    size_t          netCount = 0;
 
-    for ( size_t i=0 ; i<_segments.size(); ) {
-      if (_segments[i]->getLength() >= globalThreshold) {
-        NetData* netData = anabatic->getNetData( _segments[i]->getNet() );
-        if (netData->isGlobalRouted()) ++netCount;
+    sort( _segments.begin(), _segments.end(), SortSegmentByLength(anabatic) );
 
-        anabatic->ripup( _segments[i], Flags::Propagate );
-      } else
+    if (Session::getRoutingGauge()->isTwoMetals()) {
+      for ( size_t i=0 ; i<_segments.size() ; ) {
+        if (not isEnding(_segments[i])) {
+          NetData* netData = anabatic->getNetData( _segments[i]->getNet() );
+          if (netData->isGlobalFixed ()) break;
+          if (netData->isGlobalRouted()) ++netCount;
+          anabatic->ripup( _segments[i], Flags::Propagate );
+          continue;
+        }
         ++i;
+      }
+    } else {
+      size_t truncate = (size_t)( (getCapacity()*2) / 3 );
+      while ( _segments.size() > truncate ) {
+        NetData* netData = anabatic->getNetData( _segments[truncate]->getNet() );
+        if (netData->isGlobalFixed ()) break;
+        if (netData->isGlobalRouted()) ++netCount;
+        anabatic->ripup( _segments[truncate], Flags::Propagate );
+      }
+      
+    // DbU::Unit  globalThreshold = Session::getSliceHeight()*3;
+    // for ( size_t i=0 ; i<_segments.size() ; ) {
+    //   if (_segments[i]->getLength() >= globalThreshold) {
+    //     NetData* netData = anabatic->getNetData( _segments[i]->getNet() );
+    //     if (netData->isGlobalRouted()) ++netCount;
+    //     anabatic->ripup( _segments[i], Flags::Propagate );
+    //   } else {
+    //     ++i;
+    //   }
+    // }
     }
+
     return netCount;
   }
 
@@ -259,7 +416,7 @@ namespace Anabatic {
     if (source == _target)
       throw Error("Edge::_setSource(): Source & target are the same (%s).", getString(source).c_str() );
     
-    _invalidate();
+    invalidate( false );
     _source=source;
   }
 
@@ -269,26 +426,41 @@ namespace Anabatic {
     if (_source == target)
       throw Error("Edge::_setTarget(): Source & target are the same (%s).", getString(target).c_str() );
     
-    _invalidate();
+    invalidate( false );
     _target=target;
   }
 
 
-  void  Edge::_invalidate ()
+  void  Edge::invalidate ( bool )
   {
+    cdebug_log(110,1) << "Edge::invalidate() " << this << endl;
+
     _flags |= Flags::Invalidated;
     Super::invalidate( false );
+
+    cdebug_tabw(110,-1);
   }
 
 
-  void  Edge::_revalidate ()
+  void  Edge::materialize ()
   {
-    Interval side = getSide();
-    _axis     = side.getCenter();
-    _capacity = getAnabatic()->getCapacity( side, _flags );
+    cdebug_log(110,1) << "Edge::materialize() " << this << endl;
+
+    Flags    flags = _flags;
+    Interval side  = getSide();
+    _axis = side.getCenter();
+
+    if      (getSource()->isStdCellRow() and getTarget()->isStdCellRow()) flags |= Flags::NullCapacity;
+    else if (getSource()->isChannelRow() and getTarget()->isChannelRow()) flags |= Flags::InfiniteCapacity;
+
+    _capacities = getAnabatic()->_createCapacity( _flags, side );
 
     _flags.reset( Flags::Invalidated );
-    cdebug_log(110,0) << "Edge::_revalidate() " << this << endl;
+    cdebug_log(110,0) << "Edge::materialize() " << this << endl;
+
+    Super::materialize();
+
+    cdebug_tabw(110,-1);
   }
 
 
@@ -301,28 +473,31 @@ namespace Anabatic {
     static DbU::Unit halfThickness = getAnabatic()->getConfiguration()->getEdgeWidth () / 2;
     static DbU::Unit halfLength    = getAnabatic()->getConfiguration()->getEdgeLength() / 2;
 
-    if (_flags.isset(Flags::Horizontal))
-      return Box( _target->getXMin() - halfLength, _axis - halfThickness
-                , _target->getXMin() + halfLength, _axis + halfThickness
-                );
+    Box bb;
 
-    return Box( _axis - halfThickness, _target->getYMin() - halfLength
+    if (_flags.isset(Flags::Horizontal))
+      bb = Box( _target->getXMin() - halfLength, _axis - halfThickness
+              , _target->getXMin() + halfLength, _axis + halfThickness
+              );
+    else
+      bb = Box( _axis - halfThickness, _target->getYMin() - halfLength
               , _axis + halfThickness, _target->getYMin() + halfLength
               );
+
+    return bb;
   }
 
 
-  bool Edge::isMaxCapacity ( Net* net ) const 
+  bool  Edge::isMaxCapacity ( Net* net ) const 
   {
-    if (net){
-      Hurricane::NetRoutingState* state = Hurricane::NetRoutingExtension::get( net );
-    //cerr << "bool Edge::isMaxCapacity ( Net* net ) const: " << net << endl;
-    //cerr << "WPitch: " << state->getWPitch() << endl;
+    unsigned int wpitch = 0;
+    if (net) {
+      cdebug_log(112,0) << "_capacity:" << getCapacity() << endl;
 
-      return ( (_realOccupancy +state->getWPitch()) > _capacity ) ? true : false; 
-    } else {
-      return ( _realOccupancy >= _capacity ) ? true : false; 
+      Hurricane::NetRoutingState* state = Hurricane::NetRoutingExtension::get( net );
+      wpitch = (state) ? state->getWPitch()-1 : 0;
     }
+    return (_realOccupancy + wpitch >= getCapacity()); 
   }
 
 
@@ -348,7 +523,7 @@ namespace Anabatic {
     s.insert( s.size()-1, " "   +DbU::getValueString(center.getY()) );
     s.insert( s.size()-1, "] "  +DbU::getValueString(_axis) );
     s.insert( s.size()-1, " "   +getString(_realOccupancy) );
-    s.insert( s.size()-1, "/"   +getString(_capacity) );
+    s.insert( s.size()-1, "/"   +getString(getCapacity()) );
     s.insert( s.size()-1, " h:" +getString(_historicCost) );
     s.insert( s.size()-1, " "   +getString(_flags) );
     return s;
@@ -359,7 +534,8 @@ namespace Anabatic {
   {
     Record* record = Super::_getRecord();
     record->add( getSlot("_flags"            ,  _flags            ) );
-    record->add( getSlot("_capacity"         ,  _capacity         ) );
+    record->add( getSlot("_capacities"       ,  _capacities       ) );
+    record->add( getSlot("_reservedCapacity" ,  _reservedCapacity ) );
     record->add( getSlot("_realOccupancy"    ,  _realOccupancy    ) );
     record->add( getSlot("_estimateOccupancy",  _estimateOccupancy) );
     record->add( getSlot("_source"           ,  _source           ) );

anabatic/src/EdgeCapacity.cpp

@@ -0,0 +1,123 @@
+// -*- mode: C++; explicit-buffer-name: "EdgeCapacity.cpp<anabatic>" -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2018-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |     A n a b a t i c  -  Global Routing Toolbox                  |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Module  :  "./EdgeCapacity.cpp"                            |
+// +-----------------------------------------------------------------+
+
+
+#include <sstream>
+#include "anabatic/EdgeCapacity.h"
+#include "anabatic/AnabaticEngine.h"
+
+
+namespace Anabatic {
+
+  using std::ostringstream;
+
+
+  EdgeCapacity::EdgeCapacity ( AnabaticEngine* anabatic, Flags direction, Interval span, size_t depth )
+    : _anabatic  (anabatic)
+    , _refCount  (0)
+    , _flags     (direction)
+    , _depth     (depth+1)
+    , _span      (span)
+    , _capacities()
+  {
+    int defcap = (_flags & Flags::InfiniteCapacity) ? 100 : 0;
+
+    _capacities.reserve( _depth );
+    for ( size_t i=0 ; i<_depth ; ++i ) _capacities.push_back( defcap );
+
+    if (_flags & (Flags::NullCapacity|Flags::InfiniteCapacity)) return;
+
+    Box           ab = _anabatic->getCell()->getAbutmentBox();
+    RoutingGauge* rg = _anabatic->getConfiguration()->getRoutingGauge();
+
+    span = _span;
+    span.inflate( 0, -1 );
+    if (span.isEmpty()) return;
+
+    const vector<RoutingLayerGauge*>& layerGauges = rg->getLayerGauges();
+    for ( size_t depth=0 ; depth < _depth ; ++depth ) {
+      if (layerGauges[depth]->getType() != Constant::Default) continue;
+
+      if (_flags & Flags::Horizontal) {
+        if (layerGauges[depth]->getDirection() != Constant::Horizontal) continue;
+        _capacities[depth] = layerGauges[depth]->getTrackNumber( span.getVMin() - ab.getYMin()
+                                                               , span.getVMax() - ab.getYMin() );
+      //cdebug_log(110,0) << "Horizontal edge capacity:" << capacity << endl;
+      }
+
+      if (_flags & Flags::Vertical) {
+        if (layerGauges[depth]->getDirection() != Constant::Vertical) continue;
+        _capacities[depth] = layerGauges[depth]->getTrackNumber( span.getVMin() - ab.getXMin()
+                                                               , span.getVMax() - ab.getXMin() );
+      //cdebug_log(110,0) << "Vertical edge capacity:" << capacity << endl;
+      }
+    }
+  }
+
+
+  void  EdgeCapacity::forceCapacity ( unsigned int capacity )
+  {
+          bool                        forced      = false;
+          RoutingGauge*               rg          = _anabatic->getConfiguration()->getRoutingGauge();
+    const vector<RoutingLayerGauge*>& layerGauges = rg->getLayerGauges();
+
+    for ( size_t i=0 ; i<_depth ; ++i ) {
+      if (layerGauges[i]->getType() != Constant::Default) continue;
+      if ( (_flags & Flags::Horizontal) xor layerGauges[i]->isHorizontal() ) continue;
+      if (forced) _capacities[i] = 0;
+      else {
+        _capacities[i] = capacity;
+        forced = true;
+      }
+    }
+  }
+
+
+  string  EdgeCapacity::_getString () const
+  {
+    ostringstream os;
+    os << "<EdgeCapacity ";
+    if      (_flags & Flags::Horizontal) os << "Horizontal ";
+    else if (_flags & Flags::Vertical  ) os << "Vertical ";
+    else                                 os << "Unknown ";
+    os <<  "["  << DbU::getValueString(_span.getVMin())
+       << " : " << DbU::getValueString(_span.getVMax())
+       << "] "  << getCapacity()
+       << " refs:" << _refCount
+       << ">";
+    return os.str();
+  }
+
+
+  Record* EdgeCapacity::_getRecord () const
+  {
+    Record* record = new Record( getString(this) );
+    record->add( getSlot( "_anabatic",  _anabatic ) );
+    record->add( getSlot( "_refCount",  _refCount ) );
+    record->add( getSlot( "_flags"   , &_flags    ) );
+    record->add( getSlot( "_span"    , &_span     ) );
+
+    RoutingGauge* rg = getAnabatic()->getConfiguration()->getRoutingGauge();
+    for ( size_t depth=0 ; depth<_depth ; ++depth ) {
+      ostringstream s;
+      const Layer* layer = rg->getRoutingLayer(depth);
+      s << "_capacities[" << depth << ":" << ((layer) ? layer->getName() : "None") << "]";
+      record->add( getSlot ( s.str(), _capacities[depth] ) );
+    }
+    return record;
+  }
+
+
+}  // Anabatic namespace.

anabatic/src/Edges.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Edges.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -20,6 +20,7 @@
 
 namespace Anabatic {
 
+  using std::cerr;
   using std::endl;
 
 
@@ -63,10 +64,10 @@ namespace Anabatic {
   {
     cdebug_log(110,0) << "GCell_Edges::Locator::progress() [from] " << _stateFlags << " iedge:" << _iedge << endl;
     cdebug_log(110,0) << "  _filterFlags:" << _filterFlags << endl;
-    cdebug_log(110,0) << "  East:"  << _gcell->getEastEdges().size()
-                    << "  North:" << _gcell->getNorthEdges().size()
-                    << "  West:"  << _gcell->getWestEdges().size()
-                    << "  South:" << _gcell->getSouthEdges().size() << endl;
+    cdebug_log(110,0) << "  East:"  << _gcell->getEastEdges ().size()
+                      << "  North:" << _gcell->getNorthEdges().size()
+                      << "  West:"  << _gcell->getWestEdges ().size()
+                      << "  South:" << _gcell->getSouthEdges().size() << endl;
     cdebug_log(110,0) << this << endl;
 
     ++_iedge;
@@ -74,7 +75,7 @@ namespace Anabatic {
       if (_stateFlags.contains(Flags::EastSide)) {
         if (   (_iedge < _gcell->getEastEdges().size())
            and _filterFlags.contains(Flags::EastSide)) break;
-        // cdebug_log(110,0) << "Switching to North side." << endl;
+      //cdebug_log(110,0) << "Switching to North side." << endl;
         _stateFlags = Flags::NorthSide;
         _iedge      = 0;
         // cdebug_log(110,0) << this << endl;
@@ -83,7 +84,7 @@ namespace Anabatic {
       if (_stateFlags.contains(Flags::NorthSide))  {
         if (   (_iedge < _gcell->getNorthEdges().size())
            and _filterFlags.contains(Flags::NorthSide)) break;
-        // cdebug_log(110,0) << "Switching to West side." << endl;
+      //cdebug_log(110,0) << "Switching to West side." << endl;
         _stateFlags = Flags::WestSide;
         _iedge      = 0;
         // cdebug_log(110,0) << this << endl;
@@ -92,7 +93,7 @@ namespace Anabatic {
       if (_stateFlags.contains(Flags::WestSide))  {
         if (   (_iedge < _gcell->getWestEdges().size())
            and _filterFlags.contains(Flags::WestSide)) break;
-        // cdebug_log(110,0) << "Switching to South side." << endl;
+      //cdebug_log(110,0) << "Switching to South side." << endl;
         _stateFlags = Flags::SouthSide;
         _iedge      = 0;
         continue;
@@ -100,7 +101,7 @@ namespace Anabatic {
       if (_stateFlags.contains(Flags::SouthSide))  {
         if (   (_iedge < _gcell->getSouthEdges().size())
            and _filterFlags.contains(Flags::SouthSide)) break;
-        // cdebug_log(110,0) << "All edges done." << endl;
+      //cdebug_log(110,0) << "All edges done." << endl;
         _stateFlags = 0;
         _iedge      = 0;
         break;;
@@ -141,4 +142,144 @@ namespace Anabatic {
   }
 
 
+// -------------------------------------------------------------------
+// Class  :  "Anabatic::Path_Edges".
+
+  Path_Edges::Locator::Locator ( const GCell* source, const GCell* target, Flags pathFlags )
+    : EdgesHL()
+    , _source    (source)
+    , _target    (target)
+    , _stateFlags(Flags::NoFlags)
+    , _uprobe    (0)
+    , _edge      (NULL)
+  {
+    if (_source == _target) return;
+    
+    Interval hoverlap = _source->getHSide().getIntersection( _target->getHSide() );
+    Interval voverlap = _source->getVSide().getIntersection( _target->getVSide() );
+
+    if (not voverlap.isEmpty()) {
+      if (_source->getXMin() > _target->getXMin()) std::swap( _source, _target );
+      _stateFlags |= Flags::EastSide;
+      _uprobe      = voverlap.getCenter();
+    } else if (not hoverlap.isEmpty()) {
+      if (_source->getYMin() > _target->getYMin()) std::swap( _source, _target );
+      _stateFlags |= Flags::NorthSide;
+      _uprobe      = hoverlap.getCenter();
+    } else {
+      if (_source->getXMin() > _target->getXMin()) {
+        std::swap( _source, _target );
+      }
+
+      if (_source->getYMin() < _target->getYMin()) {
+        if (pathFlags & Flags::NorthPath) {
+          _stateFlags |= Flags::NorthSide;
+          _uprobe      = _source->getXCenter();
+        } else {
+          _stateFlags |= Flags::EastSide;
+          _uprobe      = _source->getYCenter();
+        }
+      } else {
+        if (pathFlags & Flags::NorthPath) {
+          _stateFlags |= Flags::EastSide;
+          _uprobe      = _source->getYCenter();
+        } else {
+          _stateFlags |= Flags::SouthSide;
+          _uprobe      = _source->getXCenter();
+        }
+      }
+    }
+
+    _edge = _source->getEdgeAt( _stateFlags, _uprobe );
+  }
+
+
+  EdgesHL* Path_Edges::Locator::getClone () const
+  { return new Locator (*this); }
+
+
+  Edge* Path_Edges::Locator::getElement () const
+  { return _edge; }
+
+
+  bool  Path_Edges::Locator::isValid () const
+  { return (_edge != NULL); }
+
+
+  void  Path_Edges::Locator::progress ()
+  {
+    if (not _edge) return;
+
+    GCell* neighbor = NULL;
+    if (_stateFlags.contains(Flags::SouthSide) or _stateFlags.contains(Flags::WestSide)) neighbor = _edge->getSource();
+    if (_stateFlags.contains(Flags::NorthSide) or _stateFlags.contains(Flags::EastSide)) neighbor = _edge->getTarget();
+
+    if (neighbor == _target) { _edge = NULL; return; }
+
+    if (_stateFlags.contains(Flags::EastSide)) {
+      Interval overlap = neighbor->getHSide().getIntersection( _target->getHSide() );
+      
+      if (not overlap.isEmpty()) {
+        overlap = neighbor->getVSide().getIntersection( _target->getVSide() );
+        if (not overlap.isEmpty()) { _edge = NULL; return; }
+
+        _stateFlags.reset( Flags::EastSide );
+        _stateFlags |= (_target->getYMin() < _source->getYMin()) ? Flags::SouthSide
+                                                                 : Flags::NorthSide;
+        _uprobe      = overlap.getCenter();
+      }
+    } else if (_stateFlags.contains(Flags::SouthSide)) {
+      Interval overlap = neighbor->getVSide().getIntersection( _target->getVSide() );
+      
+      if (not overlap.isEmpty()) {
+        overlap = neighbor->getHSide().getIntersection( _target->getHSide() );
+        if (not overlap.isEmpty()) {
+          _edge = NULL; return; }
+        
+        _stateFlags.reset( Flags::SouthSide );
+        _stateFlags |= Flags::EastSide;
+        _uprobe      = overlap.getCenter();
+      }
+    } else if (_stateFlags.contains(Flags::NorthSide)) {
+      Interval overlap = neighbor->getVSide().getIntersection( _target->getVSide() );
+      
+      if (not overlap.isEmpty()) {
+        overlap = neighbor->getHSide().getIntersection( _target->getHSide() );
+        if (not overlap.isEmpty()) { _edge = NULL; return; }
+        
+        _stateFlags.reset( Flags::NorthSide );
+        _stateFlags |= Flags::EastSide;
+        _uprobe      = overlap.getCenter();
+      }
+    }
+
+    _edge = neighbor->getEdgeAt( _stateFlags, _uprobe );
+  }
+
+
+  string  Path_Edges::Locator::_getString () const
+  {
+    string s = "<Path_Edges::Locator @" + getString(_edge) + ">";
+    return s;
+  }
+
+
+  EdgesHC* Path_Edges::getClone () const
+  { return new Path_Edges( *this ); }
+
+
+  EdgesHL* Path_Edges::getLocator () const
+  { return new Locator (_source,_target,_pathFlags); }
+
+
+  string  Path_Edges::_getString () const
+  {
+    string s = "<Path_Edges from:"
+             + getString(_source) + "to:"
+             + getString(_target)
+             + ">";
+    return s;
+  }
+
+
 }  // Anabatic namespace.

anabatic/src/GCell.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "GCell.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -273,6 +273,8 @@ namespace Anabatic {
 
   Name      GCell::_extensionName = "Anabatic::GCell";
   uint32_t  GCell::_displayMode   = GCell::Boundary;
+  DbU::Unit GCell::_matrixHSide   = 0;
+  DbU::Unit GCell::_matrixVSide   = 0;
 
 
   uint32_t  GCell::getDisplayMode () { return _displayMode; }
@@ -296,6 +298,7 @@ namespace Anabatic {
     , _contacts      ()
     , _depth         (Session::getRoutingGauge()->getDepth())
     , _pinDepth      (0)
+    , _rpCount       (0)
     , _blockages     (new DbU::Unit [_depth])
     , _cDensity      (0.0)
     , _densities     (new float [_depth])
@@ -303,7 +306,16 @@ namespace Anabatic {
     , _fragmentations(new float [_depth])
     , _globalsCount  (new float [_depth])
     , _key           (this,1)
+    , _lastClonedKey (NULL)
   {
+    if (not _matrixHSide) {
+      _matrixVSide = Session::getSliceHeight();
+      _matrixHSide = Session::getSliceHeight();
+
+      if (_matrixHSide % Session::getSliceStep())
+        _matrixHSide += Session::getSliceStep() - _matrixHSide % Session::getSliceStep();
+    }
+
     for ( size_t i=0 ; i<_depth ; i++ ) {
       _blockages     [i] = 0;
       _densities     [i] = 0.0;
@@ -331,13 +343,13 @@ namespace Anabatic {
     if (not anabatic)            throw Error( "GCell::create(): NULL anabatic argument." );
     if (not anabatic->getCell()) throw Error( "GCell::create(): AnabaticEngine has no Cell loaded." );
 
-    anabatic->openSession();
+    bool reUseSession = Session::isOpen();
+    if (not reUseSession) anabatic->openSession();
     GCell* gcell = new GCell ( anabatic
                              , anabatic->getCell()->getAbutmentBox().getXMin()
                              , anabatic->getCell()->getAbutmentBox().getYMin() );
     gcell->_postCreate();
-    gcell->_revalidate();
-    Session::close();
+    if (not reUseSession) Session::close();
 
     return gcell;
   }
@@ -447,6 +459,14 @@ namespace Anabatic {
   }
 
 
+  bool  GCell::isHorizontalPlane ( size_t depth ) const
+  { return _anabatic->getConfiguration()->getLayerGauge(depth)->isHorizontal(); }
+
+
+  bool  GCell::isVerticalPlane ( size_t depth ) const
+  { return _anabatic->getConfiguration()->getLayerGauge(depth)->isVertical(); }
+  
+
   Contact* GCell::hasGContact ( const Net* net ) const
   {
     for ( Contact* contact : _gcontacts ) {
@@ -456,6 +476,26 @@ namespace Anabatic {
   }
 
 
+  bool  GCell::hasNet ( const Net* net ) const
+  {
+    if (hasGContact(net)) return true;
+
+    for ( Edge* edge : _eastEdges ) {
+      for ( Segment* segment : edge->getSegments() ) {
+        if (segment->getNet() == net) return true;
+      }
+    }
+
+    for ( Edge* edge : _northEdges ) {
+      for ( Segment* segment : edge->getSegments() ) {
+        if (segment->getNet() == net) return true;
+      }
+    }
+
+    return false;
+  }
+
+
   Contact* GCell::hasGContact ( const Contact* owned ) const
   {
     for ( Contact* contact : _gcontacts ) {
@@ -467,6 +507,9 @@ namespace Anabatic {
 
   Contact* GCell::breakGoThrough ( Net* net )
   {
+    Contact* gcontact = hasGContact( net );
+    if (gcontact) return gcontact;
+
     for ( Edge* edge : _eastEdges ) {
       for ( Segment* segment : edge->getSegments() ) {
         if (segment->getNet() == net) 
@@ -481,6 +524,22 @@ namespace Anabatic {
       }
     }
 
+    return getGContact( net );
+  }
+
+
+  Segment* GCell::hasGoThrough ( Net* net ) const
+  {
+    for ( Edge* edge : _eastEdges ) {
+      for ( Segment* segment : edge->getSegments() ) {
+        if (segment->getNet() == net) return segment;
+      }
+    }
+    for ( Edge* edge : _northEdges ) {
+      for ( Segment* segment : edge->getSegments() ) {
+        if (segment->getNet() == net) return segment;
+      }
+    }
     return NULL;
   }
 
@@ -498,13 +557,49 @@ namespace Anabatic {
   {
     for ( Edge* edge : getEdges(sideHint) ) {
       GCell* side = edge->getOpposite(this);
-      if ( (sideHint & (Flags::WestSide |Flags::EastSide )) and (u < side->getYMax()) ) return edge;
-      if ( (sideHint & (Flags::SouthSide|Flags::NorthSide)) and (u < side->getXMax()) ) return edge;
+      if (   (sideHint.contains(Flags::WestSide) or sideHint.contains(Flags::EastSide ))
+         and (u < side->getYMax()) ) {
+        cdebug_log(112,0) << "H Opposite @" << DbU::getValueString(u) << " is: " << side << endl;
+        return edge;
+      }
+      if (   (sideHint.contains(Flags::SouthSide) or sideHint.contains(Flags::NorthSide))
+         and (u < side->getXMax()) ) {
+        cdebug_log(112,0) << "V Opposite @" << DbU::getValueString(u) << " is: " << side << endl;
+        return edge;
+      }
     }
     return NULL;
   }
 
 
+  GCell* GCell::getEastNMatrix() const
+  {
+    if (!this->getEast()->isMatrix()) return this->getEast();
+    else {
+      GCell* gcell = this->getEast();
+      while(gcell->getEast()){
+        if   (!gcell->getEast()->isMatrix()) break;
+        else                                 gcell = gcell->getEast();
+      }
+      return gcell->getEast();
+    }
+  }
+  
+
+  GCell* GCell::getNorthNMatrix() const
+  {
+    if (!this->getNorth()->isMatrix()) return this->getNorth();
+    else {
+      GCell* gcell = this->getNorth();
+      while(gcell->getNorth()){
+        if   (!gcell->getNorth()->isMatrix()) break;
+        else                                 gcell = gcell->getNorth();
+      }
+      return gcell->getNorth();
+    }
+  }
+
+
   GCell* GCell::getWest  ( DbU::Unit y ) const
   {
     for ( Edge* edge : _westEdges ) {
@@ -559,8 +654,6 @@ namespace Anabatic {
   {
     const GCell* current = this;
 
-    if (not this) cerr << Error("*this* is NULL!") << endl;
-
     while ( current ) {
       if (not current->isFlat() and current->getBoundingBox().contains(x,y)) break;
 
@@ -633,15 +726,17 @@ namespace Anabatic {
       size_t iedge = 0;
       for ( ; (iedge < _southEdges.size()) ; ++iedge ) {
         cdebug_log(110,0) << "[" << iedge << "] xmax of:"
-                        << _southEdges[iedge]->getOpposite(this)
-                        << " " << _southEdges[iedge] << endl;
+                          << _southEdges[iedge]->getOpposite(this)
+                          << " " << _southEdges[iedge] << endl;
         if (x <= _southEdges[iedge]->getOpposite(this)->getXMax()) break;
       }
 
       if (      (x <  _southEdges[iedge]->getOpposite(this)->getXMax())
          or (   (x == _southEdges[iedge]->getOpposite(this)->getXMax())
-            and (chunk->getXMax() == getXMax())) )
+            and (chunk->getXMax() == getXMax())) ) {
         Edge::create( _southEdges[iedge]->getOpposite(this), chunk, Flags::Vertical );
+        _southEdges[iedge]->invalidate( false );
+      }
 
       _moveEdges( chunk, iedge+1, Flags::SouthSide );
     }
@@ -655,15 +750,14 @@ namespace Anabatic {
 
       if (      (x <  _northEdges[iedge]->getOpposite(this)->getXMax())
          or (   (x == _northEdges[iedge]->getOpposite(this)->getXMax())
-            and (chunk->getXMax() == getXMax())) )
+            and (chunk->getXMax() == getXMax())) ) {
         Edge::create( chunk, _northEdges[iedge]->getOpposite(this), Flags::Vertical );
+        _northEdges[iedge]->invalidate( false );
+      }
 
       _moveEdges( chunk, iedge+1, Flags::NorthSide );
     }
 
-    _revalidate();
-    chunk->_revalidate();
-
     cdebug_tabw(110,-1);
 
     return chunk;
@@ -694,8 +788,10 @@ namespace Anabatic {
 
       if (      (y <  _westEdges[iedge]->getOpposite(this)->getYMax())
          or (   (y == _westEdges[iedge]->getOpposite(this)->getYMax())
-            and (chunk->getYMax() == getYMax())) )
+            and (chunk->getYMax() == getYMax())) ) {
         Edge::create( _westEdges[iedge]->getOpposite(this), chunk, Flags::Horizontal );
+        _westEdges[iedge]->invalidate( false );
+      }
 
       _moveEdges( chunk, iedge+1, Flags::WestSide );
     }
@@ -707,15 +803,14 @@ namespace Anabatic {
 
       if (      (y <  _eastEdges[iedge]->getOpposite(this)->getYMax())
          or (   (y == _eastEdges[iedge]->getOpposite(this)->getYMax())
-            and (chunk->getYMax() == getYMax())) )
+            and (chunk->getYMax() == getYMax())) ) {
         Edge::create( chunk, _eastEdges[iedge]->getOpposite(this), Flags::Horizontal );
+        _eastEdges[iedge]->invalidate( false );
+      }
 
       _moveEdges( chunk, iedge+1, Flags::EastSide );
     }
 
-    _revalidate();
-    chunk->_revalidate();
-
     cdebug_tabw(110,-1);
 
     return chunk;
@@ -724,47 +819,49 @@ namespace Anabatic {
 
   bool  GCell::doGrid ()
   {
-    getAnabatic()->openSession();
+    bool openSession = Session::isOpen();
+    if (not openSession) getAnabatic()->openSession();
 
-    DbU::Unit side  = Session::getSliceHeight();
+    DbU::Unit vside = getMatrixVSide();
+    DbU::Unit hside = getMatrixHSide();
     Interval  hspan = getSide( Flags::Horizontal );
     Interval  vspan = getSide( Flags::Vertical );
 
-    if (hspan.getSize() < 3*side) {
-      cerr << Error( "GCell::doGrid(): GCell is too narrow (dx:%s) to build a grid.\n"
-                     "        (%s)"
-                   , DbU::getValueString(hspan.getSize()).c_str()
-                   , getString(this).c_str()
-                   ) << endl;
-      Session::close();
-      return false;
-    }
+    // if (hspan.getSize() < 2*hside) {
+    //   cerr << Error( "GCell::doGrid(): GCell is too narrow (dx:%s) to build a grid.\n"
+    //                  "        (%s)"
+    //                , DbU::getValueString(hspan.getSize()).c_str()
+    //                , getString(this).c_str()
+    //                ) << endl;
+    //   Session::close();
+    //   return false;
+    // }
 
-    if (vspan.getSize() < 3*side) {
-      cerr << Error( "GCell::doGrid(): GCell is too narrow (dy:%s) to build a grid.\n"
-                     "        (%s)"
-                   , DbU::getValueString(vspan.getSize()).c_str()
-                   , getString(this).c_str()
-                   ) << endl;
-      return false;
-    }
+    // if (vspan.getSize() < 2*vside) {
+    //   cerr << Error( "GCell::doGrid(): GCell is too narrow (dy:%s) to build a grid.\n"
+    //                  "        (%s)"
+    //                , DbU::getValueString(vspan.getSize()).c_str()
+    //                , getString(this).c_str()
+    //                ) << endl;
+    //   return false;
+    // }
 
     GCell*    row    = this;
     GCell*    column = NULL;
-    DbU::Unit ycut   = vspan.getVMin()+side;
-    for ( ; ycut < vspan.getVMax() ; ycut += side ) {
+    DbU::Unit ycut   = vspan.getVMin()+vside;
+    for ( ; ycut < vspan.getVMax() ; ycut += vside ) {
       column = row;
       row    = row->hcut( ycut );
       row->setType( Flags::MatrixGCell );
 
-      for ( DbU::Unit xcut = hspan.getVMin()+side ; xcut < hspan.getVMax() ; xcut += side ) {
+      for ( DbU::Unit xcut = hspan.getVMin()+hside ; xcut < hspan.getVMax() ; xcut += hside ) {
         column = column->vcut( xcut );
         column->setType( Flags::MatrixGCell );
       }
     }
 
     column = row;
-    for ( DbU::Unit xcut = hspan.getVMin()+side ; xcut < hspan.getVMax() ; xcut += side ) {
+    for ( DbU::Unit xcut = hspan.getVMin()+hside ; xcut < hspan.getVMax() ; xcut += hside ) {
       column = column->vcut( xcut );
       column->setType( Flags::MatrixGCell );
     }
@@ -782,26 +879,39 @@ namespace Anabatic {
   //  }
   //}
 
-    Session::close();
+    if (not openSession) Session::close();
     return true;
   }
 
 
-  void  GCell::_revalidate ()
+  void  GCell::invalidate ( bool propagateFlag )
   {
-    cdebug_log(110,1) << "GCell::revalidate() " << this << endl;
-    cdebug_log(110,1) << "West side."  << endl; for ( Edge* edge : _westEdges  ) edge->revalidate(); cdebug_tabw(110,-1);
-    cdebug_log(110,1) << "East side."  << endl; for ( Edge* edge : _eastEdges  ) edge->revalidate(); cdebug_tabw(110,-1);
-    cdebug_log(110,1) << "South side." << endl; for ( Edge* edge : _southEdges ) edge->revalidate(); cdebug_tabw(110,-1);
-    cdebug_log(110,1) << "North side." << endl; for ( Edge* edge : _northEdges ) edge->revalidate(); cdebug_tabw(110,-1);
+    cdebug_log(110,1) << "GCell::invalidate() " << this << endl;
+    Super::invalidate( propagateFlag );
+    _flags |= Flags::Invalidated;
+
+    cdebug_log(110,1) << "West side."  << endl; for ( Edge* edge : _westEdges  ) edge->invalidate(); cdebug_tabw(110,-1);
+    cdebug_log(110,1) << "East side."  << endl; for ( Edge* edge : _eastEdges  ) edge->invalidate(); cdebug_tabw(110,-1);
+    cdebug_log(110,1) << "South side." << endl; for ( Edge* edge : _southEdges ) edge->invalidate(); cdebug_tabw(110,-1);
+    cdebug_log(110,1) << "North side." << endl; for ( Edge* edge : _northEdges ) edge->invalidate(); cdebug_tabw(110,-1);
+
+    cdebug_tabw(110,-1);
+  }
+
+
+  void  GCell::materialize ()
+  {
+    cdebug_log(110,1) << "GCell::materialize() " << this << endl;
 
     if (_xmin > getXMax()+1)
-      cerr << Error( "GCell::_revalidate(): %s, X Min is greater than Max.", getString(this).c_str() );
+      cerr << Error( "GCell::materialize(): %s, X Min is greater than Max.", getString(this).c_str() );
     if (_ymin > getYMax()+1)
-      cerr << Error( "GCell::_revalidate(): %s, Y Min is greater than Max.", getString(this).c_str() );
+      cerr << Error( "GCell::materialize(): %s, Y Min is greater than Max.", getString(this).c_str() );
 
     _anabatic->_updateLookup( this );
   //_anabatic->getMatrix()->show();
+    Super::materialize();
+
     cdebug_tabw(110,-1);
   }
 
@@ -898,36 +1008,52 @@ namespace Anabatic {
   }
 
 
-  void GCell::setXY ( DbU::Unit x, DbU::Unit y )
+  void GCell::setSouthWestCorner ( DbU::Unit x, DbU::Unit y )
   {
-    UpdateSession::open();
+  //DbU::Unit dx = x - _xmin;
+  //DbU::Unit dy = y - _ymin;
+
+  /*for ( Contact* contact : _gcontacts ) {
+    Point position = contact->getPosition().translate( dx, dy );
+
+      for ( Component* component : contact->getSlaveComponents() ) {
+        Horizontal* horizontal = dynamic_cast<Horizontal*>( component );
+        if (horizontal) {
+        horizontal->setY( position.getY() );
+        } else {
+          Vertical* vertical = dynamic_cast<Vertical*>( component );
+        vertical->setX( position.getX() );
+        }
+      }
+      
+      if (not contact->getAnchor()) contact->setPosition( Point(x,y) );
+      }*/
+
     _xmin = x;
     _ymin = y;
-    UpdateSession::close(); 
+
+    invalidate( false );
   }
 
 
-  void GCell::updateContactsPosition ()
+  void GCell::updateGContacts ( Flags flags )
   {
-    UpdateSession::open();
-    DbU::Unit xc = (getXMax() + getXMin())/2;
-    DbU::Unit yc = (getYMax() + getYMin())/2;
-    for (vector<Contact*>::iterator it = _gcontacts.begin(); it != _gcontacts.end(); it++){
-      for ( Component* c : (*it)->getSlaveComponents() ){
-        Horizontal* h = dynamic_cast<Horizontal*>(c);
-        Vertical*   v = dynamic_cast<Vertical*>  (c);
-        if (h){
-        //if (h->getY() == (*it)->getY()) h->setY(yc);
-          h->setY(yc);
-        } else if (v) {
-        //if (v->getX() == (*it)->getX()) v->setX(xc);
-          v->setX(xc);
+    Point center ( _xmin+getWidth()/2, _ymin+getHeight()/2 );
+
+    for ( Contact* contact : _gcontacts ) {
+      for ( Component* component : contact->getSlaveComponents() ) {
+        Horizontal* horizontal = dynamic_cast<Horizontal*>( component );
+        if (horizontal and (flags & Flags::Vertical)) {
+          horizontal->setY( center.getY() );
+        } else {
+          Vertical* vertical = dynamic_cast<Vertical*>( component );
+          if (vertical and (flags & Flags::Horizontal)) {
+            vertical->setX( center.getX() );
+          }
         }
       }
-      (*it)->setX(xc);
-      (*it)->setY(yc);
+      if (not contact->getAnchor()) contact->setPosition( center );
     }
-    UpdateSession::close(); 
   }
 
 
@@ -964,7 +1090,7 @@ namespace Anabatic {
       if (_gcontacts[i] == unref) {
         if (_gcontacts[i]->getSlaveComponents().getLocator()->isValid()) return false;
         
-        cdebug_log(112,0) << "  Effective destroy." << endl;
+        cdebug_log(112,0) << "  Effective destroy " << (void*)unref << endl;
         std::swap( _gcontacts[i], _gcontacts[_gcontacts.size()-1] );
         _gcontacts[ _gcontacts.size()-1 ]->destroy();
         _gcontacts.pop_back();
@@ -1100,7 +1226,7 @@ namespace Anabatic {
   }
 
 
-  float  GCell::getHCapacity () const
+  int  GCell::getHCapacity () const
   {
     int capacity = 0;
     if (not _eastEdges.empty()) {
@@ -1108,11 +1234,11 @@ namespace Anabatic {
     } else {
       for ( Edge* edge : _westEdges ) capacity += edge->getCapacity(); 
     }
-    return (float)capacity;
+    return capacity;
   }
 
 
-  float  GCell::getVCapacity () const
+  int  GCell::getVCapacity () const
   {
     int capacity = 0;
     if (not _northEdges.empty()) {
@@ -1120,7 +1246,20 @@ namespace Anabatic {
     } else {
       for ( Edge* edge : _southEdges ) capacity += edge->getCapacity(); 
     }
-    return (float)capacity;
+    return capacity;
+  }
+
+
+  int  GCell::getCapacity ( size_t depth ) const
+  {
+    const vector<Edge*>* edges = NULL;
+    if (isHorizontalPlane(depth)) edges = (_eastEdges .empty()) ? &_westEdges  : &_eastEdges;
+    else                          edges = (_northEdges.empty()) ? &_southEdges : &_northEdges;
+
+    int capacity = 0;
+    for ( Edge* edge : *edges ) capacity += edge->getCapacity(depth); 
+
+    return capacity;
   }
 
 
@@ -1143,8 +1282,8 @@ namespace Anabatic {
     float  vdensity = 0.0;
 
     for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
-      if ( i%2 ) { hdensity += _densities[i]; ++hplanes; }
-      else       { vdensity += _densities[i]; ++vplanes; }
+      if (isHorizontalPlane(i)) { hdensity += _densities[i]; ++hplanes; }
+      else                      { vdensity += _densities[i]; ++vplanes; }
     }
 
     if (hplanes) hdensity /= hplanes;
@@ -1169,7 +1308,7 @@ namespace Anabatic {
       float  hdensity = 0.0;
 
       for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
-        if (i%2) { hdensity += _densities[i]; ++hplanes; }
+        if (isHorizontalPlane(i)) { hdensity += _densities[i]; ++hplanes; }
       }
       if (hplanes) hdensity /= hplanes;
 
@@ -1179,7 +1318,7 @@ namespace Anabatic {
       float  vdensity = 0.0;
 
       for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
-        if (i%2 == 0) { vdensity += _densities[i]; ++vplanes; }
+        if (isVerticalPlane(i)) { vdensity += _densities[i]; ++vplanes; }
       }
 
       if (vplanes) vdensity /= vplanes;
@@ -1191,11 +1330,11 @@ namespace Anabatic {
       }
     } else if (getAnabatic()->getDensityMode() == MaxHDensity) {
       for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
-        if ((i%2) and (_densities[i] > density)) density = _densities[i];
+        if (isHorizontalPlane(i) and (_densities[i] > density)) density = _densities[i];
       }
     } else if (getAnabatic()->getDensityMode() == MaxVDensity) {
       for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
-        if ((i%2 == 0) and (_densities[i] > density)) density = _densities[i];
+        if (isVerticalPlane(i) and (_densities[i] > density)) density = _densities[i];
       }
     }
 
@@ -1210,7 +1349,7 @@ namespace Anabatic {
     _blockages[depth] += length;
     _flags |= Flags::Invalidated;
 
-    cdebug_log(149,0) << "GCell:addBlockage() " << this << " "
+    cdebug_log(149,0) << "GCell::addBlockage() " << this << " "
                 << depth << ":" << DbU::getValueString(_blockages[depth]) << endl;
   }
 
@@ -1244,11 +1383,17 @@ namespace Anabatic {
     size_t begin = 0;
 
     for ( ; begin < end ; begin++ ) {
+      if (not _hsegments[begin])
+        cerr << Bug( "GCell::removeHSegment(): In %s, NULL segment at [%u/%u]."
+                   , _getString().c_str(), begin, _hsegments.size() ) << endl;
+      
       if (_hsegments[begin] == segment) std::swap( _hsegments[begin], _hsegments[--end] );
+      cdebug_log(9000,0) << "GCell::removeHSegment() " << this << endl;
+      cdebug_log(9000,0) << "  " << segment << endl;
     }
 
     if (_hsegments.size() == end) {
-      cerr << Bug( "%s do not go through %s."
+      cerr << Bug( "GCell::removeHSegment(): %s do not go through %s."
                  , getString(segment).c_str(), _getString().c_str() ) << endl;
       return;
     }
@@ -1296,57 +1441,45 @@ namespace Anabatic {
 
     _flags.reset( Flags::Saturated );
 
-    for ( size_t i=0 ; i<_vsegments.size() ; i++ ) {
-      if ( _vsegments[i] == NULL )
-        cerr << "NULL Autosegment at index " << i << endl;
-    }
-
     sort( _hsegments.begin(), _hsegments.end(), AutoSegment::CompareByDepthLength() );
     sort( _vsegments.begin(), _vsegments.end(), AutoSegment::CompareByDepthLength() );
 
-    float                    hcapacity    = getHCapacity ();
-    float                    vcapacity    = getVCapacity ();
-    float                    ccapacity    = hcapacity * vcapacity * 4; 
-    DbU::Unit                width        = getXMax() - getXMin();
-    DbU::Unit                height       = getYMax() - getYMin();
-    DbU::Unit                hpenalty     = 0 /*_box.getWidth () / 3*/;
-    DbU::Unit                vpenalty     = 0 /*_box.getHeight() / 3*/;
-    DbU::Unit                uLengths1    [ _depth ];
-    DbU::Unit                uLengths2    [ _depth ];
-    float                    localCounts  [ _depth ];
-    vector<UsedFragments>    ufragments   ( _depth );
+    float                 ccapacity    = getHCapacity() * getVCapacity() * (_depth-_pinDepth); 
+    DbU::Unit             width        = getXMax() - getXMin();
+    DbU::Unit             height       = getYMax() - getYMin();
+    DbU::Unit             hpenalty     = 0 /*_box.getWidth () / 3*/;
+    DbU::Unit             vpenalty     = 0 /*_box.getHeight() / 3*/;
+    DbU::Unit             uLengths1    [ _depth ];
+    DbU::Unit             uLengths2    [ _depth ];
+    float                 localCounts  [ _depth ];
+    vector<UsedFragments> ufragments   ( _depth );
 
     for ( size_t i=0 ; i<_depth ; i++ ) {
       ufragments[i].setPitch ( Session::getPitch(i) );
       _feedthroughs[i] = 0.0;
+      uLengths1    [i] = 0;
       uLengths2    [i] = 0;
       localCounts  [i] = 0.0;
       _globalsCount[i] = 0.0;
 
-      if (Session::getDirection(i) & Flags::Horizontal) {
-        ufragments[i].setSpan    ( getXMin(), getXMax() );
-        ufragments[i].setCapacity( (size_t)hcapacity );
-      } else {
-        ufragments[i].setSpan    ( getYMin(), getYMax() );
-        ufragments[i].setCapacity( (size_t)vcapacity );
-      }
+      ufragments[i].setCapacity( (size_t)getCapacity(i) );
+      if (isHorizontalPlane(i)) ufragments[i].setSpan( getXMin(), getXMax() );
+      else                      ufragments[i].setSpan( getYMin(), getYMax() );
     }
 
   // Compute wirelength associated to contacts (in DbU::Unit converted to float).
     AutoSegment::DepthLengthSet  processeds;
     for ( AutoContact* contact : _contacts ) {
       for ( size_t i=0 ; i<_depth ; i++ ) uLengths1[i] = 0;
-      contact->getLengths ( uLengths1, processeds );
+      contact->getLengths( uLengths1, processeds );
       for ( size_t i=0 ; i<_depth ; i++ ) {
-        if (Session::getDirection(i) & Flags::Horizontal)
-          uLengths2[i] += uLengths1[i]+hpenalty;
-        else
-          uLengths2[i] += uLengths1[i]+vpenalty; break;
+        if (isHorizontalPlane(i)) uLengths2[i] += uLengths1[i]+hpenalty;
+        else                      uLengths2[i] += uLengths1[i]+vpenalty;
       }
     }
 
   // Add the "pass through" horizontal segments.
-    if ( _hsegments.size() ) {
+    if (not _hsegments.empty()) {
       const Layer* layer = _hsegments[0]->getLayer();
       size_t       depth = Session::getRoutingGauge()->getLayerDepth(layer);
       size_t       count = 0;
@@ -1370,7 +1503,7 @@ namespace Anabatic {
     }
 
   // Add the "pass through" vertical segments.
-    if ( _vsegments.size() ) {
+    if (not _vsegments.empty()) {
       const Layer* layer = _vsegments[0]->getLayer();
       size_t       depth = Session::getRoutingGauge()->getLayerDepth(layer);
       size_t       count = 0;
@@ -1378,7 +1511,7 @@ namespace Anabatic {
         _globalsCount[depth] += 1.0;
         ufragments[depth].incGlobals();
 
-        if ( layer != _vsegments[i]->getLayer() ) {
+        if (layer != _vsegments[i]->getLayer()) {
           uLengths2[depth] += count * height;
 
           count = 0;
@@ -1388,7 +1521,7 @@ namespace Anabatic {
         count++;
         _feedthroughs[depth] += 1.0;
       }
-      if ( count ) {
+      if (count) {
         uLengths2[depth] += count * height;
       }
     }
@@ -1396,17 +1529,23 @@ namespace Anabatic {
   // Add the blockages.
     for ( size_t i=0 ; i<_depth ; i++ ) {
       uLengths2[i] += _blockages[i];
+      if (not i) continue;
+      if ((float)(_blockages[i] * Session::getPitch(i)) > 0.40*(float)(width*height)) {
+        flags() |= Flags::GoStraight;
+      //cerr << "| Set GoStraight on " << this << endl;
+      }
     }
 
   // Compute the number of non pass-through tracks.
-    if (processeds.size()) {
+    if (not processeds.empty()) {
       AutoSegment::DepthLengthSet::iterator isegment = processeds.begin();
       const Layer* layer = (*isegment)->getLayer();
       DbU::Unit    axis  = (*isegment)->getAxis();
       size_t       depth = Session::getRoutingGauge()->getLayerDepth(layer);
       size_t       count = 0;
       for ( ; isegment != processeds.end(); ++isegment ) {
-        _feedthroughs[depth] += ((*isegment)->isGlobal()) ? 0.50 : 0.33;
+      //_feedthroughs[depth] += ((*isegment)->isGlobal()) ? 0.50 : 0.33;
+        _feedthroughs[depth] += 0.50;
         localCounts  [depth] += 1.0;
         if ( (*isegment)->isGlobal() ) _globalsCount[depth] += 1.0;
 
@@ -1423,9 +1562,11 @@ namespace Anabatic {
 
   // Normalize: 0 < d < 1.0 (divide by H/V capacity).
     for ( size_t i=0 ; i<_depth ; i++ ) {
+      int capacity = getCapacity(i);
+      
       if (Session::getDirection(i) & Flags::Horizontal) {
-        if (width) {
-          _densities     [i]  = ((float)uLengths2[i]) / ( hcapacity * (float)width );
+        if (width and capacity) {
+          _densities     [i]  = ((float)uLengths2[i]) / (float)( capacity * width );
           _feedthroughs  [i] += (float)(_blockages[i] / width);
           _fragmentations[i]  = (float)ufragments[i].getMaxFree().getSize() / (float)width;
         } else {
@@ -1434,8 +1575,8 @@ namespace Anabatic {
           _fragmentations[i]  = 0;
         }
       } else {
-        if (height) {
-          _densities     [i]  = ((float)uLengths2[i]) / ( vcapacity * (float)height );
+        if (height and capacity) {
+          _densities     [i]  = ((float)uLengths2[i]) / (float)( capacity * height );
           _feedthroughs  [i] += (float)(_blockages[i] / height);
           _fragmentations[i]  = (float)ufragments[i].getMaxFree().getSize() / (float)height;
         } else {
@@ -1448,10 +1589,8 @@ namespace Anabatic {
       if (_densities[i] >= 1.0) _flags |= Flags::Saturated;
     }
 
-    if (ccapacity)
-      _cDensity = ( (float)_contacts.size() ) / ccapacity;
-    else
-      _cDensity = 0;
+    if (ccapacity) _cDensity = ( (float)_contacts.size() ) / ccapacity;
+    else           _cDensity = 0;
     _flags.reset( Flags::Invalidated );
 
     checkDensity();
@@ -1462,17 +1601,16 @@ namespace Anabatic {
 
   void  GCell::truncDensities ()
   {
-    int  hcapacity = (int)getHCapacity();
-    int  vcapacity = (int)getVCapacity();
-    Box  bBox      = getBoundingBox();
+    Box  bBox = getBoundingBox();
 
     for ( size_t i=0 ; i<_depth ; i++ ) {
-      if (Session::getDirection(i) & Flags::Horizontal) {
-        if (_blockages[i] > hcapacity * bBox.getWidth())
-          _blockages[i]  = hcapacity * bBox.getWidth();
+      int capacity = getCapacity(i);
+      if (isHorizontalPlane(i)) {
+        if (_blockages[i] > capacity * bBox.getWidth())
+          _blockages[i]  = capacity * bBox.getWidth();
       } else {
-        if (_blockages[i] > vcapacity * bBox.getHeight())
-          _blockages[i]  = vcapacity * bBox.getHeight();
+        if (_blockages[i] > capacity * bBox.getHeight())
+          _blockages[i]  = capacity * bBox.getHeight();
       }
     }
     _flags &= ~Flags::Saturated;
@@ -1508,20 +1646,31 @@ namespace Anabatic {
   {
     if (isInvalidated()) const_cast<GCell*>(this)->updateDensity();
 
-    float capacity = 0.0;
-    if (Session::getDirection(depth) & Flags::Horizontal) capacity = getHCapacity();
-    else                                                  capacity = getVCapacity();
+    float capacity = getCapacity(depth);
 
     cdebug_log(149,0) << "  | hasFreeTrack [" << getId() << "] depth:" << depth << " "
-                << Session::getRoutingGauge()->getRoutingLayer(depth)->getName()
-              //<< " " << (_densities[depth]*capacity) << " vs. " << capacity
-                << " " << _feedthroughs[depth] << " vs. " << capacity
-                << " " << this << endl;
+                      << Session::getRoutingGauge()->getRoutingLayer(depth)->getName()
+                    //<< " " << (_densities[depth]*capacity) << " vs. " << capacity
+                      << " " << _feedthroughs[depth] << " vs. " << capacity
+                      << " " << this << endl;
     
     return (_feedthroughs[depth] + 0.99 + reserve <= capacity);
   }
 
 
+  size_t  GCell::getNetCount () const
+  {
+    set<Net*> nets;
+
+    for ( Edge* edge : _westEdges  ) for ( Segment* segment : edge->getSegments() ) nets.insert( segment->getNet() );
+    for ( Edge* edge : _eastEdges  ) for ( Segment* segment : edge->getSegments() ) nets.insert( segment->getNet() );
+    for ( Edge* edge : _northEdges ) for ( Segment* segment : edge->getSegments() ) nets.insert( segment->getNet() );
+    for ( Edge* edge : _southEdges ) for ( Segment* segment : edge->getSegments() ) nets.insert( segment->getNet() );
+
+    return nets.size();
+  }
+
+
   void  GCell::rpDesaturate ( set<Net*>& globalNets )
   {
     set<RoutingPad*> rps;
@@ -1634,7 +1783,7 @@ namespace Anabatic {
 
   bool  GCell::stepNetDesaturate ( size_t depth, set<Net*>& globalNets, GCell::Set& invalidateds )
   {
-    cdebug_log(9000,0) << "Deter| GCell::stepNetDesaturate() depth:" << depth << endl;
+    cdebug_log(149,0) << "GCell::stepNetDesaturate() depth:" << depth << endl;
     cdebug_log(9000,0) << "Deter| " << this << endl;
 
     updateDensity();
@@ -1656,7 +1805,7 @@ namespace Anabatic {
       if (segmentDepth < depth) continue;
       if (segmentDepth > depth) break;
 
-      cdebug_log(9000,0) << "Deter| Move up " << (*isegment) << endl;
+      cdebug_log(149,0) << "Move up " << (*isegment) << endl;
 
       if (getAnabatic()->moveUpNetTrunk(*isegment,globalNets,invalidateds))
         return true;
@@ -1666,16 +1815,16 @@ namespace Anabatic {
   }
   
 
-  void GCell::setEdgesOccupancy ( unsigned int width, unsigned int height )
+  void  GCell::forceEdgesCapacities ( unsigned int hcapacity, unsigned int vcapacity )
   {
-    getEastEdge()->setCapacity(width);
-    getWestEdge()->setCapacity(width);
-    getNorthEdge()->setCapacity(height);
-    getSouthEdge()->setCapacity(height);
-    getEastEdge()->setRealOccupancy(0);
-    getWestEdge()->setRealOccupancy(0);
-    getNorthEdge()->setRealOccupancy(0);
-    getSouthEdge()->setRealOccupancy(0);
+    if (getEastEdge() ) getEastEdge ()->forceCapacity( hcapacity );
+    if (getWestEdge() ) getWestEdge ()->forceCapacity( hcapacity );
+    if (getNorthEdge()) getNorthEdge()->forceCapacity( vcapacity );
+    if (getSouthEdge()) getSouthEdge()->forceCapacity( vcapacity );
+    if (getEastEdge() ) getEastEdge ()->setRealOccupancy(0);
+    if (getWestEdge() ) getWestEdge ()->setRealOccupancy(0);
+    if (getNorthEdge()) getNorthEdge()->setRealOccupancy(0);
+    if (getSouthEdge()) getSouthEdge()->setRealOccupancy(0);
   }
 
 
@@ -1688,6 +1837,13 @@ namespace Anabatic {
     string s = Super::_getString();
     s.insert( s.size()-1, " "+getString(getBoundingBox()) );
     s.insert( s.size()-1, " "+getString(_flags) );
+    s.insert( s.size()-1, " "+getString(_rpCount) );
+  /* string s = "<GCell at(" + DbU::getValueString(getXMin())
+       +  "-" + DbU::getValueString(getYMin()) 
+       +  "-" + DbU::getValueString(getXMax()) 
+       +  "-" + DbU::getValueString(getYMax()) 
+       +  "-" + DbU::getValueString(getHeight())
+       +  "-" + DbU::getValueString(getWidth()) + ")";*/
     return s;
   }
 
@@ -1702,6 +1858,7 @@ namespace Anabatic {
     record->add( getSlot("_northEdges" , &_northEdges) );
     record->add( DbU::getValueSlot("_xmin", &_xmin) );
     record->add( DbU::getValueSlot("_ymin", &_ymin) );
+    record->add( getSlot ( "_gcontacts", &_gcontacts ) );
     record->add( getSlot ( "_vsegments", &_vsegments ) );
     record->add( getSlot ( "_hsegments", &_hsegments ) );
     record->add( getSlot ( "_contacts" , &_contacts  ) );
@@ -1713,7 +1870,7 @@ namespace Anabatic {
       ostringstream s;
       const Layer* layer = rg->getRoutingLayer(depth)->getBlockageLayer();
       s << "_blockages[" << depth << ":" << ((layer) ? layer->getName() : "None") << "]";
-      record->add( getSlot ( s.str(),  &_blockages[depth] ) );
+      record->add( DbU::getValueSlot( s.str(), &_blockages[depth] ) );
     }
 
     for ( size_t depth=0 ; depth<_depth ; ++depth ) {

anabatic/src/LayerAssign.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -31,11 +31,287 @@
 #include "hurricane/Horizontal.h"
 #include "hurricane/Cell.h"
 #include "crlcore/RoutingGauge.h"
-#include "anabatic/AutoContact.h"
+#include "anabatic/AutoContactTerminal.h"
 #include "anabatic/AutoSegment.h"
 #include "anabatic/AnabaticEngine.h"
 
 
+namespace {
+
+
+  using namespace std;
+  using namespace CRL;
+  using namespace Hurricane;
+  using namespace Anabatic;
+
+
+  class SortRpByX {
+    public:
+      inline       SortRpByX  ();
+      inline bool  operator() ( RoutingPad* rp1, RoutingPad* rp2 );
+  };
+
+
+  inline  SortRpByX::SortRpByX ()
+  { }
+
+
+  inline bool  SortRpByX::operator() ( RoutingPad* rp1, RoutingPad* rp2 )
+  {
+    DbU::Unit x1 = rp1->getCenter().getX();
+    DbU::Unit x2 = rp2->getCenter().getX();
+
+    if (x1 == x2) return false;
+    return (x1 < x2);
+  }
+
+
+// -----------------------------------------------------------------
+// Class : "RpsInRow".
+
+  class RpsInRow {
+    public:
+      class Compare {
+        public:
+          bool  operator() ( const RpsInRow* lhs, const RpsInRow* rhs ) const;
+      };
+    public:
+      inline                            RpsInRow      ( RoutingPad*, AnabaticEngine* );
+      inline const vector<RoutingPad*>& getRps        () const;
+      inline       size_t               getSouth      () const;
+      inline       size_t               getNorth      () const;
+      inline const Interval&            getRpsHSpan   () const;
+      inline const Interval&            getRpsVSpan   () const;
+                   void                 slacken       ();
+    private:
+                   void                 _findTopology ();
+      inline       void                 _merge        ( RoutingPad* );
+    private:
+      AnabaticEngine*      _anabatic;
+      vector<RoutingPad*>  _rps;
+      size_t               _north;
+      size_t               _south;
+      Interval             _hSpan;
+      Interval             _vSpan;
+  };
+
+
+  inline RpsInRow::RpsInRow ( RoutingPad* seed, AnabaticEngine* anabatic )
+    : _anabatic(anabatic)
+    , _rps     ()
+    , _north   (0)
+    , _south   (0)
+    , _hSpan   ()
+    , _vSpan   ( false )
+  {
+    _rps.push_back( seed );
+    _findTopology();
+  }
+
+  
+  inline const vector<RoutingPad*>& RpsInRow::getRps      () const { return _rps; }
+  inline       size_t               RpsInRow::getSouth    () const { return _south; }
+  inline       size_t               RpsInRow::getNorth    () const { return _north; }
+  inline const Interval&            RpsInRow::getRpsHSpan () const { return _hSpan; }
+  inline const Interval&            RpsInRow::getRpsVSpan () const { return _vSpan; }
+
+  
+  bool  RpsInRow::Compare::operator() ( const RpsInRow* lhs, const RpsInRow* rhs ) const
+  {
+    if ( (lhs->_rps.size() == 2) and (rhs->_rps.size() != 2) ) return true;
+    if ( (lhs->_rps.size() != 2) and (rhs->_rps.size() == 2) ) return false;
+    if ( lhs->_rps.size() != rhs->_rps.size() ) return lhs->_rps.size() < rhs->_rps.size();
+
+    size_t lhsNs = lhs->_south + lhs->_north;
+    size_t rhsNs = rhs->_south + rhs->_north;
+    if (lhsNs != rhsNs) return lhsNs < rhsNs;
+
+    if (lhs->_vSpan != rhs->_vSpan) return lhs->_vSpan.getSize() < rhs->_vSpan.getSize();
+    if (lhs->_hSpan != rhs->_hSpan) return lhs->_hSpan.getSize() < rhs->_hSpan.getSize();
+    
+    return lhs->_rps[0]->getId() < rhs->_rps[0]->getId();
+  }
+
+
+  inline void  RpsInRow::_merge ( RoutingPad* rp )
+  {
+    if (rp != _rps[0]) _rps.push_back( rp );
+
+    Box bb ( _rps.back()->getBoundingBox() );
+    _hSpan.merge( bb.getCenter().getX() );
+    _vSpan.intersection( bb.getYMin(), bb.getYMax() );
+  }
+
+
+  void  RpsInRow::_findTopology ()
+  {
+    cdebug_log(146,1) << "RpsInRow::findTopology() - " << _rps[0] << endl;
+
+    _merge( _rps[0] );
+
+    AutoSegmentStack stack;
+
+    for ( Component* component : _rps[0]->getSlaveComponents() ) {
+      cdebug_log(146,0) << "slave component: " << component << endl;
+      AutoContact* rpContact = Session::lookup( dynamic_cast<Contact*>(component) );
+      if (rpContact) {
+        cdebug_log(146,0) << "Start rp: " << rpContact << endl;
+
+        for ( AutoSegment* segment : rpContact->getAutoSegments() ) {
+          cdebug_log(146,0) << "Examining: " << segment << endl;
+          AutoContact* target = segment->getOppositeAnchor(rpContact);
+
+          if (target) {
+            if (segment->isHorizontal()) {
+              stack.push( target, segment );
+            } else {
+              if (segment->isLocal()) {
+                stack.push( target, segment );
+              } else {
+                if (segment->getAutoSource() == rpContact) ++_north;
+                else                                       ++_south;
+              }
+            }
+          }
+        }
+
+        // Find Rps in same horizontal GCell range.
+        cdebug_log(146,0) << "Find Rps in same horizontal GCell range" << endl;
+
+        while ( not stack.isEmpty() ) {
+          AutoSegment* from    = stack.getAutoSegment();
+          AutoContact* contact = stack.getAutoContact();
+          stack.pop();
+
+          for ( AutoSegment* segment : contact->getAutoSegments() ) {
+            if (segment == from) continue;
+            if (segment->isVertical() and not segment->isLocal()) {
+              if (segment->getAutoSource() == contact) ++_north;
+              else                                     ++_south;
+              continue;
+            }
+
+            AutoContact*         target   = segment->getOppositeAnchor( contact );
+            AutoContactTerminal* terminal = dynamic_cast<AutoContactTerminal*>( target );
+            if (terminal) {
+              _merge( terminal->getRoutingPad() );
+            }
+
+            stack.push( target, segment );
+          }
+        }
+      }
+    }
+
+    sort( _rps.begin(), _rps.end(), SortRpByX() );
+
+    cdebug_log(146,0) << "findHAlignedsRps() - Exit" << endl;
+    cdebug_tabw(146,-1);
+  }
+
+
+  void  RpsInRow::slacken ()
+  {
+    cdebug_log(149,1) << "RpsInRow::slacken()" << endl;
+
+    for ( RoutingPad* rp : _rps ) {
+      cdebug_log(149,0) << "Slacken from: " << rp << endl;
+
+      if (rp->getLayer()) {
+        if (_anabatic->getConfiguration()->getLayerDepth(rp->getLayer()) == 1)
+          cdebug_log(149,0) << "In METAL2, skiping" << endl;
+          continue;
+      }
+         
+      for ( Component* component : rp->getSlaveComponents() ) {
+        AutoContact* rpContact = Session::lookup( dynamic_cast<Contact*>(component) );
+        if (rpContact) {
+          cdebug_log(149,0) << "+ " << rpContact << endl;
+          for ( AutoSegment* segment : rpContact->getAutoSegments() ) {
+            cdebug_log(149,0) << "| " << segment << endl;
+
+            if (segment->isVertical()) {
+              if (segment->getDepth() == 1) {
+                cdebug_log(149,0) << "| Slacken: " << segment << endl;
+                segment->changeDepth( 2, Flags::NoFlags );
+                cdebug_log(149,0) << "| After Slacken: " << segment << endl;
+              }
+            } else {
+              segment->makeDogleg( rpContact->getGCell() );
+              cdebug_log(149,0) << "| Make dogleg: " << segment << endl;
+            }
+          }
+        }
+      }
+    }
+    cdebug_tabw(149,-1);
+  }
+
+
+// -----------------------------------------------------------------
+// Class : "GCellRps".
+
+  class GCellRps {
+    public:
+      class Compare {
+        public:
+          bool  operator() ( const GCellRps* lhs, const GCellRps* rhs ) const;
+      };
+    public:
+                                      GCellRps     ( GCell*, AnabaticEngine* );
+                                     ~GCellRps     ();
+      inline GCell*                   getGCell     () const;
+      inline size_t                   add          ( RoutingPad* );
+      inline void                     consolidate  ();
+      inline RpsInRow*                getRpsInRow  ( size_t i );
+      inline const vector<RpsInRow*>& getRpsInRows () const;
+    private:
+      AnabaticEngine*    _anabatic;
+      GCell*             _gcell;
+      vector<RpsInRow*>  _rpsInRows;
+  };
+
+
+  GCellRps::GCellRps ( GCell* gcell, AnabaticEngine* anabatic )
+    : _anabatic (anabatic)
+    , _gcell    (gcell)
+    , _rpsInRows()
+  { }
+
+
+  GCellRps::~GCellRps ()
+  {
+    for ( RpsInRow* elem : _rpsInRows ) delete elem;
+  }
+
+
+  inline GCell* GCellRps::getGCell () const { return _gcell; }
+
+
+  inline size_t  GCellRps::add ( RoutingPad* rp )
+  {
+    _rpsInRows.push_back( new RpsInRow(rp,_anabatic) );
+    return _rpsInRows.size() - 1;
+  }
+
+
+  inline void  GCellRps::consolidate ()
+  {
+    sort( _rpsInRows.begin(), _rpsInRows.end(), RpsInRow::Compare() );
+  }
+
+
+  inline       RpsInRow*          GCellRps::getRpsInRow  ( size_t i ) { return _rpsInRows[i]; }
+  inline const vector<RpsInRow*>& GCellRps::getRpsInRows () const     { return _rpsInRows; }
+
+  
+  bool  GCellRps::Compare::operator() ( const GCellRps* lhs, const GCellRps* rhs ) const
+  { return lhs->getGCell()->getId() < rhs->getGCell()->getId(); }
+
+
+}  // Anonymous namespace.
+
+
 namespace Anabatic {
 
   using Hurricane::DebugSession;
@@ -59,9 +335,55 @@ namespace Anabatic {
 
     cmess1 << "  o  Desaturate layer "
            << Session::getRoutingGauge()->getRoutingLayer(depth)->getName() << endl;
+    cdebug_log(149,0) << "Session::getSaturateRatio()=" << Session::getSaturateRatio() << endl;
 
+    GCellKeyQueue  queue;
+    GCell::Set     invalidateds;
+
+    for ( GCell* gcell : getGCells() ) queue.push( gcell->cloneKey(depth) );
+
+    bool optimized = true;
+    bool finished  = false;
+    while ( optimized ) {
+      Session::revalidate ();
+      optimized = false;
+
+      while ( not queue.empty() ) {
+        GCell::Key* topKey = queue.top();
+        GCell*      gcell  = const_cast<GCell*>( topKey->getGCell() );
+        queue.pop();
+
+        if (topKey->isActive()) {
+          cdebug_log(149,0) << "_desaturate: [" << depth << "]:"
+                            << gcell->getDensity(depth) << " " << gcell << endl;
+          
+          if (not gcell->isSaturated(depth)) {
+            cdebug_log(149,0) << "STOP desaturated: " << gcell << endl;
+            finished = true;
+          } else {
+            if (finished) {
+              cparanoid << "[ERROR] Still saturated: " << gcell << endl;
+            }
+          }
+          
+          if (not finished) {
+            optimized = gcell->stepNetDesaturate( depth, globalNets, invalidateds );
+            if (optimized) {
+              for ( GCell* gcell : invalidateds ) {
+                queue.push( gcell->cloneKey(depth) );
+              }
+            }
+          }
+        }
+
+        delete topKey;
+      }
+    }
+    
+
+#if OLD_QUEUE_DISABLED
     GCellDensitySet queue   ( depth, getGCells() );
-    GCell::Set      invalidateds;
+    GCell::Set     invalidateds;
 
     bool optimized = true;
     while ( optimized ) {
@@ -73,7 +395,7 @@ namespace Anabatic {
       size_t i = 0;
       for ( ; igcell!=queue.getGCells().end() ; ++igcell, ++i ) {
         cdebug_log(149,0) << "_desaturate: [" << depth << "]:"
-                    << (*igcell)->getDensity(depth) << " " << *igcell << endl;
+                          << (*igcell)->getDensity(depth) << " " << *igcell << endl;
 
         if (not (*igcell)->isSaturated(depth)) {
           cdebug_log(149,0) << "STOP desaturated: @" << i << " " << *igcell << endl;
@@ -95,6 +417,7 @@ namespace Anabatic {
         }
       }
     }
+#endif
   }
 
 
@@ -117,8 +440,14 @@ namespace Anabatic {
         }
 
         global++;
-        if ((*isegment)->getLayer() == Session::getRoutingLayer(1)) (*isegment)->setLayer( Session::getRoutingLayer(3) );
-        if ((*isegment)->getLayer() == Session::getRoutingLayer(2)) (*isegment)->setLayer( Session::getRoutingLayer(4) );
+        if ((*isegment)->getLayer() == Session::getRoutingLayer(1)) {
+          (*isegment)->setLayer( Session::getRoutingLayer(3) );
+          (*isegment)->setWidth( Session::getWireWidth   (3) );
+        }
+        if ((*isegment)->getLayer() == Session::getRoutingLayer(2)) {
+          (*isegment)->setLayer( Session::getRoutingLayer(4) );
+          (*isegment)->setWidth( Session::getWireWidth   (4) );
+        }
       }
     }
 
@@ -142,7 +471,7 @@ namespace Anabatic {
 
   void  AnabaticEngine::_layerAssignByTrunk ( Net* net, set<Net*>& globalNets, unsigned long& total, unsigned long& global )
   {
-    DebugSession::open( net, 140, 150 );
+    DebugSession::open( net, 145, 150 );
 
     cdebug_log(149,0) << "Anabatic::_layerAssignByTrunk ( " << net << " )" << endl;
     cdebug_tabw(145,1);
@@ -172,8 +501,14 @@ namespace Anabatic {
           netGlobal++;
 
           cdebug_log(145,0) << "Migrate to M4/M5: " << autoSegment << endl;
-          if (autoSegment->isHorizontal()) autoSegment->setLayer( Session::getRoutingLayer(3) );
-          if (autoSegment->isVertical  ()) autoSegment->setLayer( Session::getRoutingLayer(4) );
+          if (autoSegment->isHorizontal()) {
+            autoSegment->setLayer( Session::getRoutingLayer(3) );
+            autoSegment->setWidth( Session::getWireWidth   (3) );
+          }
+          if (autoSegment->isVertical()) {
+            autoSegment->setLayer( Session::getRoutingLayer(4) );
+            autoSegment->setWidth( Session::getWireWidth   (4) );
+          }
         }
       }
     }
@@ -199,11 +534,124 @@ namespace Anabatic {
   }
 
 
+  void  AnabaticEngine::_layerAssignNoGlobalM2V ( Net* net, set<Net*>& globalNets, unsigned long& total, unsigned long& global )
+  {
+    cdebug_log(149,0) << "Anabatic::_layerAssignNoGlobalM2V ( " << net << " )" << endl;
+    cdebug_tabw(145,1);
+
+    bool               isGlobalNet = false;
+    unsigned long      netGlobal   = 0;
+    unsigned long      netTotal    = 0;
+    set<AutoContact*>  globalContacts;
+
+    for ( Segment* baseSegment : net->getSegments() ) {
+      ++netTotal;
+
+      AutoSegment* segment = Session::lookup( baseSegment );
+
+      if (not segment or segment->isLocal()) continue;
+
+      isGlobalNet = true;
+      netTotal    = 0;
+      globalNets.insert( net );
+      break;
+    }
+
+    if (isGlobalNet) {
+      vector<AutoSegment*> horizontals;
+
+      for ( Segment* baseSegment : net->getSegments() ) {
+        AutoSegment* segment = Session::lookup( baseSegment );
+        if (not segment or not segment->isCanonical()) continue;
+
+        if (segment->isHorizontal()) horizontals.push_back( segment );
+      }
+
+      for ( AutoSegment* horizontal : horizontals ) {
+        vector<AutoSegment*> collapseds;
+        vector<AutoSegment*> perpandiculars;
+        vector<AutoSegment*> northBounds;
+        vector<AutoSegment*> southBounds;
+        DbU::Unit            leftBound;
+        DbU::Unit            rightBound;
+      //bool                 hasNorth = false;
+      //bool                 hasSouth = false;
+
+        AutoSegment::getTopologicalInfos( horizontal
+                                        , collapseds
+                                        , perpandiculars
+                                        , leftBound
+                                        , rightBound
+                                        );
+
+        for ( AutoSegment* perpandicular : perpandiculars ) {
+          if (Session::getLayerDepth(perpandicular->getLayer()) > 2) continue;
+
+          bool hasGlobal = false;
+          for ( AutoSegment* aligned : perpandicular->getAligneds(Flags::NoCheckLayer|Flags::WithSelf) ) {
+            if (aligned->isGlobal()) { hasGlobal = true; break; }
+          }
+          if (not hasGlobal) continue;
+
+          // if (perpandicular->getSourceY() == horizontal->getAxis()) {
+          //   hasNorth = true;
+          //   if (hasGlobal) northBounds.push_back( perpandicular );
+          // } else {
+          //   hasSouth = true;
+          //   if (hasGlobal) southBounds.push_back( perpandicular );
+          // }
+          
+          if (  perpandicular->getAutoSource()->getGCell()->getNorth()
+             != perpandicular->getAutoTarget()->getGCell()) {
+            perpandicular->changeDepth( 3, Flags::Propagate );
+            ++netGlobal;
+            continue;
+          }
+        }
+
+        // if (hasSouth and hasNorth) {
+        //   if (not northBounds.empty()) {
+        //     for ( AutoSegment* perpandicular : northBounds )
+        //       perpandicular->changeDepth( 3, Flags::Propagate );
+        //   } else {
+        //     for ( AutoSegment* perpandicular : southBounds )
+        //       perpandicular->changeDepth( 3, Flags::Propagate );
+        //   }
+        // }
+      }
+    }
+
+    total  += netTotal;
+    global += netGlobal;
+
+    cdebug_tabw(145,-1);
+  }
+
+
+  void  AnabaticEngine::_layerAssignNoGlobalM2V ( unsigned long& total, unsigned long& global, set<Net*>& globalNets )
+  {
+    cmess1 << "  o  Assign Layer (no global vertical metal2)." << endl;
+
+    for ( Net* net : getCell()->getNets() ) {
+      DebugSession::open( net, 145, 150 );
+
+      NetRoutingState* state = NetRoutingExtension::get( net );
+      if (not state or state->isAutomaticGlobalRoute()) {
+        _layerAssignNoGlobalM2V( net, globalNets, total, global );
+      } else {
+        cdebug_log(145,0) << net << " is not automatic routed, skipped." << endl;
+      }
+
+      DebugSession::close();
+    }
+  }
+
+
 #if THIS_IS_DISABLED
   void  AnabaticEngine::moveULeft ( AutoSegment* seed, set<Net*>& globalNets, GCell::Set& invalidateds )
   {
     Net* net = seed->getNet();
-    DebugSession::open( net, 140, 150 );
+    DebugSession::open( net, 145, 150 );
 
     cdebug_log(9000,0) << "Deter| Move left: " << seed << endl;
 
@@ -240,7 +688,7 @@ namespace Anabatic {
   void  AnabaticEngine::moveURight ( AutoSegment* seed, set<Net*>& globalNets, GCell::Set& invalidateds )
   {
     Net* net = seed->getNet();
-    DebugSession::open( net, 140, 150 );
+    DebugSession::open( net, 145, 150 );
 
     cdebug_log(9000,0) << "Deter| Move right: " << seed << endl;
 
@@ -280,7 +728,7 @@ namespace Anabatic {
     Net*         net       = seed->getNet();
     unsigned int seedDepth = Session::getRoutingGauge()->getLayerDepth(seed->getLayer());
 
-    DebugSession::open( net, 140, 150 );
+    DebugSession::open( net, 145, 150 );
     cdebug_log(9000,0) << "Deter| moveUpNetTrunk() depth:" << seedDepth << " " << seed << endl;
 
     if (not seed->canMoveUp( 1.0, Flags::Propagate|Flags::AllowTerminal|Flags::NoCheckLayer) ) {
@@ -306,7 +754,7 @@ namespace Anabatic {
         if (not segment->isStrongTerminal()) locals.push_back( segment );
         continue;
       }
-      if ( (segment->getLength() < 3*Session::getSliceHeight()) and (segment != seed) ) {
+      if ( (segment->getAnchoredLength() < 3*Session::getSliceHeight()) and (segment != seed) ) {
         locals.push_back( segment );
         continue;
       }
@@ -474,6 +922,8 @@ namespace Anabatic {
 
   void  AnabaticEngine::layerAssign ( uint32_t method )
   {
+  //DebugSession::open( 145, 150 );
+
     cdebug_log(9000,0) << "Deter| Layer Assignment" << endl;
 
     set<Net*> globalNets;
@@ -486,8 +936,9 @@ namespace Anabatic {
 
     if (Session::getAllowedDepth() >= 3) {
       switch ( method ) {
-        case EngineLayerAssignByLength: _layerAssignByLength( total, global, globalNets ); break;
-        case EngineLayerAssignByTrunk:  _layerAssignByTrunk ( total, global, globalNets ); break;
+        case EngineLayerAssignByLength:    _layerAssignByLength    ( total, global, globalNets ); break;
+        case EngineLayerAssignByTrunk:     _layerAssignByTrunk     ( total, global, globalNets ); break;
+        case EngineLayerAssignNoGlobalM2V: _layerAssignNoGlobalM2V ( total, global, globalNets ); break;
         case EngineNoNetLayerAssign:    break;
         default:
           stopMeasures();
@@ -502,7 +953,8 @@ namespace Anabatic {
       globalNets.clear();
       Session::revalidate();
   
-      if (getConfiguration()->getAllowedDepth() > 2) {
+      if (   (method != EngineLayerAssignNoGlobalM2V) 
+         and (getConfiguration()->getAllowedDepth() > 2) ) {
         for ( size_t depth=1 ; depth <= getConfiguration()->getAllowedDepth()-2; ++depth ) {
           _desaturate( depth, globalNets, total, global );
           if ( (depth > 1) and ((depth-1)%2 == 1) ) Session::revalidate();
@@ -519,6 +971,54 @@ namespace Anabatic {
       Session::setAnabaticFlags( Flags::WarnOnGCellOverload );
     }
 
+    set<GCellRps*,GCellRps::Compare> gcellRpss;
+    
+    for ( GCell* gcell : getGCells() ) {
+      set<RoutingPad*,Entity::CompareById> rps;
+      
+      const vector<AutoContact*> contacts = gcell->getContacts();
+      for ( AutoContact* contact : contacts ) {
+        AutoContactTerminal* terminal = dynamic_cast<AutoContactTerminal*>( contact );
+        if (terminal) {
+          rps.insert( terminal->getRoutingPad() );
+        }
+      }
+      if (rps.size() > 8) {
+        GCellRps* gcellRps = new GCellRps ( gcell, this );
+        gcellRpss.insert( gcellRps );
+
+        for ( RoutingPad* rp : rps ) gcellRps->add( rp );
+      }
+    } 
+
+    for ( GCellRps* gcellRps : gcellRpss ) {
+      gcellRps->consolidate();
+      
+      const vector<RpsInRow*>& rpsInRows = gcellRps->getRpsInRows();
+      cdebug_log(149,0) << gcellRps->getGCell() << " has " << rpsInRows.size() << " terminals." << endl;
+
+      size_t count = 0;
+      for ( RpsInRow* rpsInRow : rpsInRows ) {
+        cdebug_log(149,0) << "North:" << rpsInRow->getNorth() << " South:"
+             << rpsInRow->getSouth() << " net:"
+             << rpsInRow->getRps()[0]->getNet()->getName() << endl;
+        cdebug_log(149,0) << "H-Span:" << rpsInRow->getRpsHSpan() << " V-Span:" << rpsInRow->getRpsVSpan() << endl;
+        for ( RoutingPad* arp : rpsInRow->getRps() ) {
+          cdebug_log(149,0) << "| " << arp << endl;
+        }
+        if (++count < 2) rpsInRow->slacken();
+      }
+
+      for ( AutoSegment* segment : gcellRps->getGCell()->getHSegments() ) {
+        if (segment->canPivotUp()) {
+          cdebug_log(149,0) << "Move up horizontal: " << segment << endl;
+          segment->moveUp( Flags::Propagate );
+        }
+      }
+      
+      delete gcellRps;
+    }
+  
     checkGCellDensities();
     Session::close();
 
@@ -529,6 +1029,8 @@ namespace Anabatic {
     // cmess2 << "     - Global segments : " << global << endl;
     // cmess2 << "     - Ratio : "
     //        << ((float)global/(float)total)*100.0 << "%." << endl;
+
+  //DebugSession::close();
   }
 
 

anabatic/src/Matrix.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Matrix.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -78,8 +78,10 @@ namespace Anabatic {
 
     int index = xy2maxIndex(x,y);
     cdebug_log(110,0) << "Matrix::getUnder() ("
-                    << DbU::getValueString(x) << " "
-                    << DbU::getValueString(y) << ") index:" << index << endl;
+                      << DbU::getValueString(x) << " "
+                      << DbU::getValueString(y) << ") index:" << index
+                      << " " << ((index < 0) ? NULL : _gcells[index]->getUnder(x,y)) << endl;
+
 
     return (index < 0) ? NULL : _gcells[index]->getUnder(x,y);
   }
@@ -117,7 +119,7 @@ namespace Anabatic {
     DbU::Unit dy = updateArea.getYMin() - _area.getYMin();
 
     cdebug_log(110,0) <<  "raw_i:" << (dx / _side + ((dx%_side) ? 1 : 0))
-                    << " raw_j:" << (dy / _side + ((dy%_side) ? 1 : 0)) << endl;
+                      << " raw_j:" << (dy / _side + ((dy%_side) ? 1 : 0)) << endl;
     cdebug_log(110,0) << "indexMin:" << indexMin << endl;
     cdebug_log(110,0) << "indexMax:" << indexMax << endl;
     cdebug_log(110,0) << "xspan:   " << xspan << endl;
@@ -138,6 +140,13 @@ namespace Anabatic {
   }
 
 
+  void  Matrix::resize ( Cell* cell, const vector<GCell*>& gcells )
+  {
+    setCell( cell, _side );
+    for ( GCell* gcell : gcells ) updateLookup( gcell );
+  }
+
+
   void  Matrix::show () const
   {
     cdebug_log(111,0) << this << endl;

anabatic/src/NetBuilderM2.cpp

@@ -0,0 +1,352 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Module  :       "./NetBuilderM2.cpp"                       |
+// +-----------------------------------------------------------------+
+
+
+#include <cstdlib>
+#include <sstream>
+#include "hurricane/Bug.h"
+#include "hurricane/Breakpoint.h"
+#include "hurricane/Error.h"
+#include "hurricane/Warning.h"
+#include "hurricane/DebugSession.h"
+#include "hurricane/Layer.h"
+#include "hurricane/BasicLayer.h"
+#include "hurricane/RegularLayer.h"
+#include "hurricane/Technology.h"
+#include "hurricane/DataBase.h"
+#include "hurricane/Net.h"
+#include "hurricane/NetExternalComponents.h"
+#include "hurricane/NetRoutingProperty.h"
+#include "hurricane/RoutingPad.h"
+#include "hurricane/RoutingPads.h"
+#include "hurricane/Pad.h"
+#include "hurricane/Plug.h"
+#include "hurricane/Cell.h"
+#include "hurricane/Instance.h"
+#include "hurricane/Vertical.h"
+#include "hurricane/Horizontal.h"
+#include "crlcore/AllianceFramework.h"
+#include "crlcore/RoutingGauge.h"
+#include "crlcore/Measures.h"
+#include "anabatic/AutoContactTerminal.h"
+#include "anabatic/AutoContactTurn.h"
+#include "anabatic/AutoContactHTee.h"
+#include "anabatic/AutoContactVTee.h"
+#include "anabatic/AutoSegment.h"
+#include "anabatic/NetBuilderM2.h"
+#include "anabatic/AnabaticEngine.h"
+
+
+namespace Anabatic {
+
+  using std::swap;
+
+  
+  NetBuilderM2::NetBuilderM2 ()
+    : NetBuilder()
+  { }
+
+
+  NetBuilderM2::~NetBuilderM2 () { }
+
+  
+  void  NetBuilderM2::doRp_AutoContacts ( GCell*        gcell
+                                        , Component*    rp
+                                        , AutoContact*& source
+                                        , AutoContact*& target
+                                        , uint64_t      flags
+                                        )
+  {
+    cdebug_log(145,1) << "NetBuilderM2::doRp_AutoContacts()" << endl;
+    cdebug_log(145,0)   << rp << endl;
+
+    source = target = NULL;
+
+    Point        sourcePosition;
+    Point        targetPosition;
+    const Layer* rpLayer        = rp->getLayer();
+    size_t       rpDepth        = Session::getLayerDepth( rp->getLayer() );
+    Flags        direction      = Session::getDirection ( rpDepth );
+    DbU::Unit    viaSide        = Session::getViaWidth  ( rpDepth );
+
+    getPositions( rp, sourcePosition, targetPosition );
+
+    if (sourcePosition.getX() > targetPosition.getX()) swap( sourcePosition, targetPosition );
+    if (sourcePosition.getY() > targetPosition.getY()) swap( sourcePosition, targetPosition );
+
+    GCell* sourceGCell = Session::getAnabatic()->getGCellUnder( sourcePosition );
+    GCell* targetGCell = Session::getAnabatic()->getGCellUnder( targetPosition );
+
+    if (rpDepth == 0) {
+      rpLayer   = Session::getContactLayer(0);
+      direction = Flags::Horizontal;
+      viaSide   = Session::getViaWidth( rpDepth );
+    }
+
+  // Non-M1 terminal or punctual M1 protections.
+    if ((rpDepth != 0) or (sourcePosition == targetPosition)) {
+      map<Component*,AutoSegment*>::iterator irp = getRpLookup().find( rp );
+      if (irp == getRpLookup().end()) {
+        AutoContact* sourceProtect = AutoContactTerminal::create( sourceGCell
+                                                                , rp
+                                                                , rpLayer
+                                                                , sourcePosition
+                                                                , viaSide, viaSide
+                                                                );
+        AutoContact* targetProtect = AutoContactTerminal::create( targetGCell
+                                                                , rp
+                                                                , rpLayer
+                                                                , targetPosition
+                                                                , viaSide, viaSide
+                                                                );
+        sourceProtect->setFlags( CntFixed );
+        targetProtect->setFlags( CntFixed );
+
+        AutoSegment* segment = AutoSegment::create( sourceProtect, targetProtect, direction );
+        segment->setFlags( AutoSegment::SegFixed );
+
+        getRpLookup().insert( make_pair(rp,segment) );
+      }
+    }
+
+    if (sourcePosition != targetPosition) {
+      if (flags & DoSourceContact)
+        source = AutoContactTerminal::create( sourceGCell
+                                            , rp
+                                            , rpLayer
+                                            , sourcePosition
+                                            , viaSide, viaSide
+                                            );
+      if (flags & DoTargetContact)
+        target = AutoContactTerminal::create( targetGCell
+                                            , rp
+                                            , rpLayer
+                                            , targetPosition
+                                            , viaSide, viaSide
+                                            );
+    }
+
+    if (not source and not target) {
+      source = target = AutoContactTerminal::create( gcell
+                                                   , rp
+                                                   , rpLayer
+                                                   , rp->getCenter()
+                                                   , viaSide, viaSide
+                                                   );
+    }
+
+    cdebug_tabw(145,-1);
+    return;
+  }
+
+
+  AutoContact* NetBuilderM2::doRp_Access ( GCell* gcell, Component* rp, uint64_t flags )
+  {
+    cdebug_log(145,1) << getTypeName() << "::doRp_Access()" << endl;
+    cdebug_log(145,0) << rp << endl;
+
+    Point        sourcePosition;
+    Point        targetPosition;
+    const Layer* rpLayer        = rp->getLayer();
+    const Layer* viaLayer       = Session::getDContactLayer();
+    DbU::Unit    viaSide        = Session::getDContactWidth();
+    DbU::Unit    ypitch         = Session::getDVerticalPitch();
+
+    getPositions( rp, sourcePosition, targetPosition );
+
+    if (sourcePosition.getX() > targetPosition.getX()) swap( sourcePosition, targetPosition );
+    if (sourcePosition.getY() > targetPosition.getY()) swap( sourcePosition, targetPosition );
+
+    Point position = rp->getCenter();
+    if (not (flags & Middle)) {
+      if (flags & NorthBound) position = targetPosition;
+      if (flags & SouthBound) position = sourcePosition;
+    }
+
+    DbU::Unit ycontact = (flags & SouthBound) ? gcell->getYMin() : gcell->getYMax()-ypitch;
+
+    AutoContact* rpContact = AutoContactTerminal::create( gcell, rp, rpLayer, position, viaSide, viaSide );
+    AutoContact* contact1  = AutoContactTurn::create( gcell, getNet(), viaLayer );
+    AutoContact* contact2  = AutoContactTurn::create( gcell, getNet(), viaLayer );
+    contact1->setPosition( position.getX(), ycontact );
+    contact2->setPosition( position.getX(), ycontact );
+    rpContact->setFlags( CntFixed );
+    contact1 ->setFlags( CntFixed );
+    contact2 ->setFlags( CntFixed );
+
+    AutoSegment* fixed  = AutoSegment::create( rpContact, contact1, Flags::Vertical   );
+    AutoSegment* dogleg = AutoSegment::create( contact1 , contact2, Flags::Horizontal );
+    fixed ->setFlags( AutoSegment::SegFixed );
+    dogleg->setFlags( AutoSegment::SegFixed );
+
+    cdebug_tabw(145,-1);
+    return contact2;
+  }
+
+
+  bool  NetBuilderM2::_do_1G_1M1 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_1G_1M1()" << endl;
+
+    uint64_t  flags = NoFlags;
+    if      (north()) flags |= NorthBound;
+    else if (south()) flags |= SouthBound;
+
+    AutoContact* contact = NULL;
+    contact = doRp_Access( getGCell(), getRoutingPads()[0], flags );
+    setNorthEastContact( contact );
+    push( north(), contact, SouthWest );
+    push( south(), contact, SouthWest );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderM2::_do_2G_1M1 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_2G_1M1()" << endl;
+
+    AutoContact* contact = NULL;
+    contact = doRp_Access( getGCell(), getRoutingPads()[0], SouthBound|NorthBound );
+    push( north(), contact, SouthWest|Middle );
+
+    contact = doRp_Access( getGCell(), getRoutingPads()[0], SouthBound|NorthBound );
+    push( south(), contact, SouthWest|Middle );
+    
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderM2::_do_xG ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_xG()" << endl;
+
+    vector<Hook*> hooksNS = getNorths();
+    hooksNS.insert( hooksNS.end(), getSouths().begin(), getSouths().end() );
+    sortHookByX( hooksNS, NoFlags );
+
+    const Layer* viaLayer = Session::getDContactLayer();
+    AutoContact* contactW = NULL;
+    AutoContact* contactE = NULL;
+
+  // Simple turn.
+    if (  (west() and not east() and (hooksNS.size() == 1))
+       or (east() and not west() and (hooksNS.size() == 1)) ) {
+      contactW = AutoContactTurn::create( getGCell(), getNet(), viaLayer );
+      push( west()    , contactW, SouthWest );
+      push( east()    , contactW, SouthWest );
+      push( hooksNS[0], contactW, SouthWest );
+      cdebug_tabw(145,-1);
+      return true;
+    }
+
+  // Simple HTee.
+    if (west() and east() and (hooksNS.size() == 1)) {
+      contactW = AutoContactHTee::create( getGCell(), getNet(), viaLayer );
+      push( west()    , contactW, SouthWest );
+      push( east()    , contactW, SouthWest );
+      push( hooksNS[0], contactW, SouthWest );
+      cdebug_tabw(145,-1);
+      return true;
+    }
+    
+    cdebug_log(145,0) << "West side processing." << endl;
+  // West side processing.
+    if (west()) {
+      contactW =  AutoContactHTee::create( getGCell(), getNet(), viaLayer );
+      push( west()    , contactW, SouthWest );
+      push( hooksNS[0], contactW, SouthWest );
+    } else {
+      contactW =  AutoContactTurn::create( getGCell(), getNet(), viaLayer );
+      push( hooksNS[0], contactW, SouthWest );
+    }
+
+    cdebug_log(145,0) << "Middle processing." << endl;
+  // Middle (North & South) processing.
+    if (hooksNS.size() > 2) {
+      for ( size_t i=1 ; i<hooksNS.size()-1 ; ++i ) {
+        AutoContact* current = AutoContactHTee::create( getGCell(), getNet(), viaLayer );
+        AutoSegment::create( contactW, current, Flags::Horizontal );
+        push( hooksNS[i], current, SouthWest );
+
+        contactW = current;
+      }
+    }
+
+    cdebug_log(145,0) << "East side processing." << endl;
+  // East side processing.
+    if (east()) {
+      contactE =  AutoContactHTee::create( getGCell(), getNet(), viaLayer );
+      push( east(), contactE, SouthWest );
+      if (hooksNS.size() > 1)
+        push( hooksNS[hooksNS.size()-1], contactE, SouthWest );
+    } else {
+      contactE =  AutoContactTurn::create( getGCell(), getNet(), viaLayer );
+      push( hooksNS[hooksNS.size()-1], contactE, SouthWest );
+    }
+
+    AutoSegment::create( contactW, contactE, Flags::Horizontal );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool NetBuilderM2::_do_globalSegment ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_globalSegment()" << endl;
+
+    if (getSourceContact()) {
+      Segment*     segment       = static_cast <Segment*> ( getFromHook()->getComponent() );
+      AutoSegment* globalSegment = AutoSegment::create( getSourceContact(), getSouthWestContact(), segment );
+
+      globalSegment->setFlags( (getDegree() == 2) ? AutoSegment::SegBipoint : 0 );
+      cdebug_log(145,0) << "Create global segment: " << globalSegment << endl;
+  
+    // HARDCODED VALUE.
+      if ( (getTopology() & Global_Fixed) and (globalSegment->getAnchoredLength() < 2*Session::getSliceHeight()) )
+        addToFixSegments( globalSegment );
+        
+      if (getConnexity().fields.globals < 2) {
+        cdebug_tabw(145,-1);
+        return false;
+      }
+    } else
+      setFromHook( NULL );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderM2::_do_1G_xM1     () { return false; }
+  bool  NetBuilderM2::_do_xG_1Pad    () { return false; }
+  bool  NetBuilderM2::_do_1G_1PinM2  () { return false; }
+  bool  NetBuilderM2::_do_xG_xM2     () { return false; }
+  bool  NetBuilderM2::_do_1G_1M3     () { return false; }
+  bool  NetBuilderM2::_do_xG_xM3     () { return false; }
+  bool  NetBuilderM2::_do_xG_1M1_1M2 () { return false; }
+  bool  NetBuilderM2::_do_xG_xM1_xM3 () { return false; }
+  bool  NetBuilderM2::_do_4G_1M2     () { return false; }
+  bool  NetBuilderM2::_do_2G         () { return false; }
+
+
+  string  NetBuilderM2::getTypeName () const
+  { return "NetBuilderM2"; }
+
+
+}  // Anabatic namespace.

anabatic/src/NetBuilderVH.cpp

@@ -0,0 +1,676 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2018-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Module  :       "./NetBuilderVH.cpp"                       |
+// +-----------------------------------------------------------------+
+
+
+#include <cstdlib>
+#include <sstream>
+#include "hurricane/Bug.h"
+#include "hurricane/Breakpoint.h"
+#include "hurricane/Error.h"
+#include "hurricane/Warning.h"
+#include "hurricane/DebugSession.h"
+#include "hurricane/Layer.h"
+#include "hurricane/BasicLayer.h"
+#include "hurricane/RegularLayer.h"
+#include "hurricane/Technology.h"
+#include "hurricane/DataBase.h"
+#include "hurricane/Net.h"
+#include "hurricane/NetExternalComponents.h"
+#include "hurricane/NetRoutingProperty.h"
+#include "hurricane/RoutingPad.h"
+#include "hurricane/RoutingPads.h"
+#include "hurricane/Pad.h"
+#include "hurricane/Pin.h"
+#include "hurricane/Plug.h"
+#include "hurricane/Cell.h"
+#include "hurricane/Instance.h"
+#include "hurricane/Vertical.h"
+#include "hurricane/Horizontal.h"
+#include "crlcore/AllianceFramework.h"
+#include "crlcore/RoutingGauge.h"
+#include "crlcore/Measures.h"
+#include "anabatic/AutoContactTerminal.h"
+#include "anabatic/AutoContactTurn.h"
+#include "anabatic/AutoContactHTee.h"
+#include "anabatic/AutoContactVTee.h"
+#include "anabatic/AutoSegment.h"
+#include "anabatic/NetBuilderVH.h"
+#include "anabatic/AnabaticEngine.h"
+
+
+namespace Anabatic {
+
+  using std::swap;
+  using Hurricane::Transformation;
+  using Hurricane::Warning;
+  using Hurricane::Error;
+  using Hurricane::Pin;
+
+  
+  NetBuilderVH::NetBuilderVH ()
+    : NetBuilder()
+  { }
+
+
+  NetBuilderVH::~NetBuilderVH () { }
+
+  
+  void  NetBuilderVH::doRp_AutoContacts ( GCell*        gcell
+                                        , Component*    rp
+                                        , AutoContact*& source
+                                        , AutoContact*& target
+                                        , uint64_t      flags
+                                        )
+  {
+    cdebug_log(145,1) << getTypeName() << "::doRp_AutoContacts()" << endl;
+    cdebug_log(145,0)   << rp << endl;
+
+    source = target = NULL;
+
+    Point        sourcePosition;
+    Point        targetPosition;
+    const Layer* rpLayer        = rp->getLayer();
+    size_t       rpDepth        = Session::getLayerDepth( rp->getLayer() );
+    Flags        direction      = Session::getDirection ( rpDepth );
+    DbU::Unit    viaSide        = Session::getViaWidth  ( rpDepth );
+    DbU::Unit    gridPosition   = 0;
+
+    getPositions( rp, sourcePosition, targetPosition );
+
+    if (sourcePosition.getX() > targetPosition.getX()) swap( sourcePosition, targetPosition );
+    if (sourcePosition.getY() > targetPosition.getY()) swap( sourcePosition, targetPosition );
+
+    GCell* sourceGCell = Session::getAnabatic()->getGCellUnder( sourcePosition );
+    GCell* targetGCell = Session::getAnabatic()->getGCellUnder( targetPosition );
+
+    if (rpDepth == 0) {
+      rpLayer   = Session::getContactLayer(0);
+      direction = Flags::Vertical;
+      viaSide   = Session::getViaWidth( rpDepth );
+
+      RoutingPad* rrp = dynamic_cast<RoutingPad*>( rp );
+      if (rrp) {
+        // if (not getAnabatic()->getConfiguration()->selectRpComponent(rrp)) {
+        //   cerr << Warning( "%s::doRp_AutoContacts(): %s has no components on grid."
+        //                  , getTypeName().c_str()
+        //                  , getString(rp).c_str() ) << endl;
+        // }
+      } else {
+        cerr << Warning( "%s::doRp_AutoContacts(): %s is *not* a RoutingPad."
+                       , getTypeName().c_str()
+                       , getString(rp).c_str() ) << endl;
+      }
+    }
+
+#if 0
+  // Quasi-punctual M1 terminal.
+    if (flags & VSmall) {
+      Box                ab             = rp->getCell()->getBoundingBox();
+      RoutingLayerGauge* gaugeMetal3    = Session::getLayerGauge( 2 );
+      DbU::Unit          metal3axis     = gaugeMetal3->getTrackPosition( ab.getYMin()
+                                                                       , ab.getYMax()
+                                                                       , sourcePosition.getY()
+                                                                       , Constant::Nearest );
+      DbU::Unit          viaSideProtect = Session::getViaWidth((size_t)0);
+
+      AutoContact* sourceVia12 = AutoContactTerminal::create( sourceGCell
+                                                            , rp
+                                                            , Session::getContactLayer(0)
+                                                            , sourcePosition
+                                                            , viaSideProtect, viaSideProtect
+                                                            );
+      AutoContact* targetVia12 = AutoContactTerminal::create( targetGCell
+                                                            , rp
+                                                            , Session::getContactLayer(0)
+                                                            , targetPosition
+                                                            , viaSideProtect, viaSideProtect
+                                                            );
+      AutoContact* sourceVia23 = AutoContactTurn::create( sourceGCell, net, Session::getContactLayer(1) );
+      AutoContact* targetVia23 = AutoContactTurn::create( targetGCell, net, Session::getContactLayer(1) );
+      sourceVia23->setY( metal3axis );
+      targetVia23->setY( metal3axis );
+      sourceVia23->setX( sourcePosition.getX() );
+      targetVia23->setX( targetPosition.getX() );
+
+      AutoSegment* segmentS = AutoSegment::create( sourceVia12, sourceVia23, Flags::Vertical );
+      AutoSegment* segmentT = AutoSegment::create( targetVia12, targetVia23, Flags::Vertical );
+      AutoSegment* segmentM = AutoSegment::create( sourceVia23, targetVia23, Flags::Horizontal );
+
+      sourceVia12->setFlags( CntFixed );
+      sourceVia23->setFlags( CntFixed );
+      targetVia12->setFlags( CntFixed );
+      targetVia23->setFlags( CntFixed );
+      segmentS->setFlags( AutoSegment::SegFixed );
+      segmentT->setFlags( AutoSegment::SegFixed );
+      segmentM->setFlags( AutoSegment::SegFixed );
+
+      cdebug_log(145,0) << "Hard protect: " << rp << endl;
+      cdebug_log(145,0) << "X:" << DbU::getValueString(sourcePosition.getX())
+                        << " Metal3 Track Y:" << DbU::getValueString(metal3axis) << endl;
+    }
+#endif
+
+  // Non-M1 terminal or punctual M1 protections.
+    if ( (rpDepth != 0) or ((sourcePosition == targetPosition) and (gridPosition == 0)) ) {
+      map<Component*,AutoSegment*>::iterator irp = getRpLookup().find( rp );
+      if (irp == getRpLookup().end()) {
+        AutoContact* sourceProtect = AutoContactTerminal::create( sourceGCell
+                                                                , rp
+                                                                , rpLayer
+                                                                , sourcePosition
+                                                                , viaSide, viaSide
+                                                                );
+        AutoContact* targetProtect = AutoContactTerminal::create( targetGCell
+                                                                , rp
+                                                                , rpLayer
+                                                                , targetPosition
+                                                                , viaSide, viaSide
+                                                                );
+        sourceProtect->setFlags( CntFixed );
+        targetProtect->setFlags( CntFixed );
+
+        AutoSegment* segment = AutoSegment::create( sourceProtect, targetProtect, direction );
+        segment->setFlags( AutoSegment::SegFixed );
+
+        getRpLookup().insert( make_pair(rp,segment) );
+      }
+    }
+
+    if (sourcePosition != targetPosition) {
+      if (flags & DoSourceContact)
+        source = AutoContactTerminal::create( sourceGCell
+                                            , rp
+                                            , rpLayer
+                                            , sourcePosition
+                                            , viaSide, viaSide
+                                            );
+      if (flags & DoTargetContact)
+        target = AutoContactTerminal::create( targetGCell
+                                            , rp
+                                            , rpLayer
+                                            , targetPosition
+                                            , viaSide, viaSide
+                                            );
+    }
+
+    if (not source and not target) {
+      source = target = AutoContactTerminal::create( gcell
+                                                   , rp
+                                                   , rpLayer
+                                                   , rp->getCenter()
+                                                   , viaSide, viaSide
+                                                   );
+    }
+
+    cdebug_tabw(145,-1);
+    return;
+  }
+
+
+  AutoContact* NetBuilderVH::doRp_Access ( GCell* gcell, Component* rp, uint64_t flags )
+  {
+    cdebug_log(145,1) << getTypeName() << "::doRp_Access() - flags:" << flags << endl;
+
+    AutoContact* rpContactSource;
+    AutoContact* rpContactTarget;
+
+    flags |= checkRoutingPadSize( rp );
+
+    doRp_AutoContacts( gcell, rp, rpContactSource, rpContactTarget, flags );
+
+    if (not (flags & (HAccess|HAccessEW))) {
+      AutoContact* subContact1 = AutoContactTurn::create( gcell, rp->getNet(), Session::getContactLayer(1) );
+      AutoContact* subContact2 = AutoContactTurn::create( gcell, rp->getNet(), Session::getContactLayer(1) );
+      AutoSegment::create( rpContactSource, subContact1, Flags::Vertical  );
+      AutoSegment::create( subContact1,     subContact2, Flags::Horizontal );
+      rpContactSource = subContact2;
+    } else {
+      if (flags & VSmall) {
+        AutoContact* subContact1 = NULL;
+        if (flags & HAccessEW)
+          subContact1 = AutoContactHTee::create( gcell, rp->getNet(), Session::getContactLayer(1) );
+        else
+          subContact1 = AutoContactTurn::create( gcell, rp->getNet(), Session::getContactLayer(1) );
+
+        AutoSegment::create( rpContactSource, subContact1, Flags::Vertical );
+        rpContactSource = subContact1;
+      }
+    }
+
+    cdebug_tabw(145,-1);
+
+    return rpContactSource;
+  }
+
+
+  bool  NetBuilderVH::_do_1G_1PinM2 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_1G_1PinM2() [Managed Configuration - Optimized] " << getTopology() << endl;
+
+    Pin* pin = dynamic_cast<Pin*>( getRoutingPads()[0]->getOccurrence().getEntity() );
+    if (   (pin->getAccessDirection() != Pin::AccessDirection::SOUTH)
+       and (pin->getAccessDirection() != Pin::AccessDirection::NORTH) ) {
+      cerr << Error( "%s::do_1G_1PinM2(): %s *must* be north or south."
+                   , getTypeName().c_str()
+                   , getString(pin).c_str() ) << endl;
+    }
+
+    uint64_t  flags = NoFlags;
+    if      (east()) { flags |= HAccess|VSmall; }
+    else if (west()) { flags |= HAccess|VSmall; }
+    
+    setBothCornerContacts( doRp_Access(getGCell(),getRoutingPads()[0],flags) );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_xG_1PinM2 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_xG_1PinM2() [Managed Configuration] " << getTopology() << endl;
+
+    Pin* pin = dynamic_cast<Pin*>( getRoutingPads()[0]->getOccurrence().getEntity() );
+    if (   (pin->getAccessDirection() != Pin::AccessDirection::SOUTH)
+       and (pin->getAccessDirection() != Pin::AccessDirection::NORTH) ) {
+      cerr << Error( "%s::do_xG_1PinM2(): %s *must* be north or south."
+                   , getTypeName().c_str()
+                   , getString(pin).c_str() ) << endl;
+    }
+
+    RoutingPad*  rp         = getRoutingPads()[0];
+    AutoContact* pinContact = NULL;
+    doRp_AutoContacts( getGCell(), rp, pinContact, pinContact, HSmall|VSmall );
+
+    if (not north() and not south()) {
+      AutoContact* subContact1 = AutoContactHTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+      AutoSegment::create( pinContact, subContact1, Flags::Vertical );
+      setBothCornerContacts( subContact1 );
+    } else {
+      AutoContact* subContact1 = AutoContactVTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+      AutoSegment::create( pinContact, subContact1, Flags::Vertical );
+      
+      if (east() and west()) {
+        AutoContact* subContact2 = AutoContactVTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+        AutoSegment::create( subContact1, subContact2, Flags::Vertical );
+      
+        setSouthWestContact( (south()) ? subContact1 : subContact2 );
+        setNorthEastContact( (south()) ? subContact2 : subContact1 );
+      } else
+        setBothCornerContacts( subContact1 );
+    }
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_1G_1PinM3 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_1G_1PinM3() [Managed Configuration - Optimized] " << getTopology() << endl;
+
+    Pin* pin = dynamic_cast<Pin*>( getRoutingPads()[0]->getOccurrence().getEntity() );
+    if (   (pin->getAccessDirection() != Pin::AccessDirection::EAST)
+       and (pin->getAccessDirection() != Pin::AccessDirection::WEST) ) {
+      cerr << Error( "%s::do_1G_1PinM2(): %s *must* be east or west."
+                   , getTypeName().c_str()
+                   , getString(pin).c_str() ) << endl;
+    }
+
+    AutoContact* pinContact = NULL;
+    doRp_AutoContacts( getGCell(), getRoutingPads()[0], pinContact, pinContact, HSmall|VSmall );
+
+    if (east() or west()) {
+      AutoContact* subContact1 = AutoContactTurn::create( getGCell(), getRoutingPads()[0]->getNet(), Session::getContactLayer(1) );
+      AutoContact* subContact2 = AutoContactTurn::create( getGCell(), getRoutingPads()[0]->getNet(), Session::getContactLayer(1) );
+
+      AutoSegment::create( pinContact , subContact1, Flags::Horizontal  );
+      AutoSegment::create( subContact1, subContact2, Flags::Vertical );
+      pinContact = subContact2;
+    } else {
+      AutoContact* subContact1 = NULL;
+      subContact1 = AutoContactTurn::create( getGCell(), getRoutingPads()[0]->getNet(), Session::getContactLayer(1) );
+
+      AutoSegment::create( pinContact, subContact1, Flags::Horizontal );
+      pinContact = subContact1;
+    }
+
+    setBothCornerContacts( pinContact );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_xG_1PinM3 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_xG_1PinM3() [Managed Configuration] " << getTopology() << endl;
+
+    RoutingPad* rp  = getRoutingPads()[0];
+    Pin*        pin = dynamic_cast<Pin*>( rp->getOccurrence().getEntity() );
+    if (   (pin->getAccessDirection() != Pin::AccessDirection::EAST)
+       and (pin->getAccessDirection() != Pin::AccessDirection::WEST) ) {
+      cerr << Error( "%s::do_xG_1PinM3(): %s *must* be east or west."
+                   , getTypeName().c_str()
+                   , getString(pin).c_str() ) << endl;
+    }
+
+    AutoContact* pinContact = NULL;
+    doRp_AutoContacts( getGCell(), rp, pinContact, pinContact, HSmall|VSmall );
+
+    if (not east() and not west()) {
+      AutoContact* subContact1 = AutoContactVTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+      AutoSegment::create( pinContact, subContact1, Flags::Horizontal );
+      setBothCornerContacts( subContact1 );
+    } else {
+      AutoContact* subContact1 = AutoContactHTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+      AutoSegment::create( pinContact, subContact1, Flags::Horizontal );
+      
+      if (north() and south()) {
+        AutoContact* subContact2 = AutoContactHTee::create( getGCell(), rp->getNet(), Session::getContactLayer(1) );
+        AutoSegment::create( subContact1, subContact2, Flags::Horizontal );
+      
+        setSouthWestContact( (west()) ? subContact1 : subContact2 );
+        setNorthEastContact( (west()) ? subContact2 : subContact1 );
+      } else
+        setBothCornerContacts( subContact1 );
+    }
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_1G_1M1 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_1G_1M1() [Managed Configuration - Optimized] " << getTopology() << endl;
+
+    uint64_t  flags = NoFlags;
+    if      (east()) { flags |= HAccess|VSmall; }
+    else if (west()) { flags |= HAccess|VSmall; }
+
+    setBothCornerContacts( doRp_Access(getGCell(),getRoutingPads()[0],flags) );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_1G_xM1 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_1G_" << (int)getConnexity().fields.M1 << "M1() [Defered Configuration]" << endl;
+
+    _do_xG_xM1_xM3();
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_2G_1M1 ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_2G_1M1 [Managed Configuration]" << endl;
+    cdebug_log(145,0) << "north:     " << north() << endl;
+    cdebug_log(145,0) << "south:     " << south() << endl;
+    cdebug_log(145,0) << "east:      " << east() << endl;
+    cdebug_log(145,0) << "west:      " << west() << endl;
+
+    AutoContact* tee  = NULL;
+
+    if (east() and west()) {
+      tee = doRp_Access( getGCell(), getRoutingPads()[0], HAccessEW|VSmall );
+    } else {
+      AutoContact* turn = doRp_Access( getGCell(), getRoutingPads()[0], HAccess|VSmall );
+
+      if (east() or west())
+        tee = AutoContactHTee::create( getGCell(), getNet(), Session::getDContactLayer() );
+      else
+        tee = AutoContactVTee::create( getGCell(), getNet(), Session::getDContactLayer() );
+
+      AutoSegment::create( turn, tee, Flags::Horizontal );
+    }
+    setBothCornerContacts( tee );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_xG_xM1_xM3 ()
+  {
+  // Implicit hypothesis : we have at least two globals and at least one terminal.
+    
+    cdebug_log(145,1) << getTypeName()
+                      << "::_do_xG_"  << (int)getConnexity().fields.M1
+                      << "M1_"        << (int)getConnexity().fields.M3
+                      << "M3() [G:"   << (int)getConnexity().fields.globals << " Managed Configuration]" << endl;
+    cdebug_log(145,0) << "getConnexity(): " << getConnexity().connexity << endl;
+    cdebug_log(145,0) << "north:     " << north() << endl;
+    cdebug_log(145,0) << "south:     " << south() << endl;
+    cdebug_log(145,0) << "east:      " << east() << endl;
+    cdebug_log(145,0) << "west:      " << west() << endl;
+
+    sortRpByX( getRoutingPads(), NoFlags ); // increasing X.
+
+    size_t       iLast        = getRoutingPads().size()-1;
+    AutoContact* leftContact  = NULL;
+    AutoContact* rightContact = NULL;
+
+    if (south() or west()) {
+      leftContact = doRp_Access( getGCell(), getRoutingPads()[0], HAccessEW|VSmall );
+      if (south() and west()) {
+        setSouthWestContact( AutoContactHTee::create( getGCell(), getNet(), Session::getDContactLayer() ) );
+        AutoSegment::create( getSouthWestContact(), leftContact, Flags::Horizontal );
+      } else {
+        if (west())
+          setSouthWestContact( leftContact );
+        else {
+          setSouthWestContact( AutoContactTurn::create( getGCell(), getNet(), Session::getDContactLayer() ) );
+          AutoSegment::create( leftContact, getSouthWestContact(), Flags::Horizontal );
+        }
+      }
+    } else {
+      leftContact = doRp_Access( getGCell(), getRoutingPads()[0], HAccess|VSmall );
+    }
+    
+    for ( size_t i=1 ; i<getRoutingPads().size()-1 ; ++i ) {
+      rightContact = doRp_Access( getGCell(), getRoutingPads()[i], HAccessEW|VSmall );
+      AutoSegment::create( leftContact, rightContact, Flags::Horizontal );
+
+      leftContact = rightContact;
+    }
+
+    if (north() or east()) {
+      if (getRoutingPads().size() > 1) {
+        rightContact = doRp_Access( getGCell(), getRoutingPads()[iLast], HAccessEW|VSmall );
+        AutoSegment::create( leftContact, rightContact, Flags::Horizontal );
+      } else {
+        rightContact = leftContact;
+      }
+
+      if (north() and east()) {
+        setNorthEastContact( AutoContactHTee::create( getGCell(), getNet(), Session::getDContactLayer() ) );
+        AutoSegment::create( rightContact, getNorthEastContact(), Flags::Horizontal );
+      } else {
+        if (east())
+          setNorthEastContact( rightContact );
+        else {
+          setNorthEastContact( AutoContactTurn::create( getGCell(), getNet(), Session::getDContactLayer() ) );
+          AutoSegment::create( rightContact, getNorthEastContact(), Flags::Horizontal );
+        }
+      }
+    } else {
+      rightContact = doRp_Access( getGCell(), getRoutingPads()[iLast], HAccess|VSmall );
+      AutoSegment::create( leftContact, rightContact, Flags::Horizontal );
+    }
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_2G ()
+  {
+    cdebug_log(145,0) << getTypeName() << "::_do_2G()" << endl;
+    return _do_xG();
+  }
+
+  bool  NetBuilderVH::_do_xG ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_xG()" << endl;
+
+    const Layer* viaLayer = Session::getDContactLayer();
+
+    if (getConnexity().fields.globals == 2) {
+      setBothCornerContacts( AutoContactTurn::create( getGCell(), getNet(), viaLayer ) );
+    } else if (getConnexity().fields.globals == 3) {
+      if (east() and west()) {
+        setSouthWestContact( AutoContactTurn::create( getGCell(), getNet(), viaLayer ) );
+        setNorthEastContact( AutoContactVTee::create( getGCell(), getNet(), viaLayer ) );
+        if (south()) swapCornerContacts();
+
+        AutoSegment::create( getSouthWestContact(), getNorthEastContact(), Flags::Vertical );
+      } else {
+        setSouthWestContact( AutoContactTurn::create( getGCell(), getNet(), viaLayer ) );
+        setNorthEastContact( AutoContactHTee::create( getGCell(), getNet(), viaLayer ) );
+        if (west()) swapCornerContacts();
+
+        AutoSegment::create( getSouthWestContact(), getNorthEastContact(), Flags::Horizontal );
+      }
+    } else { // fields.globals == 4.
+      AutoContact* turn = AutoContactTurn::create( getGCell(), getNet(), viaLayer );
+      setSouthWestContact( AutoContactHTee::create( getGCell(), getNet(), viaLayer ) );
+      setNorthEastContact( AutoContactVTee::create( getGCell(), getNet(), viaLayer ) );
+      AutoSegment::create( getSouthWestContact(), turn, Flags::Horizontal );
+      AutoSegment::create( turn, getNorthEastContact(), Flags::Vertical   );
+    } 
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  bool  NetBuilderVH::_do_globalSegment ()
+  {
+    cdebug_log(145,1) << getTypeName() << "::_do_globalSegment()" << endl;
+
+    if (getSourceContact()) {
+      AutoContact* targetContact
+        = ( getSegmentHookType(getFromHook()) & (NorthBound|EastBound) )
+        ? getNorthEastContact() : getSouthWestContact() ;
+      AutoSegment* globalSegment = AutoSegment::create( getSourceContact()
+                                                      , targetContact
+                                                      , static_cast<Segment*>( getFromHook()->getComponent() )
+                                                      );
+      globalSegment->setFlags( (getDegree() == 2) ? AutoSegment::SegBipoint : 0 );
+      cdebug_log(145,0) << "Create global segment: " << globalSegment << endl;
+  
+    // HARDCODED VALUE.
+      if ( (getTopology() & Global_Fixed) and (globalSegment->getAnchoredLength() < 2*Session::getSliceHeight()) )
+        addToFixSegments( globalSegment );
+        
+      if (getConnexity().fields.globals < 2) {
+        cdebug_tabw(145,-1);
+        return false;
+      }
+    } else
+      setFromHook( NULL );
+    
+    push( east (), getNorthEastContact() );
+    push( west (), getSouthWestContact() );
+    push( north(), getNorthEastContact() );
+    push( south(), getSouthWestContact() );
+
+    cdebug_tabw(145,-1);
+    return true;
+  }
+
+
+  void  NetBuilderVH::singleGCell ( AnabaticEngine* anbt, Net* net )
+  {
+    cdebug_log(145,1) << getTypeName() << "::singleGCell() " << net << endl;
+
+    vector<RoutingPad*>  rps;
+
+    for ( RoutingPad* rp : net->getRoutingPads() ) {
+      if (Session::getRoutingGauge()->getLayerDepth(rp->getLayer()) == 0) {
+        rps.push_back( rp );
+        continue;
+      }
+      cerr << Error( "%s::singleGCell(): Non metal1 terminals are not managed yet.\n"
+                     "        (%s)"
+                   , getTypeName().c_str()
+                   , getString(rp).c_str()
+                   ) << endl;
+      cdebug_tabw(145,-1);
+      return;
+    }
+
+    if (rps.size() < 2) {
+      cerr << Error( "%s::singleGCell(): For %s, less than two Plugs/Pins (%d)."
+                   , getTypeName().c_str()
+                   , getString(net).c_str()
+                   , rps.size() ) << endl;
+      cdebug_tabw(145,-1);
+      return;
+    }
+
+    if (rps.empty()) {
+      cerr << Error( "%s::singleGCell(): No terminals for Net \"%s\"."
+                   , getTypeName().c_str()
+                   , getString(net->getName()).c_str() ) << endl;
+      cdebug_tabw(145,-1);
+      return;
+    }
+
+    sortRpByX( rps, NetBuilder::NoFlags ); // increasing X.
+
+    GCell* gcell1 = anbt->getGCellUnder( (*rps.begin ())->getCenter() );
+    GCell* gcell2 = anbt->getGCellUnder( (*rps.rbegin())->getCenter() );
+
+    if (not gcell1) {
+      cerr << Error( "%s::singleGCell(): No GCell under %s."
+                   , getTypeName().c_str()
+                   , getString(*(rps.begin())).c_str() ) << endl;
+      cdebug_tabw(145,-1);
+      return;
+    }
+    if (gcell1 != gcell2) {
+      cerr << Error( "%s::singleGCell(): Not under a single GCell %s."
+                   , getTypeName().c_str()
+                   , getString(*(rps.rbegin())).c_str() ) << endl;
+      cdebug_tabw(145,-1);
+      return;
+    }
+
+    cdebug_log(145,0) << "singleGCell " << gcell1 << endl;
+
+    AutoContact* source = NULL;
+    AutoContact* target = NULL;
+
+    for ( size_t irp=1 ; irp<rps.size() ; ++irp ) {
+      source = doRp_Access( gcell1, rps[irp-1], HAccess|VSmall );
+      target = doRp_Access( gcell1, rps[irp  ], HAccess|VSmall );
+      AutoSegment::create( source, target, Flags::Horizontal );
+    }
+
+    cdebug_tabw(145,-1);
+  }
+
+
+  string  NetBuilderVH::getTypeName () const
+  { return "NetBuilderVH"; }
+
+
+}  // Anabatic namespace.

anabatic/src/NetConstraints.cpp

@@ -61,55 +61,55 @@ namespace {
 
   void  propagateConstraintFromRp ( RoutingPad* rp )
   {
-    cdebug_log(145,1) << "propagateConstraintFromRp() - " << rp << endl;
+    cdebug_log(146,1) << "propagateConstraintFromRp() - " << rp << endl;
 
     for ( Component* component : rp->getSlaveComponents() ) {
-      cdebug_log(145,0) << "slave component: " << component << endl;
+      cdebug_log(146,0) << "slave component: " << component << endl;
       AutoContact* sourceContact = Session::lookup( dynamic_cast<Contact*>(component) );
       if (sourceContact) {
-        cdebug_log(145,0) << "Start slave: " << sourceContact << endl;
+        Box  constraintBox = sourceContact->getConstraintBox();
+
+        cdebug_log(146,0) << "Start slave: " << sourceContact << endl;
+        cdebug_log(146,0) << "Constraint: " << constraintBox << endl;
 
         set<AutoSegment*>  verticalSegments;
         set<AutoSegment*>  horizontalSegments;
 
         for ( AutoSegment* segment : sourceContact->getAutoSegments() ) {
-          cdebug_log(145,0) << "Examining: " << segment << endl;
+          cdebug_log(146,0) << "Examining: " << segment << endl;
           AutoContact* targetContact = segment->getOppositeAnchor(sourceContact);
 
           if (targetContact) {
             if (segment->isHorizontal()) {
-              cdebug_log(145,0) << "On horizontal stack " << segment << endl;
+              cdebug_log(146,0) << "On horizontal stack " << segment << endl;
               horizontalSegments.insert( segment );
             } else {
-              cdebug_log(145,0) << "On vertical stack " << segment << endl;
+              cdebug_log(146,0) << "On vertical stack " << segment << endl;
               verticalSegments.insert( segment );
             }
           }
         }
 
-        Box  constraintBox = sourceContact->getConstraintBox();
-        cdebug_log(145,0) << "Contraint: " << constraintBox << endl;
-
         // Propagate constraint through horizontally aligned segments.
-        cdebug_log(145,0) << "Propagate constraint on horizontal segments" << endl;
+        cdebug_log(146,0) << "Propagate constraint on horizontal segments" << endl;
 
         for ( AutoSegment* horizontal : horizontalSegments ) {
           AutoContact* contact = NULL;
           for ( AutoSegment* aligned : horizontal->getAligneds(Flags::WithSelf) ) {
-            cdebug_log(145,0) << "aligned horizontal: " << aligned << endl;
+            cdebug_log(146,0) << "aligned horizontal: " << aligned << endl;
 
             contact = aligned->getAutoTarget();
-            cdebug_log(145,0) << "contact: " << contact << endl;
+            cdebug_log(146,0) << "contact: " << contact << endl;
             if (contact) {
-              cdebug_log(145,0) << "Apply to (target): " << contact << endl;
+              cdebug_log(146,0) << "Apply to (target): " << contact << endl;
               contact->restrictConstraintBox( constraintBox.getYMin()
                                             , constraintBox.getYMax()
                                             , Flags::Horizontal|Flags::WarnOnError );
             }
             contact = aligned->getAutoSource();
-            cdebug_log(145,0) << "contact: " << contact << endl;
+            cdebug_log(146,0) << "contact: " << contact << endl;
             if (contact) {
-              cdebug_log(145,0) << "Apply to (source): " << contact << endl;
+              cdebug_log(146,0) << "Apply to (source): " << contact << endl;
               contact->restrictConstraintBox( constraintBox.getYMin()
                                             , constraintBox.getYMax()
                                             , Flags::Horizontal|Flags::WarnOnError );
@@ -118,23 +118,23 @@ namespace {
         } 
 
         // Propagate constraint through vertically aligned segments.
-        cdebug_log(145,0) << "Propagate constraint on vertical segments" << endl;
+        cdebug_log(146,0) << "Propagate constraint on vertical segments" << endl;
 
         for ( AutoSegment* vertical : verticalSegments ) {
           AutoContact* contact = NULL;
           for ( AutoSegment* aligned : vertical->getAligneds(Flags::WithSelf) ) {
-            cdebug_log(145,0) << "aligned vertical: " << aligned << endl;
+            cdebug_log(146,0) << "aligned vertical: " << aligned << endl;
 
             contact = aligned->getAutoTarget();
             if (contact) {
-              cdebug_log(145,0) << "Apply to (target): " << contact << endl;
+              cdebug_log(146,0) << "Apply to (target): " << contact << endl;
               contact->restrictConstraintBox( constraintBox.getXMin()
                                             , constraintBox.getXMax()
                                             , Flags::Vertical|Flags::WarnOnError );
             }
             contact = aligned->getAutoSource();
             if (contact) {
-              cdebug_log(145,0) << "Apply to (source): " << contact << endl;
+              cdebug_log(146,0) << "Apply to (source): " << contact << endl;
               contact->restrictConstraintBox( constraintBox.getXMin()
                                             , constraintBox.getXMax()
                                             , Flags::Vertical|Flags::WarnOnError );
@@ -144,8 +144,8 @@ namespace {
       }
     }
 
-    cdebug_log(145,0) << "propagateConstraintFromRp() - Exit" << endl;
-    cdebug_tabw(145,-1);
+    cdebug_log(146,0) << "propagateConstraintFromRp() - Exit" << endl;
+    cdebug_tabw(146,-1);
   }
 
 
@@ -159,35 +159,128 @@ namespace Anabatic {
   using Hurricane::Cell;
 
 
+  void  propagateDistanceFromRp ( RoutingPad* rp )
+  {
+    cdebug_log(146,1) << "propagateDistanceFromRp() - " << rp << endl;
+
+    unsigned int                              distance = 0;
+    vector< pair<AutoContact*,AutoSegment*> > currents;
+    vector< pair<AutoContact*,AutoSegment*> > successors;
+
+    for ( Component* component : rp->getSlaveComponents() ) {
+      cdebug_log(146,0) << "slave component: " << component << endl;
+
+      AutoContact* sourceContact = Session::lookup( dynamic_cast<Contact*>(component) );
+      if (sourceContact) {
+        cdebug_log(146,0) << "Start slave: " << sourceContact << endl;
+
+        for ( AutoSegment* segment : sourceContact->getAutoSegments() ) {
+          cdebug_log(146,0) << "Pushing: " << segment << endl;
+          currents.push_back( make_pair(sourceContact,segment) );
+        }
+      }
+    }
+
+    while ( not currents.empty() ) {
+      for ( size_t i = 0 ; i<currents.size() ; ++i ) {
+        AutoContact* source  = currents[i].first;
+        AutoSegment* segment = currents[i].second;
+
+        if ( (distance == 1) and (segment->getRpDistance() == 1) ) {
+          vector<GCell*> gcells;
+          segment->getGCells( gcells );
+
+          if (gcells.size() < 3)
+            segment->setFlags( AutoSegment::SegUnbreakable );
+        }
+
+        if (distance >= segment->getRpDistance()) continue;
+        segment->setRpDistance( distance );
+        cdebug_log(146,0) << "Popped: " << segment << endl;
+        
+        AutoContact* target = segment->getOppositeAnchor( source );
+        if (target) {
+          for ( AutoSegment* successor : target->getAutoSegments() ) {
+            if (successor == segment) continue;
+            
+            // if (successor->isNonPref()) {
+            //   cdebug_log(146,0) << "Pushing (non-pref): " << successor << endl;
+            //   currents.push_back( make_pair(target,successor) );
+            // } else {
+              cdebug_log(146,0) << "Pushing: " << successor << endl;
+              successors.push_back( make_pair(target,successor) );
+            // }
+          }
+        }
+      }
+
+      if (++distance > 15) break;
+
+      currents.clear();
+      currents.swap( successors );
+    }
+
+    cdebug_log(146,0) << "propagateDistanceFromRp() - Exit" << endl;
+    cdebug_tabw(146,-1);
+  }
+
+
   void  AnabaticEngine::computeNetConstraints ( Net* net )
   {
-    DebugSession::open( net, 140, 150);
+    DebugSession::open( net, 146, 150);
 
     cdebug_log(149,0) << "Anabatic::computeNetConstraints( " << net << " )" << endl;
-    cdebug_tabw(145,1);
+    cdebug_tabw(146,1);
 
     vector<RoutingPad*> routingPads;
-    forEach ( Component*, icomponent, net->getComponents() ) {
-      Contact* contact = dynamic_cast<Contact*>( *icomponent );
+    for ( Component* component : net->getComponents() ) {
+      Contact* contact = dynamic_cast<Contact*>( component );
       if (contact) {
         AutoContact* autoContact = Session::lookup( contact );
         if (autoContact) 
           autoContact->restoreNativeConstraintBox();
       } else {
-        RoutingPad* routingPad = dynamic_cast<RoutingPad*>( *icomponent );
-        if (routingPad) routingPads.push_back( routingPad );
+        Segment* segment = dynamic_cast<Segment*>( component );
+        if (segment) {
+          AutoSegment* autoSegment = Session::lookup( segment );
+          if (autoSegment) 
+            autoSegment->setRpDistance( 15 );
+        } else {
+          RoutingPad* routingPad = dynamic_cast<RoutingPad*>( component );
+          if (routingPad) routingPads.push_back( routingPad );
+        }
       }
     }
 
-    for ( size_t i=0 ; i<routingPads.size() ; i++ )
+    for ( size_t i=0 ; i<routingPads.size() ; i++ ) {
       propagateConstraintFromRp( routingPads[i] );
+      propagateDistanceFromRp  ( routingPads[i] );
+    }
+
+    for ( Segment* segment : net->getSegments() ) {
+      AutoSegment* autoSegment = Session::lookup( segment );
+      if (not autoSegment) continue;
+      if (autoSegment->isUnbreakable()) continue;
+      if (autoSegment->getRpDistance() >= 2) continue;
+      if (autoSegment->getRpDistance() == 1) continue;
+
+      vector<GCell*> gcells;
+      autoSegment->getGCells( gcells );
+
+      if     (gcells.size() >  2) continue;
+    //if (   (gcells.size() == 2)
+    //   and (  not autoSegment->getAutoSource()->isTerminal()
+    //       or not autoSegment->getAutoTarget()->isTerminal()) ) continue;
+
+      autoSegment->setFlags( AutoSegment::SegUnbreakable );
+    }
 
     // forEach ( Segment*, isegment, net->getSegments() ) {
     //   AutoSegment* autoSegment = Session::lookup( *isegment );
     //   if (autoSegment) autoSegment->toConstraintAxis();
     // }
 
-    cdebug_tabw(145,-1);
+    cdebug_tabw(146,-1);
     DebugSession::close();
   }
 

anabatic/src/NetOptimals.cpp

@@ -2,7 +2,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -61,7 +61,7 @@ namespace Anabatic {
 
   void  AnabaticEngine::toOptimals ( Net* net )
   {
-    DebugSession::open( net, 140, 150 );
+    DebugSession::open( net, 145, 150 );
     cdebug_log(149,0) << "Anabatic::_toOptimals( " << net << " )" << endl;
     cdebug_tabw(145,1);
 

anabatic/src/PreRouteds.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2014-2016, All Rights Reserved
+// Copyright (c) UPMC 2014-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -35,6 +35,7 @@ namespace Anabatic {
   using Hurricane::RegularLayer;
   using Hurricane::Component;
   using Hurricane::Pin;
+  using Hurricane::Plug;
   using Hurricane::DeepNet;
   using Hurricane::Cell;
   using Hurricane::NetRoutingExtension;
@@ -66,12 +67,16 @@ namespace Anabatic {
 
 
 
-  void  AnabaticEngine::setupPreRouteds ()
+  size_t  AnabaticEngine::setupPreRouteds ()
   {
     cmess1 << "  o  Looking for fixed or manually global routed nets." << endl;
 
     openSession();
 
+    size_t toBeRouteds = 0;
+    Box    ab          = getCell()->getAbutmentBox();
+    ab.inflate( -1 );
+
     for ( Net* net : getCell()->getNets() ) {
       if (net == _blockageNet) continue;
       if (net->getType() == Net::Type::POWER ) continue;
@@ -81,13 +86,93 @@ namespace Anabatic {
       vector<Segment*>  segments;
       vector<Contact*>  contacts;
 
-      bool   isPreRouted = false;
-      bool   isFixed     = false;
-      size_t rpCount     = 0;
+      bool   isManualGlobalRouted = false;
+      bool   isManualDetailRouted = false;
+      bool   isFixed              = false;
+      size_t rpCount              = 0;
 
-      if (net->isDeepNet()) {
-        rpCount = 2;
+      for( Component* component : net->getComponents() ) {
+        if (dynamic_cast<Pin *>(component)) continue;
+        if (dynamic_cast<Plug*>(component)) continue;
 
+        const RegularLayer* layer = dynamic_cast<const RegularLayer*>(component->getLayer());
+        if (layer and (layer->getBasicLayer()->getMaterial() == BasicLayer::Material::blockage))
+            continue;
+
+        if (   not Session::isGaugeLayer(component->getLayer())
+           and not Session::isGLayer    (component->getLayer())) {
+          const BasicLayer* basicLayer = dynamic_cast<const BasicLayer*>( component->getLayer() );
+          if (basicLayer and (basicLayer->getMaterial() == BasicLayer::Material::cut))
+            continue;
+          throw Error( "AnabaticEngine::setupPreRouted(): A component of \"%s\" has a routing gauge umanaged layer.\n"
+                       "        (%s)"
+                     , getString(net->getName()).c_str()
+                     , getString(component).c_str()
+                     );
+        }
+
+        Horizontal* horizontal = dynamic_cast<Horizontal*>(component);
+        if (horizontal) {
+          if (    not ab.contains(horizontal->getSourcePosition())
+             and  not ab.contains(horizontal->getTargetPosition()) ) continue;
+
+          segments.push_back( horizontal );
+          if (Session::isGLayer(component->getLayer())) {
+            isManualGlobalRouted = true;
+          } else {
+            isManualDetailRouted = true;
+            if (horizontal->getWidth() != Session::getWireWidth(horizontal->getLayer()))
+              isFixed = true;
+          }
+        } else {
+          Vertical* vertical = dynamic_cast<Vertical*>(component);
+          if (vertical) {
+            if (    not ab.contains(vertical->getSourcePosition())
+               and  not ab.contains(vertical->getTargetPosition()) ) continue;
+
+            if (Session::isGLayer(component->getLayer())) {
+              isManualGlobalRouted = true;
+            } else {
+              isManualDetailRouted = true;
+              segments.push_back( vertical );
+              if (vertical->getWidth() != Session::getWireWidth(vertical->getLayer()))
+                isFixed = true;
+            }
+          } else {
+            Contact* contact = dynamic_cast<Contact*>(component);
+            if (contact) {
+              if (not ab.contains(contact->getCenter())) continue;
+
+              if (Session::isGLayer(component->getLayer())) {
+                isManualGlobalRouted = true;
+              } else {
+                isManualGlobalRouted = true;
+                contacts.push_back( contact );
+                if (  (contact->getWidth () != Session::getViaWidth(contact->getLayer()))
+                   or (contact->getHeight() != Session::getViaWidth(contact->getLayer()))
+                   or (contact->getLayer () == Session::getContactLayer(0)) )
+                  isFixed = true;
+              }
+            } else {
+              RoutingPad* rp = dynamic_cast<RoutingPad*>(component);
+              if (rp) {
+                ++rpCount;
+              } else {
+                // Plug* plug = dynamic_cast<Plug*>(component);
+                // if (plug) {
+                //   cerr << "buildPreRouteds(): " << plug << endl;
+                //   ++rpCount;
+                // }
+              }
+            }
+          }
+        }
+      }
+
+      if (   (not isFixed)
+         and (not isManualGlobalRouted)
+         and (not isManualDetailRouted)
+         and net->isDeepNet()) {
         Net* rootNet = dynamic_cast<Net*>(
                          dynamic_cast<DeepNet*>(net)->getRootNetOccurrence().getEntity() );
         for( Component* component : rootNet->getComponents() ) {
@@ -95,84 +180,52 @@ namespace Anabatic {
           if (dynamic_cast<Vertical*>  (component)) { isFixed = true; break; }
           if (dynamic_cast<Contact*>   (component)) { isFixed = true; break; }
         }
-      } else {
-        for( Component* component : net->getComponents() ) {
-          if (dynamic_cast<Pin*>(component)) continue;
-
-          const RegularLayer* layer = dynamic_cast<const RegularLayer*>(component->getLayer());
-          if (layer and (layer->getBasicLayer()->getMaterial() == BasicLayer::Material::blockage))
-            continue;
-
-          Horizontal* horizontal = dynamic_cast<Horizontal*>(component);
-          if (horizontal) {
-            segments.push_back( horizontal );
-            isPreRouted = true;
-            if (horizontal->getWidth() != Session::getWireWidth(horizontal->getLayer()))
-              isFixed = true;
-          } else {
-            Vertical* vertical = dynamic_cast<Vertical*>(component);
-            if (vertical) {
-              isPreRouted = true;
-              segments.push_back( vertical );
-              if (vertical->getWidth() != Session::getWireWidth(vertical->getLayer()))
-                isFixed = true;
-            } else {
-              Contact* contact = dynamic_cast<Contact*>(component);
-              if (contact) {
-                isPreRouted = true;
-                contacts.push_back( contact );
-                if (  (contact->getWidth () != Session::getViaWidth(contact->getLayer()))
-                   or (contact->getHeight() != Session::getViaWidth(contact->getLayer())) )
-                  isFixed = true;
-              } else {
-                RoutingPad* rp = dynamic_cast<RoutingPad*>(component);
-                if (rp) {
-                  ++rpCount;
-                } else {
-                  // Plug* plug = dynamic_cast<Plug*>(component);
-                  // if (plug) {
-                  //   cerr << "buildPreRouteds(): " << plug << endl;
-                  //   ++rpCount;
-                  // }
-                }
-              }
-            }
-          }
-        }
       }
 
-      if (isFixed or isPreRouted or (rpCount < 2)) {
+      if (isFixed or isManualDetailRouted or isManualGlobalRouted or (rpCount < 2)) {
         NetData*         ndata = getNetData( net, Flags::Create );
         NetRoutingState* state = ndata->getNetRoutingState();
         state->unsetFlags( NetRoutingState::AutomaticGlobalRoute );
-        state->setFlags  ( NetRoutingState::ManualGlobalRoute );
+        if (isManualGlobalRouted) {
+          state->setFlags( NetRoutingState::ManualGlobalRoute );
+          ndata->setGlobalFixed( true );
+        }
+        if (isManualDetailRouted)
+          state->setFlags( NetRoutingState::ManualDetailRoute );
         ndata->setGlobalRouted( true );
         if (rpCount < 2)
-          state->setFlags  ( NetRoutingState::Unconnected );
+          state->setFlags( NetRoutingState::Unconnected );
 
         if (isFixed) {
-          cmess2 << "     - <" << net->getName() << "> is fixed." << endl;
-          state->unsetFlags( NetRoutingState::ManualGlobalRoute );
+          if (rpCount > 1)
+            cmess2 << "     - <" << net->getName() << "> is fixed." << endl;
+          state->unsetFlags( NetRoutingState::ManualGlobalRoute|NetRoutingState::ManualDetailRoute );
           state->setFlags  ( NetRoutingState::Fixed );
-        } else {
+        } else if (isManualGlobalRouted) {
+          cmess2 << "     - <" << net->getName() << "> is manually global routed." << endl;
+        } else if (isManualDetailRouted) {
           if (rpCount > 1) {
-            cmess2 << "     - <" << net->getName() << "> is manually global routed." << endl;
-            for ( auto icontact : contacts ) {
-              AutoContact::createFrom( icontact );
+            ++toBeRouteds;
+            cmess2 << "     - <" << net->getName() << "> is manually detail routed." << endl;
+            for ( auto contact : contacts ) {
+              AutoContact::createFrom( contact );
             }
-          
-            for ( auto isegment : segments ) {
-              AutoContact* source = Session::lookup( dynamic_cast<Contact*>( isegment->getSource() ));
-              AutoContact* target = Session::lookup( dynamic_cast<Contact*>( isegment->getTarget() ));
-              AutoSegment* autoSegment = AutoSegment::create( source, target, isegment );
+            for ( auto segment : segments ) {
+              AutoContact* source = Session::lookup( dynamic_cast<Contact*>( segment->getSource() ));
+              AutoContact* target = Session::lookup( dynamic_cast<Contact*>( segment->getTarget() ));
+              AutoSegment* autoSegment = AutoSegment::create( source, target, segment );
               autoSegment->setFlags( AutoSegment::SegUserDefined|AutoSegment::SegAxisSet );
             }
           }
         }
+      } else {
+        ++toBeRouteds;
       }
     }
 
     Session::close();
+
+    return toBeRouteds;
   }
 
 

anabatic/src/PyAnabatic.cpp

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+ 
 // |                   C O R I O L I S                               |
@@ -71,11 +71,12 @@ extern "C" {
     PyObject* dictionnary = PyModule_GetDict(module);
     PyObject* constant;
 
-    LoadObjectConstant( dictionnary,EngineLoadGrByNet        ,"EngineLoadGrByNet"         );
-    LoadObjectConstant( dictionnary,EngineLoadGrByGCell      ,"EngineLoadGrByGCell"       );
-    LoadObjectConstant( dictionnary,EngineLayerAssignByLength,"EngineLayerAssignByLength" );
-    LoadObjectConstant( dictionnary,EngineLayerAssignByTrunk ,"EngineLayerAssignByTrunk"  );
-    LoadObjectConstant( dictionnary,EngineNoNetLayerAssign   ,"EngineNoNetLayerAssign"    );
+    LoadObjectConstant( dictionnary,EngineLoadGrByNet           ,"EngineLoadGrByNet"            );
+    LoadObjectConstant( dictionnary,EngineLoadGrByGCell         ,"EngineLoadGrByGCell"          );
+    LoadObjectConstant( dictionnary,EngineLayerAssignByLength   ,"EngineLayerAssignByLength"    );
+    LoadObjectConstant( dictionnary,EngineLayerAssignByTrunk    ,"EngineLayerAssignByTrunk"     );
+    LoadObjectConstant( dictionnary,EngineLayerAssignNoGlobalM2V,"EngineLayerAssignNoGlobalM2V" );
+    LoadObjectConstant( dictionnary,EngineNoNetLayerAssign      ,"EngineNoNetLayerAssign"       );
   }
 
   

anabatic/src/Session.cpp

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Session.cpp<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -17,6 +17,7 @@
 #include <cstdlib>
 #include <sstream>
 #include "hurricane/Error.h"
+#include "hurricane/Warning.h"
 #include "hurricane/Horizontal.h"
 #include "hurricane/Vertical.h"
 #include "hurricane/Cell.h"
@@ -47,6 +48,7 @@ namespace Anabatic {
   using namespace std;
   using Hurricane::tab;
   using Hurricane::Error;
+  using Hurricane::Warning;
   using Hurricane::ForEachIterator;
   using Hurricane::UpdateSession;
   using Hurricane::Horizontal;
@@ -80,7 +82,12 @@ namespace Anabatic {
     , _segmentRevalidateds()
     , _netInvalidateds    ()
     , _netRevalidateds    ()
-  { }
+  {
+    _autoContacts       .reserve( 1024 );
+    _doglegs            .reserve( 1024 );
+    _segmentInvalidateds.reserve( 1024 );
+    _segmentRevalidateds.reserve( 1024 );
+  }
 
 
   void  Session::_postCreate ()
@@ -158,6 +165,7 @@ namespace Anabatic {
 
         canonical->setFlags( AutoSegment::SegCanonical );
         cdebug_log(145,0) << "Canonical: " << canonical << endl;
+        Interval userConstraints = canonical->getUserConstraints();
 
         for ( size_t j=0 ; j<aligneds.size() ; j++ ) {
           if (isWeakGlobal and not aligneds[j]->isGlobal()) aligneds[j]->setFlags  ( AutoSegment::SegWeakGlobal );
@@ -171,14 +179,29 @@ namespace Anabatic {
           }
           aligneds[j]->unsetFlags( AutoSegment::SegCanonical );
           cdebug_log(145,0) << "Secondary: " << aligneds[j] << endl;
+
+          userConstraints.intersection( aligneds[j]->getUserConstraints() );
         }
         if (aligneds.empty()) canonical->setFlags( AutoSegment::SegNotAligned );
 
+        if (not getRoutingGauge()->isSymbolic()
+           and (userConstraints.getSize() < Session::getPitch(1)*2) ) {
+            cerr << Warning( "Session::_canonize(): On %s\n"
+                             "          Combined user constraints are too tight [%s : %s]."
+                           , getString(canonical).c_str()
+                           , DbU::getValueString(userConstraints.getVMin()).c_str()
+                           , DbU::getValueString(userConstraints.getVMax()).c_str()
+                           ) << endl;
+        }
+
         cdebug_log(149,0) << "Align on canonical:" << canonical << endl;
+        cdebug_log(145,0) << "Combined user constraints: " << userConstraints << endl;
 
       //canonical->setAxis( canonical->getAxis(), Flags::Realignate );
-        if (canonical->isUnsetAxis()) canonical->toOptimalAxis( Flags::Realignate|Flags::Propagate );
-        else                          canonical->setAxis( canonical->getAxis(), Flags::Realignate|Flags::Propagate );
+        if (canonical->isUnsetAxis() and not canonical->isFixed())
+          canonical->toOptimalAxis( Flags::Realignate|Flags::Propagate );
+        else
+          canonical->setAxis( canonical->getAxis(), Flags::Realignate|Flags::Propagate );
         aligneds.clear();
         cdebug_tabw(145,-1);
       }
@@ -192,21 +215,21 @@ namespace Anabatic {
   {
     cdebug_log(145,1) << "Anabatic::Session::_revalidateTopology()" << endl;
 
-    set<Net*>::iterator inet = _netInvalidateds.begin();
-
-    for ( ; inet != _netInvalidateds.end() ; inet++ ) {
-      cdebug_log(145,0) << "Anabatic::Session::_revalidateTopology(Net*)" << *inet << endl;
-      _anabatic->updateNetTopology    ( *inet );
-      _anabatic->computeNetConstraints( *inet );
-      _anabatic->_computeNetOptimals  ( *inet );
-      _anabatic->_computeNetTerminals ( *inet );
+    for ( Net* net : _netInvalidateds ) {
+      cdebug_log(145,0) << "Anabatic::Session::_revalidateTopology(Net*)" << net << endl;
+      _anabatic->updateNetTopology    ( net );
+      _anabatic->computeNetConstraints( net );
+      _anabatic->_computeNetOptimals  ( net );
+    //_anabatic->_computeNetTerminals ( net );
     }
     _canonize ();
 
+    AutoSegment* segment = NULL;
     for ( size_t i=0 ; i<_segmentInvalidateds.size() ; ++i ) {
-      if (_segmentInvalidateds[i]->isCanonical()) {
-        if (_segmentInvalidateds[i]->isUnsetAxis()) _segmentInvalidateds[i]->toOptimalAxis();
-        else                                        _segmentInvalidateds[i]->toConstraintAxis();
+      segment = _segmentInvalidateds[i];
+      if (segment->isCanonical()) {
+        if (segment->isUnsetAxis()) segment->toOptimalAxis();
+        else                        segment->toConstraintAxis();
       }
     }
     
@@ -236,6 +259,8 @@ namespace Anabatic {
     cdebug_log(145,0) << "_segmentInvalidateds.size(): " << _segmentInvalidateds.size() << endl;
 
     _segmentRevalidateds.clear();
+    std::sort( _segmentInvalidateds.begin(), _segmentInvalidateds.end()
+             , AutoSegment::CompareByRevalidate() );
     for ( size_t i=0 ; i < _segmentInvalidateds.size() ; ++i, ++count ) {
       _segmentInvalidateds[i]->revalidate();
       if ( not _destroyedSegments.empty()
@@ -337,20 +362,46 @@ namespace Anabatic {
   }
 
 
+  DbU::Unit  Session::_getNearestTrackAxis ( const Layer* layer, DbU::Unit axis, uint32_t mode )
+  {
+    Box ab = _anabatic->getCell()->getAbutmentBox();
+
+    RoutingLayerGauge* lg = _routingGauge->getLayerGauge( layer );
+    if (not lg) return axis;
+    
+    DbU::Unit minAxis = 0;
+    DbU::Unit maxAxis = 0;
+    if (lg->getDirection() == Constant::Horizontal) {
+      minAxis = ab.getYMin();
+      maxAxis = ab.getYMax();
+    } else {
+      minAxis = ab.getXMin();
+      maxAxis = ab.getXMax();
+    }
+    DbU::Unit trackAxis = lg->getTrackPosition( minAxis
+                                              , lg->getTrackIndex( minAxis
+                                                                 , maxAxis
+                                                                 , axis
+                                                                 , mode ) );
+    return trackAxis;
+  }
+
+
   Point  Session::_getNearestGridPoint ( Point p, Box constraint )
   {
     Box ab = _anabatic->getCell()->getAbutmentBox();
 
-    RoutingLayerGauge* lg = _routingGauge->getLayerGauge( 1 );
+    RoutingLayerGauge* lg = _routingGauge->getVerticalGauge();
     DbU::Unit x = lg->getTrackPosition( ab.getXMin()
                                       , lg->getTrackIndex( ab.getXMin()
                                                          , ab.getXMax()
                                                          , p.getX()
                                                          , Constant::Nearest ) );
+    
     if (x < constraint.getXMin()) x += lg->getPitch();
     if (x > constraint.getXMax()) x -= lg->getPitch();
 
-    lg = _routingGauge->getLayerGauge( 2 );
+    lg = _routingGauge->getHorizontalGauge();
     DbU::Unit y = lg->getTrackPosition( ab.getYMin()
                                       , lg->getTrackIndex( ab.getYMin()
                                                          , ab.getYMax()

anabatic/src/anabatic/:

@@ -0,0 +1,646 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/AutoSegment.h"                      |
+// +-----------------------------------------------------------------+
+
+
+#ifndef  ANABATIC_AUTOSEGMENT_H
+#define  ANABATIC_AUTOSEGMENT_H
+
+#include <set>
+#include <iostream>
+#include <functional>
+#include "hurricane/Interval.h"
+#include "hurricane/Segment.h"
+#include "hurricane/Components.h"
+#include "hurricane/Contact.h"
+namespace Hurricane {
+  class Layer;
+  class Horizontal;
+  class Vertical;
+  class Cell;
+}
+#include "crlcore/RoutingGauge.h"
+#include "anabatic/Constants.h"
+#include "anabatic/GCell.h"
+#include "anabatic/AutoSegments.h"
+#include "anabatic/Session.h"
+
+
+namespace Anabatic {
+
+  using std::array;
+  using std::set;
+  using std::cerr;
+  using std::endl;
+  using std::binary_function;
+  using Hurricane::StaticObservable;
+  using Hurricane::BaseObserver;
+  using Hurricane::tab;
+  using Hurricane::Interval;
+  using Hurricane::Layer;
+  using Hurricane::Components;
+  using Hurricane::Horizontal;
+  using Hurricane::Vertical;
+  using Hurricane::Cell;
+  using CRL::RoutingGauge;
+
+  class AutoHorizontal;
+  class AutoVertical;
+
+// -------------------------------------------------------------------
+// Class  :  "AutoSegment".
+
+ 
+
+  class AutoSegment {
+      friend class AutoHorizontal;
+      friend class AutoVertical;
+
+    public:
+      static const uint64_t  SegNoFlags           =  0L;
+      static const uint64_t  SegHorizontal        = (1L<< 0);
+      static const uint64_t  SegFixed             = (1L<< 1);
+      static const uint64_t  SegFixedAxis         = (1L<< 2);
+      static const uint64_t  SegGlobal            = (1L<< 3);
+      static const uint64_t  SegWeakGlobal        = (1L<< 4);
+      static const uint64_t  SegLongLocal         = (1L<< 5);
+      static const uint64_t  SegCanonical         = (1L<< 6);
+      static const uint64_t  SegBipoint           = (1L<< 7);
+      static const uint64_t  SegDogleg            = (1L<< 8);
+      static const uint64_t  SegStrap             = (1L<< 9);
+      static const uint64_t  SegSourceTop         = (1L<<10);
+      static const uint64_t  SegSourceBottom      = (1L<<11);
+      static const uint64_t  SegTargetTop         = (1L<<12);
+      static const uint64_t  SegTargetBottom      = (1L<<13);
+      static const uint64_t  SegIsReduced         = (1L<<14);
+      static const uint64_t  SegDrag              = (1L<<15);
+      static const uint64_t  SegLayerChange       = (1L<<16);
+      static const uint64_t  SegSourceTerminal    = (1L<<17);  // Replace Terminal.
+      static const uint64_t  SegTargetTerminal    = (1L<<18);  // Replace Terminal.
+      static const uint64_t  SegStrongTerminal    = SegSourceTerminal|SegTargetTerminal;
+      static const uint64_t  SegWeakTerminal1     = (1L<<19);  // Replace TopologicalEnd.
+      static const uint64_t  SegWeakTerminal2     = (1L<<20);  // Replace TopologicalEnd.
+      static const uint64_t  SegNotSourceAligned  = (1L<<21);
+      static const uint64_t  SegNotTargetAligned  = (1L<<22);
+      static const uint64_t  SegUnbound           = (1L<<23);
+      static const uint64_t  SegHalfSlackened     = (1L<<24);
+      static const uint64_t  SegSlackened         = (1L<<25);
+      static const uint64_t  SegAxisSet           = (1L<<26);
+      static const uint64_t  SegInvalidated       = (1L<<27);
+      static const uint64_t  SegInvalidatedSource = (1L<<28);
+      static const uint64_t  SegInvalidatedTarget = (1L<<29);
+      static const uint64_t  SegInvalidatedLayer  = (1L<<30);
+      static const uint64_t  SegCreated           = (1L<<31);
+      static const uint64_t  SegUserDefined       = (1L<<32);
+      static const uint64_t  SegAnalog            = (1L<<33);
+      static const uint64_t  SegWide              = (1L<<34);
+    // Masks.
+      static const uint64_t  SegWeakTerminal      = SegStrongTerminal|SegWeakTerminal1|SegWeakTerminal2;
+      static const uint64_t  SegNotAligned        = SegNotSourceAligned|SegNotTargetAligned;
+      static const uint64_t  SegSpinTop           = SegSourceTop    |SegTargetTop;
+      static const uint64_t  SegSpinBottom        = SegSourceBottom |SegTargetBottom;
+      static const uint64_t  SegDepthSpin         = SegSpinTop      |SegSpinBottom;
+
+    public:
+      class Observable : public StaticObservable<1> {
+        public:
+          enum Indexes { TrackSegment = 0
+                       };
+        public:
+          inline             Observable ();
+        private:
+                             Observable ( const StaticObservable& );
+                 Observable& operator=  ( const StaticObservable& );
+      };
+    public:
+      enum ObserverFlag { Create           = (1 <<  0)
+                        , Destroy          = (1 <<  1)
+                        , Invalidate       = (1 <<  2)
+                        , Revalidate       = (1 <<  3)
+                        , RevalidatePPitch = (1 <<  4)
+                        };
+    public:
+      typedef  std::function< void(AutoSegment*) >  RevalidateCb_t;
+    public:
+             static  void                setAnalogMode              ( bool );
+             static  bool                getAnalogMode              ();
+      inline static  DbU::Unit           getViaToTopCap             ( size_t depth );
+      inline static  DbU::Unit           getViaToBottomCap          ( size_t depth );
+      inline static  DbU::Unit           getViaToSameCap            ( size_t depth );
+             static  AutoSegment*        create                     ( AutoContact*  source
+                                                                    , AutoContact*  target
+                                                                    , Segment*      hurricaneSegment
+                                                                    );
+             static  AutoSegment*        create                     ( AutoContact*  source
+                                                                    , AutoContact*  target
+                                                                    , Flags         dir
+                                                                    , size_t        depth=RoutingGauge::nlayerdepth
+                                                                    );
+                     void                destroy                    ();
+    // Wrapped Segment Functions.                            
+             virtual Segment*            base                       () const = 0;
+             virtual Segment*            base                       () = 0;
+             virtual Horizontal*         getHorizontal              () { return NULL; };
+             virtual Vertical*           getVertical                () { return NULL; };
+      inline         Cell*               getCell                    () const;
+      inline         Net*                getNet                     () const;
+      inline         const Layer*        getLayer                   () const;
+      inline         Box                 getBoundingBox             () const;
+      inline         Hook*               getSourceHook              ();
+      inline         Hook*               getTargetHook              ();
+      inline         Contact*            getSource                  () const;
+      inline         Contact*            getTarget                  () const;
+      inline         Component*          getOppositeAnchor          ( Component* ) const;
+      inline         Components          getAnchors                 () const;
+             virtual DbU::Unit           getX                       () const;
+             virtual DbU::Unit           getY                       () const;
+      inline         DbU::Unit           getWidth                   () const;
+      inline         DbU::Unit           getContactWidth            () const;
+      inline         DbU::Unit           getLength                  () const;
+      inline         DbU::Unit           getSourcePosition          () const;
+      inline         DbU::Unit           getTargetPosition          () const;
+      inline         DbU::Unit           getSourceX                 () const;
+      inline         DbU::Unit           getSourceY                 () const;
+      inline         DbU::Unit           getTargetX                 () const;
+      inline         DbU::Unit           getTargetY                 () const;
+      inline         void                invert                     ();
+      inline         void                setLayer                   ( const Layer* );
+    // Predicates.                                           
+      inline         bool                isHorizontal               () const;
+      inline         bool                isVertical                 () const;
+      inline         bool                isGlobal                   () const;
+      inline         bool                isWeakGlobal               () const;
+      inline         bool                isLongLocal                () const;
+      inline         bool                isLocal                    () const;
+      inline         bool                isFixed                    () const;
+      inline         bool                isFixedAxis                () const;
+      inline         bool                isBipoint                  () const;
+      inline         bool                isWeakTerminal             () const;
+      inline         bool                isWeakTerminal1            () const;
+      inline         bool                isWeakTerminal2            () const;
+      inline         bool                isTerminal                 () const;
+      inline         bool                isDrag                     () const;
+      inline         bool                isNotSourceAligned         () const;
+      inline         bool                isNotTargetAligned         () const;
+      inline         bool                isNotAligned               () const;
+                     bool                isStrongTerminal           ( Flags flags=Flags::NoFlags ) const;
+      inline         bool                isSourceTerminal           () const;
+      inline         bool                isTargetTerminal           () const;
+      inline         bool                isLayerChange              () const;
+      inline         bool                isSpinTop                  () const;
+      inline         bool                isSpinBottom               () const;
+      inline         bool                isSpinTopOrBottom          () const;
+      inline         bool                isReduced                  () const;
+      inline         bool                isStrap                    () const;
+      inline         bool                isDogleg                   () const;
+      inline         bool                isUnbound                  () const;
+      inline         bool                isInvalidated              () const;
+      inline         bool                isInvalidatedLayer         () const;
+      inline         bool                isCreated                  () const;
+      inline         bool                isCanonical                () const;
+      inline         bool                isUnsetAxis                () const;
+      inline         bool                isSlackened                () const;
+      inline         bool                isUserDefined              () const;
+                     bool                isReduceCandidate          () const;
+                     bool                isUTurn                    () const;
+      inline         bool                isAnalog                   () const;
+      inline         bool                isWide                     () const;
+             virtual bool                _canSlacken                () const = 0;
+                     bool                canReduce                  () const;
+                     bool                mustRaise                  () const;
+                     Flags               canDogleg                  ( Interval );
+             virtual bool                canMoveULeft               ( float reserve=0.0 ) const = 0;
+             virtual bool                canMoveURight              ( float reserve=0.0 ) const = 0;
+                     bool                canMoveUp                  ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canPivotUp                 ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canPivotDown               ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canSlacken                 ( Flags flags=Flags::NoFlags ) const;
+             virtual bool                checkPositions             () const = 0;
+             virtual bool                checkConstraints           () const = 0;
+                     bool                checkDepthSpin             () const;
+    // Accessors.                                            
+      inline         unsigned long       getId                      () const;
+      inline         uint64_t            getFlags                   () const;
+             virtual Flags               getDirection               () const = 0;
+      inline         GCell*              getGCell                   () const;
+             virtual bool                getGCells                  ( vector<GCell*>& ) const = 0;
+      inline         AutoContact*        getAutoSource              () const;
+      inline         AutoContact*        getAutoTarget              () const;
+                     AutoContact*        getOppositeAnchor          ( AutoContact* ) const;
+                     size_t              getPerpandicularsBound     ( set<AutoSegment*>& );
+      inline         AutoSegment*        getParent                  () const;
+      inline         unsigned int        getDepth                   () const;
+      inline         DbU::Unit           getPitch                   () const;
+                     DbU::Unit           getPPitch                  () const;
+#if DISABLED
+                     DbU::Unit           getExtensionCap            () const;
+#endif
+                     DbU::Unit           getExtensionCap            ( Flags ) const;
+      inline         DbU::Unit           getAxis                    () const;
+                     void                getEndAxes                 ( DbU::Unit& sourceAxis, DbU::Unit& targetAxis ) const;
+             virtual DbU::Unit           getSourceU                 () const = 0;
+             virtual DbU::Unit           getTargetU                 () const = 0;
+             virtual DbU::Unit           getDuSource                () const = 0;
+             virtual DbU::Unit           getDuTarget                () const = 0;
+      inline         DbU::Unit           getOrigin                  () const;
+      inline         DbU::Unit           getExtremity               () const;
+             virtual Interval            getSpanU                   () const = 0;
+                     Interval            getMinSpanU                () const;
+             virtual Interval            getSourceConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
+             virtual Interval            getTargetConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
+             virtual bool                getConstraints             ( DbU::Unit& min, DbU::Unit& max ) const = 0;
+      inline         bool                getConstraints             ( Interval& i ) const;
+      inline         const Interval&     getUserConstraints         () const;
+      inline         const Interval&     getNativeConstraints       () const;
+             virtual DbU::Unit           getSlack                   () const;
+      inline         DbU::Unit           getOptimalMin              () const;
+      inline         DbU::Unit           getOptimalMax              () const;
+      inline         DbU::Unit           getNativeMin               () const;
+      inline         DbU::Unit           getNativeMax               () const;
+                     Interval&           getOptimal                 ( Interval& i ) const;
+             virtual DbU::Unit           getCost                    ( DbU::Unit axis ) const;
+             virtual AutoSegment*        getCanonical               ( DbU::Unit& min , DbU::Unit& max );
+      inline         AutoSegment*        getCanonical               ( Interval& i );
+                     float               getMaxUnderDensity         ( Flags flags );
+    // Modifiers.                                            
+      inline         void                unsetFlags                 ( uint64_t );
+      inline         void                setFlags                   ( uint64_t );
+                     void                setFlagsOnAligneds         ( uint64_t );
+      inline         void                incReduceds                ();
+      inline         void                decReduceds                ();
+             virtual void                setDuSource                ( DbU::Unit du ) = 0;
+             virtual void                setDuTarget                ( DbU::Unit du ) = 0;
+                     void                computeTerminal            ();
+             virtual void                updateOrient               () = 0;
+             virtual void                updatePositions            () = 0;
+             virtual void                updateNativeConstraints    () = 0;
+                     void                updateSourceSpin           ();
+                     void                updateTargetSpin           ();
+                     void                sourceDetach               ();
+                     void                targetDetach               ();
+                     void                sourceAttach               ( AutoContact* );
+                     void                targetAttach               ( AutoContact* );
+    //inline         void                mergeUserConstraints       ( const Interval& );
+                     void                mergeUserConstraints       ( const Interval& );
+      inline         void                resetUserConstraints       ();
+      inline         void                setOptimalMin              ( DbU::Unit min );
+      inline         void                setOptimalMax              ( DbU::Unit max );
+      inline         void                mergeNativeMin             ( DbU::Unit min );
+      inline         void                mergeNativeMax             ( DbU::Unit max );
+      inline         void                resetNativeConstraints     ( DbU::Unit min, DbU::Unit max );
+                     bool                checkNotInvalidated        () const;
+      inline         void                setParent                  ( AutoSegment* );
+                     void                revalidate                 ();
+                     AutoSegment*        makeDogleg                 ( AutoContact* );
+                     Flags               makeDogleg                 ( Interval, Flags flags=Flags::NoFlags );
+                     Flags               makeDogleg                 ( GCell*  , Flags flags=Flags::NoFlags );
+             virtual Flags               _makeDogleg                ( GCell*  , Flags flags ) = 0;
+             virtual bool                moveULeft                  () = 0;
+             virtual bool                moveURight                 () = 0;
+                     bool                slacken                    ( Flags flags );
+             virtual bool                _slacken                   ( Flags flags ) = 0;
+                     void                _changeDepth               ( unsigned int depth, Flags flags );
+                     void                changeDepth                ( unsigned int depth, Flags flags );
+                     bool                moveUp                     ( Flags flags=Flags::NoFlags );
+                     bool                moveDown                   ( Flags flags=Flags::NoFlags );
+                     bool                reduceDoglegLayer          ();
+                     bool                reduce                     ();
+                     bool                raise                      ();
+    // Canonical Modifiers.                                            
+                     AutoSegment*        canonize                   ( Flags flags=Flags::NoFlags );
+             virtual void                invalidate                 ( Flags flags=Flags::Propagate );
+                     void                invalidate                 ( AutoContact* );
+                     void                computeOptimal             ( set<AutoSegment*>& processeds );
+                     void                setAxis                    ( DbU::Unit, Flags flags=Flags::NoFlags );
+                     bool                toConstraintAxis           ( Flags flags=Flags::Realignate );
+                     bool                toOptimalAxis              ( Flags flags=Flags::Realignate );
+    // Collections & Filters.                                
+                     AutoSegments        getOnSourceContact         ( Flags direction );
+                     AutoSegments        getOnTargetContact         ( Flags direction );
+                     AutoSegments        getCachedOnSourceContact   ( Flags direction );
+                     AutoSegments        getCachedOnTargetContact   ( Flags direction );
+                     AutoSegments        getAligneds                ( Flags flags=Flags::NoFlags );
+                     AutoSegments        getConnecteds              ( Flags flags=Flags::NoFlags );
+                     AutoSegments        getPerpandiculars          ( Flags flags=Flags::NoFlags );
+                     size_t              getAlignedContacts         ( map<AutoContact*,int>& ) const ;
+    // Observers.                         
+      template< typename OwnerT >
+      inline         OwnerT*             getObserver                ( size_t slot );
+      inline         void                setObserver                ( size_t slot, BaseObserver* );
+      inline         void                notify                     ( unsigned int flags );
+    // Inspector Management.                                 
+             virtual Record*             _getRecord                 () const = 0;
+             virtual string              _getString                 () const = 0;
+             virtual string              _getTypeName               () const = 0;
+    // Non-reviewed atomic modifiers.
+                     bool                _check                     () const;
+#if THIS_IS_DISABLED
+             virtual void                desalignate                ( AutoContact* ) = 0;
+                     bool                shearUp                    ( GCell*
+                                                                    , AutoSegment*& movedUp
+                                                                    , float         reserve
+                                                                    , Flags         flags );
+#endif
+                                  
+    protected:                    
+    // Internal: Static Attributes.
+      static size_t                        _allocateds;
+      static size_t                        _globalsCount;
+      static bool                          _analogMode;
+      static bool                          _initialized;
+      static vector< array<DbU::Unit*,3> > _extensionCaps;
+    // Internal: Attributes.      
+      const  unsigned long                 _id;
+             GCell*                        _gcell;
+             uint64_t                      _flags;
+             unsigned int                  _depth      : 8;
+             unsigned int                  _optimalMin :16;
+             unsigned int                  _optimalMax :16;
+             unsigned int                  _reduceds   : 2;
+             DbU::Unit                     _sourcePosition;
+             DbU::Unit                     _targetPosition;
+             Interval                      _userConstraints;
+             Interval                      _nativeConstraints;
+             AutoSegment*                  _parent;
+             Observable                    _observers;
+                                  
+    // Internal: Constructors & Destructors.
+    protected:                    
+                                         AutoSegment     ( Segment* segment );
+             virtual                    ~AutoSegment     ();
+             static  void                _preCreate      ( AutoContact* source, AutoContact* target );
+             virtual void                _postCreate     ();
+             virtual void                _preDestroy     ();
+             static  void                _initialize     ();
+    private:                                      
+                                         AutoSegment     ( const AutoSegment& );
+                     AutoSegment&        operator=       ( const AutoSegment& );
+    protected:                                    
+                     void                _invalidate     ();
+      inline         uint64_t            _getFlags       () const;
+                     std::string         _getStringFlags () const;
+             virtual void                _setAxis        ( DbU::Unit ) = 0;
+
+    public:
+      struct CompareId : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          inline bool  operator() ( const AutoSegment* lhs, const AutoSegment* rhs ) const;
+      };
+    public:
+      struct CompareByDepthLength : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
+      };
+    public:
+      struct CompareByDepthAxis : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
+      };
+    public:
+      typedef std::set<AutoSegment*,CompareByDepthLength>  DepthLengthSet;
+      typedef std::set<AutoSegment*,CompareId>             IdSet;
+
+    // Static Utilities.
+    public:
+      static inline uint64_t      swapSourceTargetFlags      ( AutoSegment* );
+      static inline bool          areAlignedsAndDiffLayer    ( AutoSegment*, AutoSegment* );
+      static        AutoSegment*  getGlobalThroughDogleg     ( AutoSegment* dogleg, AutoContact* from );
+      static        bool          isTopologicalBound         ( AutoSegment*  seed, Flags flags );
+      static inline bool          arePerpandiculars          ( AutoSegment* a, AutoSegment* b );
+      static inline bool          arePerpandiculars          ( bool isHorizontalA, AutoSegment* b );
+      static inline bool          areAligneds                ( AutoSegment* a, AutoSegment* b );
+      static        Flags         getPerpandicularState      ( AutoContact* contact
+                                                             , AutoSegment* source
+                                                             , AutoSegment* current
+                                                             , bool         isHorizontalMaster
+                                                             , const Layer* masterLayer=NULL
+                                                             );
+      static inline Flags         getPerpandicularState      ( AutoContact* contact
+                                                             , AutoSegment* source
+                                                             , AutoSegment* current
+                                                             , AutoSegment* master
+                                                             );
+      static void                 getTopologicalInfos        ( AutoSegment*          seed
+                                                             , vector<AutoSegment*>& collapseds
+                                                             , vector<AutoSegment*>& perpandiculars
+                                                             , DbU::Unit&            leftBound
+                                                             , DbU::Unit&            rightBound
+                                                             );
+      static int                  getTerminalCount           ( AutoSegment* seed
+                                                             , vector<AutoSegment*>& collapseds
+                                                             );
+      static inline int           getTerminalCount           ( AutoSegment* seed );
+      static inline size_t        getGlobalsCount            ();
+      static inline size_t        getAllocateds              ();
+      static inline unsigned long getMaxId                   ();
+  };
+
+
+// Inline Functions.
+  inline  DbU::Unit       AutoSegment::getViaToTopCap         ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][0]) : 0; }
+  inline  DbU::Unit       AutoSegment::getViaToBottomCap      ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][1]) : 0; }
+  inline  DbU::Unit       AutoSegment::getViaToSameCap        ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][2]) : 0; }
+  inline  unsigned long   AutoSegment::getId                  () const { return _id; }
+  inline  Cell*           AutoSegment::getCell                () const { return base()->getCell(); }
+  inline  Net*            AutoSegment::getNet                 () const { return base()->getNet(); }
+  inline  const Layer*    AutoSegment::getLayer               () const { return base()->getLayer(); }
+  inline  Box             AutoSegment::getBoundingBox         () const { return base()->getBoundingBox(); }
+  inline  Hook*           AutoSegment::getSourceHook          () { return base()->getSourceHook(); }
+  inline  Hook*           AutoSegment::getTargetHook          () { return base()->getTargetHook(); }
+  inline  Contact*        AutoSegment::getSource              () const { return static_cast<Contact*>(base()->getSource()); }
+  inline  Contact*        AutoSegment::getTarget              () const { return static_cast<Contact*>(base()->getTarget()); }
+  inline  Component*      AutoSegment::getOppositeAnchor      ( Component* anchor ) const { return base()->getOppositeAnchor(anchor); };
+  inline  AutoSegment*    AutoSegment::getParent              () const { return _parent; }
+  inline  DbU::Unit       AutoSegment::getSourcePosition      () const { return _sourcePosition; }
+  inline  DbU::Unit       AutoSegment::getTargetPosition      () const { return _targetPosition; }
+  inline  DbU::Unit       AutoSegment::getSourceX             () const { return base()->getSourceX(); }
+  inline  DbU::Unit       AutoSegment::getSourceY             () const { return base()->getSourceY(); }
+  inline  DbU::Unit       AutoSegment::getTargetX             () const { return base()->getTargetX(); }
+  inline  DbU::Unit       AutoSegment::getTargetY             () const { return base()->getTargetY(); }
+  inline  DbU::Unit       AutoSegment::getWidth               () const { return base()->getWidth(); }
+  inline  DbU::Unit       AutoSegment::getLength              () const { return base()->getLength(); }
+  inline  void            AutoSegment::invert                 () { base()->invert(); }
+  inline  GCell*          AutoSegment::getGCell               () const { return _gcell; }
+  inline  AutoContact*    AutoSegment::getAutoSource          () const { return Session::lookup(getSource()); }
+  inline  AutoContact*    AutoSegment::getAutoTarget          () const { return Session::lookup(getTarget()); }
+  inline  bool            AutoSegment::getConstraints         ( Interval& i ) const { return getConstraints(i.getVMin(),i.getVMax()); }
+  inline  AutoSegment*    AutoSegment::getCanonical           ( Interval& i ) { return getCanonical(i.getVMin(),i.getVMax()); }
+  inline  unsigned int    AutoSegment::getDepth               () const { return _depth; }
+  inline  DbU::Unit       AutoSegment::getPitch               () const { return Session::getPitch(getDepth(),Flags::NoFlags); }
+  inline  DbU::Unit       AutoSegment::getAxis                () const { return isHorizontal()?base()->getY():base()->getX(); }
+  inline  DbU::Unit       AutoSegment::getOrigin              () const { return isHorizontal()?_gcell->getYMin():_gcell->getXMin(); }
+  inline  DbU::Unit       AutoSegment::getExtremity           () const { return isHorizontal()?_gcell->getYMax():_gcell->getXMax(); }
+  inline  DbU::Unit       AutoSegment::getOptimalMin          () const { return DbU::lambda(_optimalMin) + getOrigin(); }
+  inline  DbU::Unit       AutoSegment::getOptimalMax          () const { return DbU::lambda(_optimalMax) + getOrigin(); }
+  inline  DbU::Unit       AutoSegment::getNativeMin           () const { return _nativeConstraints.getVMin(); }
+  inline  DbU::Unit       AutoSegment::getNativeMax           () const { return _nativeConstraints.getVMax(); }
+  inline  const Interval& AutoSegment::getUserConstraints     () const { return _userConstraints; }
+  inline  const Interval& AutoSegment::getNativeConstraints   () const { return _nativeConstraints; }
+                                                              
+  inline  bool            AutoSegment::isHorizontal           () const { return _flags & SegHorizontal; }
+  inline  bool            AutoSegment::isVertical             () const { return not (_flags & SegHorizontal); }
+  inline  bool            AutoSegment::isFixed                () const { return _flags & SegFixed; }
+  inline  bool            AutoSegment::isFixedAxis            () const { return _flags & SegFixedAxis; }
+  inline  bool            AutoSegment::isGlobal               () const { return _flags & SegGlobal; }
+  inline  bool            AutoSegment::isWeakGlobal           () const { return _flags & SegWeakGlobal; }
+  inline  bool            AutoSegment::isLongLocal            () const { return _flags & SegLongLocal; }
+  inline  bool            AutoSegment::isLocal                () const { return not (_flags & SegGlobal); }
+  inline  bool            AutoSegment::isBipoint              () const { return _flags & SegBipoint; }
+  inline  bool            AutoSegment::isWeakTerminal         () const { return _flags & SegWeakTerminal; }
+  inline  bool            AutoSegment::isWeakTerminal1        () const { return _flags & SegWeakTerminal1; }
+  inline  bool            AutoSegment::isWeakTerminal2        () const { return _flags & SegWeakTerminal2; }
+  inline  bool            AutoSegment::isSourceTerminal       () const { return _flags & SegSourceTerminal; }
+  inline  bool            AutoSegment::isTargetTerminal       () const { return _flags & SegTargetTerminal; }
+  inline  bool            AutoSegment::isTerminal             () const { return _flags & SegStrongTerminal; }
+  inline  bool            AutoSegment::isDrag                 () const { return _flags & SegDrag; }
+  inline  bool            AutoSegment::isNotSourceAligned     () const { return _flags & SegNotSourceAligned; }
+  inline  bool            AutoSegment::isNotTargetAligned     () const { return _flags & SegNotTargetAligned; }
+  inline  bool            AutoSegment::isNotAligned           () const { return (_flags & SegNotAligned) == SegNotAligned; }
+  inline  bool            AutoSegment::isDogleg               () const { return _flags & SegDogleg  ; }
+  inline  bool            AutoSegment::isUnbound              () const { return _flags & SegUnbound  ; }
+  inline  bool            AutoSegment::isStrap                () const { return _flags & SegStrap; }
+  inline  bool            AutoSegment::isLayerChange          () const { return _flags & SegLayerChange; }
+  inline  bool            AutoSegment::isSpinTop              () const { return ((_flags & SegSpinTop   ) == SegSpinTop); }
+  inline  bool            AutoSegment::isSpinBottom           () const { return ((_flags & SegSpinBottom) == SegSpinBottom); }
+  inline  bool            AutoSegment::isSpinTopOrBottom      () const { return isSpinTop() or isSpinBottom(); }
+  inline  bool            AutoSegment::isReduced              () const { return _flags & SegIsReduced; }
+  inline  bool            AutoSegment::isSlackened            () const { return _flags & SegSlackened; }
+  inline  bool            AutoSegment::isCanonical            () const { return _flags & SegCanonical; }
+  inline  bool            AutoSegment::isUnsetAxis            () const { return not (_flags & SegAxisSet); }
+  inline  bool            AutoSegment::isInvalidated          () const { return _flags & SegInvalidated; }
+  inline  bool            AutoSegment::isInvalidatedLayer     () const { return _flags & SegInvalidatedLayer; }
+  inline  bool            AutoSegment::isCreated              () const { return _flags & SegCreated; }
+  inline  bool            AutoSegment::isUserDefined          () const { return _flags & SegUserDefined; }
+  inline  bool            AutoSegment::isAnalog               () const { return _flags & SegAnalog; }
+  inline  bool            AutoSegment::isWide                 () const { return _flags & SegWide; }
+  inline  void            AutoSegment::setFlags               ( uint64_t flags ) { _flags |=  flags; }
+  inline  void            AutoSegment::unsetFlags             ( uint64_t flags ) { _flags &= ~flags; }
+                                                              
+  inline  uint64_t        AutoSegment::getFlags               () const { return _flags; }
+  inline  uint64_t        AutoSegment::_getFlags              () const { return _flags; }
+  inline  void            AutoSegment::incReduceds            () { if (_reduceds<3) ++_reduceds; }
+  inline  void            AutoSegment::decReduceds            () { if (_reduceds>0) --_reduceds; }
+  inline  void            AutoSegment::setLayer               ( const Layer* layer ) { base()->setLayer(layer); _depth=Session::getLayerDepth(layer); _flags|=SegInvalidatedLayer; }
+  inline  void            AutoSegment::setOptimalMin          ( DbU::Unit min ) { _optimalMin = (unsigned int)DbU::getLambda(min-getOrigin()); }
+  inline  void            AutoSegment::setOptimalMax          ( DbU::Unit max ) { _optimalMax = (unsigned int)DbU::getLambda(max-getOrigin()); }
+  inline  void            AutoSegment::mergeNativeMin         ( DbU::Unit min ) { _nativeConstraints.getVMin() = std::max( min, _nativeConstraints.getVMin() ); }
+  inline  void            AutoSegment::mergeNativeMax         ( DbU::Unit max ) { _nativeConstraints.getVMax() = std::min( max, _nativeConstraints.getVMax() ); }
+  inline  void            AutoSegment::resetNativeConstraints ( DbU::Unit min, DbU::Unit max ) { _nativeConstraints = Interval( min, max ); }
+//inline  void            AutoSegment::mergeUserConstraints   ( const Interval& constraints ) { _userConstraints.intersection(constraints); }
+  inline  void            AutoSegment::resetUserConstraints   () { _userConstraints = Interval(false); }
+
+
+  inline  DbU::Unit  AutoSegment::getContactWidth () const
+  { return getWidth() + Session::getViaWidth(getLayer()) - Session::getWireWidth(getLayer()); }
+
+
+  inline  void  AutoSegment::setParent ( AutoSegment* parent )
+  {
+    if ( parent == this ) {
+      cerr << "Parentage Looping: " << parent->_getString() << endl;
+    }
+    _parent = parent;
+  }
+
+  inline bool  AutoSegment::CompareId::operator() ( const AutoSegment* lhs, const AutoSegment* rhs ) const
+  { return lhs->getId() < rhs->getId(); }
+ 
+  inline uint64_t  AutoSegment::swapSourceTargetFlags ( AutoSegment* segment )
+  {
+    uint64_t segFlags  = segment->getFlags();
+    uint64_t swapFlags = segment->getFlags() & ~(SegSourceTop        |SegTargetTop
+                                                |SegSourceBottom     |SegTargetBottom
+                                                |SegSourceTerminal   |SegTargetTerminal
+                                                |SegNotSourceAligned |SegNotTargetAligned
+                                                |SegInvalidatedSource|SegInvalidatedTarget
+                                                );
+
+    swapFlags |= (segFlags & SegSourceTop        ) ? SegTargetTop         : SegNoFlags;
+    swapFlags |= (segFlags & SegSourceBottom     ) ? SegTargetBottom      : SegNoFlags;
+    swapFlags |= (segFlags & SegSourceTerminal   ) ? SegTargetTerminal    : SegNoFlags;
+    swapFlags |= (segFlags & SegNotSourceAligned ) ? SegNotTargetAligned  : SegNoFlags;
+    swapFlags |= (segFlags & SegInvalidatedSource) ? SegInvalidatedTarget : SegNoFlags;
+
+    swapFlags |= (segFlags & SegTargetTop        ) ? SegSourceTop         : SegNoFlags;
+    swapFlags |= (segFlags & SegTargetBottom     ) ? SegSourceBottom      : SegNoFlags;
+    swapFlags |= (segFlags & SegTargetTerminal   ) ? SegSourceTerminal    : SegNoFlags;
+    swapFlags |= (segFlags & SegNotTargetAligned ) ? SegNotSourceAligned  : SegNoFlags;
+    swapFlags |= (segFlags & SegInvalidatedTarget) ? SegInvalidatedSource : SegNoFlags;
+    return swapFlags;
+  }
+
+  inline bool  AutoSegment::areAlignedsAndDiffLayer ( AutoSegment* s1, AutoSegment* s2 )
+  { return s1 and s2
+      and  (s1->isHorizontal() == s2->isHorizontal())
+      and  (s1->getLayer() != s2->getLayer()); }
+
+  inline bool  AutoSegment::arePerpandiculars ( AutoSegment* a, AutoSegment* b )
+  { return a and b and (a->isHorizontal() != b->isHorizontal()); }
+
+  inline bool  AutoSegment::arePerpandiculars ( bool isHorizontalA, AutoSegment* b )
+  { return b and (isHorizontalA != b->isHorizontal()); }
+
+  inline bool  AutoSegment::areAligneds ( AutoSegment* a, AutoSegment* b )
+  { return a and b and (a->isHorizontal() == b->isHorizontal()); }
+
+  inline Flags  AutoSegment::getPerpandicularState ( AutoContact* contact
+                                                   , AutoSegment* source
+                                                   , AutoSegment* current
+                                                   , AutoSegment* master  )
+  {
+    return getPerpandicularState ( contact, source, current, master->isHorizontal(), master->getLayer() );
+  }
+
+
+  inline int  AutoSegment::getTerminalCount ( AutoSegment* seed )
+  {
+    cdebug_log(145,0) << "getTerminalCount() - " << seed << endl;
+
+    vector<AutoSegment*>  collapseds;
+    vector<AutoSegment*>  perpandiculars;
+    DbU::Unit             leftBound;
+    DbU::Unit             rightBound;
+
+    getTopologicalInfos ( seed
+                        , collapseds
+                        , perpandiculars
+                        , leftBound
+                        , rightBound
+                        );
+
+    return getTerminalCount ( seed, collapseds );
+  }
+
+
+  inline size_t  AutoSegment::getGlobalsCount () { return _globalsCount; }
+  inline size_t  AutoSegment::getAllocateds   () { return _allocateds; }
+
+
+  inline void  AutoSegment::setObserver ( size_t slot, BaseObserver* observer )
+  { _observers.setObserver( slot, observer ); }
+
+  template<typename OwnerT>
+  inline OwnerT* AutoSegment::getObserver ( size_t slot )
+  { return _observers.getObserver<OwnerT>(slot); }
+
+  inline void  AutoSegment::notify ( unsigned int flags )
+  { _observers.notify( flags ); }
+
+  inline AutoSegment::Observable::Observable () : StaticObservable<1>() { }
+
+
+} // End of Anabatic namespace.
+
+
+INSPECTOR_P_SUPPORT(Anabatic::AutoSegment);
+
+
+# endif  // ANABATIC_AUTOSEGMENT_H

anabatic/src/anabatic/AnabaticEngine.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,20 +14,16 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_ANABATIC_ENGINE_H
-#define  ANABATIC_ANABATIC_ENGINE_H
-
+#pragma  once
 #include <memory>
 #include <string>
 #include <vector>
 #include <set>
-
 #include "hurricane/NetRoutingProperty.h"
 namespace Hurricane {
   class Instance;
   class CellViewer;
 }
-
 #include "crlcore/ToolEngine.h"
 #include "anabatic/Configuration.h"
 #include "anabatic/Matrix.h"
@@ -68,6 +64,8 @@ namespace Anabatic {
       };
     public:
                                     RawGCellsUnder ( const AnabaticEngine*, Segment* );
+                                    RawGCellsUnder ( const AnabaticEngine*, Point source, Point target );
+                   void             commonCtor     ( const AnabaticEngine*, Point source, Point target );
       inline       bool             empty          () const;
       inline       size_t           size           () const;
       inline       GCell*           gcellAt        ( size_t ) const;
@@ -102,19 +100,26 @@ namespace Anabatic {
 
   class NetData {
     public:
-                                    NetData            ( Net* );
+                                    NetData            ( Net*, AnabaticEngine* );
+      inline       bool             isGlobalEstimated  () const;
       inline       bool             isGlobalRouted     () const;
+      inline       bool             isGlobalFixed      () const;
       inline       bool             isMixedPreRoute    () const;
       inline       bool             isFixed            () const;
+      inline       bool             isExcluded         () const;
       inline       Net*             getNet             () const;
       inline       NetRoutingState* getNetRoutingState () const;
       inline const Box&             getSearchArea      () const;
       inline       DbU::Unit        getHalfPerimeter   () const;
       inline       size_t           getRpCount         () const;
+      inline       size_t           getDiodeRpCount    () const;
       inline       DbU::Unit        getSparsity        () const;
       inline       void             setNetRoutingState ( NetRoutingState* );
       inline       void             setSearchArea      ( Box );
+      inline       void             setGlobalEstimated ( bool );
       inline       void             setGlobalRouted    ( bool );
+      inline       void             setGlobalFixed     ( bool );
+      inline       void             setExcluded        ( bool );
       inline       void             setRpCount         ( size_t );
     private:                                     
                               NetData            ( const NetData& );
@@ -125,22 +130,30 @@ namespace Anabatic {
       NetRoutingState* _state;
       Box              _searchArea;
       size_t           _rpCount;
+      size_t           _diodeCount;
       DbU::Unit        _sparsity;
       Flags            _flags;
   };
 
 
+  inline bool             NetData::isGlobalEstimated  () const { return _flags & Flags::GlobalEstimated; }
   inline bool             NetData::isGlobalRouted     () const { return _flags & Flags::GlobalRouted; }
+  inline bool             NetData::isGlobalFixed      () const { return _flags & Flags::GlobalFixed; }
   inline bool             NetData::isMixedPreRoute    () const { return (_state) ? _state->isMixedPreRoute() : false; }
   inline bool             NetData::isFixed            () const { return (_state) ? _state->isFixed        () : false; }
+  inline bool             NetData::isExcluded         () const { return _flags & Flags::ExcludeRoute; }
   inline Net*             NetData::getNet             () const { return _net; }
   inline NetRoutingState* NetData::getNetRoutingState () const { return _state; }
   inline const Box&       NetData::getSearchArea      () const { return _searchArea; }
   inline DbU::Unit        NetData::getHalfPerimeter   () const { return (_searchArea.isEmpty()) ? 0.0 : (_searchArea.getWidth()+_searchArea.getHeight()); }
   inline size_t           NetData::getRpCount         () const { return _rpCount; }
+  inline size_t           NetData::getDiodeRpCount    () const { return _diodeCount; }
   inline void             NetData::setNetRoutingState ( NetRoutingState* state ) { _state=state; }
   inline DbU::Unit        NetData::getSparsity        () const { return _sparsity; }
-  inline void             NetData::setGlobalRouted    ( bool state ) { _flags.set(Flags::GlobalRouted,state); }
+  inline void             NetData::setGlobalEstimated ( bool state ) { _flags.set(Flags::GlobalEstimated,state); }
+  inline void             NetData::setGlobalRouted    ( bool state ) { _flags.set(Flags::GlobalRouted   ,state); }
+  inline void             NetData::setGlobalFixed     ( bool state ) { _flags.set(Flags::GlobalFixed    ,state); }
+  inline void             NetData::setExcluded        ( bool state ) { _flags.set(Flags::ExcludeRoute   ,state); }
   inline void             NetData::setRpCount         ( size_t count ) { _rpCount=count; _update(); }
 
 
@@ -153,7 +166,12 @@ namespace Anabatic {
       inline bool operator() ( const NetData* lhs, const NetData* rhs ) const
       {
         if (lhs->isMixedPreRoute() != rhs->isMixedPreRoute()) return lhs->isMixedPreRoute();
-        if (lhs->getSparsity()     != rhs->getSparsity()    ) return lhs->getSparsity() < rhs->getSparsity();
+        if ((lhs->getRpCount() > 10) or (rhs->getRpCount() > 10)) {
+          if (lhs->getRpCount() != rhs->getRpCount())
+            return lhs->getRpCount() > rhs->getRpCount();
+        }
+        
+        if (lhs->getSparsity() != rhs->getSparsity()) return lhs->getSparsity() < rhs->getSparsity();
         return lhs->getNet()->getId() < rhs->getNet()->getId();
       }
   };
@@ -179,135 +197,157 @@ namespace Anabatic {
     public:
       typedef ToolEngine  Super;
     public:
-      static        AnabaticEngine*   create                ( Cell* );
-      static        AnabaticEngine*   get                   ( const Cell* );
-      static  const Name&             staticGetName         ();
-      virtual const Name&             getName               () const;
-      virtual       Configuration*    getConfiguration      ();
-      inline        uint64_t          getDensityMode        () const;
-      inline        CellViewer*       getViewer             () const;
-      inline        void              setViewer             ( CellViewer* );
-      inline        EngineState       getState              () const;
-      inline  const Matrix*           getMatrix             () const;
-      inline  const vector<GCell*>&   getGCells             () const;
-      inline  const vector<Edge*>&    getOvEdges            () const;
-      inline        GCell*            getSouthWestGCell     () const;
-      inline        GCell*            getGCellUnder         ( DbU::Unit x, DbU::Unit y ) const;
-      inline        GCell*            getGCellUnder         ( Point ) const;
-      inline        GCellsUnder       getGCellsUnder        ( Segment* ) const;
-                    Interval          getUSide              ( Flags direction ) const;
-                    int               getCapacity           ( Interval, Flags ) const;
-                    size_t            getNetsFromEdge       ( const Edge*, NetSet& );
-      virtual       void              openSession           ();
-      inline        void              setState              ( EngineState state );
-      inline        void              setDensityMode        ( uint64_t );
-      inline        void              addOv                 ( Edge* );
-      inline        void              removeOv              ( Edge* );
-      inline const  NetDatas&         getNetDatas           () const;
-                    NetData*          getNetData            ( Net*, Flags flags=Flags::NoFlags );
-                    void              setupNetDatas         ();
-                    void              updateMatrix          ();
+      static        AnabaticEngine*   create                  ( Cell* );
+      static        AnabaticEngine*   get                     ( const Cell* );
+      static  const Name&             staticGetName           ();
+      virtual const Name&             getName                 () const;
+      virtual       Configuration*    getConfiguration        ();
+      virtual const Configuration*    getConfiguration        () const;
+      inline        uint64_t          getDensityMode          () const;
+      inline        CellViewer*       getViewer               () const;
+      inline        void              setViewer               ( CellViewer* );
+      inline        EngineState       getState                () const;
+      inline  const Matrix*           getMatrix               () const;
+      inline  const vector<GCell*>&   getGCells               () const;
+      inline  const vector<Edge*>&    getOvEdges              () const;
+      inline        GCell*            getSouthWestGCell       () const;
+      inline        GCell*            getGCellUnder           ( DbU::Unit x, DbU::Unit y ) const;
+      inline        GCell*            getGCellUnder           ( Point ) const;
+      inline        GCellsUnder       getGCellsUnder          ( Segment* ) const;
+      inline        GCellsUnder       getGCellsUnder          ( Point source, Point target ) const;
+      inline        Edges             getEdgesUnderPath       ( GCell* source, GCell* target, Flags pathFlags=Flags::NorthPath ) const;
+                    Interval          getUSide                ( Flags direction ) const;
+                    int               getCapacity             ( Interval, Flags ) const;
+                    size_t            getNetsFromEdge         ( const Edge*, NetSet& );
+      virtual       void              openSession             ();
+      inline        void              setState                ( EngineState state );
+      inline        void              setDensityMode          ( uint64_t );
+      inline        void              addOv                   ( Edge* );
+      inline        void              removeOv                ( Edge* );
+      inline const  NetDatas&         getNetDatas             () const;
+                    NetData*          getNetData              ( Net*, Flags flags=Flags::NoFlags );
+                    void              setupNetDatas           ();
+                    void              exclude                 ( const Name& netName );
+                    void              exclude                 ( Net* );
+                    void              updateMatrix            ();
+                    bool              checkPlacement          () const;
     // Dijkstra related functions.                            
-      inline        int               getStamp              () const;
-      inline        int               incStamp              ();
-                    Contact*          breakAt               ( Segment*, GCell* );
-                    void              ripup                 ( Segment*, Flags );
-                    bool              unify                 ( Contact* );
+      inline        int               getStamp                () const;
+      inline        int               incStamp                ();
+                    Contact*          breakAt                 ( Segment*, GCell* );
+                    void              ripup                   ( Segment*, Flags );
+                    bool              unify                   ( Contact* );
     // Global routing related functions.                      
-                    void              globalRoute           ();
-                    void              cleanupGlobal         ();
+                    void              globalRoute             ();
+                    void              cleanupGlobal           ();
+                    void              relaxOverConstraineds   ();
     // Detailed routing related functions.                    
-      inline        bool              isInDemoMode          () const;
-      inline        bool              isChip                () const;
-      inline        bool              doWarnOnGCellOverload () const;
-      inline        bool              doDestroyBaseContact  () const;
-      inline        bool              doDestroyBaseSegment  () const;
-      inline        bool              doDestroyTool         () const;
-      inline        DbU::Unit         getGlobalThreshold    () const;
-      inline        float             getSaturateRatio      () const;
-      inline        size_t            getSaturateRp         () const;
-      inline        DbU::Unit         getExtensionCap       () const;
-      inline        Net*              getBlockageNet        () const;
-      inline const  ChipTools&        getChipTools          () const;
-      inline const  vector<NetData*>& getNetOrdering        () const;
-                    void              updateDensity         ();
-                    size_t            checkGCellDensities   ();
-      inline        void              setGlobalThreshold    ( DbU::Unit );
-      inline        void              setSaturateRatio      ( float );
-      inline        void              setSaturateRp         ( size_t );
-      inline        void              setBlockageNet        ( Net* );
-                    void              chipPrep              ();
-                    void              setupSpecialNets      ();
-                    void              setupPreRouteds       ();
-                    void              loadGlobalRouting     ( uint32_t method );
-                    void              computeNetConstraints ( Net* );
-                    void              toOptimals            ( Net* );
-                    void              updateNetTopology     ( Net* );
-                    bool              moveUpNetTrunk        ( AutoSegment*, set<Net*>& globalNets, GCell::Set& invalidateds );
-                    void              layerAssign           ( uint32_t method );
-                    void              finalizeLayout        ();
-      inline const  AutoContactLut&   _getAutoContactLut    () const;
-      inline const  AutoSegmentLut&   _getAutoSegmentLut    () const;
-                    void              _link                 ( AutoContact* );
-                    void              _link                 ( AutoSegment* );
-                    void              _unlink               ( AutoContact* );
-                    void              _unlink               ( AutoSegment* );
-                    AutoContact*      _lookup               ( Contact* ) const;
-                    AutoSegment*      _lookup               ( Segment* ) const;
-                    void              _loadGrByNet          ();
-                    void              _loadNetGlobalRouting ( Net* );
-                    void              _computeNetOptimals   ( Net* );
-                    void              _computeNetTerminals  ( Net* );
-                    void              _alignate             ( Net* );
-                    void              _desaturate           ( unsigned int depth, set<Net*>&, unsigned long& total, unsigned long& globals );
-                    void              _layerAssignByLength  ( unsigned long& total, unsigned long& global, set<Net*>& );
-                    void              _layerAssignByLength  ( Net*, unsigned long& total, unsigned long& global, set<Net*>& );
-                    void              _layerAssignByTrunk   ( unsigned long& total, unsigned long& global, set<Net*>& );
-                    void              _layerAssignByTrunk   ( Net*, set<Net*>&, unsigned long& total, unsigned long& global );
-                    void              _saveNet              ( Net* );
-                    void              _destroyAutoContacts  ();
-                    void              _destroyAutoSegments  ();
-                    void              _check                ( Net* net ) const;
-                    bool              _check                ( const char* message ) const;
-                    void              printMeasures         ( const string& tag ) const;
+      inline        bool              isInDemoMode            () const;
+      inline        bool              isChip                  () const;
+      inline        bool              doWarnOnGCellOverload   () const;
+      inline        bool              doDestroyBaseContact    () const;
+      inline        bool              doDestroyBaseSegment    () const;
+      inline        bool              doDestroyTool           () const;
+      inline        DbU::Unit         getAntennaGateMaxWL     () const;
+      inline        DbU::Unit         getAntennaDiodeMaxWL    () const;
+      inline        DbU::Unit         getGlobalThreshold      () const;
+      inline        float             getSaturateRatio        () const;
+      inline        size_t            getSaturateRp           () const;
+      inline        DbU::Unit         getExtensionCap         () const;
+      inline        Cell*             getDiodeCell            () const;
+      inline        Net*              getBlockageNet          () const;
+      inline const  ChipTools&        getChipTools            () const;
+      inline const  vector<NetData*>& getNetOrdering          () const;
+                    void              invalidateRoutingPads   ();
+                    void              updateDensity           ();
+                    size_t            checkGCellDensities     ();
+      inline        void              setGlobalThreshold      ( DbU::Unit );
+      inline        void              setSaturateRatio        ( float );
+      inline        void              setSaturateRp           ( size_t );
+      inline        void              setBlockageNet          ( Net* );
+                    void              chipPrep                ();
+                    void              computeEdgeCapacities   ( int maxHCap, int maxVCap, int termSatThreshold, int maxTermSat );
+                    void              antennaProtect          ( Net*, uint32_t& failed, uint32_t& total );
+                    void              antennaProtect          ();
+                    void              setupSpecialNets        ();
+                    size_t            setupPreRouteds         ();
+                    void              loadGlobalRouting       ( uint32_t method );
+                    void              computeNetConstraints   ( Net* );
+                    void              toOptimals              ( Net* );
+                    void              updateNetTopology       ( Net* );
+                    bool              moveUpNetTrunk          ( AutoSegment*, set<Net*>& globalNets, GCell::Set& invalidateds );
+                    void              layerAssign             ( uint32_t method );
+                    void              finalizeLayout          ();
+                    void              exportExternalNets      ();
+      inline const  AutoContactLut&   _getAutoContactLut      () const;
+      inline const  AutoSegmentLut&   _getAutoSegmentLut      () const;
+                    void              _link                   ( AutoContact* );
+                    void              _link                   ( AutoSegment* );
+                    void              _unlink                 ( AutoContact* );
+                    void              _unlink                 ( AutoSegment* );
+                    AutoContact*      _lookup                 ( Contact* ) const;
+                    AutoSegment*      _lookup                 ( Segment* ) const;
+                    EdgeCapacity*     _createCapacity         ( Flags, Interval );
+                    size_t            _unrefCapacity          ( EdgeCapacity* );
+                    void              _loadGrByNet            ();
+                    void              _computeNetOptimals     ( Net* );
+                    void              _computeNetTerminals    ( Net* );
+                    void              _alignate               ( Net* );
+                    void              _desaturate             ( unsigned int depth, set<Net*>&, unsigned long& total, unsigned long& globals );
+                    void              _layerAssignByLength    ( unsigned long& total, unsigned long& global, set<Net*>& );
+                    void              _layerAssignByLength    ( Net*, unsigned long& total, unsigned long& global, set<Net*>& );
+                    void              _layerAssignByTrunk     ( unsigned long& total, unsigned long& global, set<Net*>& );
+                    void              _layerAssignByTrunk     ( Net*, set<Net*>&, unsigned long& total, unsigned long& global );
+                    void              _layerAssignNoGlobalM2V ( unsigned long& total, unsigned long& global, set<Net*>& );
+                    void              _layerAssignNoGlobalM2V ( Net*, set<Net*>&, unsigned long& total, unsigned long& global );
+                    void              _saveNet                ( Net* );
+                    void              _destroyAutoContacts    ();
+                    void              _destroyAutoSegments    ();
+                    void              _check                  ( Net* net ) const;
+                    bool              _check                  ( const char* message ) const;
+                    void              printMeasures           ( const string& tag ) const;
     // Misc. functions.                                       
-      inline const  Flags&            flags                 () const;
-      inline        Flags&            flags                 ();
-                    void              reset                 ();
-      inline        void              _add                  ( GCell* );
-      inline        void              _remove               ( GCell* );
-      inline        void              _updateLookup         ( GCell* );
-      inline        bool              _inDestroy            () const;
+      inline const  Flags&            flags                   () const;
+      inline        Flags&            flags                   ();
+                    void              reset                   ();
+      inline        void              _add                    ( GCell* );
+      inline        void              _remove                 ( GCell* );
+      inline        void              _updateLookup           ( GCell* );
+      inline        void              _updateGContacts        ( Flags flags=Flags::Horizontal|Flags::Vertical );
+      inline        void              _resizeMatrix           ();
+      inline        bool              _inDestroy              () const;
     // Inspector support.                                     
-      virtual       Record*           _getRecord            () const;
-      virtual       string            _getString            () const;
-      virtual       string            _getTypeName          () const;
+      virtual       Record*           _getRecord              () const;
+      virtual       string            _getString              () const;
+      virtual       string            _getTypeName            () const;
     protected:                                                
-                                      AnabaticEngine        ( Cell* );
-      virtual                        ~AnabaticEngine        ();
-      virtual       void              _postCreate           ();
-      virtual       void              _preDestroy           ();
-                    void              _gutAnabatic          ();
+                                      AnabaticEngine          ( Cell* );
+      virtual                        ~AnabaticEngine          ();
+      virtual       void              _postCreate             ();
+      virtual       void              _preDestroy             ();
+                    void              _gutAnabatic            ();
     private:                                                   
-                                      AnabaticEngine        ( const AnabaticEngine& );
-                    AnabaticEngine&   operator=             ( const AnabaticEngine& );
+                                      AnabaticEngine          ( const AnabaticEngine& );
+                    AnabaticEngine&   operator=               ( const AnabaticEngine& );
     private:
-      static Name              _toolName;
-             Configuration*    _configuration;
-             ChipTools         _chipTools;
-             EngineState       _state;
-             Matrix            _matrix;
-             vector<GCell*>    _gcells;
-             vector<Edge*>     _ovEdges;
-             vector<NetData*>  _netOrdering;
-             NetDatas          _netDatas;
-             CellViewer*       _viewer;
-             Flags             _flags;
-             int               _stamp;
-             uint64_t          _densityMode;
-             AutoSegmentLut    _autoSegmentLut;
-             AutoContactLut    _autoContactLut;
-             Net*              _blockageNet;
+      static Name                _toolName;
+             Configuration*      _configuration;
+             ChipTools           _chipTools;
+             EngineState         _state;
+             Matrix              _matrix;
+             vector<GCell*>      _gcells;
+             vector<Edge*>       _ovEdges;
+             vector<NetData*>    _netOrdering;
+             NetDatas            _netDatas;
+             CellViewer*         _viewer;
+             Flags               _flags;
+             int                 _stamp;
+             uint64_t            _densityMode;
+             AutoSegmentLut      _autoSegmentLut;
+             AutoContactLut      _autoContactLut;
+             EdgeCapacityLut     _edgeCapacitiesLut;
+             Net*                _blockageNet;
+             Cell*               _diodeCell;
   };
 
 
@@ -322,6 +362,8 @@ namespace Anabatic {
   inline       GCell*            AnabaticEngine::getGCellUnder         ( DbU::Unit x, DbU::Unit y ) const { return _matrix.getUnder(x,y); }
   inline       GCell*            AnabaticEngine::getGCellUnder         ( Point p ) const { return _matrix.getUnder(p); }
   inline       GCellsUnder       AnabaticEngine::getGCellsUnder        ( Segment* s ) const { return std::shared_ptr<RawGCellsUnder>( new RawGCellsUnder(this,s) ); }
+  inline       GCellsUnder       AnabaticEngine::getGCellsUnder        ( Point source, Point target ) const { return std::shared_ptr<RawGCellsUnder>( new RawGCellsUnder(this,source,target) ); }
+  inline       Edges             AnabaticEngine::getEdgesUnderPath     ( GCell* source, GCell* target, Flags pathFlags ) const { return new Path_Edges(source,target,pathFlags); }
   inline       uint64_t          AnabaticEngine::getDensityMode        () const { return _densityMode; }
   inline       void              AnabaticEngine::setDensityMode        ( uint64_t mode ) { _densityMode=mode; }
   inline       void              AnabaticEngine::setBlockageNet        ( Net* net ) { _blockageNet = net; }
@@ -335,17 +377,22 @@ namespace Anabatic {
   inline       bool              AnabaticEngine::doWarnOnGCellOverload () const { return _flags & Flags::WarnOnGCellOverload; }
   inline       bool              AnabaticEngine::isInDemoMode          () const { return _flags & Flags::DemoMode; }
   inline       bool              AnabaticEngine::isChip                () const { return _chipTools.isChip(); }
+  inline       DbU::Unit         AnabaticEngine::getAntennaGateMaxWL   () const { return getConfiguration()->getAntennaGateMaxWL(); }
+  inline       DbU::Unit         AnabaticEngine::getAntennaDiodeMaxWL  () const { return getConfiguration()->getAntennaDiodeMaxWL(); }
   inline       DbU::Unit         AnabaticEngine::getGlobalThreshold    () const { return _configuration->getGlobalThreshold(); }
   inline       float             AnabaticEngine::getSaturateRatio      () const { return _configuration->getSaturateRatio(); }
   inline       size_t            AnabaticEngine::getSaturateRp         () const { return _configuration->getSaturateRp(); }
   inline       void              AnabaticEngine::setSaturateRatio      ( float ratio ) { _configuration->setSaturateRatio(ratio); }
   inline       void              AnabaticEngine::setSaturateRp         ( size_t threshold ) { _configuration->setSaturateRp(threshold); }
+  inline       Cell*             AnabaticEngine::getDiodeCell          () const { return _diodeCell; }
   inline       Net*              AnabaticEngine::getBlockageNet        () const { return _blockageNet; }
   inline const ChipTools&        AnabaticEngine::getChipTools          () const { return _chipTools; }
   inline const vector<NetData*>& AnabaticEngine::getNetOrdering        () const { return _netOrdering; }
   inline       void              AnabaticEngine::setGlobalThreshold    ( DbU::Unit threshold ) { _configuration->setGlobalThreshold(threshold); }
   inline const NetDatas&         AnabaticEngine::getNetDatas           () const { return _netDatas; }
   inline       void              AnabaticEngine::_updateLookup         ( GCell* gcell ) { _matrix.updateLookup(gcell); }
+  inline       void              AnabaticEngine::_resizeMatrix         () { _matrix.resize( getCell(), getGCells() ); }
+  inline       void              AnabaticEngine::_updateGContacts      ( Flags flags ) { for ( GCell* gcell : getGCells() ) gcell->updateGContacts(flags); }
   inline       bool              AnabaticEngine::_inDestroy            () const { return _flags & Flags::DestroyMask; }
   
   inline void  AnabaticEngine::_add ( GCell* gcell )
@@ -367,12 +414,15 @@ namespace Anabatic {
   inline       int    AnabaticEngine::getStamp () const { return _stamp; }
   inline       int    AnabaticEngine::incStamp () { return ++_stamp; }
 
-  inline void  AnabaticEngine::addOv ( Edge* edge ) { _ovEdges.push_back(edge); }
+  inline void  AnabaticEngine::addOv ( Edge* edge ) {
+    _ovEdges.push_back(edge);
+  }
 
   inline void  AnabaticEngine::removeOv ( Edge* edge )
   {
-    for ( auto iedge = _ovEdges.begin() ; iedge != _ovEdges.end() ; ++iedge )
-      if (*iedge == edge) { _ovEdges.erase(iedge); break; }
+    for ( auto iedge = _ovEdges.begin() ; iedge != _ovEdges.end() ; ++iedge ) {
+      if (*iedge == edge) { _ovEdges.erase(iedge); return; }
+    }
   }
 
 
@@ -382,5 +432,3 @@ namespace Anabatic {
 
 
 INSPECTOR_P_SUPPORT(Anabatic::AnabaticEngine);
-
-#endif  // ANABATIC_ANABATIC_ENGINE_H

anabatic/src/anabatic/AutoContact.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -35,6 +35,7 @@ namespace Anabatic {
   using Hurricane::setInBound;
   using Hurricane::tab;
   using Hurricane::Name;
+  using Hurricane::Entity;
   using Hurricane::Net;
   using Hurricane::Component;
   using Hurricane::Components;
@@ -48,7 +49,7 @@ namespace Anabatic {
   class AutoContact;
 
 
-  typedef  std::map<Contact*,AutoContact*>  AutoContactLut;
+  typedef  std::map<Contact*,AutoContact*,Entity::CompareById>  AutoContactLut;
 
 
 // -------------------------------------------------------------------
@@ -67,6 +68,11 @@ namespace Anabatic {
                        , CntIgnoreAnchor          = (1 << 11)
                        , CntWeakTerminal          = (1 << 12)
                        , CntUserNativeConstraints = (1 << 13)
+                       , CntOnVertical            = (1 << 14)
+                       , CntOnHorizontal          = (1 << 15)
+                       , CntDrag                  = (1 << 16)
+                       , CntHDogleg               = (1 << 17)
+                       , CntVDogleg               = (1 << 18)
                        };
 
   class AutoContact {
@@ -97,7 +103,7 @@ namespace Anabatic {
       inline  void             setSizes                   ( DbU::Unit width, DbU::Unit height );
       inline  void             setX                       ( DbU::Unit );
       inline  void             setY                       ( DbU::Unit );
-      inline  void             setPosition                ( DbU::Unit width, DbU::Unit height );
+      inline  void             setPosition                ( DbU::Unit x, DbU::Unit y );
       inline  void             setPosition                ( const Point& );
       inline  void             setDx                      ( DbU::Unit );
       inline  void             setDy                      ( DbU::Unit );
@@ -115,15 +121,20 @@ namespace Anabatic {
       inline  bool             isVTee                     () const;
       inline  bool             isFixed                    () const;
       inline  bool             isUserNativeConstraints    () const;
+      inline  bool             isHDogleg                  () const;
+      inline  bool             isVDogleg                  () const;
+      virtual bool             isOnPin                    () const;
       inline  bool             hasBadTopology             () const;
               bool             canDestroy                 ( Flags flags=Flags::NoFlags ) const;
               bool             canMoveUp                  ( const AutoSegment* moved ) const;
+      inline  bool             canDrag                    () const;
     // Accessors.                                        
       inline  Contact*         base                       () const;
       static  size_t           getAllocateds              ();
       static  const Name&      getStaticName              ();
       virtual const Name&      getName                    () const;
       inline  size_t           getId                      () const;
+      inline  Flags            getFlags                   () const;
       virtual Box              getBoundingBox             () const;
       inline  GCell*           getGCell                   () const;
       virtual AutoSegment*     getOpposite                ( const AutoSegment* ) const = 0;
@@ -153,6 +164,7 @@ namespace Anabatic {
       virtual void             cacheDetach                ( AutoSegment* ) = 0;
       virtual void             cacheAttach                ( AutoSegment* ) = 0;
       virtual void             updateCache                () = 0;
+              void             updateLayer                ();
               void             updateSize                 ();
       virtual void             updateGeometry             () = 0;
       virtual void             updateTopology             () = 0;
@@ -172,6 +184,7 @@ namespace Anabatic {
                                                           , Flags flags=Flags::WarnOnError );
               void             restoreNativeConstraintBox ();
               void             migrateConstraintBox       ( AutoContact* other );
+              void             setLayerAndWidth           ( size_t delta, size_t depth );
               void             destroy                    ();
     // Inspector Management.
               Record*          _getRecord                 () const;
@@ -252,8 +265,12 @@ namespace Anabatic {
   inline bool          AutoContact::isTerminal              () const { return _flags&CntTerminal; }
   inline bool          AutoContact::isHTee                  () const { return _flags&CntHTee; }
   inline bool          AutoContact::isVTee                  () const { return _flags&CntVTee; }
+  inline bool          AutoContact::isHDogleg               () const { return _flags&CntHDogleg; }
+  inline bool          AutoContact::isVDogleg               () const { return _flags&CntVDogleg; }
   inline bool          AutoContact::hasBadTopology          () const { return _flags&CntBadTopology; }
+  inline bool          AutoContact::canDrag                 () const { return _flags&CntDrag; }
   inline size_t        AutoContact::getId                   () const { return _id; }
+  inline Flags         AutoContact::getFlags                () const { return _flags; }
   inline Contact*      AutoContact::base                    () const { return _contact; }
   inline GCell*        AutoContact::getGCell                () const { return _gcell; }
   inline Box           AutoContact::getConstraintBox        () const { return Box(getCBXMin(),getCBYMin(),getCBXMax(),getCBYMax()); }

anabatic/src/anabatic/AutoContactHTee.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |

anabatic/src/anabatic/AutoContactTerminal.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+// Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -60,6 +60,7 @@ namespace Anabatic {
       virtual void                 _invalidate            ( Flags flags );
     public:
               bool                 isEndPoint             () const;
+      virtual bool                 isOnPin                () const;
       virtual Box                  getNativeConstraintBox () const;
               RoutingPad*          getRoutingPad          () const;
       inline  AutoSegment*         getSegment             () const;

anabatic/src/anabatic/AutoContactTurn.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |

anabatic/src/anabatic/AutoContactVTee.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2012-2016, All Rights Reserved
+// Copyright (c) UPMC 2012-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |

anabatic/src/anabatic/AutoHorizontal.h

@@ -49,7 +49,7 @@ namespace Anabatic {
       virtual Interval        getSourceConstraints    ( Flags flags=0 ) const;
       virtual Interval        getTargetConstraints    ( Flags flags=0 ) const;
       virtual Flags           getDirection            () const;
-      virtual size_t          getGCells               ( vector<GCell*>& ) const;
+      virtual bool            getGCells               ( vector<GCell*>& ) const;
     // Modifiers.                                     
       virtual void            setDuSource             ( DbU::Unit );
       virtual void            setDuTarget             ( DbU::Unit );

anabatic/src/anabatic/AutoSegment.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -39,6 +39,7 @@ namespace Hurricane {
 
 namespace Anabatic {
 
+  using std::array;
   using std::set;
   using std::cerr;
   using std::endl;
@@ -57,11 +58,10 @@ namespace Anabatic {
   class AutoHorizontal;
   class AutoVertical;
 
+
 // -------------------------------------------------------------------
 // Class  :  "AutoSegment".
 
- 
-
   class AutoSegment {
       friend class AutoHorizontal;
       friend class AutoVertical;
@@ -70,38 +70,44 @@ namespace Anabatic {
       static const uint64_t  SegNoFlags           =  0L;
       static const uint64_t  SegHorizontal        = (1L<< 0);
       static const uint64_t  SegFixed             = (1L<< 1);
-      static const uint64_t  SegGlobal            = (1L<< 2);
-      static const uint64_t  SegWeakGlobal        = (1L<< 3);
-      static const uint64_t  SegLongLocal         = (1L<< 4);
-      static const uint64_t  SegCanonical         = (1L<< 5);
-      static const uint64_t  SegBipoint           = (1L<< 6);
-      static const uint64_t  SegDogleg            = (1L<< 7);
-      static const uint64_t  SegStrap             = (1L<< 8);
-      static const uint64_t  SegSourceTop         = (1L<< 9);
-      static const uint64_t  SegSourceBottom      = (1L<<10);
-      static const uint64_t  SegTargetTop         = (1L<<11);
-      static const uint64_t  SegTargetBottom      = (1L<<12);
-      static const uint64_t  SegIsReduced         = (1L<<13);
-      static const uint64_t  SegLayerChange       = (1L<<14);
-      static const uint64_t  SegSourceTerminal    = (1L<<15);  // Replace Terminal.
-      static const uint64_t  SegTargetTerminal    = (1L<<16);  // Replace Terminal.
+      static const uint64_t  SegFixedAxis         = (1L<< 2);
+      static const uint64_t  SegGlobal            = (1L<< 3);
+      static const uint64_t  SegWeakGlobal        = (1L<< 4);
+      static const uint64_t  SegLongLocal         = (1L<< 5);
+      static const uint64_t  SegCanonical         = (1L<< 6);
+      static const uint64_t  SegBipoint           = (1L<< 7);
+      static const uint64_t  SegDogleg            = (1L<< 8);
+      static const uint64_t  SegStrap             = (1L<< 9);
+      static const uint64_t  SegSourceTop         = (1L<<10);
+      static const uint64_t  SegSourceBottom      = (1L<<11);
+      static const uint64_t  SegTargetTop         = (1L<<12);
+      static const uint64_t  SegTargetBottom      = (1L<<13);
+      static const uint64_t  SegIsReduced         = (1L<<14);
+      static const uint64_t  SegDrag              = (1L<<15);
+      static const uint64_t  SegLayerChange       = (1L<<16);
+      static const uint64_t  SegSourceTerminal    = (1L<<17);  // Replace Terminal.
+      static const uint64_t  SegTargetTerminal    = (1L<<18);  // Replace Terminal.
       static const uint64_t  SegStrongTerminal    = SegSourceTerminal|SegTargetTerminal;
-      static const uint64_t  SegWeakTerminal1     = (1L<<17);  // Replace TopologicalEnd.
-      static const uint64_t  SegWeakTerminal2     = (1L<<18);  // Replace TopologicalEnd.
-      static const uint64_t  SegNotSourceAligned  = (1L<<19);
-      static const uint64_t  SegNotTargetAligned  = (1L<<20);
-      static const uint64_t  SegUnbound           = (1L<<21);
-      static const uint64_t  SegHalfSlackened     = (1L<<22);
-      static const uint64_t  SegSlackened         = (1L<<23);
-      static const uint64_t  SegAxisSet           = (1L<<24);
-      static const uint64_t  SegInvalidated       = (1L<<25);
-      static const uint64_t  SegInvalidatedSource = (1L<<26);
-      static const uint64_t  SegInvalidatedTarget = (1L<<27);
-      static const uint64_t  SegInvalidatedLayer  = (1L<<28);
-      static const uint64_t  SegCreated           = (1L<<29);
-      static const uint64_t  SegUserDefined       = (1L<<30);
-      static const uint64_t  SegAnalog            = (1L<<31);
-      static const uint64_t  SegWide              = (1L<<32);
+      static const uint64_t  SegWeakTerminal1     = (1L<<19);  // Replace TopologicalEnd.
+      static const uint64_t  SegWeakTerminal2     = (1L<<20);  // Replace TopologicalEnd.
+      static const uint64_t  SegNotSourceAligned  = (1L<<21);
+      static const uint64_t  SegNotTargetAligned  = (1L<<22);
+      static const uint64_t  SegUnbound           = (1L<<23);
+      static const uint64_t  SegHalfSlackened     = (1L<<24);
+      static const uint64_t  SegSlackened         = (1L<<25);
+      static const uint64_t  SegAxisSet           = (1L<<26);
+      static const uint64_t  SegInvalidated       = (1L<<27);
+      static const uint64_t  SegInvalidatedSource = (1L<<28);
+      static const uint64_t  SegInvalidatedTarget = (1L<<29);
+      static const uint64_t  SegInvalidatedLayer  = (1L<<30);
+      static const uint64_t  SegCreated           = (1L<<31);
+      static const uint64_t  SegUserDefined       = (1L<<32);
+      static const uint64_t  SegAnalog            = (1L<<33);
+      static const uint64_t  SegWide              = (1L<<34);
+      static const uint64_t  SegShortNet          = (1L<<35);
+      static const uint64_t  SegUnbreakable       = (1L<<36);
+      static const uint64_t  SegNonPref           = (1L<<37);
+      static const uint64_t  SegAtMinArea         = (1L<<38);
     // Masks.
       static const uint64_t  SegWeakTerminal      = SegStrongTerminal|SegWeakTerminal1|SegWeakTerminal2;
       static const uint64_t  SegNotAligned        = SegNotSourceAligned|SegNotTargetAligned;
@@ -130,252 +136,286 @@ namespace Anabatic {
     public:
       typedef  std::function< void(AutoSegment*) >  RevalidateCb_t;
     public:
-      static  void                setAnalogMode              ( bool );
-      static  bool                getAnalogMode              ();
-      static  AutoSegment*        create                     ( AutoContact*  source
-                                                             , AutoContact*  target
-                                                             , Segment*      hurricaneSegment
-                                                             );
-      static  AutoSegment*        create                     ( AutoContact*  source
-                                                             , AutoContact*  target
-                                                             , Flags         dir
-                                                             , size_t        depth=RoutingGauge::nlayerdepth
-                                                             );
-              void                destroy                    ();
+             static  void                setAnalogMode              ( bool );
+             static  bool                getAnalogMode              ();
+             static  void                setShortNetMode            ( bool );
+      inline static  DbU::Unit           getViaToTopCap             ( size_t depth );
+      inline static  DbU::Unit           getViaToBottomCap          ( size_t depth );
+      inline static  DbU::Unit           getViaToSameCap            ( size_t depth );
+      inline static  DbU::Unit           getMinimalLength           ( size_t depth );
+             static  AutoSegment*        create                     ( AutoContact*  source
+                                                                    , AutoContact*  target
+                                                                    , Segment*      hurricaneSegment
+                                                                    );
+             static  AutoSegment*        create                     ( AutoContact*  source
+                                                                    , AutoContact*  target
+                                                                    , Flags         dir
+                                                                    , size_t        depth=RoutingGauge::nlayerdepth
+                                                                    );
+                     void                destroy                    ();
     // Wrapped Segment Functions.                            
-      virtual Segment*            base                       () const = 0;
-      virtual Segment*            base                       () = 0;
-      virtual Horizontal*         getHorizontal              () { return NULL; };
-      virtual Vertical*           getVertical                () { return NULL; };
-      inline  Cell*               getCell                    () const;
-      inline  Net*                getNet                     () const;
-      inline  const Layer*        getLayer                   () const;
-      inline  Box                 getBoundingBox             () const;
-      inline  Hook*               getSourceHook              ();
-      inline  Hook*               getTargetHook              ();
-      inline  Contact*            getSource                  () const;
-      inline  Contact*            getTarget                  () const;
-      inline  Component*          getOppositeAnchor          ( Component* ) const;
-      inline  Components          getAnchors                 () const;
-      virtual DbU::Unit           getX                       () const;
-      virtual DbU::Unit           getY                       () const;
-      inline  DbU::Unit           getWidth                   () const;
-      inline  DbU::Unit           getContactWidth            () const;
-      inline  DbU::Unit           getLength                  () const;
-      inline  DbU::Unit           getSourcePosition          () const;
-      inline  DbU::Unit           getTargetPosition          () const;
-      inline  DbU::Unit           getSourceX                 () const;
-      inline  DbU::Unit           getSourceY                 () const;
-      inline  DbU::Unit           getTargetX                 () const;
-      inline  DbU::Unit           getTargetY                 () const;
-      inline  void                invert                     ();
-      inline  void                setLayer                   ( const Layer* );
+             virtual Segment*            base                       () const = 0;
+             virtual Segment*            base                       () = 0;
+             virtual Horizontal*         getHorizontal              () { return NULL; };
+             virtual Vertical*           getVertical                () { return NULL; };
+      inline         Cell*               getCell                    () const;
+      inline         Net*                getNet                     () const;
+      inline         const Layer*        getLayer                   () const;
+      inline         Box                 getBoundingBox             () const;
+      inline         Hook*               getSourceHook              ();
+      inline         Hook*               getTargetHook              ();
+      inline         Contact*            getSource                  () const;
+      inline         Contact*            getTarget                  () const;
+      inline         Component*          getOppositeAnchor          ( Component* ) const;
+      inline         Components          getAnchors                 () const;
+             virtual DbU::Unit           getX                       () const;
+             virtual DbU::Unit           getY                       () const;
+      inline         DbU::Unit           getWidth                   () const;
+      inline         DbU::Unit           getContactWidth            () const;
+      inline         DbU::Unit           getLength                  () const;
+      inline         DbU::Unit           getSpanLength              () const;
+      inline         DbU::Unit           getAnchoredLength          () const;
+      inline         DbU::Unit           getSourcePosition          () const;
+      inline         DbU::Unit           getTargetPosition          () const;
+      inline         DbU::Unit           getSourceX                 () const;
+      inline         DbU::Unit           getSourceY                 () const;
+      inline         DbU::Unit           getTargetX                 () const;
+      inline         DbU::Unit           getTargetY                 () const;
+      inline         void                invert                     ();
+      inline         void                setLayer                   ( const Layer* );
+      inline         void                setLayer                   ( size_t depth );
+      inline         void                setWidth                   ( DbU::Unit );
     // Predicates.                                           
-      inline  bool                isHorizontal               () const;
-      inline  bool                isVertical                 () const;
-      inline  bool                isGlobal                   () const;
-      inline  bool                isWeakGlobal               () const;
-      inline  bool                isLongLocal                () const;
-      inline  bool                isLocal                    () const;
-      inline  bool                isFixed                    () const;
-      inline  bool                isBipoint                  () const;
-      inline  bool                isWeakTerminal             () const;
-      inline  bool                isWeakTerminal1            () const;
-      inline  bool                isWeakTerminal2            () const;
-      inline  bool                isTerminal                 () const;
-      inline  bool                isNotSourceAligned         () const;
-      inline  bool                isNotTargetAligned         () const;
-      inline  bool                isNotAligned               () const;
-              bool                isStrongTerminal           ( Flags flags=Flags::NoFlags ) const;
-      inline  bool                isSourceTerminal           () const;
-      inline  bool                isTargetTerminal           () const;
-      inline  bool                isLayerChange              () const;
-      inline  bool                isSpinTop                  () const;
-      inline  bool                isSpinBottom               () const;
-      inline  bool                isSpinTopOrBottom          () const;
-      inline  bool                isReduced                  () const;
-      inline  bool                isStrap                    () const;
-      inline  bool                isDogleg                   () const;
-      inline  bool                isUnbound                  () const;
-      inline  bool                isInvalidated              () const;
-      inline  bool                isInvalidatedLayer         () const;
-      inline  bool                isCreated                  () const;
-      inline  bool                isCanonical                () const;
-      inline  bool                isUnsetAxis                () const;
-      inline  bool                isSlackened                () const;
-      inline  bool                isUserDefined              () const;
-              bool                isReduceCandidate          () const;
-              bool                isUTurn                    () const;
-      inline  bool                isAnalog                   () const;
-      inline  bool                isWide                     () const;
-      virtual bool                _canSlacken                () const = 0;
-              bool                canReduce                  () const;
-              bool                mustRaise                  () const;
-              Flags               canDogleg                  ( Interval );
-      virtual bool                canMoveULeft               ( float reserve=0.0 ) const = 0;
-      virtual bool                canMoveURight              ( float reserve=0.0 ) const = 0;
-              bool                canMoveUp                  ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
-              bool                canPivotUp                 ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
-              bool                canPivotDown               ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
-              bool                canSlacken                 ( Flags flags=Flags::NoFlags ) const;
-      virtual bool                checkPositions             () const = 0;
-      virtual bool                checkConstraints           () const = 0;
-              bool                checkDepthSpin             () const;
+      inline         bool                isHorizontal               () const;
+      inline         bool                isVertical                 () const;
+      inline         bool                isGlobal                   () const;
+      inline         bool                isWeakGlobal               () const;
+      inline         bool                isLongLocal                () const;
+      inline         bool                isLocal                    () const;
+      inline         bool                isFixed                    () const;
+      inline         bool                isFixedAxis                () const;
+      inline         bool                isBipoint                  () const;
+      inline         bool                isWeakTerminal             () const;
+      inline         bool                isWeakTerminal1            () const;
+      inline         bool                isWeakTerminal2            () const;
+      inline         bool                isTerminal                 () const;
+      inline         bool                isUnbreakable              () const;
+      inline         bool                isNonPref                  () const;
+      inline         bool                isDrag                     () const;
+      inline         bool                isAtMinArea                () const;
+      inline         bool                isNotSourceAligned         () const;
+      inline         bool                isNotTargetAligned         () const;
+      inline         bool                isNotAligned               () const;
+                     bool                isStrongTerminal           ( Flags flags=Flags::NoFlags ) const;
+      inline         bool                isSourceTerminal           () const;
+      inline         bool                isTargetTerminal           () const;
+      inline         bool                isLayerChange              () const;
+      inline         bool                isStackedStrap             () const;
+      inline         bool                isSpinTop                  () const;
+      inline         bool                isSpinBottom               () const;
+      inline         bool                isSpinTopOrBottom          () const;
+      inline         bool                isReduced                  () const;
+                     bool                isUnderMinLength           () const;
+      inline         bool                isStrap                    () const;
+      inline         bool                isDogleg                   () const;
+      inline         bool                isUnbound                  () const;
+      inline         bool                isInvalidated              () const;
+      inline         bool                isInvalidatedLayer         () const;
+      inline         bool                isCreated                  () const;
+      inline         bool                isCanonical                () const;
+      inline         bool                isUnsetAxis                () const;
+      inline         bool                isSlackened                () const;
+      inline         bool                isUserDefined              () const;
+                     bool                isMiddleStack              () const;
+                     bool                isReduceCandidate          () const;
+                     bool                isUTurn                    () const;
+      inline         bool                isAnalog                   () const;
+      inline         bool                isWide                     () const;
+      inline         bool                isShortNet                 () const;
+             virtual bool                _canSlacken                () const = 0;
+                     bool                canReduce                  ( Flags flags=Flags::WithPerpands ) const;
+                     bool                mustRaise                  () const;
+                     Flags               canDogleg                  ( Interval );
+             virtual bool                canMoveULeft               ( float reserve=0.0 ) const = 0;
+             virtual bool                canMoveURight              ( float reserve=0.0 ) const = 0;
+                     bool                canMoveUp                  ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canPivotUp                 ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canPivotDown               ( float reserve=0.0, Flags flags=Flags::NoFlags ) const;
+                     bool                canSlacken                 ( Flags flags=Flags::NoFlags ) const;
+             virtual bool                checkPositions             () const = 0;
+             virtual bool                checkConstraints           () const = 0;
+                     bool                checkDepthSpin             () const;
     // Accessors.                                            
-      inline  unsigned long       getId                      () const;
-      inline  uint64_t            getFlags                   () const;
-      virtual Flags               getDirection               () const = 0;
-      inline  GCell*              getGCell                   () const;
-      virtual size_t              getGCells                  ( vector<GCell*>& ) const = 0;
-      inline  AutoContact*        getAutoSource              () const;
-      inline  AutoContact*        getAutoTarget              () const;
-              AutoContact*        getOppositeAnchor          ( AutoContact* ) const;
-              size_t              getPerpandicularsBound     ( set<AutoSegment*>& );
-      inline  AutoSegment*        getParent                  () const;
-      inline  unsigned int        getDepth                   () const;
-      inline  DbU::Unit           getPitch                   () const;
-              DbU::Unit           getPPitch                  () const;
-              DbU::Unit           getExtensionCap            () const;
-      inline  DbU::Unit           getAxis                    () const;
-      virtual DbU::Unit           getSourceU                 () const = 0;
-      virtual DbU::Unit           getTargetU                 () const = 0;
-      virtual DbU::Unit           getDuSource                () const = 0;
-      virtual DbU::Unit           getDuTarget                () const = 0;
-      inline  DbU::Unit           getOrigin                  () const;
-      inline  DbU::Unit           getExtremity               () const;
-      virtual Interval            getSpanU                   () const = 0;
-              Interval            getMinSpanU                () const;
-      virtual Interval            getSourceConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
-      virtual Interval            getTargetConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
-      virtual bool                getConstraints             ( DbU::Unit& min, DbU::Unit& max ) const = 0;
-      inline  bool                getConstraints             ( Interval& i ) const;
-      inline  const Interval&     getUserConstraints         () const;
-      inline  const Interval&     getNativeConstraints       () const;
-      virtual DbU::Unit           getSlack                   () const;
-      inline  DbU::Unit           getOptimalMin              () const;
-      inline  DbU::Unit           getOptimalMax              () const;
-      inline  DbU::Unit           getNativeMin               () const;
-      inline  DbU::Unit           getNativeMax               () const;
-              Interval&           getOptimal                 ( Interval& i ) const;
-      virtual DbU::Unit           getCost                    ( DbU::Unit axis ) const;
-      virtual AutoSegment*        getCanonical               ( DbU::Unit& min , DbU::Unit& max );
-      inline  AutoSegment*        getCanonical               ( Interval& i );
-              float               getMaxUnderDensity         ( Flags flags );
+      inline         unsigned long       getId                      () const;
+      inline         uint64_t            getFlags                   () const;
+             virtual Flags               getDirection               () const = 0;
+      inline         GCell*              getGCell                   () const;
+             virtual bool                getGCells                  ( vector<GCell*>& ) const = 0;
+      inline         AutoContact*        getAutoSource              () const;
+      inline         AutoContact*        getAutoTarget              () const;
+                     AutoContact*        getOppositeAnchor          ( AutoContact* ) const;
+                     size_t              getPerpandicularsBound     ( set<AutoSegment*>& );
+      inline         AutoSegment*        getParent                  () const;
+      inline         unsigned int        getRpDistance              () const;
+      inline         unsigned int        getDepth                   () const;
+      inline         DbU::Unit           getPitch                   () const;
+                     DbU::Unit           getPPitch                  () const;
+#if DISABLED
+                     DbU::Unit           getExtensionCap            () const;
+#endif
+                     DbU::Unit           getExtensionCap            ( Flags ) const;
+      inline         DbU::Unit           getAxis                    () const;
+                     void                getEndAxes                 ( DbU::Unit& sourceAxis, DbU::Unit& targetAxis ) const;
+             virtual DbU::Unit           getSourceU                 () const = 0;
+             virtual DbU::Unit           getTargetU                 () const = 0;
+             virtual DbU::Unit           getDuSource                () const = 0;
+             virtual DbU::Unit           getDuTarget                () const = 0;
+      inline         DbU::Unit           getOrigin                  () const;
+      inline         DbU::Unit           getExtremity               () const;
+             virtual Interval            getSpanU                   () const = 0;
+                     Interval            getMinSpanU                () const;
+             virtual Interval            getSourceConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
+             virtual Interval            getTargetConstraints       ( Flags flags=Flags::NoFlags ) const = 0;
+             virtual bool                getConstraints             ( DbU::Unit& min, DbU::Unit& max ) const = 0;
+      inline         bool                getConstraints             ( Interval& i ) const;
+      inline         const Interval&     getUserConstraints         () const;
+      inline         const Interval&     getNativeConstraints       () const;
+             virtual DbU::Unit           getSlack                   () const;
+      inline         DbU::Unit           getOptimalMin              () const;
+      inline         DbU::Unit           getOptimalMax              () const;
+      inline         DbU::Unit           getNativeMin               () const;
+      inline         DbU::Unit           getNativeMax               () const;
+                     Interval&           getOptimal                 ( Interval& i ) const;
+             virtual DbU::Unit           getCost                    ( DbU::Unit axis ) const;
+             virtual AutoSegment*        getCanonical               ( DbU::Unit& min , DbU::Unit& max );
+      inline         AutoSegment*        getCanonical               ( Interval& i );
+                     float               getMaxUnderDensity         ( Flags flags );
+      inline         uint32_t            getReduceds                () const;
+                     uint32_t            getNonReduceds             ( Flags flags=Flags::WithPerpands ) const;
     // Modifiers.                                            
-      inline  void                unsetFlags                 ( uint64_t );
-      inline  void                setFlags                   ( uint64_t );
-              void                setFlagsOnAligneds         ( uint64_t );
-      inline  void                incReduceds                ();
-      inline  void                decReduceds                ();
-      virtual void                setDuSource                ( DbU::Unit du ) = 0;
-      virtual void                setDuTarget                ( DbU::Unit du ) = 0;
-              void                computeTerminal            ();
-      virtual void                updateOrient               () = 0;
-      virtual void                updatePositions            () = 0;
-      virtual void                updateNativeConstraints    () = 0;
-              void                updateSourceSpin           ();
-              void                updateTargetSpin           ();
-              void                sourceDetach               ();
-              void                targetDetach               ();
-              void                sourceAttach               ( AutoContact* );
-              void                targetAttach               ( AutoContact* );
-    //inline  void                mergeUserConstraints       ( const Interval& );
-              void                mergeUserConstraints       ( const Interval& );
-      inline  void                resetUserConstraints       ();
-      inline  void                setOptimalMin              ( DbU::Unit min );
-      inline  void                setOptimalMax              ( DbU::Unit max );
-      inline  void                mergeNativeMin             ( DbU::Unit min );
-      inline  void                mergeNativeMax             ( DbU::Unit max );
-      inline  void                resetNativeConstraints     ( DbU::Unit min, DbU::Unit max );
-              bool                checkNotInvalidated        () const;
-      inline  void                setParent                  ( AutoSegment* );
-              void                revalidate                 ();
-              AutoSegment*        makeDogleg                 ( AutoContact* );
-              Flags               makeDogleg                 ( Interval, Flags flags=Flags::NoFlags );
-              Flags               makeDogleg                 ( GCell*  , Flags flags=Flags::NoFlags );
-      virtual Flags               _makeDogleg                ( GCell*  , Flags flags ) = 0;
-      virtual bool                moveULeft                  () = 0;
-      virtual bool                moveURight                 () = 0;
-              bool                slacken                    ( Flags flags );
-      virtual bool                _slacken                   ( Flags flags ) = 0;
-              void                _changeDepth               ( unsigned int depth, Flags flags );
-              void                changeDepth                ( unsigned int depth, Flags flags );
-              bool                moveUp                     ( Flags flags=Flags::NoFlags );
-              bool                moveDown                   ( Flags flags=Flags::NoFlags );
-              bool                reduceDoglegLayer          ();
-              bool                reduce                     ();
-              bool                raise                      ();
+      inline         void                unsetFlags                 ( uint64_t );
+      inline         void                setFlags                   ( uint64_t );
+                     void                setFlagsOnAligneds         ( uint64_t );
+      inline         void                setRpDistance              ( unsigned int );
+      inline         void                incReduceds                ();
+      inline         void                decReduceds                ();
+             virtual void                setDuSource                ( DbU::Unit du ) = 0;
+             virtual void                setDuTarget                ( DbU::Unit du ) = 0;
+                     void                computeTerminal            ();
+             virtual void                updateOrient               () = 0;
+             virtual void                updatePositions            () = 0;
+             virtual void                updateNativeConstraints    () = 0;
+                     void                updateSourceSpin           ();
+                     void                updateTargetSpin           ();
+                     void                sourceDetach               ();
+                     void                targetDetach               ();
+                     void                sourceAttach               ( AutoContact* );
+                     void                targetAttach               ( AutoContact* );
+    //inline         void                mergeUserConstraints       ( const Interval& );
+                     void                mergeUserConstraints       ( const Interval& );
+      inline         void                resetUserConstraints       ();
+      inline         void                setOptimalMin              ( DbU::Unit min );
+      inline         void                setOptimalMax              ( DbU::Unit max );
+      inline         void                mergeNativeMin             ( DbU::Unit min );
+      inline         void                mergeNativeMax             ( DbU::Unit max );
+      inline         void                resetNativeConstraints     ( DbU::Unit min, DbU::Unit max );
+                     bool                checkNotInvalidated        () const;
+      inline         void                setParent                  ( AutoSegment* );
+                     void                revalidate                 ();
+                     AutoSegment*        makeDogleg                 ( AutoContact* );
+                     Flags               makeDogleg                 ( Interval, Flags flags=Flags::NoFlags );
+                     Flags               makeDogleg                 ( GCell*  , Flags flags=Flags::NoFlags );
+             virtual Flags               _makeDogleg                ( GCell*  , Flags flags ) = 0;
+             virtual bool                moveULeft                  () = 0;
+             virtual bool                moveURight                 () = 0;
+                     bool                slacken                    ( Flags flags );
+             virtual bool                _slacken                   ( Flags flags ) = 0;
+                     void                _changeDepth               ( unsigned int depth, Flags flags );
+                     void                changeDepth                ( unsigned int depth, Flags flags );
+                     bool                moveUp                     ( Flags flags=Flags::NoFlags );
+                     bool                moveDown                   ( Flags flags=Flags::NoFlags );
+                     bool                reduceDoglegLayer          ();
+                     bool                bloatStackedStrap          ();
+                     bool                reduce                     ( Flags flags=Flags::WithPerpands );
+                     bool                raise                      ();
+                     bool                expandToMinLength          ( Interval );
+                     bool                unexpandToMinLength        ();
     // Canonical Modifiers.                                            
-              AutoSegment*        canonize                   ( Flags flags=Flags::NoFlags );
-      virtual void                invalidate                 ( Flags flags=Flags::Propagate );
-              void                invalidate                 ( AutoContact* );
-              void                computeOptimal             ( set<AutoSegment*>& processeds );
-              void                setAxis                    ( DbU::Unit, Flags flags=Flags::NoFlags );
-              bool                toConstraintAxis           ( Flags flags=Flags::Realignate );
-              bool                toOptimalAxis              ( Flags flags=Flags::Realignate );
+                     AutoSegment*        canonize                   ( Flags flags=Flags::NoFlags );
+             virtual void                invalidate                 ( Flags flags=Flags::Propagate );
+                     void                invalidate                 ( AutoContact* );
+                     void                computeOptimal             ( set<AutoSegment*>& processeds );
+                     void                setAxis                    ( DbU::Unit, Flags flags=Flags::NoFlags );
+                     bool                toConstraintAxis           ( Flags flags=Flags::Realignate );
+                     bool                toOptimalAxis              ( Flags flags=Flags::Realignate );
     // Collections & Filters.                                
-              AutoSegments        getOnSourceContact         ( Flags direction );
-              AutoSegments        getOnTargetContact         ( Flags direction );
-              AutoSegments        getCachedOnSourceContact   ( Flags direction );
-              AutoSegments        getCachedOnTargetContact   ( Flags direction );
-              AutoSegments        getAligneds                ( Flags flags=Flags::NoFlags );
-              AutoSegments        getConnecteds              ( Flags flags=Flags::NoFlags );
-              AutoSegments        getPerpandiculars          ( Flags flags=Flags::NoFlags );
-              size_t              getAlignedContacts         ( map<AutoContact*,int>& ) const ;
+                     AutoSegments        getOnSourceContact         ( Flags direction );
+                     AutoSegments        getOnTargetContact         ( Flags direction );
+                     AutoSegments        getCachedOnSourceContact   ( Flags direction );
+                     AutoSegments        getCachedOnTargetContact   ( Flags direction );
+                     AutoSegments        getAligneds                ( Flags flags=Flags::NoFlags );
+                     AutoSegments        getConnecteds              ( Flags flags=Flags::NoFlags );
+                     AutoSegments        getPerpandiculars          ( Flags flags=Flags::NoFlags );
+                     size_t              getAlignedContacts         ( map<AutoContact*,int>& ) const ;
     // Observers.                         
       template< typename OwnerT >
-      inline  OwnerT*             getObserver                ( size_t slot );
-      inline  void                setObserver                ( size_t slot, BaseObserver* );
-      inline  void                notify                     ( unsigned int flags );
+      inline         OwnerT*             getObserver                ( size_t slot );
+      inline         void                setObserver                ( size_t slot, BaseObserver* );
+      inline         void                notify                     ( unsigned int flags );
     // Inspector Management.                                 
-      virtual Record*             _getRecord                 () const = 0;
-      virtual string              _getString                 () const = 0;
-      virtual string              _getTypeName               () const = 0;
+             virtual Record*             _getRecord                 () const = 0;
+             virtual string              _getString                 () const = 0;
+             virtual string              _getTypeName               () const = 0;
     // Non-reviewed atomic modifiers.
-              bool                _check                     () const;
+                     bool                _check                     () const;
 #if THIS_IS_DISABLED
-      virtual void                desalignate                ( AutoContact* ) = 0;
-              bool                shearUp                    ( GCell*
-                                                             , AutoSegment*& movedUp
-                                                             , float         reserve
-                                                             , Flags         flags );
+             virtual void                desalignate                ( AutoContact* ) = 0;
+                     bool                shearUp                    ( GCell*
+                                                                    , AutoSegment*& movedUp
+                                                                    , float         reserve
+                                                                    , Flags         flags );
 #endif
                                   
     protected:                    
     // Internal: Static Attributes.
-      static size_t               _allocateds;
-      static size_t               _globalsCount;
-      static bool                 _analogMode;
+      static size_t                        _allocateds;
+      static size_t                        _globalsCount;
+      static bool                          _analogMode;
+      static bool                          _shortNetMode;
+      static bool                          _initialized;
+      static vector< array<DbU::Unit*,4> > _extensionCaps;
     // Internal: Attributes.      
-      const  unsigned long        _id;
-             GCell*               _gcell;
-             uint64_t             _flags;
-             unsigned int         _depth      : 8;
-             unsigned int         _optimalMin :16;
-             unsigned int         _optimalMax :16;
-             unsigned int         _reduceds   : 2;
-             DbU::Unit            _sourcePosition;
-             DbU::Unit            _targetPosition;
-             Interval             _userConstraints;
-             Interval             _nativeConstraints;
-             AutoSegment*         _parent;
-             Observable           _observers;
+      const  unsigned long                 _id;
+             GCell*                        _gcell;
+             uint64_t                      _flags;
+             unsigned int                  _depth        : 8;
+             unsigned int                  _optimalMin   :16;
+             unsigned int                  _optimalMax   :16;
+             unsigned int                  _reduceds     : 2;
+             unsigned int                  _rpDistance   : 4;
+             DbU::Unit                     _sourcePosition;
+             DbU::Unit                     _targetPosition;
+             Interval                      _userConstraints;
+             Interval                      _nativeConstraints;
+             AutoSegment*                  _parent;
+             Observable                    _observers;
                                   
     // Internal: Constructors & Destructors.
     protected:                    
-                                  AutoSegment     ( Segment* segment );
-      virtual                    ~AutoSegment     ();
-      static  void                _preCreate      ( AutoContact* source, AutoContact* target );
-      virtual void                _postCreate     ();
-      virtual void                _preDestroy     ();
+                                         AutoSegment     ( Segment* segment );
+             virtual                    ~AutoSegment     ();
+             static  void                _preCreate      ( AutoContact* source, AutoContact* target );
+             virtual void                _postCreate     ();
+             virtual void                _preDestroy     ();
+             static  void                _initialize     ();
     private:                                      
-                                  AutoSegment     ( const AutoSegment& );
-              AutoSegment&        operator=       ( const AutoSegment& );
+                                         AutoSegment     ( const AutoSegment& );
+                     AutoSegment&        operator=       ( const AutoSegment& );
     protected:                                    
-              void                _invalidate     ();
-      inline  uint64_t            _getFlags       () const;
-              std::string         _getStringFlags () const;
-      virtual void                _setAxis        ( DbU::Unit ) = 0;
+                     void                _invalidate     ();
+      inline         uint64_t            _getFlags       () const;
+                     std::string         _getStringFlags () const;
+             virtual void                _setAxis        ( DbU::Unit ) = 0;
 
     public:
       struct CompareId : public binary_function<AutoSegment*,AutoSegment*,bool> {
@@ -389,8 +429,20 @@ namespace Anabatic {
       struct CompareByDepthAxis : public binary_function<AutoSegment*,AutoSegment*,bool> {
           bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
       };
+    public:
+      struct CompareBySourceU : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
+      };
+    public:
+      struct CompareByRevalidate : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
+      };
+      struct CompareByReduceds : public binary_function<AutoSegment*,AutoSegment*,bool> {
+          bool operator() ( AutoSegment* lhs, AutoSegment* rhs ) const;
+      };
     public:
       typedef std::set<AutoSegment*,CompareByDepthLength>  DepthLengthSet;
+      typedef std::set<AutoSegment*,CompareId>             IdSet;
 
     // Static Utilities.
     public:
@@ -429,6 +481,10 @@ namespace Anabatic {
 
 
 // Inline Functions.
+  inline  DbU::Unit       AutoSegment::getViaToTopCap         ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][0]) : 0; }
+  inline  DbU::Unit       AutoSegment::getViaToBottomCap      ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][1]) : 0; }
+  inline  DbU::Unit       AutoSegment::getViaToSameCap        ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][2]) : 0; }
+  inline  DbU::Unit       AutoSegment::getMinimalLength       ( size_t depth ) { return (depth < _extensionCaps.size()) ? *(_extensionCaps[depth][3]) : 0; }
   inline  unsigned long   AutoSegment::getId                  () const { return _id; }
   inline  Cell*           AutoSegment::getCell                () const { return base()->getCell(); }
   inline  Net*            AutoSegment::getNet                 () const { return base()->getNet(); }
@@ -455,6 +511,7 @@ namespace Anabatic {
   inline  bool            AutoSegment::getConstraints         ( Interval& i ) const { return getConstraints(i.getVMin(),i.getVMax()); }
   inline  AutoSegment*    AutoSegment::getCanonical           ( Interval& i ) { return getCanonical(i.getVMin(),i.getVMax()); }
   inline  unsigned int    AutoSegment::getDepth               () const { return _depth; }
+  inline  unsigned int    AutoSegment::getRpDistance          () const { return _rpDistance; }
   inline  DbU::Unit       AutoSegment::getPitch               () const { return Session::getPitch(getDepth(),Flags::NoFlags); }
   inline  DbU::Unit       AutoSegment::getAxis                () const { return isHorizontal()?base()->getY():base()->getX(); }
   inline  DbU::Unit       AutoSegment::getOrigin              () const { return isHorizontal()?_gcell->getYMin():_gcell->getXMin(); }
@@ -465,21 +522,27 @@ namespace Anabatic {
   inline  DbU::Unit       AutoSegment::getNativeMax           () const { return _nativeConstraints.getVMax(); }
   inline  const Interval& AutoSegment::getUserConstraints     () const { return _userConstraints; }
   inline  const Interval& AutoSegment::getNativeConstraints   () const { return _nativeConstraints; }
+  inline  uint32_t        AutoSegment::getReduceds            () const { return _reduceds; }
                                                               
   inline  bool            AutoSegment::isHorizontal           () const { return _flags & SegHorizontal; }
   inline  bool            AutoSegment::isVertical             () const { return not (_flags & SegHorizontal); }
   inline  bool            AutoSegment::isFixed                () const { return _flags & SegFixed; }
+  inline  bool            AutoSegment::isFixedAxis            () const { return _flags & SegFixedAxis; }
   inline  bool            AutoSegment::isGlobal               () const { return _flags & SegGlobal; }
   inline  bool            AutoSegment::isWeakGlobal           () const { return _flags & SegWeakGlobal; }
   inline  bool            AutoSegment::isLongLocal            () const { return _flags & SegLongLocal; }
   inline  bool            AutoSegment::isLocal                () const { return not (_flags & SegGlobal); }
+  inline  bool            AutoSegment::isUnbreakable          () const { return _flags & SegUnbreakable; }
+  inline  bool            AutoSegment::isNonPref              () const { return _flags & SegNonPref; }
   inline  bool            AutoSegment::isBipoint              () const { return _flags & SegBipoint; }
-  inline  bool            AutoSegment::isWeakTerminal         () const { return _flags & SegWeakTerminal; }
-  inline  bool            AutoSegment::isWeakTerminal1        () const { return _flags & SegWeakTerminal1; }
-  inline  bool            AutoSegment::isWeakTerminal2        () const { return _flags & SegWeakTerminal2; }
+  inline  bool            AutoSegment::isWeakTerminal         () const { return (_rpDistance < 2); }
+  inline  bool            AutoSegment::isWeakTerminal1        () const { return (_rpDistance == 1); }
+  inline  bool            AutoSegment::isWeakTerminal2        () const { return (_rpDistance == 2); }
   inline  bool            AutoSegment::isSourceTerminal       () const { return _flags & SegSourceTerminal; }
   inline  bool            AutoSegment::isTargetTerminal       () const { return _flags & SegTargetTerminal; }
-  inline  bool            AutoSegment::isTerminal             () const { return _flags & SegStrongTerminal; }
+  inline  bool            AutoSegment::isTerminal             () const { return (_rpDistance == 0); }
+  inline  bool            AutoSegment::isDrag                 () const { return _flags & SegDrag; }
+  inline  bool            AutoSegment::isAtMinArea            () const { return _flags & SegAtMinArea; }
   inline  bool            AutoSegment::isNotSourceAligned     () const { return _flags & SegNotSourceAligned; }
   inline  bool            AutoSegment::isNotTargetAligned     () const { return _flags & SegNotTargetAligned; }
   inline  bool            AutoSegment::isNotAligned           () const { return (_flags & SegNotAligned) == SegNotAligned; }
@@ -500,14 +563,17 @@ namespace Anabatic {
   inline  bool            AutoSegment::isUserDefined          () const { return _flags & SegUserDefined; }
   inline  bool            AutoSegment::isAnalog               () const { return _flags & SegAnalog; }
   inline  bool            AutoSegment::isWide                 () const { return _flags & SegWide; }
+  inline  bool            AutoSegment::isShortNet             () const { return _flags & SegShortNet; }
   inline  void            AutoSegment::setFlags               ( uint64_t flags ) { _flags |=  flags; }
   inline  void            AutoSegment::unsetFlags             ( uint64_t flags ) { _flags &= ~flags; }
                                                               
   inline  uint64_t        AutoSegment::getFlags               () const { return _flags; }
   inline  uint64_t        AutoSegment::_getFlags              () const { return _flags; }
+  inline  void            AutoSegment::setRpDistance          ( unsigned int distance ) { _rpDistance=distance; }
   inline  void            AutoSegment::incReduceds            () { if (_reduceds<3) ++_reduceds; }
   inline  void            AutoSegment::decReduceds            () { if (_reduceds>0) --_reduceds; }
-  inline  void            AutoSegment::setLayer               ( const Layer* layer ) { base()->setLayer(layer); _depth=Session::getLayerDepth(layer); }
+  inline  void            AutoSegment::setLayer               ( const Layer* layer ) { base()->setLayer(layer); _depth=Session::getLayerDepth(layer); _flags|=SegInvalidatedLayer; }
+  inline  void            AutoSegment::setWidth               ( DbU::Unit width ) { base()->setWidth(width); }
   inline  void            AutoSegment::setOptimalMin          ( DbU::Unit min ) { _optimalMin = (unsigned int)DbU::getLambda(min-getOrigin()); }
   inline  void            AutoSegment::setOptimalMax          ( DbU::Unit max ) { _optimalMax = (unsigned int)DbU::getLambda(max-getOrigin()); }
   inline  void            AutoSegment::mergeNativeMin         ( DbU::Unit min ) { _nativeConstraints.getVMin() = std::max( min, _nativeConstraints.getVMin() ); }
@@ -515,11 +581,25 @@ namespace Anabatic {
   inline  void            AutoSegment::resetNativeConstraints ( DbU::Unit min, DbU::Unit max ) { _nativeConstraints = Interval( min, max ); }
 //inline  void            AutoSegment::mergeUserConstraints   ( const Interval& constraints ) { _userConstraints.intersection(constraints); }
   inline  void            AutoSegment::resetUserConstraints   () { _userConstraints = Interval(false); }
+  inline  DbU::Unit       AutoSegment::getAnchoredLength      () const { return std::abs(getTargetU() - getSourceU()); }
 
+  inline  void  AutoSegment::setLayer ( size_t depth )
+  {
+    RoutingLayerGauge* layerGauge = Session::getLayerGauge( depth );
+    base()->setLayer( layerGauge->getLayer    () );
+    base()->setWidth( layerGauge->getWireWidth() );
+
+    _depth = depth;
+    _flags|=SegInvalidatedLayer;
+  }
 
   inline  DbU::Unit  AutoSegment::getContactWidth () const
   { return getWidth() + Session::getViaWidth(getLayer()) - Session::getWireWidth(getLayer()); }
 
+  inline  DbU::Unit  AutoSegment::getSpanLength () const
+  { return getAnchoredLength() + getExtensionCap( Flags::Source|Flags::LayerCapOnly|Flags::NoMinLength )
+                               + getExtensionCap( Flags::Target|Flags::LayerCapOnly|Flags::NoMinLength );
+  }
 
   inline  void  AutoSegment::setParent ( AutoSegment* parent )
   {
@@ -529,7 +609,6 @@ namespace Anabatic {
     _parent = parent;
   }
 
-
   inline bool  AutoSegment::CompareId::operator() ( const AutoSegment* lhs, const AutoSegment* rhs ) const
   { return lhs->getId() < rhs->getId(); }
  

anabatic/src/anabatic/AutoSegments.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC/LIP6 2008-2016, All Rights Reserved
+// Copyright (c) UPMC/LIP6 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -48,6 +48,7 @@ namespace Anabatic {
   using Hurricane::DbU;
   using Hurricane::Box;
   using Hurricane::Hook;
+  using Hurricane::Entity;
   using Hurricane::Component;
   using Hurricane::Contact;
   using Hurricane::Segment;
@@ -70,13 +71,13 @@ namespace Anabatic {
 // -------------------------------------------------------------------
 // Collections.
 
-  typedef Hurricane::Filter<AutoSegment*>     AutoSegmentHF;
-  typedef Hurricane::Locator<AutoSegment*>    AutoSegmentHL;
-  typedef Hurricane::Collection<AutoSegment*> AutoSegmentHC;
-  typedef GenericCollection<AutoSegment*>     AutoSegments;
-  typedef GenericLocator<AutoSegment*>        AutoSegmentLocator;
-  typedef GenericFilter<AutoSegment*>         AutoSegmentFilter;
-  typedef map<Segment*,AutoSegment*>          AutoSegmentLut;
+  typedef Hurricane::Filter<AutoSegment*>                 AutoSegmentHF;
+  typedef Hurricane::Locator<AutoSegment*>                AutoSegmentHL;
+  typedef Hurricane::Collection<AutoSegment*>             AutoSegmentHC;
+  typedef GenericCollection<AutoSegment*>                 AutoSegments;
+  typedef GenericLocator<AutoSegment*>                    AutoSegmentLocator;
+  typedef GenericFilter<AutoSegment*>                     AutoSegmentFilter;
+  typedef map<Segment*,AutoSegment*,Entity::CompareById>  AutoSegmentLut;
 
 
 // -------------------------------------------------------------------

anabatic/src/anabatic/AutoVertical.h

@@ -49,7 +49,7 @@ namespace Anabatic {
       virtual Interval      getSourceConstraints    ( Flags flags=0 ) const;
       virtual Interval      getTargetConstraints    ( Flags flags=0 ) const;
       virtual Flags         getDirection            () const;
-      virtual size_t        getGCells               ( vector<GCell*>& ) const;
+      virtual bool          getGCells               ( vector<GCell*>& ) const;
     // Modifiers.                                   
       virtual void          setDuSource             ( DbU::Unit );
       virtual void          setDuTarget             ( DbU::Unit );

anabatic/src/anabatic/ChipTools.h

@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC/LIP6 2008-2016, All Rights Reserved
+// Copyright (c) UPMC/LIP6 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_CHIP_TOOLS_H
-#define  ANABATIC_CHIP_TOOLS_H
-
+#pragma  once
 #include <string>
 #include "hurricane/DbU.h"
 #include "hurricane/Torus.h"
@@ -113,6 +111,4 @@ namespace Anabatic {
 
 } // Anabatic namespace.
 
-INSPECTOR_PV_SUPPORT(Anabatic::ChipTools);
-
-#endif  // ANABATIC_CHIP_TOOLS_H
+INSPECTOR_PR_SUPPORT(Anabatic::ChipTools);

anabatic/src/anabatic/Configuration.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Configuration.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_CONFIGURATION_H
-#define  ANABATIC_CONFIGURATION_H
-
+#pragma  once
 #include <string>
 #include <vector>
 
@@ -24,6 +22,7 @@
 namespace Hurricane {
   class Layer;
   class Cell;
+  class RoutingPad;
 }
 
 namespace CRL {
@@ -43,6 +42,7 @@ namespace Anabatic {
   using  Hurricane::Name;
   using  Hurricane::Layer;
   using  Hurricane::DbU;
+  using  Hurricane::RoutingPad;
   using  Hurricane::Cell;
   using  CRL::CellGauge;
   using  CRL::RoutingGauge;
@@ -53,59 +53,99 @@ namespace Anabatic {
 // Class  :  "Anabatic::Configuration".
 
   class Configuration {
+    public:
+      static const size_t  ndepth = (size_t)-1;
     public:
     // Constructor & Destructor.
-                                 Configuration       ( const CellGauge* cg=NULL, const RoutingGauge* rg=NULL );
-                                 Configuration       ( const Configuration& );
-      virtual                   ~Configuration       ();
-      virtual Configuration*     clone               () const;
+                                 Configuration        ( const CellGauge* cg=NULL, const RoutingGauge* rg=NULL );
+                                 Configuration        ( const Configuration& );
+      virtual                   ~Configuration        ();
+      virtual Configuration*     clone                () const;
     // Methods.
-              bool               isGMetal            ( const Layer* ) const;
-              bool               isGContact          ( const Layer* ) const;
-              const Layer*       getGContactLayer    () const;
-              const Layer*       getGHorizontalLayer () const;
-              const Layer*       getGVerticalLayer   () const;
-              size_t             getDepth            () const;
-              size_t             getAllowedDepth     () const;
-              size_t             getLayerDepth       ( const Layer* ) const;
-              CellGauge*         getCellGauge        () const;
-              RoutingGauge*      getRoutingGauge     () const;
-              RoutingLayerGauge* getLayerGauge       ( size_t depth ) const;
-              const Layer*       getRoutingLayer     ( size_t depth ) const;
-              Layer*             getContactLayer     ( size_t depth ) const;
-              DbU::Unit          getSliceHeight      () const;
-              DbU::Unit          getSliceStep        () const;
-              DbU::Unit          getPitch            ( size_t depth, Flags flags ) const;
-              DbU::Unit          getOffset           ( size_t depth ) const;
-              DbU::Unit          getWireWidth        ( size_t depth ) const;
-              DbU::Unit          getExtensionCap     ( size_t depth ) const;
-              Flags              getDirection        ( size_t depth ) const;
-              DbU::Unit          getPitch            ( const Layer*, Flags flags ) const;
-              DbU::Unit          getOffset           ( const Layer* ) const;
-              DbU::Unit          getWireWidth        ( const Layer* ) const;
-              DbU::Unit          getExtensionCap     ( const Layer* ) const;
-              Flags              getDirection        ( const Layer* ) const;
-              float              getSaturateRatio    () const;
-              size_t             getSaturateRp       () const;
-              DbU::Unit          getGlobalThreshold  () const;
-              void               setAllowedDepth     ( size_t );
-              void               setSaturateRatio    ( float );
-              void               setSaturateRp       ( size_t );
-              void               setGlobalThreshold  ( DbU::Unit );
-              DbU::Unit          getEdgeLength       () const;
-              DbU::Unit          getEdgeWidth        () const;
-              float              getEdgeCostH        () const;
-              float              getEdgeCostK        () const;
-              float              getEdgeHInc         () const;
-      virtual void               print               ( Cell* ) const;
-      virtual Record*            _getRecord          () const;
-      virtual string             _getString          () const;
-      virtual string             _getTypeName        () const;
+      inline  bool               isGLayer             ( const Layer* ) const;
+              bool               isGMetal             ( const Layer* ) const;
+              bool               isGContact           ( const Layer* ) const;
+              bool               isTwoMetals          () const;
+              bool               isHV                 () const;
+              bool               isVH                 () const;
+              const Layer*       getGContactLayer     () const;
+              const Layer*       getGHorizontalLayer  () const;
+              const Layer*       getGVerticalLayer    () const;
+      inline  size_t             getGVerticalDepth    () const;
+      inline  DbU::Unit          getGVerticalPitch    () const;
+      inline  size_t             getGHorizontalDepth  () const;
+      inline  DbU::Unit          getGHorizontalPitch  () const;
+      inline  size_t             getDVerticalDepth    () const;
+      inline  const Layer*       getDVerticalLayer    () const;
+      inline  DbU::Unit          getDVerticalWidth    () const;
+      inline  DbU::Unit          getDPVerticalWidth   () const;
+      inline  DbU::Unit          getDVerticalPitch    () const;
+      inline  DbU::Unit          getDVerticalOffset   () const;
+      inline  size_t             getDHorizontalDepth  () const;
+      inline  const Layer*       getDHorizontalLayer  () const;
+      inline  DbU::Unit          getDHorizontalWidth  () const;
+      inline  DbU::Unit          getDPHorizontalWidth () const;
+      inline  DbU::Unit          getDHorizontalPitch  () const;
+      inline  DbU::Unit          getDHorizontalOffset () const;
+      inline  size_t             getDContactDepth     () const;
+      inline  const Layer*       getDContactLayer     () const;
+      inline  DbU::Unit          getDContactWidth     () const;
+      inline  DbU::Unit          getDContactPitch     () const;
+              size_t             getDepth             () const;
+              size_t             getAllowedDepth      () const;
+              size_t             getLayerDepth        ( const Layer* ) const;
+              CellGauge*         getCellGauge         () const;
+              RoutingGauge*      getRoutingGauge      () const;
+              RoutingLayerGauge* getLayerGauge        ( size_t depth ) const;
+              const Layer*       getRoutingLayer      ( size_t depth ) const;
+              Layer*             getContactLayer      ( size_t depth ) const;
+              DbU::Unit          getSliceHeight       () const;
+              DbU::Unit          getSliceStep         () const;
+              DbU::Unit          getPitch             ( size_t depth, Flags flags ) const;
+              DbU::Unit          getOffset            ( size_t depth ) const;
+              DbU::Unit          getWireWidth         ( size_t depth ) const;
+              DbU::Unit          getPWireWidth        ( size_t depth ) const;
+              DbU::Unit          getExtensionCap      ( size_t depth ) const;
+              Flags              getDirection         ( size_t depth ) const;
+              DbU::Unit          getPitch             ( const Layer*, Flags flags ) const;
+              DbU::Unit          getOffset            ( const Layer* ) const;
+              DbU::Unit          getWireWidth         ( const Layer* ) const;
+              DbU::Unit          getPWireWidth        ( const Layer* ) const;
+              DbU::Unit          getExtensionCap      ( const Layer* ) const;
+              Flags              getDirection         ( const Layer* ) const;
+              float              getSaturateRatio     () const;
+              size_t             getSaturateRp        () const;
+      inline  std::string        getDiodeName         () const;
+      inline  DbU::Unit          getAntennaGateMaxWL  () const;
+      inline  DbU::Unit          getAntennaDiodeMaxWL () const;
+              DbU::Unit          getGlobalThreshold   () const;
+              void               setAllowedDepth      ( size_t );
+              void               setSaturateRatio     ( float );
+              void               setSaturateRp        ( size_t );
+              void               setGlobalThreshold   ( DbU::Unit );
+              DbU::Unit          getEdgeLength        () const;
+              DbU::Unit          getEdgeWidth         () const;
+              float              getEdgeCostH         () const;
+              float              getEdgeCostK         () const;
+              float              getEdgeHInc          () const;
+              float              getEdgeHScaling      () const;
+              int                getGlobalIterations  () const;
+              DbU::Unit          isOnRoutingGrid      ( RoutingPad* ) const;
+              bool               selectRpComponent    ( RoutingPad* ) const;
+      virtual void               print                ( Cell* ) const;
+      virtual Record*            _getRecord           () const;
+      virtual string             _getString           () const;
+      virtual string             _getTypeName         () const;
     protected:
     // Attributes.
       const Layer*            _gmetalh;
       const Layer*            _gmetalv;
       const Layer*            _gcontact;
+      size_t                  _gdepthv;
+      size_t                  _gdepthh;
+      size_t                  _ddepthv;
+      size_t                  _ddepthh;
+      size_t                  _ddepthc;
       CellGauge*              _cg;
       RoutingGauge*           _rg;
       std::vector<DbU::Unit>  _extensionCaps;
@@ -118,15 +158,44 @@ namespace Anabatic {
       float                   _edgeCostH;
       float                   _edgeCostK;
       float                   _edgeHInc;
+      float                   _edgeHScaling;
+      int                     _globalIterations;
+      std::string             _diodeName;
+      DbU::Unit               _antennaGateMaxWL;
+      DbU::Unit               _antennaDiodeMaxWL;
     private:
       Configuration& operator=           ( const Configuration& ) = delete;
       void           _setTopRoutingLayer ( Name name );
   };
 
 
+  inline  bool         Configuration::isGLayer             ( const Layer* layer ) const { return isGMetal(layer) or isGContact(layer); }
+  inline  size_t       Configuration::getGHorizontalDepth  () const { return _gdepthh; }
+  inline  size_t       Configuration::getGVerticalDepth    () const { return _gdepthv; }
+  inline  DbU::Unit    Configuration::getGHorizontalPitch  () const { return getPitch( getGHorizontalDepth(), Flags::NoFlags ); }
+  inline  DbU::Unit    Configuration::getGVerticalPitch    () const { return getPitch( getGVerticalDepth  (), Flags::NoFlags ); }
+  inline  size_t       Configuration::getDVerticalDepth    () const { return _ddepthv; }
+  inline  const Layer* Configuration::getDVerticalLayer    () const { return getRoutingLayer( getDVerticalDepth() ); }
+  inline  DbU::Unit    Configuration::getDVerticalWidth    () const { return getWireWidth   ( getDVerticalDepth() ); }
+  inline  DbU::Unit    Configuration::getDPVerticalWidth   () const { return getPWireWidth  ( getDVerticalDepth() ); }
+  inline  DbU::Unit    Configuration::getDVerticalPitch    () const { return getPitch       ( getDVerticalDepth(), Flags::NoFlags ); }
+  inline  DbU::Unit    Configuration::getDVerticalOffset   () const { return getOffset      ( getDVerticalDepth() ); }
+  inline  size_t       Configuration::getDHorizontalDepth  () const { return _ddepthh; }
+  inline  const Layer* Configuration::getDHorizontalLayer  () const { return getRoutingLayer( getDHorizontalDepth() ); }
+  inline  DbU::Unit    Configuration::getDHorizontalWidth  () const { return getWireWidth   ( getDHorizontalDepth() ); }
+  inline  DbU::Unit    Configuration::getDPHorizontalWidth () const { return getPWireWidth  ( getDHorizontalDepth() ); }
+  inline  DbU::Unit    Configuration::getDHorizontalPitch  () const { return getPitch       ( getDHorizontalDepth(), Flags::NoFlags ); }
+  inline  DbU::Unit    Configuration::getDHorizontalOffset () const { return getOffset      ( getDHorizontalDepth() ); }
+  inline  size_t       Configuration::getDContactDepth     () const { return _ddepthc; }
+  inline  const Layer* Configuration::getDContactLayer     () const { return getContactLayer( getDContactDepth() ); }
+  inline  DbU::Unit    Configuration::getDContactWidth     () const { return getWireWidth   ( getDContactDepth() ); }
+  inline  DbU::Unit    Configuration::getDContactPitch     () const { return getPitch       ( getDContactDepth(), Flags::NoFlags ); }
+  inline  std::string  Configuration::getDiodeName         () const { return _diodeName; }
+  inline  DbU::Unit    Configuration::getAntennaGateMaxWL  () const { return _antennaGateMaxWL; }
+  inline  DbU::Unit    Configuration::getAntennaDiodeMaxWL () const { return _antennaDiodeMaxWL; }
+
+
 } // Anabatic namespace.
 
 
 INSPECTOR_P_SUPPORT(Anabatic::Configuration);
-
-#endif  // ANABATIC_CONFIGURATION_H

anabatic/src/anabatic/Constants.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Constants.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_CONSTANTS_H
-#define  ANABATIC_CONSTANTS_H
-
+#pragma  once
 #include "hurricane/Flags.h"
 
 namespace Anabatic {
@@ -39,6 +37,14 @@ namespace Anabatic {
       static const BaseFlags  MatrixGCell         ; // = (1 <<  9);
       static const BaseFlags  IoPadGCell          ; // = (1 << 10);
       static const BaseFlags  Saturated           ; // = (1 << 11);
+      static const BaseFlags  StdCellRow          ; // = (1 << 12);
+      static const BaseFlags  ChannelRow          ; // = (1 << 13);
+      static const BaseFlags  HRailGCell          ; // = (1 << 14);
+      static const BaseFlags  VRailGCell          ; // = (1 << 15);
+      static const BaseFlags  GoStraight          ; // = (1 << 16);
+    // Flags for Edge objects states only.                      
+      static const BaseFlags  NullCapacity        ; // = (1 <<  5);
+      static const BaseFlags  InfiniteCapacity    ; // = (1 <<  6);
     // Flags for Anabatic objects states only.                      
       static const BaseFlags  DemoMode            ; // = (1 <<  5);
       static const BaseFlags  WarnOnGCellOverload ; // = (1 <<  6);
@@ -46,7 +52,11 @@ namespace Anabatic {
       static const BaseFlags  DestroyBaseContact  ; // = (1 <<  8);
       static const BaseFlags  DestroyBaseSegment  ; // = (1 <<  9);
     // Flags for NetDatas objects states only.                      
-      static const BaseFlags  GlobalRouted        ; // = (1 <<  5);
+      static const BaseFlags  GlobalFixed         ; // = (1 <<  5);
+      static const BaseFlags  GlobalEstimated     ; // = (1 <<  6);
+      static const BaseFlags  GlobalRouted        ; // = (1 <<  7);
+      static const BaseFlags  DetailRouted        ; // = (1 <<  8);
+      static const BaseFlags  ExcludeRoute        ; // = (1 <<  9);
     // Masks.                                      
       static const BaseFlags  WestSide            ; // = Horizontal|Target;
       static const BaseFlags  EastSide            ; // = Horizontal|Source;
@@ -56,7 +66,10 @@ namespace Anabatic {
       static const BaseFlags  EndsMask            ; // = Source|Target;
       static const BaseFlags  DirectionMask       ; // = Horizontal|Vertical;
       static const BaseFlags  DestroyMask         ; // = DestroyGCell|DestroyBaseContact|DestroyBaseSegment;
-      static const BaseFlags  GCellTypeMask       ; // = DeviceGCell|HChannelGCell|VChannelGCell|StrutGCell|MatrixGCell|IoPadGCell;
+      static const BaseFlags  GCellTypeMask       ; // = DeviceGCell|HChannelGCell|VChannelGCell|StrutGCell|MatrixGCell|IoPadGCell|HRailGCell|VRailGCell;
+      static const BaseFlags  RowGCellMask        ; // = StdCellRow|ChannelRow;
+      static const BaseFlags  AnalogGCellMask     ; // = DeviceGCell|HChannelGCell|VChannelGCell|StrutGCell|HRailGCell|VRailGCell;
+      static const BaseFlags  EdgeCapacityMask    ; // = Horizontal|Vertical|NullCapacity|InfiniteCapacity ;
     // Flags for functions arguments only.           
       static const BaseFlags  Create              ; // = (1 <<  5);
       static const BaseFlags  WithPerpands        ;
@@ -86,6 +99,13 @@ namespace Anabatic {
       static const BaseFlags  CheckLowDensity     ;
       static const BaseFlags  CheckLowUpDensity   ;
       static const BaseFlags  NoUpdate            ;
+      static const BaseFlags  NorthPath           ;
+      static const BaseFlags  UseNonPref          ;
+      static const BaseFlags  Force               ;
+      static const BaseFlags  LayerCapOnly        ;
+      static const BaseFlags  NoMinLength         ;
+      static const BaseFlags  NoSegExt            ;
+      static const BaseFlags  NullLength          ;
     public:
       inline               Flags        ( uint64_t flags = NoFlags );
       inline               Flags        ( const Hurricane::BaseFlags& );
@@ -112,11 +132,12 @@ namespace Anabatic {
                        , EngineGutted        = 6
                        };
 
-  enum EngineAlgorithm { EngineLoadGrByNet         = (1 <<  0)
-                       , EngineLoadGrByGCell       = (1 <<  1)
-                       , EngineLayerAssignByLength = (1 <<  2)
-                       , EngineLayerAssignByTrunk  = (1 <<  3)
-                       , EngineNoNetLayerAssign    = (1 <<  4)
+  enum EngineAlgorithm { EngineLoadGrByNet            = (1 <<  0)
+                       , EngineLoadGrByGCell          = (1 <<  1)
+                       , EngineLayerAssignByLength    = (1 <<  2)
+                       , EngineLayerAssignByTrunk     = (1 <<  3)
+                       , EngineLayerAssignNoGlobalM2V = (1 <<  4)
+                       , EngineNoNetLayerAssign       = (1 <<  5)
                        };
 
 
@@ -131,6 +152,4 @@ namespace Anabatic {
 }  // Anabatic namespace.
 
 
-INSPECTOR_PV_SUPPORT(Anabatic::Flags)
-
-#endif  // ANABATIC_CONSTANTS_H
+INSPECTOR_PR_SUPPORT(Anabatic::Flags);

anabatic/src/anabatic/Dijkstra.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Dijkstra.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_DIJKSTRA_H
-#define  ANABATIC_DIJKSTRA_H
-
+#pragma  once
 #include <set>
 #include <iomanip>
 #include "hurricane/Observer.h"
@@ -44,16 +42,17 @@ namespace Anabatic {
   class IntervalC
   {
     public:
-      enum iFlag { None        = 0
-                 , iHorizontal = (1<<0)
-                 , iVertical   = (1<<1)
-                 , iSet        = (1<<2)
+      enum iFlag { None         = 0
+                 , iFHorizontal = (1<<0)
+                 , iFVertical   = (1<<1)
+                 , iSet         = (1<<2)
       };
 
     public:
                           IntervalC();
                           IntervalC(const IntervalC&);
                           IntervalC(IntervalC&);
+                          IntervalC( DbU::Unit, DbU::Unit, DbU::Unit );
                          ~IntervalC();
              void         set        ( DbU::Unit, DbU::Unit, DbU::Unit );
              void         setRange   ( DbU::Unit, DbU::Unit );
@@ -83,8 +82,8 @@ namespace Anabatic {
       DbU::Unit    _axis;
   };
 
-  inline void         IntervalC::setAsH   () { _flags = ((_flags & ~(0x3)) | iHorizontal); }
-  inline void         IntervalC::setAsV   () { _flags = ((_flags & ~(0x3)) | iVertical  ); }
+  inline void         IntervalC::setAsH   () { _flags = ((_flags & ~(0x3)) | iFHorizontal); }
+  inline void         IntervalC::setAsV   () { _flags = ((_flags & ~(0x3)) | iFVertical  ); }
   inline void         IntervalC::setAxis  ( DbU::Unit axis ) { _axis = axis; }
   inline DbU::Unit    IntervalC::getAxis  () const           { return _axis; }
   inline DbU::Unit    IntervalC::getCenter() const           { return getMin()+getMax(); }
@@ -92,8 +91,8 @@ namespace Anabatic {
   inline DbU::Unit    IntervalC::getMax   () const           { return _max; }
   inline void         IntervalC::setiSet  ()  { _flags |= iSet; }
   inline bool         IntervalC::isiSet   () const { return _flags & iSet; }
-  inline bool         IntervalC::isH      () const { return _flags & iHorizontal; }
-  inline bool         IntervalC::isV      () const { return _flags & iVertical  ; }
+  inline bool         IntervalC::isH      () const { return _flags & iFHorizontal; }
+  inline bool         IntervalC::isV      () const { return _flags & iFVertical  ; }
   inline void         IntervalC::setFlags ( Flags flags ) { _flags = flags; }
   inline Flags        IntervalC::getFlags () const    { return _flags; }
 
@@ -164,10 +163,13 @@ namespace Anabatic {
   inline void         GRAData::printInterv     () const { _interv.print()    ; }
   inline void         GRAData::printIntervfrom () const { _intervfrom.print(); }
 
+
 // -------------------------------------------------------------------
 // Class  :  "Anabatic::Vertex".
 
   class Vertex {
+    public:
+      static inline std::string  getValueString ( DbU::Unit );
     public:
       class CompareById {
         public:
@@ -185,84 +187,87 @@ namespace Anabatic {
                      , iHorizontal   = (1<<7)
                      , iVertical     = (1<<8)
                      , iSet          = (1<<9)
+                     , Driver        = (1<<10)
                      };
     public:
       static         DbU::Unit       unreached;
       static         DbU::Unit       unreachable;
     public:                         
-      static         void            notify         ( Vertex*, unsigned flags );
+      static         void            notify            ( Vertex*, unsigned flags );
+      static inline  Vertex*         lookup            ( GCell* );
     public:                                            
-             inline                  Vertex         ( GCell* );
-           //inline                  Vertex         ( size_t id );
-             inline                 ~Vertex         ();
-             inline  bool            hasDoneAllRps  () const;
-             inline  Contact*        hasGContact    ( Net* ) const;
-             inline  unsigned int    getId          () const;
-             inline  GCell*          getGCell       () const;
-             inline  AnabaticEngine* getAnabatic    () const;
-             inline  Contact*        getGContact    ( Net* );
-                     bool            hasValidStamp  () const;
-             inline  Point           getCenter      () const;
-             inline  DbU::Unit       getDistance    () const;
-             inline  int             getStamp       () const;
-             inline  int             getBranchId    () const;
-             inline  int             getConnexId    () const;
-             inline  int             getDegree      () const;
-             inline  int             getRpCount     () const;
-             inline  Edge*           getFrom        () const;
-             inline  Vertex*         getPredecessor () const;
-             inline  void            setDistance    ( DbU::Unit );
-             inline  void            setStamp       ( int );
-             inline  void            setConnexId    ( int );
-             inline  void            setBranchId    ( int );
-             inline  void            setDegree      ( int );
-             inline  void            incDegree      ( int delta=1 );
-             inline  void            setRpCount     ( int );
-             inline  void            incRpCount     ( int delta=1 );
-             inline  void            setFrom        ( Edge* );
-             inline  void            add            ( RoutingPad* );
-             inline  void            clearRps       ();
-             inline  Contact*        breakGoThrough ( Net* );
-
-    //////////////////////////////////////// Analog
-             inline  bool            isNorth        ( const Vertex* ) const;
-             inline  bool            isSouth        ( const Vertex* ) const;
-             inline  bool            isEast         ( const Vertex* ) const;
-             inline  bool            isWest         ( const Vertex* ) const;
-             inline  bool            isNRestricted  () const;
-             inline  bool            isSRestricted  () const;
-             inline  bool            isERestricted  () const;
-             inline  bool            isWRestricted  () const;
-             inline  bool            hasRestrictions() const;
-
-             inline  void            setRestricted    ();
-             inline  void            clearRestriction ();
-             inline  void            setNRestricted   ();
-             inline  void            setSRestricted   ();
-             inline  void            setERestricted   ();
-             inline  void            setWRestricted   ();
-                     bool            hasRP            ( Net* ) const;
-                     bool            hasVRP           ( Net* ) const;
-                     bool            hasHRP           ( Net* ) const;
-      static         bool            isRestricted     ( const Vertex* v1, const Vertex* v2, const Edge* e, DbU::Unit hpitch = 0, DbU::Unit vpitch = 0, Net* net = NULL);
-                     bool            areSameSide      ( const Vertex*, const Vertex* ) const;
-
-              inline bool            isFromFrom2  () const;
-              inline bool            isFrom2Mode  () const;
-              inline bool            isAxisTarget () const;
-              inline bool            isiHorizontal() const;
-              inline bool            isiVertical  () const;
-              inline void            setFlags     ( uint32_t );
-              inline void            unsetFlags   ( uint32_t );
-                     bool            isH          () const;
-                     bool            isV          () const;
-              inline void            createAData  ();
-    ////////////////////////////////////
+             inline                  Vertex            ( GCell* );
+           //inline                  Vertex            ( size_t id );
+             inline                 ~Vertex            ();
+             inline  bool            isDriver          () const;
+             inline  bool            isAnalog          () const;
+             inline  bool            hasDoneAllRps     () const;
+             inline  Contact*        hasGContact       ( Net* ) const;
+             inline  unsigned int    getId             () const;
+             inline  GCell*          getGCell          () const;
+             inline  Box             getBoundingBox    () const;
+             inline  Edges           getEdges          ( Flags sides=Flags::AllSides ) const;
+             inline  AnabaticEngine* getAnabatic       () const;
+             inline  Contact*        getGContact       ( Net* );
+                     bool            hasValidStamp     () const;
+             inline  Point           getCenter         () const;
+             inline  DbU::Unit       getDistance       () const;
+             inline  int             getStamp          () const;
+             inline  int             getBranchId       () const;
+             inline  int             getConnexId       () const;
+             inline  int             getDegree         () const;
+             inline  int             getRpCount        () const;
+                     Edge*           getFrom           () const;
+             inline  Vertex*         getPredecessor    () const;
+             inline  Vertex*         getNeighbor       ( Edge* ) const;
+             inline  void            setDriver         ( bool state );
+             inline  void            setDistance       ( DbU::Unit );
+             inline  void            setStamp          ( int );
+             inline  void            setConnexId       ( int );
+             inline  void            setBranchId       ( int );
+             inline  void            setDegree         ( int );
+             inline  void            incDegree         ( int delta=1 );
+             inline  void            setRpCount        ( int );
+             inline  void            incRpCount        ( int delta=1 );
+             inline  void            setFrom           ( Edge* );
+             inline  void            add               ( RoutingPad* );
+             inline  void            clearRps          ();
+             inline  Contact*        breakGoThrough    ( Net* );
+    // Analog related methods.
+             inline  bool            isNorth           ( const Vertex* ) const;
+             inline  bool            isSouth           ( const Vertex* ) const;
+             inline  bool            isEast            ( const Vertex* ) const;
+             inline  bool            isWest            ( const Vertex* ) const;
+             inline  bool            isNRestricted     () const;
+             inline  bool            isSRestricted     () const;
+             inline  bool            isERestricted     () const;
+             inline  bool            isWRestricted     () const;
+             inline  bool            hasRestrictions   () const;
+                     void            setRestricted     ();
+                     void            clearRestriction  ();
+             inline  void            setNRestricted    ();
+             inline  void            setSRestricted    ();
+             inline  void            setERestricted    ();
+             inline  void            setWRestricted    ();
+                     bool            hasRP             ( Net* ) const;
+                     bool            hasVRP            ( Net* ) const;
+                     bool            hasHRP            ( Net* ) const;
+      static         bool            isRestricted      ( const Vertex* v1, const Vertex* v2, const Edge* e, DbU::Unit hpitch = 0, DbU::Unit vpitch = 0, Net* net = NULL);
+                     bool            areSameSide       ( const Vertex*, const Vertex* ) const;
+              inline bool            isFromFrom2       () const;
+              inline bool            isFrom2Mode       () const;
+              inline bool            isAxisTarget      () const;
+              inline bool            isiHorizontal     () const;
+              inline bool            isiVertical       () const;
+              inline void            setFlags          ( uint32_t );
+              inline void            unsetFlags        ( uint32_t );
+                     bool            isH               () const;
+                     bool            isV               () const;
+              inline void            createAData       ();
                      Point           getStartPathPoint ( const Vertex* next ) const;
                      Point           getNextPathPoint  ( Point, const Vertex* ) const;
-    //////////////////////////////////////// GRDATA
                      void            setIntervals      ( Vertex* );
-
+              inline bool            hasAData          () const;
                      bool            isiSet            () const;
                      DbU::Unit       getIAxis          () const;
                      DbU::Unit       getIMax           () const;
@@ -277,7 +282,6 @@ namespace Anabatic {
                      void            clearFrom2        ();
                      Edge*           getFrom2          () const;
                      void            setFrom2          ( Edge* );
-                     void            createIntervFrom2 ();
                      DbU::Unit       getPIMax2         () const;
                      DbU::Unit       getPIMin2         () const;
                      DbU::Unit       getPIAxis2        () const;
@@ -289,10 +293,10 @@ namespace Anabatic {
                      GCell*          getGPrev          ( uint32_t criteria=0 ) const;
  
     // Inspector support. 
-                     string          _getString     () const;
+                     string          _getString        () const;
     private:                        
-                                     Vertex         ( const Vertex& );
-                     Vertex&         operator=      ( const Vertex& );
+                                     Vertex            ( const Vertex& );
+                     Vertex&         operator=         ( const Vertex& );
     private:
       size_t               _id;
       GCell*               _gcell;
@@ -328,7 +332,12 @@ namespace Anabatic {
   }
 
 
+  inline Vertex*         Vertex::lookup         ( GCell* gcell ) { return gcell->getObserver<Vertex>(GCell::Observable::Vertex); }
   inline                 Vertex::~Vertex        () { _gcell->setObserver( GCell::Observable::Vertex, NULL ); }
+  inline bool            Vertex::isDriver       () const { return _flags & Driver; }
+  inline bool            Vertex::isAnalog       () const { return _gcell->isAnalog(); }
+  inline Box             Vertex::getBoundingBox () const { return _gcell->getBoundingBox(); }
+  inline Edges           Vertex::getEdges       ( Flags sides ) const { return _gcell->getEdges(sides); }
   inline Contact*        Vertex::hasGContact    ( Net* net ) const { return _gcell->hasGContact(net); }
   inline unsigned int    Vertex::getId          () const { return _id; }
   inline GCell*          Vertex::getGCell       () const { return _gcell; }
@@ -341,7 +350,7 @@ namespace Anabatic {
   inline int             Vertex::getBranchId    () const { return hasValidStamp() ? _branchId :  0; }
   inline int             Vertex::getDegree      () const { return hasValidStamp() ? _degree   :  0; }
   inline int             Vertex::getRpCount     () const { return hasValidStamp() ? _rpCount  :  0; }
-  inline Edge*           Vertex::getFrom        () const { return _from; }
+//inline Edge*           Vertex::getFrom        () const { return _from; }
   inline void            Vertex::setDistance    ( DbU::Unit distance ) { _distance=distance; }
   inline void            Vertex::setFrom        ( Edge* from ) { _from=from; }
   inline void            Vertex::setStamp       ( int stamp ) { _stamp=stamp; }
@@ -356,6 +365,18 @@ namespace Anabatic {
   inline Vertex* Vertex::getPredecessor () const
   { return (hasValidStamp() and _from) ? _from->getOpposite(_gcell)->getObserver<Vertex>(GCell::Observable::Vertex) : NULL; }
 
+  inline Vertex* Vertex::getNeighbor ( Edge* edge ) const
+  {
+    GCell* gcell = edge->getOpposite( getGCell() );
+    return (gcell) ? gcell->getObserver<Vertex>(GCell::Observable::Vertex) : NULL;
+  }
+
+  inline void  Vertex::setDriver ( bool state )
+  {
+    if (state) _flags |=  Driver;
+    else       _flags &= ~Driver;
+  }
+
   inline bool  Vertex::CompareById::operator() ( const Vertex* lhs, const Vertex* rhs ) const
   { return lhs->getId() < rhs->getId(); }
 
@@ -372,8 +393,9 @@ namespace Anabatic {
   inline  bool Vertex::isWRestricted      () const { return (_flags & WRestricted); }
   inline  bool Vertex::hasRestrictions    () const { return ( isNRestricted()||isSRestricted()||isERestricted()||isWRestricted()) ; }
 
-  inline void         Vertex::setRestricted    () { _flags |= 0xF; }
-  inline void         Vertex::clearRestriction () { _flags &= ~(0xF); }
+  inline bool         Vertex::hasAData         () const { return (_adata !=NULL)? true : false; }
+//inline void         Vertex::setRestricted    () { _flags |= 0xF; }
+//inline void         Vertex::clearRestriction () { _flags &= ~(0xF); }
   inline void         Vertex::setNRestricted   () { _flags |= NRestricted; }
   inline void         Vertex::setSRestricted   () { _flags |= SRestricted; }
   inline void         Vertex::setERestricted   () { _flags |= ERestricted; }
@@ -387,45 +409,63 @@ namespace Anabatic {
   inline void         Vertex::setFlags     ( uint32_t mask ) { _flags |= mask ; }
   inline void         Vertex::unsetFlags   ( uint32_t mask ) { _flags &= ~mask; }
 
+  inline std::string  Vertex::getValueString ( DbU::Unit distance )
+  {
+    if (distance == Vertex::unreachable) return "unreachable";
+    if (distance == Vertex::unreached  ) return "unreached";
+    return DbU::getValueString( distance );
+  }
+
+
 // -------------------------------------------------------------------
 // Class  :  "Anabatic::PriorityQueue".
 
   class PriorityQueue {
     public:
-      inline          PriorityQueue ();
-      inline         ~PriorityQueue ();
-      inline  bool    empty         () const;
-      inline  size_t  size          () const;
-      inline  void    push          ( Vertex* );
-      inline  void    erase         ( Vertex* );
-      inline  Vertex* top           ();
-      inline  void    pop           ();
-      inline  void    clear         ();
-      inline  void    dump          () const;
+      inline                PriorityQueue ();
+      inline               ~PriorityQueue ();
+      inline        bool    empty         () const;
+      inline        size_t  size          () const;
+      inline        void    push          ( Vertex* );
+      inline        void    erase         ( Vertex* );
+      inline        Vertex* top           ();
+      inline        void    pop           ();
+      inline        void    clear         ();
+      inline        void    dump          () const;
+      inline        void    setAttractor  ( const Point& );
+      inline  const Point&  getAttractor  () const;
+      inline        bool    hasAttractor  () const;
     private:
       class CompareByDistance {
         public:
-          inline bool operator() ( const Vertex* lhs, const Vertex* rhs );
+                 inline      CompareByDistance ();
+                        bool operator()        ( const Vertex* lhs, const Vertex* rhs );
+          static inline void setQueue          ( PriorityQueue* );
+        private:
+          static PriorityQueue* _pqueue;
       };
     private:
+      bool                                 _hasAttractor;
+      Point                                _attractor;
       multiset<Vertex*,CompareByDistance>  _queue;
   };
 
 
-  inline bool PriorityQueue::CompareByDistance::operator() ( const Vertex* lhs, const Vertex* rhs )
-  {
-    if (lhs->getDistance() == rhs->getDistance()) return lhs->getBranchId() > rhs->getBranchId();
-    return lhs->getDistance() < rhs->getDistance();
-  }
+  inline      PriorityQueue::CompareByDistance::CompareByDistance () { }
+
+  inline void PriorityQueue::CompareByDistance::setQueue ( PriorityQueue* pqueue ) { _pqueue = pqueue; }
 
 
-  inline         PriorityQueue::PriorityQueue  () : _queue() { }
-  inline         PriorityQueue::~PriorityQueue () { }
-  inline bool    PriorityQueue::empty          () const { return _queue.empty(); }
-  inline size_t  PriorityQueue::size           () const { return _queue.size(); }
-  inline void    PriorityQueue::push           ( Vertex* v ) { _queue.insert(v); }
-  inline Vertex* PriorityQueue::top            () { return _queue.empty() ? NULL : *_queue.begin(); }
-  inline void    PriorityQueue::clear          () { _queue.clear(); }
+  inline               PriorityQueue::PriorityQueue  () : _hasAttractor(false), _attractor(), _queue() { PriorityQueue::CompareByDistance::setQueue(this); }
+  inline               PriorityQueue::~PriorityQueue () { }
+  inline       bool    PriorityQueue::empty          () const { return _queue.empty(); }
+  inline       size_t  PriorityQueue::size           () const { return _queue.size(); }
+  inline       void    PriorityQueue::push           ( Vertex* v ) { _queue.insert(v); }
+  inline       Vertex* PriorityQueue::top            () { return _queue.empty() ? NULL : *_queue.begin(); }
+  inline       void    PriorityQueue::clear          () { _queue.clear(); _hasAttractor=false; }
+  inline       void    PriorityQueue::setAttractor   ( const Point& p ) { _attractor=p;  _hasAttractor=true; }
+  inline       bool    PriorityQueue::hasAttractor   () const { return _hasAttractor; }
+  inline const Point&  PriorityQueue::getAttractor   () const { return _attractor; }
 
   inline void  PriorityQueue::pop ()
   {
@@ -475,51 +515,54 @@ namespace Anabatic {
     public:
       typedef std::function<DbU::Unit(const Vertex*,const Vertex*,const Edge*)>  distance_t;
     public:
-                        Dijkstra           ( AnabaticEngine* );
-                       ~Dijkstra           ();
+                              Dijkstra                 ( AnabaticEngine* );
+                             ~Dijkstra                 ();
     public:                                            
-      inline bool       isBipoint          () const;
-      inline bool       isSourceVertex     ( Vertex* ) const;
-      inline bool       isTargetVertex     ( Vertex* ) const;
-      inline DbU::Unit  getSearchAreaHalo  () const;
+      inline       bool       isBipoint                () const;
+      inline       bool       isSourceVertex           ( Vertex* ) const;
+      inline       Net*       getNet                   () const;
+      inline       bool       isTargetVertex           ( Vertex* ) const;
+                   DbU::Unit  getAntennaGateMaxWL      () const;
+      inline       DbU::Unit  getSearchAreaHalo        () const;
       template<typename DistanceT>                     
-      inline DistanceT* setDistance        ( DistanceT );
-      inline void       setSearchAreaHalo  ( DbU::Unit );
-             void       load               ( Net* net ); 
-             void       run                ( Mode mode=Mode::Standart );
+      inline       DistanceT* setDistance              ( DistanceT );
+      inline       void       setSearchAreaHalo        ( DbU::Unit );
+                   void       load                     ( Net* net ); 
+                   void       loadFixedGlobal          ( Net* net ); 
+                   void       run                      ( Mode mode=Mode::Standart );
+      inline const VertexSet& getSources               () const;
     private:                                           
-                        Dijkstra           ( const Dijkstra& );
-             Dijkstra&  operator=          ( const Dijkstra& );
-      static DbU::Unit  _distance          ( const Vertex*, const Vertex*, const Edge* );
-             Point      _getPonderedPoint  () const;
-             void       _cleanup           ();
-             bool       _propagate         ( Flags enabledSides );
-             void       _traceback         ( Vertex* );
-             void       _materialize       ();
-             void       _selectFirstSource ();
-             void       _toSources         ( Vertex*, int connexId );
-             void       _getConnecteds     ( Vertex*, VertexSet& );
-             void       _checkEdges        () const;
-             void       _createSelfSymSeg  ( Segment* );
+                               Dijkstra                ( const Dijkstra& );
+                   Dijkstra&  operator=                ( const Dijkstra& );
+      static       DbU::Unit  _distance                ( const Vertex*, const Vertex*, const Edge* );
+                   Point      _getPonderedPoint        () const;
+                   void       _cleanup                 ();
+                   bool       _propagate               ( Flags enabledSides );
+                   void       _traceback               ( Vertex* );
+                   void       _materialize             ();
+                   void       _selectFirstSource       ();
+                   void       _toSources               ( Vertex*, int connexId );
+                   void       _getConnecteds           ( Vertex*, VertexSet& );
+                   void       _checkEdges              () const;
+                   void       _createSelfSymSeg        ( Segment* );
                    
-             inline void setAxisTarget       ();
-             inline bool needAxisTarget      () const;
-             inline void setFlags            ( Flags );
-             inline void unsetFlags          ( Flags );
-                    void setAxisTargets      ();
-                    void unsetAxisTargets    ();
-
-             bool        _attachSymContactsHook   ( RoutingPad* );
-             void        _limitSymSearchArea      ( RoutingPad* rp );
-             void        _setSourcesGRAData       ( Vertex*, RoutingPad*);
-             bool        _checkFrom2              ( Edge*, Vertex* );
-             bool        _isDistance2Shorter      ( DbU::Unit&, Vertex*, Vertex*, Edge* );
-             void        _pushEqualDistance       ( DbU::Unit, bool, Vertex*, Vertex*, Edge* );
-             void        _updateGRAData           ( Vertex*, bool, Vertex* );
-             void        _initiateUpdateIntervals ( Vertex* );
-             bool        _updateIntervals         ( bool&, Vertex*, bool&, int&, Edge* );
-             void        _updateRealOccupancy     ( Vertex* );
+      inline       void       setAxisTarget            ();
+      inline       bool       needAxisTarget           () const;
+      inline       void       setFlags                 ( Flags );
+      inline       void       unsetFlags               ( Flags );
+                   void       setAxisTargets           ();
+                   void       unsetAxisTargets         ();
                    
+                   bool       _attachSymContactsHook   ( RoutingPad* ); 
+                   void       _limitSymSearchArea      ( RoutingPad* rp );
+                   void       _setSourcesGRAData       ( Vertex*, RoutingPad*);
+                   bool       _checkFrom2              ( Edge*, Vertex* );
+                   bool       _isDistance2Shorter      ( DbU::Unit&, Vertex*, Vertex*, Edge* );
+                   void       _pushEqualDistance       ( DbU::Unit, bool, Vertex*, Vertex*, Edge* );
+                   void       _updateGRAData           ( Vertex*, bool, Vertex* );
+                   void       _initiateUpdateIntervals ( Vertex* );
+                   bool       _updateIntervals         ( bool&, Vertex*, bool&, int&, Edge* );
+                   void       _updateRealOccupancy     ( Vertex* );
     private:
       AnabaticEngine*  _anabatic;
       vector<Vertex*>  _vertexes;
@@ -543,6 +586,7 @@ namespace Anabatic {
   inline bool       Dijkstra::isBipoint         () const { return _net and (_targets.size()+_sources.size() == 2); }
   inline bool       Dijkstra::isSourceVertex    ( Vertex* v ) const { return (_sources.find(v) != _sources.end()); }
   inline bool       Dijkstra::isTargetVertex    ( Vertex* v ) const { return (_targets.find(v) != _targets.end()); }
+  inline Net*       Dijkstra::getNet            () const { return _net; }
   inline DbU::Unit  Dijkstra::getSearchAreaHalo () const { return _searchAreaHalo; }
   inline void       Dijkstra::setSearchAreaHalo ( DbU::Unit halo ) { _searchAreaHalo = halo; }
 
@@ -552,12 +596,11 @@ namespace Anabatic {
   inline void       Dijkstra::setFlags       ( Flags mask ) { _flags |= mask; }
   inline bool       Dijkstra::needAxisTarget () const { return (_flags & Mode::AxisTarget); }
   inline void       Dijkstra::unsetFlags     ( Flags mask ) { _flags &= ~mask; }
+  inline const VertexSet& Dijkstra::getSources     () const { return _sources; }
 
 }  // Anabatic namespace.
 
 
 GETSTRING_POINTER_SUPPORT(Anabatic::Vertex);
 IOSTREAM_POINTER_SUPPORT(Anabatic::Vertex);
-INSPECTOR_PV_SUPPORT(Anabatic::Dijkstra::Mode);
-
-#endif  // ANABATIC_DIJKSTRA_H
+INSPECTOR_PR_SUPPORT(Anabatic::Dijkstra::Mode);

anabatic/src/anabatic/Edge.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Edge.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_EDGE_H
-#define  ANABATIC_EDGE_H
-
+#pragma  once
 #include <string>
 #include "hurricane/Name.h"
 #include "hurricane/Interval.h"
@@ -26,10 +24,10 @@ namespace Hurricane {
   class Segment;
 }
 #include "anabatic/Constants.h"
+#include "anabatic/EdgeCapacity.h"
 #include "anabatic/Edges.h"
 
 
-
 namespace Anabatic {
 
   using std::string;
@@ -60,8 +58,11 @@ namespace Anabatic {
       inline        bool              isHorizontal         () const;
       inline        bool              hasNet               ( const Net* ) const;
       inline        unsigned int      getCapacity          () const;
+      inline        unsigned int      getRawCapacity       () const;
+      inline        unsigned int      getReservedCapacity  () const;
+      inline        unsigned int      getCapacity          ( size_t depth ) const;
       inline        unsigned int      getRealOccupancy     () const;
-      inline        unsigned int      getEstimateOccupancy () const;
+      inline        float             getEstimateOccupancy () const;
       inline        float             getHistoricCost      () const;
                     DbU::Unit         getDistance          () const;
       inline        GCell*            getSource            () const;
@@ -73,12 +74,16 @@ namespace Anabatic {
                     Interval          getSide              () const;
                     Segment*          getSegment           ( const Net* ) const;
       inline const  vector<Segment*>& getSegments          () const;
-      inline        void              setCapacity          ( int );
-      inline        void              incCapacity          ( int );
+    //inline        void              setCapacity          ( int );
+    //inline        void              incCapacity          ( int );
+      inline        void              forceCapacity        ( int );
+      inline        void              reserveCapacity      ( int );
       inline        void              setRealOccupancy     ( int );
                     void              incRealOccupancy     ( int );
                     void              incRealOccupancy2    ( int );
+      inline        void              incEstimateOccupancy ( float );
       inline        void              setHistoricCost      ( float );
+                    bool              isEnding             ( Segment* ) const;
                     void              add                  ( Segment* );
                     void              remove               ( Segment* );
                     void              replace              ( Segment* orig, Segment* repl );
@@ -86,19 +91,18 @@ namespace Anabatic {
       inline const  Flags&            flags                () const;
       inline        Flags&            flags                ();
       inline        void              revalidate           () const;
-
                     bool              isMaxCapacity        ( Net* net = NULL ) const;
+      inline        Flags&            setFlags             ( Flags mask );
                     void              _setSource           ( GCell* );
                     void              _setTarget           ( GCell* );
-    private:                          
-                    void              _invalidate          ();
-                    void              _revalidate          ();
     public:                                    
     // ExtensionGo support.                    
       inline  const Name&             staticGetName        (); 
       virtual const Name&             getName              () const;
       virtual       void              translate            ( const DbU::Unit&, const DbU::Unit& );
       virtual       Box               getBoundingBox       () const;
+      virtual       void              invalidate           ( bool propagateFlag=true );
+      virtual       void              materialize          ();
     public:                                              
     // Inspector support.                                
       virtual       string            _getTypeName         () const;
@@ -115,7 +119,8 @@ namespace Anabatic {
     private:
       static  Name              _extensionName;
               Flags             _flags;
-              unsigned int      _capacity;
+              EdgeCapacity*     _capacities;
+              unsigned int      _reservedCapacity;
               unsigned int      _realOccupancy;
               float             _estimateOccupancy;
               float             _historicCost;
@@ -130,25 +135,34 @@ namespace Anabatic {
   inline       bool              Edge::isVertical           () const { return _flags.isset(Flags::Vertical); }
   inline       bool              Edge::isHorizontal         () const { return _flags.isset(Flags::Horizontal); }
   inline       bool              Edge::hasNet               ( const Net* owner ) const { return getSegment(owner); }
-  inline       unsigned int      Edge::getCapacity          () const { return _capacity; }
+  inline       unsigned int      Edge::getCapacity          ( size_t depth ) const { return (_capacities) ? _capacities->getCapacity(depth) : 0; }
+  inline       unsigned int      Edge::getRawCapacity       () const { return (_capacities) ? _capacities->getCapacity() : 0; }
+  inline       unsigned int      Edge::getReservedCapacity  () const { return _reservedCapacity; }
   inline       unsigned int      Edge::getRealOccupancy     () const { return _realOccupancy; }
-  inline       unsigned int      Edge::getEstimateOccupancy () const { return _estimateOccupancy; }
+  inline       float             Edge::getEstimateOccupancy () const { return _estimateOccupancy; }
   inline       float             Edge::getHistoricCost      () const { return _historicCost; }
   inline       GCell*            Edge::getSource            () const { return _source; }
   inline       GCell*            Edge::getTarget            () const { return _target; }
   inline       DbU::Unit         Edge::getAxis              () const { return _axis; }
   inline const vector<Segment*>& Edge::getSegments          () const { return _segments; }
-  inline       void              Edge::incCapacity          ( int delta ) { _capacity  = ((int)_capacity+delta > 0) ? _capacity+delta : 0; }
-  inline       void              Edge::setCapacity          ( int c     ) { _capacity  = ((int) c > 0) ? c : 0; }
+  inline       void              Edge::forceCapacity        ( int capacity ) { if (_capacities) _capacities->forceCapacity(capacity); }
+//inline       void              Edge::incCapacity          ( int delta ) { _capacity  = ((int)_capacity+delta > 0) ? _capacity+delta : 0; }
+//inline       void              Edge::setCapacity          ( int c     ) { _capacity  = ((int) c > 0) ? c : 0; }
   inline       void              Edge::setRealOccupancy     ( int c     ) { _realOccupancy = ((int) c > 0) ? c : 0; }
   inline       void              Edge::setHistoricCost      ( float hcost ) { _historicCost = hcost; }
+  inline       void              Edge::incEstimateOccupancy ( float delta ) { _estimateOccupancy += delta; }
   inline const Flags&            Edge::flags                () const { return _flags; }
   inline       Flags&            Edge::flags                () { return _flags; }
-  inline       void              Edge::revalidate           () const { /*if (_flags&Flags::Invalidated)*/ const_cast<Edge*>(this)->_revalidate(); }
+  inline       Flags&            Edge::setFlags             ( Flags mask ) { _flags |= mask; return _flags; }
+  inline       void              Edge::reserveCapacity      ( int delta ) { _reservedCapacity = ((int)_reservedCapacity+delta > 0) ? _reservedCapacity+delta : 0; }
+
+  inline unsigned int  Edge::getCapacity () const
+  {
+    if (not _capacities) return 0;
+    return (_capacities->getCapacity() > (int)_reservedCapacity) ? _capacities->getCapacity()-_reservedCapacity : 0;
+  }
  
 }  // Anabatic namespace.
 
 
 INSPECTOR_P_SUPPORT(Anabatic::Edge);
-
-#endif  // ANABATIC_EDGE_H

anabatic/src/anabatic/EdgeCapacity.h

@@ -0,0 +1,99 @@
+// -*- mode: C++; explicit-buffer-name: "EdgeCapacity.h<anabatic>" -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2018-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |     A n a b a t i c  -  Global Routing Toolbox                  |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/EdgeCapacity.h"                     |
+// +-----------------------------------------------------------------+
+
+
+#ifndef  ANABATIC_EDGE_CAPACITY_H
+#define  ANABATIC_EDGE_CAPACITY_H
+
+#include <string>
+#include <set>
+#include "hurricane/Interval.h"
+#include "anabatic/Constants.h"
+
+namespace Anabatic {
+
+  using Hurricane::Record;
+  using Hurricane::DbU;
+  using Hurricane::Interval;
+  class AnabaticEngine;
+
+
+// -------------------------------------------------------------------
+// Class  :  "EdgeCapacity".
+
+  class EdgeCapacity {
+    public:
+      class Compare {
+        public:
+          inline bool  operator() ( const EdgeCapacity*, const EdgeCapacity* ) const; 
+      };
+    public:
+                                          EdgeCapacity  ( AnabaticEngine*, Flags, Interval, size_t depth );
+             inline       size_t          incref        ();
+             inline       size_t          decref        ();
+             inline       size_t          getref        () const;
+             inline       AnabaticEngine* getAnabatic   () const;
+             inline const Interval&       getSpan       () const;
+             inline       int             getCapacity   () const;
+             inline       int             getCapacity   ( size_t depth ) const;
+                          void            forceCapacity ( unsigned int );
+                          std::string     _getString    () const;
+                          Record*         _getRecord    () const;
+    private:                              
+    private:
+      AnabaticEngine*   _anabatic;
+      size_t            _refCount;
+      Flags             _flags;
+      size_t            _depth;
+      Interval          _span;
+      std::vector<int>  _capacities;
+  };
+
+
+  inline       size_t          EdgeCapacity::incref      () { return ++_refCount; }
+  inline       size_t          EdgeCapacity::decref      () { if (_refCount < 2) { delete this; return 0; } return --_refCount; }
+  inline       size_t          EdgeCapacity::getref      () const { return _refCount; }
+  inline       AnabaticEngine* EdgeCapacity::getAnabatic () const { return _anabatic; }
+  inline const Interval&       EdgeCapacity::getSpan     () const { return _span; }
+  inline       int             EdgeCapacity::getCapacity ( size_t depth ) const { return (depth<_depth) ? _capacities[depth] : 0; }
+
+  inline int  EdgeCapacity::getCapacity () const
+  {
+    int full = 0;
+    for ( size_t depth=0; depth<_depth ; ++depth ) full += _capacities[depth];
+    return full;
+  }
+
+  inline bool  EdgeCapacity::Compare::operator() ( const EdgeCapacity* lhs, const EdgeCapacity* rhs ) const
+  {
+    if (    (lhs->_flags & Flags::Horizontal) and not (rhs->_flags & Flags::Horizontal)) return true;
+    if (not (lhs->_flags & Flags::Horizontal) and     (rhs->_flags & Flags::Horizontal)) return false;
+
+    DbU::Unit dmin = lhs->getSpan().getVMin() - rhs->getSpan().getVMin();
+    if (dmin < 0) return true;
+    if (dmin > 0) return false;
+    return lhs->getSpan().getVMax() < rhs->getSpan().getVMax();
+  }
+
+
+  typedef  std::set<EdgeCapacity*,EdgeCapacity::Compare>  EdgeCapacityLut;
+
+
+}  // Anabatic namespace.
+
+
+INSPECTOR_P_SUPPORT(Anabatic::EdgeCapacity);
+
+#endif  // ANABATIC_EDGE_CAPACITY_H

anabatic/src/anabatic/Edges.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Edges.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -19,6 +19,7 @@
 
 #include <string>
 #include <vector>
+#include "hurricane/DbU.h"
 #include "hurricane/Collection.h"
 #include "anabatic/Constants.h"
 
@@ -27,6 +28,7 @@ namespace Anabatic {
 
   using std::string;
   using std::vector;
+  using Hurricane::DbU;
   using Hurricane::Record;
   using Hurricane::Filter;
   using Hurricane::Locator;
@@ -110,12 +112,82 @@ namespace Anabatic {
   { }
 
 
+// -------------------------------------------------------------------
+// Class  :  "Path_Edges".
+
+  class Path_Edges : public EdgesHC {
+    public:
+    // Sub-Class: Locator.
+      class Locator : public EdgesHL {
+        public:
+                           Locator    ( const GCell* source, const GCell* target, Flags pathFlags );
+          inline           Locator    ( const Locator& );
+          virtual Edge*    getElement () const;
+          virtual EdgesHL* getClone   () const;
+          virtual bool     isValid    () const;
+          virtual void     progress   ();
+          virtual string   _getString () const;
+        protected:
+          const GCell*     _source;
+          const GCell*     _target;
+                Flags      _stateFlags;
+                DbU::Unit  _uprobe;
+                Edge*      _edge;
+      };
+
+    // GCell_Edges.
+    public:
+      inline           Path_Edges  ( const GCell* source, const GCell* target, Flags pathFlags=Flags::NorthPath );
+      inline           Path_Edges  ( const Path_Edges& );
+      virtual EdgesHC* getClone    () const;
+	  virtual EdgesHL* getLocator  () const;
+      virtual string  _getString   () const;
+    protected:
+      const GCell*  _source;
+      const GCell*  _target;
+            Flags   _pathFlags;
+  };
+
+  
+  inline Path_Edges::Locator::Locator ( const Locator &locator )
+    : EdgesHL()
+    , _source    (locator._source)
+    , _target    (locator._target)
+    , _stateFlags(locator._stateFlags)
+    , _uprobe    (locator._uprobe)
+    , _edge      (locator._edge)
+  {
+    // cdebug_log(110,0) << "GCell_Edges::Locator::Locator(const Locator&)" << std::endl;
+  }
+
+
+  inline Path_Edges::Path_Edges ( const GCell* source, const GCell* target, Flags pathFlags )
+    : EdgesHC()
+    , _source   (source)
+    , _target   (target)
+    , _pathFlags(pathFlags)
+  { }
+
+
+  inline Path_Edges::Path_Edges ( const Path_Edges& path )
+    : EdgesHC()
+    , _source   (path._source)
+    , _target   (path._target)
+    , _pathFlags(path._pathFlags)
+  { }
+
+
 }  // Anabatic namespace.
 
 
 GETSTRING_POINTER_SUPPORT(Anabatic::GCell_Edges);
 GETSTRING_POINTER_SUPPORT(Anabatic::GCell_Edges::Locator);
+GETSTRING_POINTER_SUPPORT(Anabatic::Path_Edges);
+GETSTRING_POINTER_SUPPORT(Anabatic::Path_Edges::Locator);
+
 IOSTREAM_POINTER_SUPPORT(Anabatic::GCell_Edges);
 IOSTREAM_POINTER_SUPPORT(Anabatic::GCell_Edges::Locator);
+IOSTREAM_POINTER_SUPPORT(Anabatic::Path_Edges);
+IOSTREAM_POINTER_SUPPORT(Anabatic::Path_Edges::Locator);
 
 #endif  // ANABATIC_EDGES_H

anabatic/src/anabatic/GCell.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "GCell.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,10 +14,9 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_GCELL_H
-#define  ANABATIC_GCELL_H
-
+#pragma  once
 #include <vector>
+#include <queue>
 #include <string>
 #include <set>
 #include <functional>
@@ -66,6 +65,8 @@ namespace Anabatic {
   class GCell;
   
 
+
+
 // -------------------------------------------------------------------
 // Class  :  "GCell".
 
@@ -113,175 +114,211 @@ namespace Anabatic {
     public:
       class Key {
         public:
-          inline        Key        ( GCell*, size_t depth );
-          inline float  getDensity () const;
-          inline GCell* getGCell   () const;
-          inline void   update     ( size_t depth );
-          friend bool   operator<  ( const Key&, const Key& );
+          inline              Key         ( const GCell*, size_t depth );
+          inline             ~Key         ();
+          inline       float  getDensity  () const;
+          inline const GCell* getGCell    () const;
+          inline       bool   isActive    () const;
+          inline       bool   isSaturated () const;
+          inline       void   update      ( size_t depth );
+          friend       bool   operator<   ( const Key&, const Key& );
+        public:
+          class Compare {
+            public:
+              inline bool operator() ( const Key*, const Key* );
+          };
         private:
-          GCell* _gcell;
-          float  _density;
+          const GCell* _gcell;
+                float  _density;
       };
     public:
-      static        uint32_t              getDisplayMode      ();
-      static        void                  setDisplayMode      ( uint32_t );
-      static        Box                   getBorder           ( const GCell*, const GCell* );
+      static        uint32_t              getDisplayMode       ();
+      static        void                  setDisplayMode       ( uint32_t );
+      static        Box                   getBorder            ( const GCell*, const GCell* );
+      static inline DbU::Unit             getMatrixHSide       ();
+      static inline DbU::Unit             getMatrixVSide       ();
     public:                                                    
-      static        GCell*                create              ( AnabaticEngine* );
+      static        GCell*                create               ( AnabaticEngine* );
     public:                                                    
-      inline        bool                  isSaturated         () const;
-                    bool                  isSaturated         ( size_t depth ) const;
-      inline        bool                  isInvalidated       () const;
-      inline        bool                  isHFlat             () const;
-      inline        bool                  isVFlat             () const;
-      inline        bool                  isFlat              () const;
-      inline        bool                  isDevice            () const;
-      inline        bool                  isHChannel          () const;
-      inline        bool                  isVChannel          () const;
-      inline        bool                  isStrut             () const;
-      inline        bool                  isMatrix            () const;
-      inline        bool                  isIoPad             () const;
-                    bool                  isWest              ( GCell* ) const;
-                    bool                  isEast              ( GCell* ) const;
-                    bool                  isNorth             ( GCell* ) const;
-                    bool                  isSouth             ( GCell* ) const;
-                    Contact*              hasGContact         ( const Contact* ) const;
-                    Contact*              hasGContact         ( const Net* ) const;
-      inline        AnabaticEngine*       getAnabatic         () const;
-      inline        Flags                 getType             () const;
-      inline        DbU::Unit             getXMin             () const;
-      inline        DbU::Unit             getYMin             () const;
-      inline        DbU::Unit             getXMax             ( int shrink=0 ) const;
-      inline        DbU::Unit             getYMax             ( int shrink=0 ) const;
-      inline        DbU::Unit             getXCenter          () const;
-      inline        DbU::Unit             getYCenter          () const;
-      inline        DbU::Unit             getConstraintXMax   ( int shrink=0 ) const;
-      inline        DbU::Unit             getConstraintYMax   ( int shrink=0 ) const;
-      inline        Interval              getSide             ( Flags direction, int shrink=0 ) const;
-      inline        Point                 getCenter           () const;
-      inline        Box                   getConstraintBox    () const;
-      inline const  vector<Edge*>&        getWestEdges        () const;
-      inline const  vector<Edge*>&        getEastEdges        () const;
-      inline const  vector<Edge*>&        getNorthEdges       () const;
-      inline const  vector<Edge*>&        getSouthEdges       () const;
-                    Edge*                 getEdgeTo           ( GCell*, Flags sideHint=Flags::AllSides ) const;
-                    Edge*                 getEdgeAt           ( Flags sideHint, DbU::Unit u ) const;
-      inline        Edges                 getEdges            ( Flags sides=Flags::AllSides ) const;
-      inline        GCell*                getWest             () const;
-      inline        GCell*                getEast             () const;
-      inline        GCell*                getSouth            () const;
-      inline        GCell*                getNorth            () const;
+      inline        bool                  isSaturated          () const;
+                    bool                  isSaturated          ( size_t depth ) const;
+      inline        bool                  isInvalidated        () const;
+      inline        bool                  isHFlat              () const;
+      inline        bool                  isVFlat              () const;
+      inline        bool                  isFlat               () const;
+      inline        bool                  isDevice             () const;
+      inline        bool                  isHChannel           () const;
+      inline        bool                  isVChannel           () const;
+      inline        bool                  isStrut              () const;
+      inline        bool                  isAnalog             () const;
+      inline        bool                  isMatrix             () const;
+      inline        bool                  isRow                () const;
+      inline        bool                  isIoPad              () const;
+      inline        bool                  isGoStraight         () const;
+      inline        bool                  isHRail              () const;
+      inline        bool                  isVRail              () const;
+      inline        bool                  isStdCellRow         () const;
+      inline        bool                  isChannelRow         () const;
+                    bool                  isWest               ( GCell* ) const;
+                    bool                  isEast               ( GCell* ) const;
+                    bool                  isNorth              ( GCell* ) const;
+                    bool                  isSouth              ( GCell* ) const;
+                    bool                  hasNet               ( const Net* ) const;
+                    Contact*              hasGContact          ( const Contact* ) const;
+                    Contact*              hasGContact          ( const Net* ) const;
+                    bool                  isHorizontalPlane    ( size_t depth ) const;
+                    bool                  isVerticalPlane      ( size_t depth ) const;
+      inline        AnabaticEngine*       getAnabatic          () const;
+      inline        Flags                 getType              () const;
+      inline        DbU::Unit             getXMin              () const;
+      inline        DbU::Unit             getYMin              () const;
+      inline        DbU::Unit             getXMax              ( int shrink=0 ) const;
+      inline        DbU::Unit             getYMax              ( int shrink=0 ) const;
+      inline        DbU::Unit             getXCenter           () const;
+      inline        DbU::Unit             getYCenter           () const;
+      inline        DbU::Unit             getConstraintXMax    ( int shrink=0 ) const;
+      inline        DbU::Unit             getConstraintYMax    ( int shrink=0 ) const;
+      inline        Interval              getSide              ( Flags direction, int shrink=0 ) const;
+      inline        Interval              getHSide             ( int shrink=0 ) const;
+      inline        Interval              getVSide             ( int shrink=0 ) const;
+      inline        Point                 getCenter            () const;
+      inline        Box                   getConstraintBox     () const;
+      inline const  vector<Edge*>&        getWestEdges         () const;
+      inline const  vector<Edge*>&        getEastEdges         () const;
+      inline const  vector<Edge*>&        getNorthEdges        () const;
+      inline const  vector<Edge*>&        getSouthEdges        () const;
+                    Edge*                 getEdgeTo            ( GCell*, Flags sideHint=Flags::AllSides ) const;
+                    Edge*                 getEdgeAt            ( Flags sideHint, DbU::Unit u ) const;
+      inline        Edges                 getEdges             ( Flags sides=Flags::AllSides ) const;
+      inline        GCell*                getWest              () const;
+      inline        GCell*                getEast              () const;
+      inline        GCell*                getSouth             () const;
+      inline        GCell*                getNorth             () const;
                                                                
-      inline        Edge*                 getWestEdge         () const;
-      inline        Edge*                 getEastEdge         () const;
-      inline        Edge*                 getSouthEdge        () const;
-      inline        Edge*                 getNorthEdge        () const;
+                    GCell*                getEastNMatrix       () const;
+                    GCell*                getNorthNMatrix      () const;
                                                                
-                    GCell*                getWest             ( DbU::Unit y ) const;
-                    GCell*                getEast             ( DbU::Unit y ) const;
-                    GCell*                getSouth            ( DbU::Unit x ) const;
-                    GCell*                getNorth            ( DbU::Unit x ) const;
-                    GCell*                getNeighborAt       ( Flags side, DbU::Unit axis ) const;
-                    GCell*                getUnder            ( DbU::Unit x, DbU::Unit y ) const;
-      inline        GCell*                getUnder            ( Point p ) const;
-                    GCell*                hcut                ( DbU::Unit y );
-                    GCell*                vcut                ( DbU::Unit x );
-                    bool                  doGrid              ();
-                    Contact*              getGContact         ( Net* );
-      inline const  vector<Contact*>&     getGContacts        () const;
-                    Contact*              breakGoThrough      ( Net* net );
-                    bool                  unrefContact        ( Contact* );
-                    void                  setXY               ( DbU::Unit x, DbU::Unit y );
-                    void                  updateContactsPosition ();
-                    void                  cleanupGlobal       ();
-      inline        DbU::Unit             getWidth            () const;
-      inline        DbU::Unit             getHeight           () const;
+      inline        Edge*                 getWestEdge          () const;
+      inline        Edge*                 getEastEdge          () const;
+      inline        Edge*                 getSouthEdge         () const;
+      inline        Edge*                 getNorthEdge         () const;
+                                                               
+                    GCell*                getWest              ( DbU::Unit y ) const;
+                    GCell*                getEast              ( DbU::Unit y ) const;
+                    GCell*                getSouth             ( DbU::Unit x ) const;
+                    GCell*                getNorth             ( DbU::Unit x ) const;
+                    GCell*                getNeighborAt        ( Flags side, DbU::Unit axis ) const;
+                    GCell*                getUnder             ( DbU::Unit x, DbU::Unit y ) const;
+      inline        GCell*                getUnder             ( Point p ) const;
+                    GCell*                hcut                 ( DbU::Unit y );
+                    GCell*                vcut                 ( DbU::Unit x );
+                    bool                  doGrid               ();
+                    Contact*              getGContact          ( Net* );
+      inline const  vector<Contact*>&     getGContacts         () const;
+                    Segment*              hasGoThrough         ( Net* ) const;
+                    Contact*              breakGoThrough       ( Net* );
+                    bool                  unrefContact         ( Contact* );
+                    void                  setSouthWestCorner   ( DbU::Unit x, DbU::Unit y );
+                    void                  cleanupGlobal        ();
+      inline        DbU::Unit             getWidth             () const;
+      inline        DbU::Unit             getHeight            () const;
     // Detailed routing functions.                             
-                    bool                  hasFreeTrack        ( size_t depth, float reserve ) const;
-      inline        size_t                getDepth            () const;
-                    float                 getHCapacity        () const;
-                    float                 getVCapacity        () const;
-                    float                 getDensity          ( Flags flags=Flags::NoFlags ) const;
-                    float                 getAverageHVDensity () const;
-                    float                 getMaxHVDensity     () const;
-      inline        float                 getCDensity         ( Flags flags=Flags::NoFlags ) const;
-      inline        float                 getWDensity         ( size_t depth, Flags flags=Flags::NoFlags  ) const;
-      inline        DbU::Unit             getBlockage         ( size_t depth ) const;
-      inline        float                 getFragmentation    ( size_t depth ) const;
-      inline        float                 getFeedthroughs     ( size_t depth ) const;
-      inline        float                 getGlobalsCount     ( size_t depth ) const;
-      inline  const vector<AutoSegment*>& getHSegments        () const;
-      inline  const vector<AutoSegment*>& getVSegments        () const;
-      inline  const vector<AutoContact*>& getContacts         () const;
-                    AutoSegments          getHStartSegments   ();
-                    AutoSegments          getVStartSegments   ();
-                    AutoSegments          getHStopSegments    ();
-                    AutoSegments          getVStopSegments    ();
-      inline        AutoSegments          getStartSegments    ( Flags direction );
-      inline        AutoSegments          getStopSegments     ( Flags direction );
-                    size_t                getRoutingPads      ( set<RoutingPad*>& );
-      inline  const Key&                  getKey              () const;
-                    size_t                checkDensity        () const;
-                    bool                  checkEdgeSaturation ( size_t hreserved, size_t vreserved) const;
-                    void                  setType             ( Flags );
-                    void                  addBlockage         ( size_t depth, DbU::Unit );
-      inline        void                  addHSegment         ( AutoSegment* );
-      inline        void                  addVSegment         ( AutoSegment* );
-      inline        void                  addContact          ( AutoContact* );
-                    void                  removeVSegment      ( AutoSegment* );
-                    void                  removeHSegment      ( AutoSegment* );
-                    void                  removeContact       ( AutoContact* );
-                    void                  updateContacts      ();
-                    size_t                updateDensity       ();
-      inline        void                  updateKey           ( size_t depth );
-                    void                  truncDensities      ();
-                    bool                  stepBalance         ( size_t depth, Set& invalidateds );
-                    void                  rpDesaturate        ( set<Net*>& );
-                    bool                  stepDesaturate      ( size_t                    depth
-                                                              , set<Net*>&, AutoSegment*& moved
-                                                              , Flags                     flags=Flags::NoFlags );
-                    bool                  stepNetDesaturate   ( size_t     depth
-                                                              , set<Net*>& globalNets
-                                                              , Set&       invalidateds );
-
-                    void                  setEdgesOccupancy   (unsigned int, unsigned int);
+                    bool                  hasFreeTrack         ( size_t depth, float reserve ) const;
+      inline        size_t                getDepth             () const;
+                    size_t                getNetCount          () const;
+      inline        int                   getRpCount           () const;
+                    int                   getHCapacity         () const;
+                    int                   getVCapacity         () const;
+                    int                   getCapacity          ( size_t depth ) const;
+                    float                 getDensity           ( Flags flags=Flags::NoFlags ) const;
+                    float                 getDensity           ( size_t depth ) const;
+                    float                 getAverageHVDensity  () const;
+                    float                 getMaxHVDensity      () const;
+      inline        float                 getCDensity          ( Flags flags=Flags::NoFlags ) const;
+      inline        float                 getWDensity          ( size_t depth, Flags flags=Flags::NoFlags  ) const;
+      inline        DbU::Unit             getBlockage          ( size_t depth ) const;
+      inline        float                 getFragmentation     ( size_t depth ) const;
+      inline        float                 getFeedthroughs      ( size_t depth ) const;
+      inline        float                 getGlobalsCount      ( size_t depth ) const;
+      inline  const vector<AutoSegment*>& getHSegments         () const;
+      inline  const vector<AutoSegment*>& getVSegments         () const;
+      inline  const vector<AutoContact*>& getContacts          () const;
+                    AutoSegments          getHStartSegments    ();
+                    AutoSegments          getVStartSegments    ();
+                    AutoSegments          getHStopSegments     ();
+                    AutoSegments          getVStopSegments     ();
+      inline        AutoSegments          getStartSegments     ( Flags direction );
+      inline        AutoSegments          getStopSegments      ( Flags direction );
+                    size_t                getRoutingPads       ( set<RoutingPad*>& );
+      inline  const Key&                  getKey               () const;
+      inline        Key*                  cloneKey             ( size_t depth ) const;
+      inline        Key*                  getLastClonedKey     () const;
+      inline        void                  clearClonedKey       () const;
+                    size_t                checkDensity         () const;
+                    bool                  checkEdgeSaturation  ( size_t hreserved, size_t vreserved) const;
+                    void                  setType              ( Flags );
+                    void                  addBlockage          ( size_t depth, DbU::Unit );
+      inline        void                  addHSegment          ( AutoSegment* );
+      inline        void                  addVSegment          ( AutoSegment* );
+      inline        void                  addContact           ( AutoContact* );
+                    void                  removeVSegment       ( AutoSegment* );
+                    void                  removeHSegment       ( AutoSegment* );
+                    void                  removeContact        ( AutoContact* );
+                    void                  updateGContacts      ( Flags flags );
+                    void                  updateContacts       ();
+                    size_t                updateDensity        ();
+      inline        void                  updateKey            ( size_t depth );
+                    void                  truncDensities       ();
+                    bool                  stepBalance          ( size_t depth, Set& invalidateds );
+                    void                  rpDesaturate         ( set<Net*>& );
+                    bool                  stepDesaturate       ( size_t                    depth
+                                                               , set<Net*>&, AutoSegment*& moved
+                                                               , Flags                     flags=Flags::NoFlags );
+                    bool                  stepNetDesaturate    ( size_t     depth
+                                                               , set<Net*>& globalNets
+                                                               , Set&       invalidateds );
+      inline        void                  incRpCount           ( int );
+                    void                  forceEdgesCapacities ( unsigned int hcapacities, unsigned int vcapacities );
     // Misc. functions.
-      inline const  Flags&                flags               () const;
-      inline        Flags&                flags               ();
-                    void                  _add                ( Edge* edge, Flags side );
-                    void                  _remove             ( Edge* edge, Flags side=Flags::AllSides );
-                    void                  _destroyEdges       ();
-                    void                  _revalidate         ();
+      inline const  Flags&                flags                () const;
+      inline        Flags&                flags                ();
+                    void                  _add                 ( Edge* edge, Flags side );
+                    void                  _remove              ( Edge* edge, Flags side=Flags::AllSides );
+                    void                  _destroyEdges        ();
     private:                                                   
-                    void                  _moveEdges          ( GCell* dest, size_t ibegin, Flags flags );
+                    void                  _moveEdges           ( GCell* dest, size_t ibegin, Flags flags );
     public:                                                    
     // Observers.                                              
       template<typename OwnerT>                                
-      inline        OwnerT*               getObserver         ( size_t slot );
-      inline        void                  setObserver         ( size_t slot, BaseObserver* );
-      inline        void                  notify              ( unsigned int flags );
+      inline        OwnerT*               getObserver          ( size_t slot );
+      inline        void                  setObserver          ( size_t slot, BaseObserver* );
+      inline        void                  notify               ( unsigned int flags );
     // ExtensionGo support.                                    
-      inline  const Name&                 staticGetName       (); 
-      virtual const Name&                 getName             () const;
-      virtual       void                  translate           ( const DbU::Unit&, const DbU::Unit& );
-      virtual       Box                   getBoundingBox      () const;
+      inline  const Name&                 staticGetName        (); 
+      virtual const Name&                 getName              () const;
+      virtual       void                  translate            ( const DbU::Unit&, const DbU::Unit& );
+      virtual       Box                   getBoundingBox       () const;
+      virtual       void                  invalidate           ( bool propagateFlag=true );
+      virtual       void                  materialize          ();
     public:                                                    
     // Inspector support.                                      
-      virtual       string                _getTypeName        () const;
-      virtual       string                _getString          () const;
-      virtual       Record*               _getRecord          () const;
+      virtual       string                _getTypeName         () const;
+      virtual       string                _getString           () const;
+      virtual       Record*               _getRecord           () const;
     protected:                                                 
-                                          GCell               ( AnabaticEngine*, DbU::Unit xmin, DbU::Unit ymin );
-      virtual                            ~GCell               ();
-                    GCell*                _create             ( DbU::Unit xmin, DbU::Unit ymin );
-      virtual       void                  _postCreate         ();
-      virtual       void                  _preDestroy         ();
+                                          GCell                ( AnabaticEngine*, DbU::Unit xmin, DbU::Unit ymin );
+      virtual                            ~GCell                ();
+                    GCell*                _create              ( DbU::Unit xmin, DbU::Unit ymin );
+      virtual       void                  _postCreate          ();
+      virtual       void                  _preDestroy          ();
     private:                                                   
-                                          GCell               ( const GCell& );
-                    GCell&                operator=           ( const GCell& );
+                                          GCell                ( const GCell& );
+                    GCell&                operator=            ( const GCell& );
     private:
       static  Name                  _extensionName;
       static  uint32_t              _displayMode;
+      static  DbU::Unit             _matrixHSide;
+      static  DbU::Unit             _matrixVSide;
               Observable            _observable;
               AnabaticEngine*       _anabatic;
               Flags                 _flags;
@@ -297,6 +334,7 @@ namespace Anabatic {
               vector<AutoContact*>  _contacts;
               size_t                _depth;
               size_t                _pinDepth;
+              int                   _rpCount;
               DbU::Unit*            _blockages;
               float                 _cDensity;
               float*                _densities;
@@ -304,54 +342,71 @@ namespace Anabatic {
               float*                _fragmentations;
               float*                _globalsCount;
               Key                   _key;
+      mutable Key*                  _lastClonedKey;
   };
 
 
-  inline       bool                  GCell::isHFlat       () const { return getYMin() == getYMax(); }
-  inline       bool                  GCell::isVFlat       () const { return getXMin() == getXMax(); }
-  inline       bool                  GCell::isFlat        () const { return isHFlat() or isVFlat(); }
-  inline       bool                  GCell::isDevice      () const { return _flags & Flags::DeviceGCell; }
-  inline       bool                  GCell::isHChannel    () const { return _flags & Flags::HChannelGCell; }
-  inline       bool                  GCell::isVChannel    () const { return _flags & Flags::VChannelGCell; }
-  inline       bool                  GCell::isStrut       () const { return _flags & Flags::StrutGCell; }
-  inline       bool                  GCell::isMatrix      () const { return _flags & Flags::MatrixGCell; }
-  inline       bool                  GCell::isIoPad       () const { return _flags & Flags::IoPadGCell; }
-  inline       bool                  GCell::isSaturated   () const { return _flags & Flags::Saturated; }
-  inline       bool                  GCell::isInvalidated () const { return _flags & Flags::Invalidated; }
-  inline       Flags                 GCell::getType       () const { return _flags & Flags::GCellTypeMask; }
-  inline       AnabaticEngine*       GCell::getAnabatic   () const { return _anabatic; }
-  inline       DbU::Unit             GCell::getXMin       () const { return _xmin; }
-  inline       DbU::Unit             GCell::getYMin       () const { return _ymin; }
-  inline       Edges                 GCell::getEdges      ( Flags sides ) const { return new GCell_Edges(this,sides); }
-  inline const vector<Edge*>&        GCell::getWestEdges  () const { return _westEdges; }
-  inline const vector<Edge*>&        GCell::getEastEdges  () const { return _eastEdges; }
-  inline const vector<Edge*>&        GCell::getNorthEdges () const { return _northEdges; }
-  inline const vector<Edge*>&        GCell::getSouthEdges () const { return _southEdges; }
-  inline       GCell*                GCell::getWest       () const { return  _westEdges.empty() ? NULL :  _westEdges[0]->getOpposite(this); }
-  inline       GCell*                GCell::getEast       () const { return  _eastEdges.empty() ? NULL :  _eastEdges[0]->getOpposite(this); }
-  inline       GCell*                GCell::getSouth      () const { return _southEdges.empty() ? NULL : _southEdges[0]->getOpposite(this); }
-  inline       GCell*                GCell::getNorth      () const { return _northEdges.empty() ? NULL : _northEdges[0]->getOpposite(this); }
+  inline       bool                  GCell::isHFlat          () const { return getYMin() == getYMax(); }
+  inline       bool                  GCell::isVFlat          () const { return getXMin() == getXMax(); }
+  inline       bool                  GCell::isFlat           () const { return isHFlat() or isVFlat(); }
+  inline       bool                  GCell::isDevice         () const { return _flags & Flags::DeviceGCell; }
+  inline       bool                  GCell::isHChannel       () const { return _flags & Flags::HChannelGCell; }
+  inline       bool                  GCell::isVChannel       () const { return _flags & Flags::VChannelGCell; }
+  inline       bool                  GCell::isStrut          () const { return _flags & Flags::StrutGCell; }
+  inline       bool                  GCell::isAnalog         () const { return _flags & Flags::AnalogGCellMask; }
+  inline       bool                  GCell::isMatrix         () const { return _flags & Flags::MatrixGCell; }
+  inline       bool                  GCell::isRow            () const { return _flags & Flags::RowGCellMask; }
+  inline       bool                  GCell::isIoPad          () const { return _flags & Flags::IoPadGCell; }
+  inline       bool                  GCell::isGoStraight     () const { return _flags & Flags::GoStraight; }
+  inline       bool                  GCell::isHRail          () const { return _flags & Flags::HRailGCell; }
+  inline       bool                  GCell::isVRail          () const { return _flags & Flags::VRailGCell; }
+  inline       bool                  GCell::isStdCellRow     () const { return _flags & Flags::StdCellRow; }
+  inline       bool                  GCell::isChannelRow     () const { return _flags & Flags::ChannelRow; }
+  inline       bool                  GCell::isSaturated      () const { return _flags & Flags::Saturated; }
+  inline       bool                  GCell::isInvalidated    () const { return _flags & Flags::Invalidated; }
+  inline       DbU::Unit             GCell::getMatrixHSide   () { return _matrixHSide; }
+  inline       DbU::Unit             GCell::getMatrixVSide   () { return _matrixVSide; }
+  inline       Flags                 GCell::getType          () const { return _flags & Flags::GCellTypeMask; }
+  inline       AnabaticEngine*       GCell::getAnabatic      () const { return _anabatic; }
+  inline       DbU::Unit             GCell::getXMin          () const { return _xmin; }
+  inline       DbU::Unit             GCell::getYMin          () const { return _ymin; }
+  inline       Interval              GCell::getHSide         ( int shrink ) const { return getSide(Flags::Horizontal,shrink); }
+  inline       Interval              GCell::getVSide         ( int shrink ) const { return getSide(Flags::Vertical  ,shrink); }
+  inline       Edges                 GCell::getEdges         ( Flags sides ) const { return new GCell_Edges(this,sides); }
+  inline const vector<Edge*>&        GCell::getWestEdges     () const { return _westEdges; }
+  inline const vector<Edge*>&        GCell::getEastEdges     () const { return _eastEdges; }
+  inline const vector<Edge*>&        GCell::getNorthEdges    () const { return _northEdges; }
+  inline const vector<Edge*>&        GCell::getSouthEdges    () const { return _southEdges; }
+  inline       GCell*                GCell::getWest          () const { return  _westEdges.empty() ? NULL :  _westEdges[0]->getOpposite(this); }
+  inline       GCell*                GCell::getEast          () const { return  _eastEdges.empty() ? NULL :  _eastEdges[0]->getOpposite(this); }
+  inline       GCell*                GCell::getSouth         () const { return _southEdges.empty() ? NULL : _southEdges[0]->getOpposite(this); }
+  inline       GCell*                GCell::getNorth         () const { return _northEdges.empty() ? NULL : _northEdges[0]->getOpposite(this); }
                                                              
-  inline       Edge*                 GCell::getWestEdge       () const { return  _westEdges.empty() ? NULL :  _westEdges[0]; }
-  inline       Edge*                 GCell::getEastEdge       () const { return  _eastEdges.empty() ? NULL :  _eastEdges[0]; }
-  inline       Edge*                 GCell::getSouthEdge      () const { return _southEdges.empty() ? NULL : _southEdges[0]; }
-  inline       Edge*                 GCell::getNorthEdge      () const { return _northEdges.empty() ? NULL : _northEdges[0]; }
+  inline       Edge*                 GCell::getWestEdge      () const { return  _westEdges.empty() ? NULL :  _westEdges[0]; }
+  inline       Edge*                 GCell::getEastEdge      () const { return  _eastEdges.empty() ? NULL :  _eastEdges[0]; }
+  inline       Edge*                 GCell::getSouthEdge     () const { return _southEdges.empty() ? NULL : _southEdges[0]; }
+  inline       Edge*                 GCell::getNorthEdge     () const { return _northEdges.empty() ? NULL : _northEdges[0]; }
                                                              
-  inline       GCell*                GCell::getUnder      ( Point p ) const { return getUnder(p.getX(),p.getY()); }
-  inline const vector<Contact*>&     GCell::getGContacts  () const { return _gcontacts; }
-  inline        size_t               GCell::getDepth      () const { return _depth; }
-  inline const vector<AutoSegment*>& GCell::getVSegments  () const { return _vsegments; }
-  inline const vector<AutoSegment*>& GCell::getHSegments  () const { return _hsegments; }
-  inline const vector<AutoContact*>& GCell::getContacts   () const { return _contacts; }
+  inline       GCell*                GCell::getUnder         ( Point p ) const { return getUnder(p.getX(),p.getY()); }
+  inline const vector<Contact*>&     GCell::getGContacts     () const { return _gcontacts; }
+  inline       size_t                GCell::getDepth         () const { return _depth; }
+  inline       int                   GCell::getRpCount       () const { return _rpCount; }
+         const vector<AutoSegment*>& GCell::getVSegments     () const { return _vsegments; }
+  inline const vector<AutoSegment*>& GCell::getHSegments     () const { return _hsegments; }
+  inline const vector<AutoContact*>& GCell::getContacts      () const { return _contacts; }
                                                              
-  inline       DbU::Unit             GCell::getWidth      () const { return (getXMax()-getXMin()); }
-  inline       DbU::Unit             GCell::getHeight     () const { return (getYMax()-getYMin()); }
+  inline       DbU::Unit             GCell::getWidth         () const { return (getXMax()-getXMin()); }
+  inline       DbU::Unit             GCell::getHeight        () const { return (getYMax()-getYMin()); }
+  inline       float                 GCell::getDensity       ( size_t depth ) const { return (depth<_depth) ? _densities[depth] : 0.0; }
                                                              
-  inline const GCell::Key&           GCell::getKey        () const { return _key; }
-  inline       void                  GCell::setType       ( Flags type ) { _flags.reset(Flags::GCellTypeMask); _flags |= (type&Flags::GCellTypeMask); };
-  inline       void                  GCell::updateKey     ( size_t depth ) { _key.update(depth); }
-  inline const Flags&                GCell::flags         () const { return _flags; }
-  inline       Flags&                GCell::flags         () { return _flags; }
+  inline const GCell::Key&           GCell::getKey           () const { return _key; }
+  inline       GCell::Key*           GCell::cloneKey         ( size_t depth ) const { _lastClonedKey = new Key(this,depth); return _lastClonedKey; }
+  inline       void                  GCell::clearClonedKey   () const { _lastClonedKey=NULL; }
+  inline       GCell::Key*           GCell::getLastClonedKey () const { return _lastClonedKey; }
+  inline       void                  GCell::setType          ( Flags type ) { _flags.reset(Flags::GCellTypeMask); _flags |= (type&Flags::GCellTypeMask); };
+  inline       void                  GCell::updateKey        ( size_t depth ) { _key.update(depth); }
+  inline const Flags&                GCell::flags            () const { return _flags; }
+  inline       Flags&                GCell::flags            () { return _flags; }
 
   inline DbU::Unit  GCell::getXMax ( int shrink ) const
   { return _eastEdges.empty() ? getCell()->getAbutmentBox().getXMax() - shrink
@@ -382,6 +437,10 @@ namespace Anabatic {
     return Interval( getXMin(), getConstraintXMax(shrink) );
   }
 
+  inline void   GCell::incRpCount ( int delta )
+  { _rpCount = (_rpCount + delta > 0) ? (_rpCount + delta) : 0; }
+
+  
   inline void  GCell::setObserver ( size_t slot, BaseObserver* observer )
   { _observable.setObserver( slot, observer ); }
 
@@ -418,12 +477,12 @@ namespace Anabatic {
   inline  DbU::Unit  GCell::getBlockage ( size_t depth ) const
   { return (depth<_depth) ? _blockages[depth] : 0; }
 
-  inline  void  GCell::addVSegment ( AutoSegment* segment )
-  { _flags |= Flags::Invalidated; _vsegments.push_back(segment); }
-
   inline  void  GCell::addHSegment ( AutoSegment* segment )
   { _flags |= Flags::Invalidated; _hsegments.push_back(segment); }
 
+  inline void  GCell::addVSegment ( AutoSegment* segment )
+  { _flags |= Flags::Invalidated; _vsegments.push_back(segment); }
+
   inline  void  GCell::addContact ( AutoContact* contact )
   { _flags |= Flags::Invalidated; _contacts.push_back(contact); }
 
@@ -435,17 +494,25 @@ namespace Anabatic {
     return lhs.getId() < rhs.getId();
   }
 
-
 // GCell::CompareByKey Inline Functions.
   inline bool  GCell::CompareByKey::operator() ( const GCell* lhs, const GCell* rhs )
   { return lhs->getKey() < rhs->getKey(); }
 
 
 // GCell::Key Inline Functions.
-  inline        GCell::Key::Key        ( GCell* owner, size_t depth ) : _gcell(owner), _density(owner->getWDensity(depth,Flags::NoUpdate)) {}
-  inline float  GCell::Key::getDensity () const { return _density; }
-  inline GCell* GCell::Key::getGCell   () const { return _gcell; }
-  inline void   GCell::Key::update     ( size_t depth ) { _density=_gcell->getWDensity(depth); }
+  inline  GCell::Key::Key ( const GCell* owner, size_t depth )
+    : _gcell(owner)
+    , _density(owner->getWDensity(depth,Flags::NoUpdate))
+  { }
+
+  inline  GCell::Key::~Key ()
+  { if (isActive()) _gcell->clearClonedKey(); }
+
+  inline       float  GCell::Key::getDensity  () const { return _density; }
+  inline const GCell* GCell::Key::getGCell    () const { return _gcell; }
+  inline       void   GCell::Key::update      ( size_t depth ) { _density=_gcell->getWDensity(depth); }
+  inline       bool   GCell::Key::isActive    () const { return (this == _gcell->getLastClonedKey()); }
+  inline       bool   GCell::Key::isSaturated () const { return _gcell->isSaturated(); }
 
   inline bool  operator< ( const GCell::Key& lhs, const GCell::Key& rhs )
   {
@@ -455,6 +522,22 @@ namespace Anabatic {
     return lhs._gcell->getId() < rhs._gcell->getId();
   }
 
+  inline bool  GCell::Key::Compare::operator() ( const GCell::Key* lhs, const GCell::Key* rhs )
+  {
+  //if (lhs->isSaturated() xor rhs->isSaturated()) return lhs->isSaturated(); 
+      
+    float difference = lhs->_density - rhs->_density;
+    if (difference != 0.0) return (difference < 0.0);
+
+    return lhs->_gcell->getId() < rhs->_gcell->getId();
+  }
+
+
+// -------------------------------------------------------------------
+// Class  :  "GCellKeyQueue".
+
+  typedef std::priority_queue< GCell::Key*, std::vector<GCell::Key*>, GCell::Key::Compare >  GCellKeyQueue;
+
 
 // -------------------------------------------------------------------
 // Class  :  "GCellDensitySet".
@@ -499,5 +582,3 @@ namespace Anabatic {
 
 
 INSPECTOR_P_SUPPORT(Anabatic::GCell);
-
-#endif  // ANABATIC_GCELL_H

anabatic/src/anabatic/Matrix.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Matrix.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2016-2016, All Rights Reserved
+// Copyright (c) UPMC 2016-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -94,7 +94,7 @@ namespace Anabatic {
       inline  GCell*     getUnder     ( Point ) const;
               void       setCell      ( Cell*, DbU::Unit side );
               void       updateLookup ( GCell* );
-              void       resize       ( Box area, DbU::Unit side );
+              void       resize       ( Cell*, const vector<GCell*>& );
               void       show         () const;
     // Inspector support.                            
       virtual Record*    _getRecord   () const;

anabatic/src/anabatic/NetBuilder.h

@@ -0,0 +1,422 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/NetBuilder.h"                       |
+// +-----------------------------------------------------------------+
+
+#ifndef  ANABATIC_NET_BUILDER_H
+#define  ANABATIC_NET_BUILDER_H
+
+#include <vector>
+#include <map>
+
+namespace Hurricane {
+  class Hook;
+  class Net;
+  class RoutingPad;
+  class Component;
+}
+
+
+namespace Anabatic {
+
+  using std::string;
+  using std::vector;
+  using std::map;
+  using std::endl;
+  using Hurricane::Hook;
+  using Hurricane::Net;
+  using Hurricane::RoutingPad;
+  using Hurricane::Component;
+  class GCell;
+  class AutoContact;
+  class AutoSegment;
+  class AnabaticEngine;
+  
+
+// -------------------------------------------------------------------
+// Class  :  "ForkStack".
+
+  class ForkStack {
+    public:
+      inline void         push       ( Hook* from, AutoContact* contact );
+      inline void         pop        ();
+      inline Hook*        getFrom    () const;
+      inline AutoContact* getContact () const;
+    private:
+      struct Element {
+                 Hook*         _from;
+                 AutoContact*  _contact;
+          inline               Element ( Hook* from, AutoContact* contact );
+      };
+    private:
+      list<Element>  _stack;
+  };
+
+
+  inline              ForkStack::Element::Element ( Hook* from, AutoContact* contact ) : _from(from), _contact(contact) {}
+  inline void         ForkStack::pop              () { if (not _stack.empty()) _stack.pop_back(); }
+  inline Hook*        ForkStack::getFrom          ()  const { return _stack.empty() ? NULL : _stack.back()._from; }
+  inline AutoContact* ForkStack::getContact       ()  const { return _stack.empty() ? NULL : _stack.back()._contact; }
+
+
+  inline void  ForkStack::push ( Hook* from, AutoContact* contact )
+  {
+    cdebug_log(145,0) << "    Stacking " << from << " + " << contact << endl;
+    _stack.push_back( Element(from,contact) );
+  }
+
+
+// -------------------------------------------------------------------
+// Class  :  "NetBuilder".
+
+  class NetBuilder {
+    public:
+      enum FunctionFlags { NoFlags         = (1 <<  0)
+                         , SortDecreasing  = (1 <<  1)
+                         , HAccess         = (1 <<  2)
+                         , HAccessEW       = (1 <<  3)
+                         , VSmall          = (1 <<  4)
+                         , HSmall          = (1 <<  5)
+                         , Punctual        = (1 <<  6)
+                         , HCollapse       = (1 <<  7)
+                         , VCollapse       = (1 <<  8)
+                         , Terminal        = (1 <<  9)
+                         , DoSourceContact = (1 << 10)
+                         , DoTargetContact = (1 << 11)
+                         , SouthBound      = (1 << 12)
+                         , NorthBound      = (1 << 13)
+                         , WestBound       = (1 << 14)
+                         , EastBound       = (1 << 15)
+                         , Middle          = (1 << 16)
+                         , UseNonPref      = (1 << 17)
+                         , NoProtect       = (1 << 18)
+                         , HBothAccess     = HAccess|HAccessEW
+                         , SouthWest       = SouthBound|WestBound
+                         , NorthEast       = NorthBound|EastBound
+                         };
+      enum TopologyFlag  { Global_Vertical_End   = 0x00000001
+                         , Global_Horizontal_End = 0x00000002
+                         , Global_Horizontal     = 0x00000004
+                         , Global_Vertical       = 0x00000008
+                         , Global_Turn           = 0x00000010
+                         , Global_Fork           = 0x00000020
+                         , Global_Fixed          = 0x00000040
+                         , Global_End            = Global_Vertical_End | Global_Horizontal_End
+                         , Global_Split          = Global_Horizontal | Global_Vertical | Global_Fork
+                         };
+
+    // Connexity Union Type.
+      enum ConnexityBits { GlobalBSize = 8
+                         , Metal1BSize = 4
+                         , Metal2BSize = 4
+                         , Metal3BSize = 4
+                         , PadsBSize   = 4
+                         , PinsBSize   = 4
+                         };
+      union UConnexity {
+        uint64_t connexity;
+        struct {
+          unsigned int globals : GlobalBSize;
+          unsigned int M1      : Metal1BSize;
+          unsigned int M2      : Metal2BSize;
+          unsigned int M3      : Metal3BSize;
+          unsigned int Pad     : PadsBSize;
+          unsigned int Pin     : PinsBSize;
+        } fields;
+      };
+    public:
+      template< typename BuilderT >
+      static  void                          load                   ( AnabaticEngine*, Net* );
+      static  void                          getPositions           ( Component* anchor, Point& source, Point& target );
+      static  uint64_t                      checkRoutingPadSize    ( Component* anchor );
+      static  Hook*                         getSegmentOppositeHook ( Hook* hook );
+      static  uint64_t                      getSegmentHookType     ( Hook* hook );
+      static  void                          sortHookByX            ( vector<Hook*>&       , uint64_t flags=NoFlags );
+      static  void                          sortHookByY            ( vector<Hook*>&       , uint64_t flags=NoFlags );
+      static  void                          sortRpByX              ( vector<RoutingPad*>& , uint64_t flags=NoFlags );
+      static  void                          sortRpByY              ( vector<RoutingPad*>& , uint64_t flags=NoFlags );
+    public:
+                                            NetBuilder             ();
+      virtual                              ~NetBuilder             ();
+              void                          clear                  ();
+      inline  bool                          isTwoMetals            () const;
+      inline  AnabaticEngine*               getAnabatic            () const;
+      inline  unsigned int                  getDegree              () const;
+      inline  void                          setDegree              ( unsigned int degree );
+              void                          fixSegments            ();
+              NetBuilder&                   setStartHook           ( AnabaticEngine*
+                                                                   , Hook*        fromHook
+                                                                   , AutoContact* sourceContact=NULL );
+              void                          construct              ();
+      inline  unsigned int                  getStateG              () const;
+      inline  UConnexity                    getConnexity           () const;
+      inline  UConnexity&                   getConnexity           ();
+      inline  Net*                          getNet                 () const;
+      inline  GCell*                        getGCell               () const;
+      inline  AutoContact*                  getSourceContact       () const;
+      inline  AutoContact*                  getSouthWestContact    () const;
+      inline  AutoContact*&                 getSouthWestContact    ();
+      inline  AutoContact*                  getNorthEastContact    () const;
+      inline  AutoContact*&                 getNorthEastContact    ();
+      inline  Hook*                         getFromHook            () const;
+      inline  ForkStack&                    getForks               ();
+      inline  vector<RoutingPad*>&          getRoutingPads         ();
+      inline  map<Component*,AutoSegment*>& getRpLookup            ();
+      inline  unsigned int                  getTopology            () const;
+      inline  vector<Hook*>&                getNorths              ();
+      inline  vector<Hook*>&                getSouths              ();
+      inline  Hook*                         north                  ( size_t i=0 ) const;
+      inline  Hook*                         south                  ( size_t i=0 ) const;
+      inline  Hook*                         east                   ( size_t i=0 ) const;
+      inline  Hook*                         west                   ( size_t i=0 ) const;
+      inline  void                          addToNorths            ( Hook* );
+      inline  void                          addToSouths            ( Hook* );
+      inline  void                          addToEasts             ( Hook* );
+      inline  void                          addToWests             ( Hook* );
+      inline  void                          clearNorths            ();
+      inline  void                          clearSouths            ();
+      inline  void                          clearEasts             ();
+      inline  void                          clearWests             ();
+      inline  void                          setFromHook            ( Hook* );
+      inline  void                          setSouthWestContact    ( AutoContact* );
+      inline  void                          setNorthEastContact    ( AutoContact* );
+      inline  void                          setBothCornerContacts  ( AutoContact* );
+      inline  void                          swapCornerContacts     ();
+      inline  void                          addToFixSegments       ( AutoSegment* );
+              bool                          push                   ( Hook* to, AutoContact* contact, uint64_t flags=0 );
+      virtual void                          doRp_AutoContacts      ( GCell*, Component*, AutoContact*& source, AutoContact*& target, uint64_t flags ) = 0;
+      virtual AutoContact*                  doRp_Access            ( GCell*, Component*, uint64_t  flags ) = 0;
+      virtual AutoContact*                  doRp_AccessPad         ( RoutingPad*, uint64_t flags );
+      virtual AutoContact*                  doRp_AccessAnalog      ( GCell*, RoutingPad*, uint64_t flags );
+              void                          doRp_StairCaseH        ( GCell*, Component* rp1, Component* rp2 );
+              void                          doRp_StairCaseV        ( GCell*, Component* rp1, Component* rp2 );
+              void                          _load                  ( AnabaticEngine*, Net* );
+    private:                                                       
+      virtual bool                          _do_xG                 ();
+      virtual bool                          _do_2G                 ();
+      virtual bool                          _do_xG_1Pad            ();
+      virtual bool                          _do_1G_1PinM1          ();
+      virtual bool                          _do_2G_1PinM1          ();
+      virtual bool                          _do_1G_1PinM2          ();
+      virtual bool                          _do_xG_1PinM2          ();
+      virtual bool                          _do_1G_1PinM3          ();
+      virtual bool                          _do_xG_1PinM3          ();
+      virtual bool                          _do_1G_1M1             ();
+      virtual bool                          _do_2G_1M1             ();
+      virtual bool                          _do_1G_xM1             ();
+      virtual bool                          _do_xG_1M1             ();
+      virtual bool                          _do_xG_xM1_xM3         ();
+      virtual bool                          _do_xG_1M1_1M2         ();
+      virtual bool                          _do_4G_1M2             ();
+      virtual bool                          _do_xG_xM2             ();
+      virtual bool                          _do_1G_1M3             ();
+      virtual bool                          _do_xG_xM3             ();
+      virtual bool                          _do_1G_xM1_1PinM2      ();
+      virtual bool                          _do_2G_xM1_1PinM2      ();
+      virtual bool                          _do_1G_1M1_1PinM3      ();
+      virtual bool                          _do_2G_xM1_1PinM3      ();
+      virtual bool                          _do_3G_xM1_1PinM3      ();
+      virtual bool                          _do_globalSegment      ();
+      virtual void                          singleGCell            ( AnabaticEngine*, Net* );
+              AutoContact*                  _doHChannel            ();
+              AutoContact*                  _doVChannel            ();
+              AutoContact*                  _doStrut               ();
+              AutoContact*                  _doDevice              ();
+              AutoContact*                  _doHRail               ();
+              AutoContact*                  _doVRail               ();
+              void                          _doIoPad               ();
+              unsigned int                  getNumberGlobals       ();
+              unsigned int                  getDeviceNeighbourBound();
+      virtual string                        getTypeName            () const;
+    private:
+
+#define CONNEXITY_VALUE( Gs, M1s, M2s, M3s, pads, pins )                 \
+      Gs + ((M1s ) <<  GlobalBSize)                                      \
+         + ((M2s ) << (GlobalBSize+Metal1BSize))                         \
+         + ((M3s ) << (GlobalBSize+Metal1BSize+Metal2BSize))             \
+         + ((pads) << (GlobalBSize+Metal1BSize+Metal2BSize+Metal3BSize)) \
+         + ((pins) << (GlobalBSize+Metal1BSize+Metal2BSize+Metal3BSize+PadsBSize))
+
+    //                     Connexity Name                      | G|M1|M2|M3|Pad|Pin|
+      enum ConnexityFlag { Conn_0G            = CONNEXITY_VALUE( 0, 0, 0, 0, 0 , 0 )
+                         , Conn_2G            = CONNEXITY_VALUE( 2, 0, 0, 0, 0 , 0 )
+                         , Conn_3G            = CONNEXITY_VALUE( 3, 0, 0, 0, 0 , 0 )
+                         , Conn_4G            = CONNEXITY_VALUE( 4, 0, 0, 0, 0 , 0 )
+                         , Conn_5G            = CONNEXITY_VALUE( 5, 0, 0, 0, 0 , 0 )
+                         , Conn_6G            = CONNEXITY_VALUE( 6, 0, 0, 0, 0 , 0 )
+                         , Conn_0G_2M1        = CONNEXITY_VALUE( 0, 2, 0, 0, 0 , 0 )
+                         , Conn_1G_1M1        = CONNEXITY_VALUE( 1, 1, 0, 0, 0 , 0 )
+                         , Conn_1G_2M1        = CONNEXITY_VALUE( 1, 2, 0, 0, 0 , 0 )
+                         , Conn_1G_3M1        = CONNEXITY_VALUE( 1, 3, 0, 0, 0 , 0 )
+                         , Conn_1G_4M1        = CONNEXITY_VALUE( 1, 4, 0, 0, 0 , 0 )
+                         , Conn_1G_5M1        = CONNEXITY_VALUE( 1, 5, 0, 0, 0 , 0 )
+                         , Conn_1G_6M1        = CONNEXITY_VALUE( 1, 6, 0, 0, 0 , 0 )
+                         , Conn_1G_7M1        = CONNEXITY_VALUE( 1, 7, 0, 0, 0 , 0 )
+                         , Conn_1G_8M1        = CONNEXITY_VALUE( 1, 8, 0, 0, 0 , 0 )
+                         , Conn_1G_9M1        = CONNEXITY_VALUE( 1, 9, 0, 0, 0 , 0 )
+                         , Conn_1G_1M2        = CONNEXITY_VALUE( 1, 0, 1, 0, 0 , 0 )
+                         , Conn_1G_2M2        = CONNEXITY_VALUE( 1, 0, 2, 0, 0 , 0 )
+                         , Conn_1G_3M2        = CONNEXITY_VALUE( 1, 0, 3, 0, 0 , 0 )
+                         , Conn_1G_4M2        = CONNEXITY_VALUE( 1, 0, 4, 0, 0 , 0 )
+                         , Conn_1G_1M3        = CONNEXITY_VALUE( 1, 0, 0, 1, 0 , 0 )
+                         , Conn_1G_2M3        = CONNEXITY_VALUE( 1, 0, 0, 2, 0 , 0 )
+                         , Conn_1G_3M3        = CONNEXITY_VALUE( 1, 0, 0, 3, 0 , 0 )
+                         , Conn_1G_4M3        = CONNEXITY_VALUE( 1, 0, 0, 4, 0 , 0 )
+                         , Conn_1G_1M1_1M2    = CONNEXITY_VALUE( 1, 1, 1, 0, 0 , 0 )
+                         , Conn_1G_1M1_1M3    = CONNEXITY_VALUE( 1, 1, 0, 1, 0 , 0 )
+                         // Connexity Name                     | G|M1|M2|M3|Pad|Pin|
+                         , Conn_2G_1M1        = CONNEXITY_VALUE( 2, 1, 0, 0, 0 , 0 )
+                         , Conn_2G_2M1        = CONNEXITY_VALUE( 2, 2, 0, 0, 0 , 0 )
+                         , Conn_2G_3M1        = CONNEXITY_VALUE( 2, 3, 0, 0, 0 , 0 )
+                         , Conn_2G_4M1        = CONNEXITY_VALUE( 2, 4, 0, 0, 0 , 0 )
+                         , Conn_2G_5M1        = CONNEXITY_VALUE( 2, 5, 0, 0, 0 , 0 )
+                         , Conn_2G_6M1        = CONNEXITY_VALUE( 2, 6, 0, 0, 0 , 0 )
+                         , Conn_2G_7M1        = CONNEXITY_VALUE( 2, 7, 0, 0, 0 , 0 )
+                         , Conn_2G_8M1        = CONNEXITY_VALUE( 2, 8, 0, 0, 0 , 0 )
+                         , Conn_2G_9M1        = CONNEXITY_VALUE( 2, 9, 0, 0, 0 , 0 )
+                         , Conn_2G_1M2        = CONNEXITY_VALUE( 2, 0, 1, 0, 0 , 0 )
+                         , Conn_2G_2M2        = CONNEXITY_VALUE( 2, 0, 2, 0, 0 , 0 )
+                         , Conn_2G_3M2        = CONNEXITY_VALUE( 2, 0, 3, 0, 0 , 0 )
+                         , Conn_2G_4M2        = CONNEXITY_VALUE( 2, 0, 4, 0, 0 , 0 )
+                         , Conn_2G_1M3        = CONNEXITY_VALUE( 2, 0, 0, 1, 0 , 0 )
+                         , Conn_2G_2M3        = CONNEXITY_VALUE( 2, 0, 0, 2, 0 , 0 )
+                         , Conn_2G_3M3        = CONNEXITY_VALUE( 2, 0, 0, 3, 0 , 0 )
+                         , Conn_2G_4M3        = CONNEXITY_VALUE( 2, 0, 0, 4, 0 , 0 )
+                         , Conn_2G_1M1_1M2    = CONNEXITY_VALUE( 2, 1, 1, 0, 0 , 0 )
+                         // Connexity Name                     | G|M1|M2|M3|Pad|Pin|
+                         , Conn_3G_1M1        = CONNEXITY_VALUE( 3, 1, 0, 0, 0 , 0 )
+                         , Conn_3G_2M1        = CONNEXITY_VALUE( 3, 2, 0, 0, 0 , 0 )
+                         , Conn_3G_3M1        = CONNEXITY_VALUE( 3, 3, 0, 0, 0 , 0 )
+                         , Conn_3G_4M1        = CONNEXITY_VALUE( 3, 4, 0, 0, 0 , 0 )
+                         , Conn_3G_5M1        = CONNEXITY_VALUE( 3, 5, 0, 0, 0 , 0 )
+                         , Conn_3G_6M1        = CONNEXITY_VALUE( 3, 6, 0, 0, 0 , 0 )
+                         , Conn_3G_7M1        = CONNEXITY_VALUE( 3, 7, 0, 0, 0 , 0 )
+                         , Conn_3G_8M1        = CONNEXITY_VALUE( 3, 8, 0, 0, 0 , 0 )
+                         , Conn_3G_9M1        = CONNEXITY_VALUE( 3, 9, 0, 0, 0 , 0 )
+                         , Conn_3G_1M2        = CONNEXITY_VALUE( 3, 0, 1, 0, 0 , 0 )
+                         , Conn_3G_2M2        = CONNEXITY_VALUE( 3, 0, 2, 0, 0 , 0 )
+                         , Conn_3G_1M3        = CONNEXITY_VALUE( 3, 0, 0, 1, 0 , 0 )
+                         , Conn_3G_2M3        = CONNEXITY_VALUE( 3, 0, 0, 2, 0 , 0 )
+                         , Conn_3G_3M3        = CONNEXITY_VALUE( 3, 0, 0, 3, 0 , 0 )
+                         , Conn_3G_4M3        = CONNEXITY_VALUE( 3, 0, 0, 4, 0 , 0 )
+                         // Connexity Name                     | G|M1|M2|M3|Pad|Pin|
+                         , Conn_4G_1M1        = CONNEXITY_VALUE( 4, 1, 0, 0, 0 , 0 )
+                         , Conn_4G_2M1        = CONNEXITY_VALUE( 4, 2, 0, 0, 0 , 0 )
+                         , Conn_4G_3M1        = CONNEXITY_VALUE( 4, 3, 0, 0, 0 , 0 )
+                         , Conn_4G_4M1        = CONNEXITY_VALUE( 4, 4, 0, 0, 0 , 0 )
+                         , Conn_4G_5M1        = CONNEXITY_VALUE( 4, 5, 0, 0, 0 , 0 )
+                         , Conn_4G_6M1        = CONNEXITY_VALUE( 4, 6, 0, 0, 0 , 0 )
+                         , Conn_4G_7M1        = CONNEXITY_VALUE( 4, 7, 0, 0, 0 , 0 )
+                         , Conn_4G_8M1        = CONNEXITY_VALUE( 4, 8, 0, 0, 0 , 0 )
+                         , Conn_4G_9M1        = CONNEXITY_VALUE( 4, 9, 0, 0, 0 , 0 )
+                         , Conn_4G_1M2        = CONNEXITY_VALUE( 4, 0, 1, 0, 0 , 0 )
+                         , Conn_4G_1M3        = CONNEXITY_VALUE( 4, 0, 0, 1, 0 , 0 )
+                         , Conn_1G_1Pad       = CONNEXITY_VALUE( 1, 0, 0, 0, 1 , 0 )
+                         , Conn_2G_1Pad       = CONNEXITY_VALUE( 2, 0, 0, 0, 1 , 0 )
+                         , Conn_3G_1Pad       = CONNEXITY_VALUE( 3, 0, 0, 0, 1 , 0 )
+                         , Conn_1G_1PinM1     = CONNEXITY_VALUE( 1, 1, 0, 0, 0 , 1 )
+                         , Conn_2G_1PinM1     = CONNEXITY_VALUE( 2, 1, 0, 0, 0 , 1 )
+                         , Conn_1G_1PinM2     = CONNEXITY_VALUE( 1, 0, 1, 0, 0 , 1 )
+                         , Conn_2G_1PinM2     = CONNEXITY_VALUE( 2, 0, 1, 0, 0 , 1 )
+                         , Conn_3G_1PinM2     = CONNEXITY_VALUE( 3, 0, 1, 0, 0 , 1 )
+                         , Conn_1G_1M1_1PinM2 = CONNEXITY_VALUE( 1, 1, 1, 0, 0 , 1 )
+                         , Conn_1G_2M1_1PinM2 = CONNEXITY_VALUE( 1, 2, 1, 0, 0 , 1 )
+                         , Conn_2G_1M1_1PinM2 = CONNEXITY_VALUE( 2, 1, 1, 0, 0 , 1 )
+                         , Conn_2G_2M1_1PinM2 = CONNEXITY_VALUE( 2, 2, 1, 0, 0 , 1 )
+                         , Conn_1G_1PinM3     = CONNEXITY_VALUE( 1, 0, 0, 1, 0 , 1 )
+                         , Conn_2G_1PinM3     = CONNEXITY_VALUE( 2, 0, 0, 1, 0 , 1 )
+                         , Conn_3G_1PinM3     = CONNEXITY_VALUE( 3, 0, 0, 1, 0 , 1 )
+                         , Conn_1G_1M1_1PinM3 = CONNEXITY_VALUE( 1, 1, 0, 1, 0 , 1 )
+                         , Conn_2G_1M1_1PinM3 = CONNEXITY_VALUE( 2, 1, 0, 1, 0 , 1 )
+                         , Conn_2G_2M1_1PinM3 = CONNEXITY_VALUE( 2, 2, 0, 1, 0 , 1 )
+                         , Conn_2G_3M1_1PinM3 = CONNEXITY_VALUE( 2, 3, 0, 1, 0 , 1 )
+                         , Conn_3G_1M1_1PinM3 = CONNEXITY_VALUE( 3, 1, 0, 1, 0 , 1 )
+                         , Conn_3G_2M1_1PinM3 = CONNEXITY_VALUE( 3, 2, 0, 1, 0 , 1 )
+                         , Conn_3G_3M1_1PinM3 = CONNEXITY_VALUE( 3, 3, 0, 1, 0 , 1 )
+                         };
+
+#undef CONNEXITY_VALUE
+
+    // Attributes.
+    private:
+             AnabaticEngine*              _anabatic;
+             ForkStack                    _forks;
+             UConnexity                   _connexity;
+             unsigned int                 _topology;
+             Net*                         _net;
+             GCell*                       _gcell;
+             AutoContact*                 _sourceContact;
+             AutoContact*                 _southWestContact;
+             AutoContact*                 _northEastContact;
+             Hook*                        _fromHook;
+             vector<Hook*>                _easts;
+             vector<Hook*>                _wests;
+             vector<Hook*>                _norths;
+             vector<Hook*>                _souths;
+             vector<RoutingPad*>          _routingPads;
+             map<Component*,AutoSegment*> _routingPadAutoSegments;
+             vector<AutoSegment*>         _toFixSegments;
+             unsigned int                 _degree;
+             bool                         _isTwoMetals;
+
+    // Sort classes.
+    public:
+  };
+
+
+  inline bool                          NetBuilder::isTwoMetals            () const { return _isTwoMetals; }
+  inline AnabaticEngine*               NetBuilder::getAnabatic            () const { return _anabatic; }
+  inline unsigned int                  NetBuilder::getDegree              () const { return _degree; }
+  inline NetBuilder::UConnexity        NetBuilder::getConnexity           () const { return _connexity; }
+  inline NetBuilder::UConnexity&       NetBuilder::getConnexity           ()       { return _connexity; }
+  inline ForkStack&                    NetBuilder::getForks               () { return _forks; }
+  inline unsigned int                  NetBuilder::getStateG              () const { return _connexity.fields.globals; }
+  inline GCell*                        NetBuilder::getGCell               () const { return _gcell; }
+  inline Net*                          NetBuilder::getNet                 () const { return _net; }
+  inline AutoContact*                  NetBuilder::getSourceContact       () const { return _sourceContact; }
+  inline AutoContact*                  NetBuilder::getSouthWestContact    () const { return _southWestContact; }
+  inline AutoContact*&                 NetBuilder::getSouthWestContact    ()       { return _southWestContact; }
+  inline AutoContact*                  NetBuilder::getNorthEastContact    () const { return _northEastContact; }
+  inline AutoContact*&                 NetBuilder::getNorthEastContact    ()       { return _northEastContact; }
+  inline Hook*                         NetBuilder::getFromHook            () const { return _fromHook; }
+  inline unsigned int                  NetBuilder::getTopology            () const { return _topology; }
+  inline vector<RoutingPad*>&          NetBuilder::getRoutingPads         () { return _routingPads; }
+  inline map<Component*,AutoSegment*>& NetBuilder::getRpLookup            () { return _routingPadAutoSegments; }
+  inline vector<Hook*>&                NetBuilder::getNorths              () { return _norths; }
+  inline vector<Hook*>&                NetBuilder::getSouths              () { return _souths; }
+  inline Hook*                         NetBuilder::north                  ( size_t i ) const { return (i<_norths.size()) ? _norths[i] : NULL; }
+  inline Hook*                         NetBuilder::south                  ( size_t i ) const { return (i<_souths.size()) ? _souths[i] : NULL; }
+  inline Hook*                         NetBuilder::east                   ( size_t i ) const { return (i<_easts .size()) ? _easts [i] : NULL; }
+  inline Hook*                         NetBuilder::west                   ( size_t i ) const { return (i<_wests .size()) ? _wests [i] : NULL; }
+  inline void                          NetBuilder::setDegree              ( unsigned int degree ) { _degree = degree; }
+  inline void                          NetBuilder::setFromHook            ( Hook* hook ) { _fromHook = hook; }
+  inline void                          NetBuilder::setBothCornerContacts  ( AutoContact* ac ) { _southWestContact = _northEastContact = ac; }
+  inline void                          NetBuilder::setSouthWestContact    ( AutoContact* ac ) { _southWestContact = ac; }
+  inline void                          NetBuilder::setNorthEastContact    ( AutoContact* ac ) { _northEastContact = ac; }
+  inline void                          NetBuilder::swapCornerContacts     () { std::swap( _southWestContact, _northEastContact ); }
+  inline void                          NetBuilder::addToFixSegments       ( AutoSegment* as ) { _toFixSegments.push_back(as); }
+  inline void                          NetBuilder::addToNorths            ( Hook* hook ) { _norths.push_back(hook); }
+  inline void                          NetBuilder::addToSouths            ( Hook* hook ) { _souths.push_back(hook); }
+  inline void                          NetBuilder::addToEasts             ( Hook* hook ) { _easts .push_back(hook); }
+  inline void                          NetBuilder::addToWests             ( Hook* hook ) { _wests .push_back(hook); }
+  inline void                          NetBuilder::clearNorths            () { _norths.clear(); }
+  inline void                          NetBuilder::clearSouths            () { _souths.clear(); }
+  inline void                          NetBuilder::clearEasts             () { _easts .clear(); }
+  inline void                          NetBuilder::clearWests             () { _wests .clear(); }
+
+  template< typename BuilderT >
+  void  NetBuilder::load ( AnabaticEngine* engine, Net* net ) {  BuilderT()._load(engine,net); }
+
+}
+
+#endif  // ANABATIC_NET_BUILDER_H

anabatic/src/anabatic/NetBuilderHV.h

@@ -0,0 +1,71 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/NetBuilderHV.h"                     |
+// +-----------------------------------------------------------------+
+
+#ifndef  ANABATIC_NET_BUILDER_HV_H
+#define  ANABATIC_NET_BUILDER_HV_H
+
+#include "anabatic/NetBuilder.h"
+
+
+namespace Anabatic {
+
+
+// -----------------------------------------------------------------
+// Class  :  "NetBuilderHV".
+
+
+  class NetBuilderHV : public NetBuilder {
+    public:
+                            NetBuilderHV           ();
+      virtual              ~NetBuilderHV           ();
+      virtual void          doRp_AutoContacts      ( GCell*, Component*, AutoContact*& source, AutoContact*& target, uint64_t flags );
+      virtual AutoContact*  doRp_Access            ( GCell*, Component*, uint64_t  flags );
+              AutoContact*  doRp_AccessNorthPin    ( GCell*, RoutingPad* );
+              AutoContact*  doRp_AccessEastWestPin ( GCell*, RoutingPad* );
+    private:                                     
+      virtual bool          _do_1G_1M1             ();
+      virtual bool          _do_1G_xM1             ();
+      virtual bool          _do_xG                 ();
+      virtual bool          _do_2G                 ();
+      virtual bool          _do_2G_1M1             ();
+      virtual bool          _do_xG_1Pad            ();
+      virtual bool          _do_1G_1PinM1          ();
+      virtual bool          _do_2G_1PinM1          ();
+      virtual bool          _do_1G_1PinM2          ();
+      virtual bool          _do_xG_1PinM2          ();
+      virtual bool          _do_1G_1PinM3          ();
+      virtual bool          _do_xG_1PinM3          ();
+      virtual bool          _do_xG_1M1             ();
+      virtual bool          _do_xG_1M1_1M2         ();
+      virtual bool          _do_xG_xM1_xM3         ();
+      virtual bool          _do_4G_1M2             ();
+      virtual bool          _do_xG_xM2             ();
+      virtual bool          _do_1G_1M3             ();
+      virtual bool          _do_xG_xM3             ();
+      virtual bool          _do_1G_xM1_1PinM2      ();
+      virtual bool          _do_2G_xM1_1PinM2      ();
+      virtual bool          _do_1G_1M1_1PinM3      ();
+      virtual bool          _do_2G_xM1_1PinM3      ();
+      virtual bool          _do_3G_xM1_1PinM3      ();
+      virtual bool          _do_globalSegment      ();
+      virtual void          singleGCell            ( AnabaticEngine*, Net* );
+    public:                                        
+      virtual string        getTypeName            () const;
+  };
+
+
+}  // Anabatic namespace.
+
+#endif  // ANABATIC_NET_BUILDER_HV_H

anabatic/src/anabatic/NetBuilderM2.h

@@ -0,0 +1,57 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/NetBuilderM2.h"                     |
+// +-----------------------------------------------------------------+
+
+#ifndef  ANABATIC_NET_BUILDER_M2_H
+#define  ANABATIC_NET_BUILDER_M2_H
+
+#include "anabatic/NetBuilder.h"
+
+
+namespace Anabatic {
+
+
+// -----------------------------------------------------------------
+// Class  :  "NetBuilderM2".
+
+  class NetBuilderM2 : public NetBuilder {
+    public:
+                            NetBuilderM2       ();
+      virtual              ~NetBuilderM2       ();
+      virtual void          doRp_AutoContacts  ( GCell*, Component*, AutoContact*& source, AutoContact*& target, uint64_t flags );
+      virtual AutoContact*  doRp_Access        ( GCell*, Component*, uint64_t  flags );
+    private:                                     
+      virtual bool          _do_1G_1M1         ();
+      virtual bool          _do_2G_1M1         ();
+      virtual bool          _do_xG             ();
+      virtual bool          _do_globalSegment  ();
+    // Should never occur, so just return false.
+      virtual bool          _do_xG_1Pad        ();
+      virtual bool          _do_1G_1PinM2      ();
+      virtual bool          _do_1G_xM1         ();
+      virtual bool          _do_xG_xM2         ();
+      virtual bool          _do_1G_1M3         ();
+      virtual bool          _do_xG_xM3         ();
+      virtual bool          _do_xG_1M1_1M2     ();
+      virtual bool          _do_xG_xM1_xM3     ();
+      virtual bool          _do_4G_1M2         ();
+      virtual bool          _do_2G             ();
+    public:
+      virtual string        getTypeName        () const;
+  };
+
+
+}  // Anabatic namespace.
+
+#endif  // ANABATIC_NET_BUILDER_M2_H

anabatic/src/anabatic/NetBuilderVH.h

@@ -0,0 +1,54 @@
+// -*- C++ -*-
+//
+// This file is part of the Coriolis Software.
+// Copyright (c) UPMC 2017-2018, All Rights Reserved
+//
+// +-----------------------------------------------------------------+
+// |                   C O R I O L I S                               |
+// |         A n a b a t i c  -  Routing Toolbox                     |
+// |                                                                 |
+// |  Author      :                    Jean-Paul CHAPUT              |
+// |  E-mail      :            Jean-Paul.Chaput@lip6.fr              |
+// | =============================================================== |
+// |  C++ Header  :  "./anabatic/NetBuilderVH.h"                     |
+// +-----------------------------------------------------------------+
+
+#ifndef  ANABATIC_NET_BUILDER_VH_H
+#define  ANABATIC_NET_BUILDER_VH_H
+
+#include "anabatic/NetBuilder.h"
+
+
+namespace Anabatic {
+
+
+// -----------------------------------------------------------------
+// Class  :  "NetBuilderVH".
+
+  class NetBuilderVH : public NetBuilder {
+    public:
+                            NetBuilderVH       ();
+      virtual              ~NetBuilderVH       ();
+      virtual void          doRp_AutoContacts  ( GCell*, Component*, AutoContact*& source, AutoContact*& target, uint64_t flags );
+      virtual AutoContact*  doRp_Access        ( GCell*, Component*, uint64_t  flags );
+    private:                                     
+      virtual bool          _do_1G_1PinM2      ();
+      virtual bool          _do_xG_1PinM2      ();
+      virtual bool          _do_1G_1PinM3      ();
+      virtual bool          _do_xG_1PinM3      ();
+      virtual bool          _do_1G_1M1         ();
+      virtual bool          _do_1G_xM1         ();
+      virtual bool          _do_2G_1M1         ();
+      virtual bool          _do_xG_xM1_xM3     ();
+      virtual bool          _do_xG             ();
+      virtual bool          _do_2G             ();
+      virtual bool          _do_globalSegment  ();
+      virtual void          singleGCell        ( AnabaticEngine*, Net* );
+    public:
+      virtual string        getTypeName        () const;
+  };
+
+
+}  // Anabatic namespace.
+
+#endif  // ANABATIC_NET_BUILDER_VH_H

anabatic/src/anabatic/Session.h

@@ -1,7 +1,7 @@
 // -*- mode: C++; explicit-buffer-name: "Session.h<anabatic>" -*-
 //
 // This file is part of the Coriolis Software.
-// Copyright (c) UPMC 2008-2016, All Rights Reserved
+// Copyright (c) UPMC 2008-2018, All Rights Reserved
 //
 // +-----------------------------------------------------------------+
 // |                   C O R I O L I S                               |
@@ -14,9 +14,7 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  ANABATIC_SESSION_H
-#define  ANABATIC_SESSION_H
-
+#pragma  once
 #include <string>
 #include <vector>
 #include <set>
@@ -24,6 +22,7 @@
 #include <boost/function.hpp>
 #include "hurricane/Commons.h"
 #include "hurricane/Box.h"
+#include "hurricane/DBo.h"
 #include "crlcore/CellGauge.h"
 #include "crlcore/RoutingGauge.h"
 #include "anabatic/Constants.h"
@@ -55,6 +54,7 @@ namespace Anabatic {
   using Hurricane::DbU;
   using Hurricane::Point;
   using Hurricane::Box;
+  using Hurricane::DBo;
   using Hurricane::Net;
   using Hurricane::Contact;
   using Hurricane::Segment;
@@ -71,99 +71,128 @@ namespace Anabatic {
   class Session {
     public:
     // Static Methods.
-      static  inline bool                        doDestroyBaseContact  ();
-      static  inline bool                        doDestroyBaseSegment  ();
-      static  inline bool                        doDestroyTool         ();
-      static         bool                        isInDemoMode          ();
-      static         bool                        doWarnGCellOverload   ();
-      static         Session*                    get                   ( const char* message=NULL );
-      static  inline Technology*                 getTechnology         ();
-      static  inline AnabaticEngine*             getAnabatic           ();
-      static  inline const Configuration*        getConfiguration      ();
-      static         float                       getSaturateRatio      ();
-      static         size_t                      getSaturateRp         ();
-      static  inline size_t                      getAllowedDepth       ();
-      static         DbU::Unit                   getExtensionCap       ();
-      static  inline CellGauge*                  getCellGauge          ();
-      static  inline DbU::Unit                   getSliceHeight        ();
-      static  inline DbU::Unit                   getSliceStep          ();
-      static  inline RoutingGauge*               getRoutingGauge       ();
-      static  inline RoutingLayerGauge*          getLayerGauge         ( size_t depth );
-      static  inline size_t                      getDepth              ();
-      static  inline size_t                      getViaDepth           ( const Layer* layer );
-      static  inline size_t                      getLayerDepth         ( const Layer* layer );
-      static  inline const Layer*                getRoutingLayer       ( size_t );
-      static  inline const Layer*                getContactLayer       ( size_t );
-      static         Flags                       getDirection          ( size_t depth );
-      static  inline DbU::Unit                   getPitch              ( size_t depth, Flags flags );
-      static  inline DbU::Unit                   getOffset             ( size_t depth );
-      static  inline DbU::Unit                   getWireWidth          ( size_t depth );
-      static  inline DbU::Unit                   getViaWidth           ( size_t depth );
-      static  inline Flags                       getDirection          ( const Layer* );
-      static  inline DbU::Unit                   getPitch              ( const Layer*, Flags flags );
-      static  inline DbU::Unit                   getOffset             ( const Layer* );
-      static  inline DbU::Unit                   getWireWidth          ( const Layer* );
-      static  inline DbU::Unit                   getViaWidth           ( const Layer* );
-      static  inline DbU::Unit                   getExtensionCap       ( const Layer* );
-      static  inline Point                       getNearestGridPoint   ( Point, Box constraints );
-      static  inline size_t                      getSegmentStackSize   ();
-      static  inline size_t                      getContactStackSize   ();
-      static  inline const vector<AutoSegment*>& getInvalidateds       (); 
-      static  inline const vector<AutoSegment*>& getRevalidateds       (); 
-      static  inline const set<AutoSegment*>&    getDestroyeds         (); 
-      static  inline const vector<AutoSegment*>& getDoglegs            (); 
-      static  inline const set<Net*>&            getNetsModificateds   (); 
-      static         void                        close                 ();
-      static         void                        setAnabaticFlags      ( Flags );
-      static  inline void                        dogleg                ( AutoSegment* );
-      static  inline void                        doglegReset           ();
-      static  inline void                        revalidateTopology    ();
-      static  inline void                        setInvalidateMask     ( Flags );
-      static  inline void                        invalidate            ( Net* );
-      static  inline void                        invalidate            ( AutoContact* );
-      static  inline void                        invalidate            ( AutoSegment* );
-      static  inline size_t                      revalidate            ();
-      static         void                        link                  ( AutoContact* );
-      static         void                        link                  ( AutoSegment* );
-      static         void                        unlink                ( AutoContact* );
-      static         void                        unlink                ( AutoSegment* );
-      static         AutoContact*                lookup                ( Contact* );
-      static         AutoSegment*                lookup                ( Segment* );
-      static  inline void                        destroyRequest        ( AutoSegment* );
+      static  inline bool                              isOpen                ();
+      static  inline bool                              doDestroyBaseContact  ();
+      static  inline bool                              doDestroyBaseSegment  ();
+      static  inline bool                              doDestroyTool         ();
+      static         bool                              isInDemoMode          ();
+      static         bool                              doWarnGCellOverload   ();
+      static         Session*                          get                   ( const char* message=NULL );
+      static  inline Technology*                       getTechnology         ();
+      static  inline AnabaticEngine*                   getAnabatic           ();
+      static  inline const Configuration*              getConfiguration      ();
+      static         float                             getSaturateRatio      ();
+      static         size_t                            getSaturateRp         ();
+      static  inline size_t                            getAllowedDepth       ();
+      static         DbU::Unit                         getExtensionCap       ();
+      static  inline CellGauge*                        getCellGauge          ();
+      static  inline DbU::Unit                         getSliceHeight        ();
+      static  inline DbU::Unit                         getSliceStep          ();
+      static  inline size_t                            getGVerticalDepth     ();
+      static  inline size_t                            getGHorizontalDepth   ();
+      static  inline DbU::Unit                         getGHorizontalPitch   ();
+      static  inline DbU::Unit                         getGVerticalPitch     ();
+      static  inline size_t                            getDVerticalDepth     ();
+      static  inline const Layer*                      getDVerticalLayer     ();
+      static  inline DbU::Unit                         getDVerticalWidth     ();
+      static  inline DbU::Unit                         getDPVerticalWidth    ();
+      static  inline DbU::Unit                         getDVerticalPitch     ();
+      static  inline DbU::Unit                         getDVerticalOffset    ();
+      static  inline size_t                            getDHorizontalDepth   ();
+      static  inline const Layer*                      getDHorizontalLayer   ();
+      static  inline DbU::Unit                         getDHorizontalWidth   ();
+      static  inline DbU::Unit                         getDPHorizontalWidth  ();
+      static  inline DbU::Unit                         getDHorizontalPitch   ();
+      static  inline DbU::Unit                         getDHorizontalOffset  ();
+      static  inline size_t                            getDContactDepth      ();
+      static  inline const Layer*                      getDContactLayer      ();
+      static  inline DbU::Unit                         getDContactWidth      ();
+      static  inline DbU::Unit                         getDContactPitch      ();
+      static  inline RoutingGauge*                     getRoutingGauge       ();
+      static  inline bool                              isGLayer              ( const Layer* );
+      static  inline bool                              isGMetal              ( const Layer* );
+      static  inline bool                              isGContact            ( const Layer* );
+      static  inline bool                              isGaugeLayer          ( const Layer* );
+      static  inline RoutingLayerGauge*                getLayerGauge         ( const Layer* );
+      static  inline RoutingLayerGauge*                getLayerGauge         ( size_t depth );
+      static  inline size_t                            getDepth              ();
+      static  inline size_t                            getViaDepth           ( const Layer* layer );
+      static  inline size_t                            getLayerDepth         ( const Layer* layer );
+      static  inline const Layer*                      getRoutingLayer       ( size_t );
+      static  inline const Layer*                      getContactLayer       ( size_t );
+      static         Flags                             getDirection          ( size_t depth );
+      static  inline DbU::Unit                         getPitch              ( size_t depth, Flags flags );
+      static  inline DbU::Unit                         getOffset             ( size_t depth );
+      static  inline DbU::Unit                         getWireWidth          ( size_t depth );
+      static  inline DbU::Unit                         getPWireWidth         ( size_t depth );
+      static  inline DbU::Unit                         getViaWidth           ( size_t depth );
+      static  inline Flags                             getDirection          ( const Layer* );
+      static  inline DbU::Unit                         getPitch              ( const Layer*, Flags flags );
+      static  inline DbU::Unit                         getOffset             ( const Layer* );
+      static  inline DbU::Unit                         getWireWidth          ( const Layer* );
+      static  inline DbU::Unit                         getViaWidth           ( const Layer* );
+      static  inline DbU::Unit                         getExtensionCap       ( const Layer* );
+      static  inline DbU::Unit                         getNearestTrackAxis   ( const Layer*,  DbU::Unit, uint32_t mode );
+      static  inline Point                             getNearestGridPoint   ( Point, Box constraints );
+      static  inline size_t                            getSegmentStackSize   ();
+      static  inline size_t                            getContactStackSize   ();
+      static  inline const vector<AutoSegment*>&       getInvalidateds       (); 
+      static  inline const vector<AutoSegment*>&       getRevalidateds       (); 
+      static  inline const set<AutoSegment*>&          getDestroyeds         (); 
+      static  inline const vector<AutoSegment*>&       getDoglegs            (); 
+      static  inline const set<Net*,DBo::CompareById>& getNetsModificateds   (); 
+      static         void                              close                 ();
+      static         void                              setAnabaticFlags      ( Flags );
+      static  inline void                              dogleg                ( AutoSegment* );
+      static  inline void                              doglegReset           ();
+      static  inline void                              revalidateTopology    ();
+      static  inline void                              setInvalidateMask     ( Flags );
+      static  inline void                              invalidate            ( Net* );
+      static  inline void                              invalidate            ( AutoContact* );
+      static  inline void                              invalidate            ( AutoSegment* );
+      static  inline size_t                            revalidate            ();
+      static         void                              link                  ( AutoContact* );
+      static         void                              link                  ( AutoSegment* );
+      static         void                              unlink                ( AutoContact* );
+      static         void                              unlink                ( AutoSegment* );
+      static         AutoContact*                      lookup                ( Contact* );
+      static         AutoSegment*                      lookup                ( Segment* );
+      static  inline void                              destroyRequest        ( AutoSegment* );
     // Methods.                                                 
-      static         Session*                    _open                 ( AnabaticEngine* );
-                     bool                        _doDestroyBaseContact ();
-                     bool                        _doDestroyBaseSegment ();
-                     bool                        _doDestroyTool        ();
-      virtual        Configuration*              _getConfiguration     ();
-              inline void                        _dogleg               ( AutoSegment* );
-              inline void                        _doglegReset          ();
-                     void                        _invalidate           ( Net* );
-              inline void                        _invalidate           ( AutoContact* );
-              inline void                        _invalidate           ( AutoSegment* );
-              inline void                        _destroyRequest       ( AutoSegment* );
-                     void                        _canonize             ();
-                     void                        _revalidateTopology   ();
-      virtual        size_t                      _revalidate           ();
-                     DbU::Unit                   _getPitch             ( size_t depth, Flags flags ) const;
-                     Point                       _getNearestGridPoint  ( Point, Box constraints );
-                     Record*                     _getRecord            () const;
-                     string                      _getString            () const;
-              inline string                      _getTypeName          () const;
+      static         Session*                          _open                 ( AnabaticEngine* );
+                     bool                              _doDestroyBaseContact ();
+                     bool                              _doDestroyBaseSegment ();
+                     bool                              _doDestroyTool        ();
+      virtual        Configuration*                    _getConfiguration     ();
+              inline void                              _dogleg               ( AutoSegment* );
+              inline void                              _doglegReset          ();
+                     void                              _invalidate           ( Net* );
+              inline void                              _invalidate           ( AutoContact* );
+              inline void                              _invalidate           ( AutoSegment* );
+              inline void                              _destroyRequest       ( AutoSegment* );
+                     void                              _canonize             ();
+                     void                              _revalidateTopology   ();
+      virtual        size_t                            _revalidate           ();
+                     DbU::Unit                         _getPitch             ( size_t depth, Flags flags ) const;
+                     DbU::Unit                         _getNearestTrackAxis  ( const Layer*, DbU::Unit, uint32_t mode );
+                     Point                             _getNearestGridPoint  ( Point, Box constraints );
+                     Record*                           _getRecord            () const;
+                     string                            _getString            () const;
+              inline string                            _getTypeName          () const;
                                    
     protected:                     
-      static Session*              _session;
-             AnabaticEngine*       _anabatic;
-             Technology*           _technology;
-             CellGauge*            _cellGauge;
-             RoutingGauge*         _routingGauge;
-             vector<AutoContact*>  _autoContacts;
-             vector<AutoSegment*>  _doglegs;
-             vector<AutoSegment*>  _segmentInvalidateds;
-             vector<AutoSegment*>  _segmentRevalidateds;
-             set<Net*>             _netInvalidateds;
-             set<Net*>             _netRevalidateds;
-             set<AutoSegment*>     _destroyedSegments;
+      static Session*                    _session;
+             AnabaticEngine*             _anabatic;
+             Technology*                 _technology;
+             CellGauge*                  _cellGauge;
+             RoutingGauge*               _routingGauge;
+             vector<AutoContact*>        _autoContacts;
+             vector<AutoSegment*>        _doglegs;
+             vector<AutoSegment*>        _segmentInvalidateds;
+             vector<AutoSegment*>        _segmentRevalidateds;
+             set<Net*,DBo::CompareById>  _netInvalidateds;
+             set<Net*,DBo::CompareById>  _netRevalidateds;
+             set<AutoSegment*>           _destroyedSegments;
 
     // Constructors.
     protected:
@@ -178,64 +207,89 @@ namespace Anabatic {
 
 
 // Inline Functions.
-  inline Technology*                 Session::getTechnology        () { return get("getTechnology()")->_technology; }
-  inline CellGauge*                  Session::getCellGauge         () { return get("getCellGauge()")->_cellGauge; }
-  inline RoutingGauge*               Session::getRoutingGauge      () { return get("getRoutingGauge()")->_routingGauge; }
-  inline bool                        Session::doDestroyBaseContact () { return get("doDestroyBaseContact()")->_doDestroyBaseContact(); }
-  inline bool                        Session::doDestroyBaseSegment () { return get("doDestroyBaseSegment()")->_doDestroyBaseSegment(); }
-  inline bool                        Session::doDestroyTool        () { return get("doDestroyTool()")->_doDestroyTool(); }
-  inline const Configuration*        Session::getConfiguration     () { return get("getConfiguration()")->_getConfiguration(); }
-  inline AnabaticEngine*             Session::getAnabatic          () { return get("getAnabatic()")->_anabatic; }
-  inline void                        Session::revalidateTopology   () { return get("revalidateTopology()")->_revalidateTopology(); }
-  inline size_t                      Session::revalidate           () { return get("revalidate()")->_revalidate(); }
-  inline size_t                      Session::getSegmentStackSize  () { return get("getSegmentStackSize()")->_segmentInvalidateds.size(); }
-  inline size_t                      Session::getContactStackSize  () { return get("getContactStackSize()")->_autoContacts.size(); }
-  inline const vector<AutoSegment*>& Session::getInvalidateds      () { return get("getInvalidateds()")->_segmentInvalidateds; }
-  inline const vector<AutoSegment*>& Session::getRevalidateds      () { return get("getRevalidateds()")->_segmentRevalidateds; }
-  inline const set<AutoSegment*>&    Session::getDestroyeds        () { return get("getDestroyeds()")->_destroyedSegments; }
-  inline const vector<AutoSegment*>& Session::getDoglegs           () { return get("getDoglegs()")->_doglegs; }
-  inline const set<Net*>&            Session::getNetsModificateds  () { return get("getNetsModificateds()")->_netRevalidateds; }
-  inline void                        Session::doglegReset          () { return get("doglegReset()")->_doglegReset (); }
-  inline void                        Session::invalidate           ( Net* net ) { return get("invalidate(Net*)")->_invalidate(net); }
-  inline void                        Session::invalidate           ( AutoContact* autoContact ) { return get("invalidate(AutoContact*)")->_invalidate(autoContact); }
-  inline void                        Session::invalidate           ( AutoSegment* autoSegment ) { return get("invalidate(AutoSegment*)")->_invalidate(autoSegment); }
-  inline void                        Session::dogleg               ( AutoSegment* autoSegment ) { return get("dogleg(AutoSegment*)")->_dogleg(autoSegment); }
-  inline void                        Session::destroyRequest       ( AutoSegment* autoSegment ) { return get("destroyRequest(AutoSegment*)")->_destroyRequest(autoSegment); }
+  inline bool                              Session::isOpen               () { return get() != NULL; }
+  inline Technology*                       Session::getTechnology        () { return get("getTechnology()")->_technology; }
+  inline CellGauge*                        Session::getCellGauge         () { return get("getCellGauge()")->_cellGauge; }
+  inline RoutingGauge*                     Session::getRoutingGauge      () { return get("getRoutingGauge()")->_routingGauge; }
+  inline bool                              Session::doDestroyBaseContact () { return get("doDestroyBaseContact()")->_doDestroyBaseContact(); }
+  inline bool                              Session::doDestroyBaseSegment () { return get("doDestroyBaseSegment()")->_doDestroyBaseSegment(); }
+  inline bool                              Session::doDestroyTool        () { return get("doDestroyTool()")->_doDestroyTool(); }
+  inline const Configuration*              Session::getConfiguration     () { return get("getConfiguration()")->_getConfiguration(); }
+  inline AnabaticEngine*                   Session::getAnabatic          () { return get("getAnabatic()")->_anabatic; }
+  inline void                              Session::revalidateTopology   () { return get("revalidateTopology()")->_revalidateTopology(); }
+  inline size_t                            Session::revalidate           () { return get("revalidate()")->_revalidate(); }
+  inline size_t                            Session::getSegmentStackSize  () { return get("getSegmentStackSize()")->_segmentInvalidateds.size(); }
+  inline size_t                            Session::getContactStackSize  () { return get("getContactStackSize()")->_autoContacts.size(); }
+  inline const vector<AutoSegment*>&       Session::getInvalidateds      () { return get("getInvalidateds()")->_segmentInvalidateds; }
+  inline const vector<AutoSegment*>&       Session::getRevalidateds      () { return get("getRevalidateds()")->_segmentRevalidateds; }
+  inline const set<AutoSegment*>&          Session::getDestroyeds        () { return get("getDestroyeds()")->_destroyedSegments; }
+  inline const vector<AutoSegment*>&       Session::getDoglegs           () { return get("getDoglegs()")->_doglegs; }
+  inline const set<Net*,DBo::CompareById>& Session::getNetsModificateds  () { return get("getNetsModificateds()")->_netRevalidateds; }
+  inline void                              Session::doglegReset          () { return get("doglegReset()")->_doglegReset (); }
+  inline void                              Session::invalidate           ( Net* net ) { return get("invalidate(Net*)")->_invalidate(net); }
+  inline void                              Session::invalidate           ( AutoContact* autoContact ) { return get("invalidate(AutoContact*)")->_invalidate(autoContact); }
+  inline void                              Session::invalidate           ( AutoSegment* autoSegment ) { return get("invalidate(AutoSegment*)")->_invalidate(autoSegment); }
+  inline void                              Session::dogleg               ( AutoSegment* autoSegment ) { return get("dogleg(AutoSegment*)")->_dogleg(autoSegment); }
+  inline void                              Session::destroyRequest       ( AutoSegment* autoSegment ) { return get("destroyRequest(AutoSegment*)")->_destroyRequest(autoSegment); }
                                            
-  inline size_t                      Session::getAllowedDepth      () { return getConfiguration()->getAllowedDepth(); }
+  inline size_t                            Session::getAllowedDepth      () { return getConfiguration()->getAllowedDepth(); }
                                            
-  inline DbU::Unit                   Session::getSliceHeight       ()                     { return getCellGauge()->getSliceHeight(); }
-  inline DbU::Unit                   Session::getSliceStep         ()                     { return getCellGauge()->getSliceStep(); }
-  inline RoutingLayerGauge*          Session::getLayerGauge        ( size_t depth )       { return getRoutingGauge()->getLayerGauge(depth); }
-  inline size_t                      Session::getDepth             ()                     { return getRoutingGauge()->getDepth(); }
-  inline size_t                      Session::getViaDepth          ( const Layer* layer ) { return getRoutingGauge()->getViaDepth(layer); }
-  inline size_t                      Session::getLayerDepth        ( const Layer* layer ) { return getRoutingGauge()->getLayerDepth(layer); }
-  inline const Layer*                Session::getRoutingLayer      ( size_t depth )       { return getRoutingGauge()->getRoutingLayer(depth); }
-  inline const Layer*                Session::getContactLayer      ( size_t depth )       { return getRoutingGauge()->getContactLayer(depth); }
-  inline DbU::Unit                   Session::getPitch             ( size_t depth, Flags flags=Flags::NoFlags ) { return get("getPitch(depth,flags)")->_getPitch( depth, flags ); }
-  inline DbU::Unit                   Session::getOffset            ( size_t depth )       { return getRoutingGauge()->getLayerOffset(depth); }
-  inline DbU::Unit                   Session::getWireWidth         ( size_t depth )       { return getRoutingGauge()->getLayerWireWidth(depth); }
-  inline DbU::Unit                   Session::getViaWidth          ( size_t depth )       { return getRoutingGauge()->getViaWidth(depth); }
-  inline DbU::Unit                   Session::getPitch             ( const Layer* layer, Flags flags=Flags::NoFlags ) { return getPitch( getLayerDepth(layer), flags ); }
-  inline DbU::Unit                   Session::getOffset            ( const Layer* layer ) { return getOffset   ( getLayerDepth(layer) ); }
-  inline DbU::Unit                   Session::getWireWidth         ( const Layer* layer ) { return getWireWidth( getLayerDepth(layer) ); }
-  inline DbU::Unit                   Session::getViaWidth          ( const Layer* layer ) { return getViaWidth ( getViaDepth(layer) ); }
-  inline DbU::Unit                   Session::getExtensionCap      ( const Layer* layer ) { return getConfiguration()->getExtensionCap(layer); }
-  inline Flags                       Session::getDirection         ( const Layer* layer ) { return getDirection( getLayerDepth(layer) ); }
-  inline Point                       Session::getNearestGridPoint  ( Point p, Box b )     { return get("getNearestGridPoint()")->_getNearestGridPoint(p,b); }
+  inline DbU::Unit                         Session::getSliceHeight       ()                     { return getCellGauge()->getSliceHeight(); }
+  inline DbU::Unit                         Session::getSliceStep         ()                     { return getCellGauge()->getSliceStep(); }
+  inline size_t                            Session::getGVerticalDepth    ()                     { return getConfiguration()->getGVerticalDepth(); }
+  inline size_t                            Session::getGHorizontalDepth  ()                     { return getConfiguration()->getGHorizontalDepth(); }
+  inline DbU::Unit                         Session::getGVerticalPitch    ()                     { return getConfiguration()->getGVerticalPitch(); }
+  inline DbU::Unit                         Session::getGHorizontalPitch  ()                     { return getConfiguration()->getGHorizontalPitch(); }
+  inline size_t                            Session::getDVerticalDepth    ()                     { return getConfiguration()->getDVerticalDepth(); }
+  inline const Layer*                      Session::getDVerticalLayer    ()                     { return getConfiguration()->getDVerticalLayer(); }
+  inline DbU::Unit                         Session::getDVerticalWidth    ()                     { return getConfiguration()->getDVerticalWidth(); }
+  inline DbU::Unit                         Session::getDPVerticalWidth   ()                     { return getConfiguration()->getDPVerticalWidth(); }
+  inline DbU::Unit                         Session::getDVerticalPitch    ()                     { return getConfiguration()->getDVerticalPitch(); }
+  inline DbU::Unit                         Session::getDVerticalOffset   ()                     { return getConfiguration()->getDVerticalOffset(); }
+  inline size_t                            Session::getDHorizontalDepth  ()                     { return getConfiguration()->getDHorizontalDepth(); }
+  inline const Layer*                      Session::getDHorizontalLayer  ()                     { return getConfiguration()->getDHorizontalLayer(); }
+  inline DbU::Unit                         Session::getDHorizontalWidth  ()                     { return getConfiguration()->getDHorizontalWidth(); }
+  inline DbU::Unit                         Session::getDPHorizontalWidth ()                     { return getConfiguration()->getDPHorizontalWidth(); }
+  inline DbU::Unit                         Session::getDHorizontalPitch  ()                     { return getConfiguration()->getDHorizontalPitch(); }
+  inline DbU::Unit                         Session::getDHorizontalOffset ()                     { return getConfiguration()->getDHorizontalOffset(); }
+  inline size_t                            Session::getDContactDepth     ()                     { return getConfiguration()->getDContactDepth(); }
+  inline const Layer*                      Session::getDContactLayer     ()                     { return getConfiguration()->getDContactLayer(); }
+  inline DbU::Unit                         Session::getDContactWidth     ()                     { return getConfiguration()->getDContactWidth(); }
+  inline DbU::Unit                         Session::getDContactPitch     ()                     { return getConfiguration()->getDContactPitch(); }
+  inline bool                              Session::isGLayer             ( const Layer* layer ) { return getConfiguration()->isGLayer(layer); }
+  inline bool                              Session::isGMetal             ( const Layer* layer ) { return getConfiguration()->isGMetal(layer); }
+  inline bool                              Session::isGContact           ( const Layer* layer ) { return getConfiguration()->isGContact(layer); }
+  inline bool                              Session::isGaugeLayer         ( const Layer* layer ) { return getRoutingGauge()->hasLayer(layer); }
+  inline RoutingLayerGauge*                Session::getLayerGauge        ( const Layer* layer ) { return getRoutingGauge()->getLayerGauge(layer); }
+  inline RoutingLayerGauge*                Session::getLayerGauge        ( size_t depth )       { return getRoutingGauge()->getLayerGauge(depth); }
+  inline size_t                            Session::getDepth             ()                     { return getRoutingGauge()->getDepth(); }
+  inline size_t                            Session::getViaDepth          ( const Layer* layer ) { return getRoutingGauge()->getViaDepth(layer); }
+  inline size_t                            Session::getLayerDepth        ( const Layer* layer ) { return getRoutingGauge()->getLayerDepth(layer); }
+  inline const Layer*                      Session::getRoutingLayer      ( size_t depth )       { return getRoutingGauge()->getRoutingLayer(depth); }
+  inline const Layer*                      Session::getContactLayer      ( size_t depth )       { return getRoutingGauge()->getContactLayer(depth); }
+  inline DbU::Unit                         Session::getPitch             ( size_t depth, Flags flags=Flags::NoFlags ) { return get("getPitch(depth,flags)")->_getPitch( depth, flags ); }
+  inline DbU::Unit                         Session::getOffset            ( size_t depth )       { return getRoutingGauge()->getLayerOffset(depth); }
+  inline DbU::Unit                         Session::getWireWidth         ( size_t depth )       { return getRoutingGauge()->getLayerWireWidth(depth); }
+  inline DbU::Unit                         Session::getPWireWidth        ( size_t depth )       { return getRoutingGauge()->getLayerPWireWidth(depth); }
+  inline DbU::Unit                         Session::getViaWidth          ( size_t depth )       { return getRoutingGauge()->getViaWidth(depth); }
+  inline DbU::Unit                         Session::getPitch             ( const Layer* layer, Flags flags=Flags::NoFlags ) { return getPitch( getLayerDepth(layer), flags ); }
+  inline DbU::Unit                         Session::getOffset            ( const Layer* layer ) { return getOffset   ( getLayerDepth(layer) ); }
+  inline DbU::Unit                         Session::getWireWidth         ( const Layer* layer ) { return getWireWidth( getLayerDepth(layer) ); }
+  inline DbU::Unit                         Session::getViaWidth          ( const Layer* layer ) { return getViaWidth ( getViaDepth(layer) ); }
+  inline DbU::Unit                         Session::getExtensionCap      ( const Layer* layer ) { return getConfiguration()->getExtensionCap(layer); }
+  inline Flags                             Session::getDirection         ( const Layer* layer ) { return getDirection( getLayerDepth(layer) ); }
+  inline Point                             Session::getNearestGridPoint  ( Point p, Box b )     { return get("getNearestGridPoint()")->_getNearestGridPoint(p,b); }
+  inline DbU::Unit                         Session::getNearestTrackAxis  ( const Layer* layer, DbU::Unit axis, uint32_t mode ) { return get("getNearestTrackAxis()")->_getNearestTrackAxis(layer,axis,mode); }
                                            
-  inline void                        Session::_dogleg              ( AutoSegment* segment ) { _doglegs.push_back(segment); }
-  inline void                        Session::_doglegReset         () { _doglegs.clear(); }
-  inline void                        Session::_invalidate          ( AutoContact* contact ) { _autoContacts.push_back(contact); }
-  inline void                        Session::_invalidate          ( AutoSegment* segment ) { _segmentInvalidateds.push_back(segment); }
-  inline void                        Session::_destroyRequest      ( AutoSegment* segment ) { _destroyedSegments.insert(segment); }
-  inline string                      Session::_getTypeName         () const { return _TName("Session"); }
+  inline void                              Session::_dogleg              ( AutoSegment* segment ) { _doglegs.push_back(segment); }
+  inline void                              Session::_doglegReset         () { _doglegs.clear(); }
+  inline void                              Session::_invalidate          ( AutoContact* contact ) { _autoContacts.push_back(contact); }
+  inline void                              Session::_invalidate          ( AutoSegment* segment ) { _segmentInvalidateds.push_back(segment); }
+  inline void                              Session::_destroyRequest      ( AutoSegment* segment ) { _destroyedSegments.insert(segment); }
+  inline string                            Session::_getTypeName         () const { return _TName("Session"); }
 
 
 } // Anabatic namespace.
 
 
 INSPECTOR_P_SUPPORT(Anabatic::Session);
-
-
-#endif  // ANABATIC_SESSION_H

bootstrap/CMakeLists.txt

@@ -5,6 +5,8 @@
 
  cmake_minimum_required(VERSION 2.4.0)
 
+ set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}")
+
  add_subdirectory(cmake_modules)
 
  list(INSERT CMAKE_MODULE_PATH 0 "${Bootstrap_SOURCE_DIR}/cmake_modules/")

bootstrap/Makefile.package

@@ -38,12 +38,13 @@ build: FORCE
 	esac;                                                    \
 	case "$${X_SCLS}" in                                     \
 	  *"devtoolset"*)                                        \
-	     cmakeArgs="$${cmakeArgs} -D Boost_NO_SYSTEM_PATHS:STRING=TRUE"; \
-	     BOOST_INCLUDEDIR="/opt/rh/devtoolset-2/root/usr/include";       \
-	     BOOST_LIBRARYDIR="/opt/rh/devtoolset-2/root/usr/lib";           \
-	     export BOOST_INCLUDEDIR BOOST_LIBRARYDIR;                       \
-	     echo "** Using $${X_SCLS}.";                                    \
-	     ;;                                                              \
+         version="`echo $${X_SCLS} | sed 's,devtoolset-,,'`";                \
+	     cmakeArgs="$${cmakeArgs} -D Boost_NO_SYSTEM_PATHS:STRING=TRUE";     \
+	     BOOST_INCLUDEDIR="/opt/rh/devtoolset-$${version}/root/usr/include"; \
+	     BOOST_LIBRARYDIR="/opt/rh/devtoolset-$${version}/root/usr/lib";     \
+	     export BOOST_INCLUDEDIR BOOST_LIBRARYDIR;                           \
+	     echo "** Using $${X_SCLS}.";                                        \
+	     ;;                                                                  \
 	esac;                                                    \
 	for tool in $(tools); do                                 \
 	  echo "** Building tool $${tool}";                      \

bootstrap/allianceInstaller.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+      srcDir=${HOME}/coriolis-2.x/src/alliance/alliance/src
+  commonRoot=${HOME}/coriolis-2.x/Linux.el7_64/Release.Shared
+    buildDir=${commonRoot}/build
+  installDir=${commonRoot}/install
+
+  export    ALLIANCE_TOP=${installDir}
+  export LD_LIBRARY_PATH=${installDir}/lib:${LD_LIBRARY_PATH}
+
+  cd ${srcDir}
+ # Skip doc generation to avoid pulling TeXLive in docker images.
+  sed -i 's,dirs="\$newdirs documentation",dirs="$newdirs",' ./autostuff
+  ./autostuff clean
+  ./autostuff
+  mkdir -p ${buildDir}
+  cd ${buildDir}
+  ${srcDir}/configure --prefix=${ALLIANCE_TOP} --enable-alc-shared
+  make -j1 install

bootstrap/build.conf

@@ -13,44 +13,33 @@ projects = [
              }
            , { 'name'      :   "coriolis"
              , 'tools'     : [ "bootstrap"
+                             , "lefdef"
+                             , "coloquinte"
                              , "vlsisapd"
                              , "hurricane"
                              , "crlcore"
-                            #, "nimbus"
-                            #, "metis"
-                            #, "mauka"
+                             , "flute"
+                             , "etesian"
                              , "anabatic"
                              , "katana"
                              , "knik"
                              , "katabatic"
                              , "kite"
-                             , "coloquinte"
-                             , "etesian"
                              , "equinox"
                              , "solstice"
+                             , "oroshi"
+                             , "bora"
+                             , "karakaze"
                              , "unicorn"
+                             , "tutorial"
                             #, "testbench"
                             #, "ispd"
                              , "cumulus"
                              , "stratus1"
                              , "documentation"
+                             , "unittests"
                              ]
              , 'repository': 'ssh://asim-t/users/largo2/git/coriolis.git' }
-
-           , { 'name'      :   "chams"
-             , 'tools'     : [ "hurricaneAMS"
-                             , "amsCore"
-                             , "opSim"
-                            #, "scribe"
-                             , "graph"
-                             , "pharos"
-                             , "isis"
-                             , "horus"
-                            #, "schematic"
-                             , "solver"
-                             , "autoDTR"
-                             ]
-             , 'repository':"ssh://melon-t/users/outil/chams/chams.git" }
            ]
 
 package = { 'name'    : 'coriolis2'

bootstrap/builder/AboutWidget.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/Builder.py

@@ -1,7 +1,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2008-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2008-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |
@@ -37,7 +37,8 @@ class Builder:
         self._clang            = False
         self._noSystemBoost    = False
         self._macports         = False
-        self._devtoolset2      = False
+        self._devtoolset       = 0
+        self._llvmtoolset      = 0
         self._qt5              = False
         self._openmp           = False
         self._enableShared     = "ON"
@@ -66,9 +67,11 @@ class Builder:
         elif attribute == "macports":
             self._macports = value
             if value: self._noSystemBoost = True
-        elif attribute == "devtoolset2":
-            self._devtoolset2 = value
+        elif attribute == "devtoolset":
+            self._devtoolset = value
             if value: self._noSystemBoost = True
+        elif attribute == "llvmtoolset":
+            self._llvmtoolset = value
         elif attribute == "qt5":              self._qt5              = value
         elif attribute == "openmp":           self._openmp           = value
         elif attribute == "enableDoc":        self._enableDoc        = value
@@ -132,16 +135,24 @@ class Builder:
 
 
     def _execute ( self, command, error ):
-        if self._devtoolset2 == True:
-            print 'Using devtoolset-2 (scl enable devtoolset-2 ...)'
-            commandAsString = ''
-            for i in range(len(command)):
-                if i: commandAsString += ' '
-                if ' ' in command[i]: commandAsString += '"'+command[i]+'"'
-                else:                 commandAsString += command[i]
-            command = [ 'scl', 'enable', 'devtoolset-2', commandAsString ]
+        collections = []
+        if self._devtoolset:
+          collections.append( 'devtoolset-%d' % self._devtoolset )
+          print 'Using devtoolset-%(v)d (scl enable devtoolset-%(v)d ...)' % {'v':self._devtoolset}
+        if self._llvmtoolset:
+          collections.append( 'llvm-toolset-%d' % self._llvmtoolset )
+          print 'Using llvm-toolset-%(v)d (scl enable llvm-toolset-%(v)d ...)' % {'v':self._llvmtoolset}
+
+        if collections:
+          commandAsString = ''
+          for i in range(len(command)):
+              if i: commandAsString += ' '
+              if ' ' in command[i]: commandAsString += '"'+command[i]+'"'
+              else:                 commandAsString += command[i]
+          command = [ 'scl', 'enable' ]
+          command += collections
+          command.append( commandAsString )
 
-       #print command
         sys.stdout.flush ()
         sys.stderr.flush ()
         child = subprocess.Popen ( command, env=self._environment, stdout=None )
@@ -174,15 +185,20 @@ class Builder:
 
         command = [ 'cmake' ]
         if self._ninja:         command += [ "-G", "Ninja" ]
-        if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE" ]
+        if self._macports:      command += [ "-D", "WITH_MACPORTS:STRING=TRUE" ]
+        if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE"
+                                          #, "-D", "BOOST_INCLUDEDIR:STRING=/usr/include/boost169"
+                                          #, "-D", "BOOST_LIBRARYDIR:STRING=/usr/lib64/boost169"
+                                           ]
         if self._qt5:           command += [ "-D", "WITH_QT5:STRING=TRUE" ]
         if self._openmp:        command += [ "-D", "WITH_OPENMP:STRING=TRUE" ]
 
         command += [ "-D", "CMAKE_BUILD_TYPE:STRING=%s"     % self.buildMode
-                   , "-D", "BUILD_SHARED_LIBS:STRING=%s"    % self.enableShared
+                  #, "-D", "BUILD_SHARED_LIBS:STRING=%s"    % self.enableShared
                    , "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir
                    , "-D", "CMAKE_INSTALL_DIR:STRING=%s"    % cmakeInstallDir
-                  #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules
+                  #, "-D", "CMAKE_MODULE_PATH:STRING=%s"    % cmakeModules
+                  #, "-D", "Boost_DEBUG:STRING=TRUE"
                    , toolSourceDir ]
             
         if not os.path.isdir(toolBuildDir):
@@ -197,14 +213,13 @@ class Builder:
             if os.path.isfile ( cmakeCache ): os.unlink ( cmakeCache )
 
         command += [ "-D", "BUILD_DOC:STRING=%s"              % self._enableDoc
-                   , "-D", "CHECK_DATABASE:STRING=%s"         % self._checkDatabase
-                   , "-D", "CHECK_DETERMINISM:STRING=%s"      % self._checkDeterminism
                    , "-D", "CMAKE_VERBOSE_MAKEFILE:STRING=%s" % self._verboseMakefile
                    , "-D", "CMAKE_INSTALL_PREFIX:STRING=%s"   % self.installDir
                    , "-D", "CMAKE_INSTALL_DIR:STRING=%s"      % cmakeInstallDir
                    ]
-        if self.libSuffix:
-            command += [ "-D", "LIB_SUFFIX:STRING=%s" % self.libSuffix ]
+        if self.libSuffix:                 command += [ "-D", "LIB_SUFFIX:STRING=%s"        % self.libSuffix ]
+        if self._checkDatabase    == 'ON': command += [ "-D", "CHECK_DATABASE:STRING=ON"    ]
+        if self._checkDeterminism == 'ON': command += [ "-D", "CHECK_DETERMINISM:STRING=ON" ]
         command += [ toolSourceDir ]
 
         self._execute ( command, "Second CMake failed" )
@@ -294,11 +309,11 @@ class Builder:
 
     def _commandTemplate ( self, tools, projects, command ):
         if self._clang:
-            self._environment[ 'CC'  ] = '/usr/bin/clang'
-            self._environment[ 'CXX' ] = '/usr/bin/clang++'
-        if self._devtoolset2:
-            self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/rh/devtoolset-2/root/usr/include'
-            self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/rh/devtoolset-2/root/usr/lib'
+            self._environment[ 'CC'  ] = 'clang'
+            self._environment[ 'CXX' ] = 'clang++'
+        if self._devtoolset:
+            self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/rh/devtoolset-%d/root/usr/include' % self._devtoolset
+            self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/rh/devtoolset-%d/root/usr/lib'     % self._devtoolset
         if self._macports:
             self._environment[ 'BOOST_INCLUDEDIR' ] = '/opt/local/include'
             self._environment[ 'BOOST_LIBRARYDIR' ] = '/opt/local/lib'
@@ -431,8 +446,8 @@ class Builder:
                   , "--define", "_tmppath                %s" % self.tmppathDir
                  #, "--define", "_enable_debug_packages  0"
                   , "--with", "binarytar" ]
-        if self._devtoolset2 == True:
-            command += [ "--define", "scl devtoolset-2" ]
+        if self._devtoolset:
+            command += [ "--define", "scl devtoolset-%d"%self._devtoolset ]
         command += [ "-ba", "--clean", rpmSpecFile ]
 
         self._execute ( command, "Rebuild rpm packages" )

bootstrap/builder/BuilderGui.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/CompileWidget.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |
@@ -139,14 +139,14 @@ class CompileWidget ( QWidget ):
 
     if self.conf.rootDir: command += [ '--root=%s'%self.conf.rootDir ]
 
-   #if self.options.svnUpdate:   command += [ '--svn-update' ]
-   #if self.options.svnStatus:   command += [ '--svn-update' ]
-    if self.options.enableDoc:   command += [ '--doc' ]
-    if self.options.devtoolset2: command += [ '--devtoolset-2' ]
-    if self.options.qt5:         command += [ '--qt5' ]
-    if self.options.noCache:     command += [ '--no-cache' ]
-    if self.options.rmBuild:     command += [ '--rm-build' ]
-    if self.options.verbose:     command += [ '--verbose' ]
+   #if self.options.svnUpdate:  command += [ '--svn-update' ]
+   #if self.options.svnStatus:  command += [ '--svn-update' ]
+    if self.options.enableDoc:  command += [ '--doc' ]
+    if self.options.devtoolset: command += [ '--devtoolset-8' ]
+    if self.options.qt5:        command += [ '--qt5' ]
+    if self.options.noCache:    command += [ '--no-cache' ]
+    if self.options.rmBuild:    command += [ '--rm-build' ]
+    if self.options.verbose:    command += [ '--verbose' ]
     if self.options.make:
         makeArguments='install '+self.options.threads
         command += [ '--make=%s'%makeArguments ]

bootstrap/builder/Configuration.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC 2008-2016, All Rights Reserved
+# Copyright (c) UPMC 2008-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/ConfigureWidget.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/Highlighter.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/OptionsWidget.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |
@@ -65,7 +65,7 @@ class OptionsWidget ( QWidget ):
    #self._svnStatus   = QCheckBox( 'SVN Status' )
     self._make        = QCheckBox( 'Build' )
     self._enableDoc   = QCheckBox( 'Build Documentation' )
-    self._devtoolset2 = QCheckBox( 'Build with devtoolset 2' )
+    self._devtoolset  = QCheckBox( 'Build with devtoolset 8' )
     self._qt5         = QCheckBox( 'Build with Qt 5 (Qt 4 default)' )
     self._noCache     = QCheckBox( 'Remove previous CMake cache' )
     self._rmBuild     = QCheckBox( 'Cleanup Build Directory' )
@@ -91,7 +91,7 @@ class OptionsWidget ( QWidget ):
     vLayout = QVBoxLayout()
     vLayout.addWidget( self._buildMode )
     vLayout.addWidget( self._enableDoc )
-    vLayout.addWidget( self._devtoolset2 )
+    vLayout.addWidget( self._devtoolset )
     vLayout.addWidget( self._qt5 )
     vLayout.addWidget( self._noCache )
     vLayout.addWidget( self._rmBuild )
@@ -130,7 +130,7 @@ class OptionsWidget ( QWidget ):
  #def _getSvnStatus   ( self ): return self._svnStatus.isChecked()
   def _getMake        ( self ): return self._make.isChecked()
   def _getEnableDoc   ( self ): return self._enableDoc.isChecked()
-  def _getDevtoolset2 ( self ): return self._devtoolset2.isChecked()
+  def _getDevtoolset  ( self ): return self._devtoolset.isChecked()
   def _getQt5         ( self ): return self._qt5.isChecked()
   def _getNoCache     ( self ): return self._noCache.isChecked()
   def _getRmBuild     ( self ): return self._rmBuild.isChecked()
@@ -143,7 +143,7 @@ class OptionsWidget ( QWidget ):
  #svnStatus   = property( _getSvnStatus )
   make        = property( _getMake )
   enableDoc   = property( _getEnableDoc )
-  devtoolset2 = property( _getDevtoolset2 )
+  devtoolset  = property( _getDevtoolset )
   qt5         = property( _getQt5 )
   noCache     = property( _getNoCache )
   rmBuild     = property( _getRmBuild )
@@ -156,7 +156,7 @@ class OptionsWidget ( QWidget ):
    #self._svnStatus  .setChecked( settings.value('builder/svnStatus').toBool() )
     self._make       .setChecked( settings.value('builder/make'     ).toBool() )
     self._enableDoc  .setChecked( settings.value('builder/enableDoc').toBool() )
-    self._devtoolset2.setChecked( settings.value('builder/devtoolset2').toBool() )
+    self._devtoolset .setChecked( settings.value('builder/devtoolset').toBool() )
     self._qt5        .setChecked( settings.value('builder/qt5').toBool() )
     self._noCache    .setChecked( settings.value('builder/noCache'  ).toBool() )
     self._rmBuild    .setChecked( settings.value('builder/rmBuild'  ).toBool() )
@@ -176,17 +176,17 @@ class OptionsWidget ( QWidget ):
 
   def saveSettings ( self ):
     settings = QSettings()
-   #settings.setValue('builder/svnUpdate'  , self._svnUpdate  .isChecked() )
-   #settings.setValue('builder/svnStatus'  , self._svnStatus  .isChecked() )
-    settings.setValue('builder/make'       , self._make       .isChecked() )
-    settings.setValue('builder/enableDoc'  , self._enableDoc  .isChecked() )
-    settings.setValue('builder/devtoolset2', self._devtoolset2.isChecked() )
-    settings.setValue('builder/qt5'        , self._qt5        .isChecked() )
-    settings.setValue('builder/buildMode'  , self._buildMode  .currentText() )
-    settings.setValue('builder/noCache'    , self._noCache    .isChecked() )
-    settings.setValue('builder/rmBuild'    , self._rmBuild    .isChecked() )
-    settings.setValue('builder/verbose'    , self._verbose    .isChecked() )
-    settings.setValue('builder/threads'    , self._threads    .currentText() )
+   #settings.setValue('builder/svnUpdate' , self._svnUpdate .isChecked() )
+   #settings.setValue('builder/svnStatus' , self._svnStatus .isChecked() )
+    settings.setValue('builder/make'      , self._make      .isChecked() )
+    settings.setValue('builder/enableDoc' , self._enableDoc .isChecked() )
+    settings.setValue('builder/devtoolset', self._devtoolset.isChecked() )
+    settings.setValue('builder/qt5'       , self._qt5       .isChecked() )
+    settings.setValue('builder/buildMode' , self._buildMode .currentText() )
+    settings.setValue('builder/noCache'   , self._noCache   .isChecked() )
+    settings.setValue('builder/rmBuild'   , self._rmBuild   .isChecked() )
+    settings.setValue('builder/verbose'   , self._verbose   .isChecked() )
+    settings.setValue('builder/threads'   , self._threads   .currentText() )
 
     for project in self._projects: project.saveToSettings()
     return

bootstrap/builder/Project.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/ProjectWidgets.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/builder/__init__.py

@@ -2,7 +2,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC/LIP6 2012-2016, All Rights Reserved
+# Copyright (c) UPMC/LIP6 2012-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |

bootstrap/ccb.py

@@ -3,7 +3,7 @@
 # -*- mode:Python -*-
 #
 # This file is part of the Coriolis Software.
-# Copyright (c) UPMC 2008-2016, All Rights Reserved
+# Copyright (c) UPMC 2008-2018, All Rights Reserved
 #
 # +-----------------------------------------------------------------+ 
 # |                   C O R I O L I S                               |
@@ -159,12 +159,8 @@ def autoLocate ():
     locations  = [ os.path.abspath(os.path.dirname(sys.argv[0]))
                  , os.environ['HOME']+'/coriolis-2.x/src/coriolis/bootstrap'
                  , os.environ['HOME']+'/coriolis/src/coriolis/bootstrap'
-                 , os.environ['HOME']+'/chams-1.x/src/coriolis/bootstrap'
-                 , os.environ['HOME']+'/chams/src/coriolis/bootstrap'
                  , '/users/outil/coriolis/coriolis-2.x/src/coriolis/bootstrap'
                  , os.environ['HOME']+'/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
-                 , os.environ['HOME']+'/chams-1.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
-                 , os.environ['HOME']+'/chams/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
                  , '/users/outil/coriolis/coriolis-2.x/'+osType+'/Release.Shared/install/'+libDir+'/'+sitePackage
                  ]
     
@@ -212,7 +208,8 @@ parser.add_option (       "--no-build"       , action="store_true" ,
 parser.add_option (       "--no-cache"       , action="store_true" ,                dest="noCache"      , help="Remove previous CMake cache before building." )
 parser.add_option (       "--rm-build"       , action="store_true" ,                dest="rmBuild"      , help="Remove previous build directoty before building." )
 parser.add_option (       "--macports"       , action="store_true" ,                dest="macports"     , help="Build against MacPorts." )
-parser.add_option (       "--devtoolset-2"   , action="store_true" ,                dest="devtoolset2"  , help="Build against TUV Dev Toolset 2." )
+parser.add_option (       "--devtoolset"     , action="store"      , type="int"   , dest="devtoolset"   , help="Build against TUV Dev Toolset N." )
+parser.add_option (       "--llvm-toolset"   , action="store"      , type="int"   , dest="llvmtoolset"  , help="Build against TUV Dev LLVM Toolset N." )
 parser.add_option (       "--qt5"            , action="store_true" ,                dest="qt5"          , help="Build against Qt 5 (default: Qt 4)." )
 parser.add_option (       "--openmp"         , action="store_true" ,                dest="openmp"       , help="Enable the use of OpenMP in Gcc." )
 parser.add_option (       "--ninja"          , action="store_true" ,                dest="ninja"        , help="Use Ninja instead of UNIX Makefile." )
@@ -275,27 +272,28 @@ else:
         builder.showConfiguration ()
         sys.exit(0)
     
-    if options.quiet:            builder.quiet             = True
-    if options.release:          builder.buildMode         = "Release"
-    if options.debug:            builder.buildMode         = "Debug"
-    if options.static:           builder.enableShared      = "OFF"
-    if options.doc:              builder.enableDoc         = "ON"
-    if options.checkDb:          builder.checkDatabase     = "ON"
-    if options.checkDeterminism: builder.checkDeterminism  = "ON"
-    if options.verboseMakefile:  builder.verboseMakefile   = "ON"
-    if options.rootDir:          builder.rootDir           = options.rootDir
-    if options.noBuild:          builder.doBuild           = False
-    if options.noCache:          builder.noCache           = True
-    if options.rmBuild:          builder.rmBuild           = True
-    if options.ninja:            builder.ninja             = True
-    if options.clang:            builder.clang             = True
-    if options.macports:         builder.macports          = True
-    if options.devtoolset2:      builder.devtoolset2       = True
-    if options.qt5:              builder.qt5               = True
-    if options.openmp:           builder.openmp            = True
-    if options.makeArguments:    builder.makeArguments     = options.makeArguments
-   #if options.svnMethod:        builder.svnMethod         = options.svnMethod
-   #if options.svnTag:           builder.svnTag            = options.svnTag
+    if options.quiet:                        builder.quiet             = True
+    if options.release:                      builder.buildMode         = "Release"
+    if options.debug:                        builder.buildMode         = "Debug"
+    if options.static:                       builder.enableShared      = "OFF"
+    if options.doc:                          builder.enableDoc         = "ON"
+    if options.checkDb:                      builder.checkDatabase     = "ON"
+    if options.checkDeterminism:             builder.checkDeterminism  = "ON"
+    if options.verboseMakefile:              builder.verboseMakefile   = "ON"
+    if options.rootDir:                      builder.rootDir           = options.rootDir
+    if options.noBuild:                      builder.doBuild           = False
+    if options.noCache:                      builder.noCache           = True
+    if options.rmBuild:                      builder.rmBuild           = True
+    if options.ninja:                        builder.ninja             = True
+    if options.clang or options.llvmtoolset: builder.clang             = True
+    if options.macports:                     builder.macports          = True
+    if options.devtoolset:                   builder.devtoolset        = options.devtoolset
+    if options.llvmtoolset:                  builder.llvmtoolset       = options.llvmtoolset
+    if options.qt5:                          builder.qt5               = True
+    if options.openmp:                       builder.openmp            = True
+    if options.makeArguments:                builder.makeArguments     = options.makeArguments
+   #if options.svnMethod:                    builder.svnMethod         = options.svnMethod
+   #if options.svnTag:                       builder.svnTag            = options.svnTag
     
    #if   options.svnStatus:   builder.svnStatus   ( tools=options.tools, projects=options.projects )
    #elif options.svnUpdate:   builder.svnUpdate   ( tools=options.tools, projects=options.projects )

bootstrap/cmake_modules/CMakeLists.txt

@@ -8,6 +8,7 @@
                    FindLibbfd.cmake
                    FindQwt.cmake
                    FindSphinx.cmake
+                   FindPelican.cmake
                    GetGitRevisionDescription.cmake
                    GetGitRevisionDescription.cmake.in
          )

bootstrap/cmake_modules/FindBootstrap.cmake

@@ -39,6 +39,15 @@
    message("-- Distribution is ${DISTRIBUTION}")
  endmacro(check_distribution)
 
+#
+# Specific setup for MacOS X.
+#
+ if(WITH_MACPORTS)
+   set(Boost_PYVER "27")
+ else()
+   set(Boost_PYVER "")
+ endif()
+
 #
 # Get the svn revision version and configure a svn.h.in file based on this version
 # The include directory name is passed as argument
@@ -75,6 +84,7 @@
 #
 # Adds -Wall to the C/C++ flags.
 #
+ set(BUILD_SHARED_LIBS "ON")
 #set(DEBUG_FLAGS "-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
  set(DEBUG_FLAGS "-g")
  if(CYGWIN)
@@ -84,10 +94,14 @@
    set(ADDTIONAL_FLAGS "")
    set(CXX_STANDARD "c++11")
  endif()
- set(CMAKE_C_FLAGS_DEBUG     "-std=${CXX_STANDARD} -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."   FORCE)
- set(CMAKE_C_FLAGS_RELEASE   "-std=${CXX_STANDARD} -Wall -O2  ${ADDTIONAL_FLAGS} -DNDEBUG"   CACHE STRING "C Compiler Release options." FORCE)
- set(CMAKE_CXX_FLAGS_DEBUG   "-std=${CXX_STANDARD} -Wall  ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options."   FORCE)
- set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2  ${ADDTIONAL_FLAGS} -DNDEBUG"   CACHE STRING "C++ Compiler Release options." FORCE)
+ set(CMAKE_C_FLAGS_DEBUG     "                     -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
+#set(CMAKE_C_FLAGS_DEBUG     "                     -Wall                    ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
+ set(CMAKE_C_FLAGS_RELEASE   "                     -Wall -O2                ${ADDTIONAL_FLAGS} -DNDEBUG"       CACHE STRING "C Compiler Release options."   FORCE)
+#set(CMAKE_C_FLAGS_RELEASE   "                     -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG"       CACHE STRING "C Compiler Release options."   FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG   "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options."   FORCE)
+#set(CMAKE_CXX_FLAGS_DEBUG   "-std=${CXX_STANDARD} -Wall                    ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options."   FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2                ${ADDTIONAL_FLAGS} -DNDEBUG"       CACHE STRING "C++ Compiler Release options." FORCE)
+#set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG"       CACHE STRING "C++ Compiler Release options." FORCE)
 
 
 #
@@ -174,35 +188,22 @@
  endmacro(hurricane_check_libraries)
 
 
-#
-# Perform some tweaks on shared/static linking.
-#
- macro(set_lib_link_mode)
-   if(NOT BUILD_SHARED_LIBS)
-   # check for qmake
-     find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake PATHS
-       /opt/qt4-static-4.3.2/bin
-       NO_DEFAULT_PATH
-       )
-     message(STATUS "Building static libraries.")
-   else(NOT BUILD_SHARED_LIBS)
-     message(STATUS "Building dynamic libraries.")
-   endif(NOT BUILD_SHARED_LIBS)
- endmacro(set_lib_link_mode)
-
-
-#
-# Find Boost, checking different versions.
-#
  macro(setup_boost)
   #set(Boost_USE_STATIC_LIBS ON)
   #message(STATUS "Always uses Boost static libraries.")
    if(ARGC LESS 1)
-     find_package(Boost 1.33.1 REQUIRED)
+     find_package(Boost 1.35.0 REQUIRED)
    else(ARGC LESS 1)
-     find_package(Boost 1.35.0 COMPONENTS ${ARGV} system)
+     foreach(component ${ARGV})
+       if(${component} STREQUAL "python")
+         set(component ${component}${Boost_PYVER})
+       endif()
+       set(components ${components} ${component})
+     endforeach()
+     
+     find_package(Boost 1.35.0 COMPONENTS ${components} system)
      if(NOT Boost_FOUND)
-       find_package(Boost 1.33.1 COMPONENTS ${ARGV} REQUIRED)
+       find_package(Boost 1.35.0 COMPONENTS ${components} REQUIRED)
      endif(NOT Boost_FOUND)
    endif(ARGC LESS 1)
    message(STATUS "Found Boost includes ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
@@ -276,15 +277,20 @@
                                PATHS         /usr/include/qt5
                                              /usr/include
                                PATH_SUFFIXES qwt )
-     find_library(QWT_LIBRARY NAMES qwt-qt5
-                              PATHS /usr/lib${LIB_SUFFIX} )
+     find_library(QWT_LIBRARY NAMES qwt-qt5 qwt
+                              PATHS /usr/lib64
+			            /usr/lib )
    else()
      find_path(QWT_INCLUDE_DIR NAMES         qwt.h
-                               PATHS         /usr/include
+                               PATHS         /usr/include/qwt-qt4
+                                             /opt/local/libexec/qt4/include
                                              /usr/include/qt4
+                                             /usr/include
                                PATH_SUFFIXES qwt )
-     find_library(QWT_LIBRARY NAMES qwt
-                              PATHS /usr/lib${LIB_SUFFIX} )
+     find_library(QWT_LIBRARY NAMES qwt-qt4 qwt
+                              PATHS /opt/local/libexec/qt4/lib
+                                    /usr/lib64
+				    /usr/lib )
    endif()
 
    if( QWT_INCLUDE_DIR AND QWT_LIBRARY)
@@ -310,10 +316,10 @@
 #
  macro(setup_sysconfdir INSTALLDIR)
    message("-- Checking installation directory <${INSTALLDIR}>")
-   string(REGEX MATCH "^/opt/rh/devtoolset-2/root/usr$" IS_OPT_RH ${INSTALLDIR})
+   string(REGEX MATCH "^/opt/rh/devtoolset-[0-9]+/root" IS_OPT_RH ${INSTALLDIR})
    if(IS_OPT_RH)
-     message("-- Using devtoolset-2 install tree /opt/rh/devtoolset-2/root/etc.")
-     set(SYS_CONF_DIR "/opt/rh/devtoolset-2/root/etc" CACHE STRING "System configuration directory (/etc)" FORCE)
+     message("-- Using devtoolset-X install tree ${IS_OPT_RH}/etc.")
+     set(SYS_CONF_DIR ${IS_OPT_RH} CACHE STRING "System configuration directory (/etc)" FORCE)
    else()
      string(REGEX MATCH "^/usr$" IS_USR ${INSTALLDIR})
      string(REGEX MATCH "^/opt$" IS_OPT ${INSTALLDIR})
@@ -413,5 +419,7 @@
    target_link_libraries( ${pytarget}  ${pyDeplibs} )
 
                  install( TARGETS      ${pytarget}    DESTINATION ${PYTHON_SITE_PACKAGES} )
+   if( NOT ("${pyIncludes}" STREQUAL "None") )
                  install( FILES        ${pyIncludes}  DESTINATION ${inc_install_dir} )
+   endif()
  endmacro( add_python_module )

bootstrap/cmake_modules/FindFLEX.cmake

@@ -63,7 +63,7 @@ FIND_PROGRAM(FLEX_EXECUTABLE flex DOC "path to the flex executable")
 MARK_AS_ADVANCED(FLEX_EXECUTABLE)
 
 FIND_LIBRARY(FL_LIBRARY NAMES fl
-  PATHS /usr/lib${LIB_SUFFIX} DOC "path to the fl library")
+  PATHS /usr/lib64 lib DOC "path to the fl library")
 SET(FLEX_LIBRARIES ${FL_LIBRARY})
 
 IF(FLEX_EXECUTABLE)

bootstrap/cmake_modules/FindLEFDEF.cmake

@@ -7,124 +7,121 @@
 #
 #  The DEF C API library:           LEFDEF_CDEF_LIBRARY
 #                                   LEFDEF_CDEF_LIBRARY_RELEASE
-#                                   LEFDEF_CDEF_LIBRARY_DEBUG
 #
 #  The DEF C API library (zlib) :   LEFDEF_ZCDEF_LIBRARY
 #                                   LEFDEF_ZCDEF_LIBRARY_RELEASE
-#                                   LEFDEF_ZCDEF_LIBRARY_DEBUG
 #
 #  The DEF C++ API library:         LEFDEF_DEF_LIBRARY
 #                                   LEFDEF_DEF_LIBRARY_RELEASE
-#                                   LEFDEF_DEF_LIBRARY_DEBUG
 #
 #  The DEF C++ API library (zlib) : LEFDEF_ZDEF_LIBRARY
 #                                   LEFDEF_ZDEF_LIBRARY_RELEASE
-#                                   LEFDEF_ZDEF_LIBRARY_DEBUG
 #
 #  The LEF C API library:           LEFDEF_CLEF_LIBRARY
 #                                   LEFDEF_CLEF_LIBRARY_RELEASE
-#                                   LEFDEF_CLEF_LIBRARY_DEBUG
 #
 #  The LEF C API library (zlib) :   LEFDEF_ZCLEF_LIBRARY
 #                                   LEFDEF_ZCLEF_LIBRARY_RELEASE
-#                                   LEFDEF_ZCLEF_LIBRARY_DEBUG
 #
 #  The LEF C++ API library:         LEFDEF_LEF_LIBRARY
 #                                   LEFDEF_LEF_LIBRARY_RELEASE
-#                                   LEFDEF_LEF_LIBRARY_DEBUG
 #
 #  The LEF C++ API library (zlib) : LEFDEF_ZLEF_LIBRARY
 #                                   LEFDEF_ZLEF_LIBRARY_RELEASE
-#                                   LEFDEF_ZLEF_LIBRARY_DEBUG
+
+# Try to find a reasonable CORIOLIS_TOP value.
+ if( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
+   set ( CORIOLIS_USER_TOP "$ENV{CORIOLIS_USER_TOP}" )
+ else( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
+   if( NOT("$ENV{CORIOLIS_TOP}" STREQUAL "") )
+     set ( CORIOLIS_TOP "$ENV{CORIOLIS_TOP}" )
+   endif( NOT("$ENV{CORIOLIS_TOP}" STREQUAL "") )
+ endif( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
 
 
-macro( _find_lefdef_lib varname libname )
-  find_library( LEFDEF_${varname}_LIBRARY_RELEASE NAMES ${libname}       PATHS ${LEFDEF_LIBRARY_DIR} )
-  find_library( LEFDEF_${varname}_LIBRARY_DEBUG   NAMES ${libname}_Debug PATHS ${LEFDEF_LIBRARY_DIR} )
+ macro( _find_lefdef_lib varname libname )
+   find_library( LEFDEF_${varname}_LIBRARY_RELEASE NAMES ${libname}       PATHS ${LEFDEF_LIBRARY_DIR} )
  
-  if( LEFDEF_${varname}_LIBRARY_RELEASE AND NOT LEFDEF_${varname}_LIBRARY_DEBUG )
-    set( LEFDEF_${varname}_LIBRARY_DEBUG ${LEFDEF_${varname}_LIBRARY_RELEASE} CACHE STRING "Path to a library" FORCE )
-  endif()
+   if( LEFDEF_${varname}_LIBRARY_RELEASE )
+     set( LEFDEF_${varname}_LIBRARY_DEBUG ${LEFDEF_${varname}_LIBRARY_RELEASE} CACHE STRING "Path to a library" FORCE )
+   endif()
  
-  if( LEFDEF_${varname}_LIBRARY_DEBUG AND NOT LEFDEF_${varname}_LIBRARY_RELEASE )
-    set( LEFDEF_${varname}_LIBRARY_RELEASE LEFDEF_${varname}_LIBRARY_DEBUG CACHE STRING "Path to a library" FORCE )
-  endif()
-
-  if( LEFDEF_${varname}_LIBRARY_RELEASE )
-    list( APPEND LEFDEF_LIBRARIES "optimized" ${LEFDEF_${varname}_LIBRARY_RELEASE}
-                                  "debug"     ${LEFDEF_${varname}_LIBRARY_DEBUG} )
-    set( LEFDEF_${varname}_LIBRARY_FOUND 1 )
-    mark_as_advanced( LEFDEF_${varname}_LIBRARY_RELEASE
-                      LEFDEF_${varname}_LIBRARY_DEBUG )
-  else()
-    set ( LEFDEF_FOUND "NO" )
-  endif()
-endmacro()
+   if( LEFDEF_${varname}_LIBRARY_RELEASE )
+     list( APPEND LEFDEF_LIBRARIES "optimized" ${LEFDEF_${varname}_LIBRARY_RELEASE}
+                                   "debug"     ${LEFDEF_${varname}_LIBRARY_DEBUG} )
+     set( LEFDEF_${varname}_LIBRARY_FOUND 1 )
+     mark_as_advanced( LEFDEF_${varname}_LIBRARY_RELEASE
+                       LEFDEF_${varname}_LIBRARY_DEBUG )
+   else()
+     set ( LEFDEF_FOUND "NO" )
+   endif()
+ endmacro()
 
 
-set( LEFDEF_INCLUDE_DIR_DESCRIPTION "directory containing the LEF/DEF include files. E.g /opt/lefdef-5.6/include" )
-set( LEFDEF_LIBRARY_DIR_DESCRIPTION "directory containing the LEF/DEF library files. E.g /opt/lefdef-5.6/lib" )
-set( LEFDEF_DIR_MESSAGE             "Set the LEFDEF_INCLUDE_DIR cmake cache entry to the ${LEFDEF_INCLUDE_DIR_DESCRIPTION}" )
+ set( LEFDEF_INCLUDE_DIR_DESCRIPTION "directory containing the LEF/DEF include files. E.g /opt/lefdef-5.6/include" )
+ set( LEFDEF_LIBRARY_DIR_DESCRIPTION "directory containing the LEF/DEF library files. E.g /opt/lefdef-5.6/lib" )
+ set( LEFDEF_DIR_MESSAGE             "Set the LEFDEF_INCLUDE_DIR cmake cache entry to the ${LEFDEF_INCLUDE_DIR_DESCRIPTION}" )
 
 
 # Don't even bother under Win32
-if ( UNIX )
-  set ( LEFDEF_FOUND "YES" )
-  set ( LEFDEF_SEARCH_PATH "$ENV{LEFDEF_TOP}"
+ if( UNIX )
+   set( LEFDEF_FOUND "YES" )
+   set( LEFDEF_SEARCH_PATH "$ENV{CORIOLIS_TOP}"
+                           "$ENV{LEFDEF_TOP}"
                            "/usr"
-                           "/opt/lefdef-5.6"
+                           "/opt/lefdef-5.8"
                            "/opt/lefdef-5.7"
+                           "/opt/lefdef-5.6"
                            "/opt/lefdef"
                            "$ENV{HOME}/oa/lefdef/5.7-s038"
                            "/soc/oa"
                            )
-  message("-- Components of LEFDEF_DIR_SEARCH:")
-  foreach(PATH ${LEFDEF_DIR_SEARCH})
-    message("--   ${PATH}")
-  endforeach(PATH)
+   message( "-- Components of LEFDEF_DIR_SEARCH:" )
+   foreach( PATH ${LEFDEF_SEARCH_PATH} )
+     message( "--   ${PATH}" )
+   endforeach()
  
-  set ( LEFDEF_LIBRARIES           "" )
-  set ( LEFDEF_LIBRARY_SEARCH_PATH "" )
+   set( LEFDEF_LIBRARIES           "" )
+   set( LEFDEF_LIBRARY_SEARCH_PATH "" )
  
-  find_path ( LEFDEF_INCLUDE_DIR NAMES "defiDefs.h"
+   find_path( LEFDEF_INCLUDE_DIR NAMES "defiDefs.hpp"
                                  PATHS ${LEFDEF_SEARCH_PATH}
-                                 PATH_SUFFIXES "include" "include/lefdef"
+                                 PATH_SUFFIXES "include/lefdef" "include"
                                  DOC "The ${LEFDEF_INCLUDE_DIR_DESCRIPTION}" )
-  message( STATUS "LEFDEF_INCLUDE_DIR: ${LEFDEF_INCLUDE_DIR}" )
+   message( STATUS "LEFDEF_INCLUDE_DIR: ${LEFDEF_INCLUDE_DIR}" )
  
-  find_path ( LEFDEF_LIBRARY_DIR NAMES "libdef.a" "libdef_Debug.a"
+   find_path( LEFDEF_LIBRARY_DIR NAMES "libdef.so"
                                  PATHS ${LEFDEF_SEARCH_PATH}
-                                 PATH_SUFFIXES "lib${LIB_SUFFIX}"
+                                 PATH_SUFFIXES "lib64" "lib"
                                  DOC "The ${LEFDEF_LIBRARY_DIR_DESCRIPTION}" )
-  message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" )
+   message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" )
  
-  if ( LEFDEF_INCLUDE_DIR AND LEFDEF_LIBRARY_DIR )
-    _find_lefdef_lib (  "CDEF" "cdef"     )
-    _find_lefdef_lib ( "ZCDEF" "cdefzlib" )
-    _find_lefdef_lib (   "DEF"  "def"     )
-    _find_lefdef_lib (  "ZDEF"  "defzlib" )
-    _find_lefdef_lib (  "CLEF" "clef"     )
-    _find_lefdef_lib ( "ZCLEF" "clefzlib" )
-    _find_lefdef_lib (   "LEF"  "lef"     )
-    _find_lefdef_lib (  "ZLEF"  "lefzlib" )
-  else ( LEFDEF_INCLUDE_DIR AND LEFDEF_LIBRARY_DIR )
-    set ( LEFDEF_FOUND "NO" )
-  endif ( LEFDEF_INCLUDE_DIR AND LEFDEF_LIBRARY_DIR )
+   if( LEFDEF_INCLUDE_DIR AND LEFDEF_LIBRARY_DIR )
+    #_find_lefdef_lib(  "CDEF" "cdef"     )
+    #_find_lefdef_lib( "ZCDEF" "cdefzlib" )
+     _find_lefdef_lib(   "DEF"  "def"     )
+     _find_lefdef_lib(  "ZDEF"  "defzlib" )
+    #_find_lefdef_lib(  "CLEF" "clef"     )
+    #_find_lefdef_lib( "ZCLEF" "clefzlib" )
+     _find_lefdef_lib(   "LEF"  "lef"     )
+     _find_lefdef_lib(  "ZLEF"  "lefzlib" )
+   else()
+     set( LEFDEF_FOUND "NO" )
+   endif()
  
-  if ( LEFDEF_FOUND )
-    message ( STATUS "Found LEF/DEF" )
-    add_definitions ( -DHAVE_LEFDEF )
-    if ( NOT LEFDEF_FIND_QUIETLY )
-      message ( STATUS "Found LEF/DEF" )
-    endif ( NOT LEFDEF_FIND_QUIETLY )
-  else ( LEFDEF_FOUND )
-    set ( LEFDEF_LIBRARIES   "" )
-    set ( LEFDEF_INCLUDE_DIR "" )
-    set ( LEFDEF_LIBRARY_DIR "" )
-    if ( LEFDEF_FIND_REQUIRED )
-      message ( STATUS "LEF/DEF libraries and/or includes NOT found!" )
-    endif ( LEFDEF_FIND_REQUIRED )
-  endif ( LEFDEF_FOUND )
+   if( LEFDEF_FOUND )
+     add_definitions( -DHAVE_LEFDEF )
+     if( NOT LEFDEF_FIND_QUIETLY )
+       message( STATUS "Found LEF/DEF" )
+     endif()
+   else( LEFDEF_FOUND )
+     set( LEFDEF_LIBRARIES   "" )
+     set( LEFDEF_INCLUDE_DIR "" )
+     set( LEFDEF_LIBRARY_DIR "" )
+     if( LEFDEF_FIND_REQUIRED )
+       message( STATUS "LEF/DEF libraries and/or includes NOT found!" )
+     endif()
+   endif( LEFDEF_FOUND )
  
-  mark_as_advanced ( LEFDEF_INCLUDE_DIR LEFDEF_LIBRARY_DIR LEFDEF_LIBRARIES )
-endif ( UNIX )
+   mark_as_advanced( LEFDEF_INCLUDE_DIR LEFDEF_LIBRARY_DIR LEFDEF_LIBRARIES )
+ endif( UNIX )

bootstrap/cmake_modules/FindPelican.cmake

@@ -0,0 +1,10 @@
+
+                     find_program( PELICAN_EXECUTABLE NAMES         pelican
+                                                      HINTS         $ENV{PELICAN_DIR}
+                                                      PATH_SUFFIXES bin
+                                                      DOC           "Pelican blog generator"
+                                 )
+ 
+                          include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( Pelican DEFAULT_MSG PELICAN_EXECUTABLE )
+                 mark_as_advanced( PELICAN_EXECUTABLE )

bootstrap/coriolisEnv.py

@@ -41,7 +41,7 @@ def scrubPath ( pathName ):
 
 
 def guessOs ():
-    useDevtoolset2    = False
+    useDevtoolset     = False
     osSlsoc7x_64      = re.compile (".*Linux.*el7.*x86_64.*")
     osSlsoc6x_64      = re.compile (".*Linux.*el6.*x86_64.*")
     osSlsoc6x         = re.compile (".*Linux.*(el|slsoc)6.*")
@@ -67,77 +67,41 @@ def guessOs ():
     uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
     lines = uname.stdout.readlines()
 
-    libDir="lib"
-    if osSlsoc7x_64.match(lines[0]):
-      osType         = "Linux.el7_64"
-      libDir         = "lib64"
+    if osSlsoc7x_64.match(lines[0]): osType = "Linux.el7_64"
     elif osSlsoc6x_64.match(lines[0]):
       osType         = "Linux.slsoc6x_64"
-      libDir         = "lib64"
-      useDevtoolset2 = True
+      useDevtoolset  = True
     elif osSlsoc6x.match(lines[0]):
       osType         = "Linux.slsoc6x"
-      useDevtoolset2 = True
-    elif osSLSoC5x_64.match(lines[0]):
-      osType         = "Linux.SLSoC5x_64"
-      libDir         = "lib64"
-    elif osSLSoC5x.match(lines[0]):
-      osType = "Linux.SLSoC5x"
-    elif osFedora_64.match(lines[0]):
-      osType = "Linux.fc_64"
-      libDir = "lib64"
-    elif osFedora.match(lines[0]):
-      osType = "Linux.fc"
-    elif osUbuntu1004.match(lines[0]):
-      osType = "Linux.Ubuntu1004"
-    elif osUbuntu1004_64.match(lines[0]):
-      osType = "Linux.Ubuntu1004_64"
-      libDir = "lib64"
-    elif osLinux_64.match(lines[0]):
-      osType = "Linux.x86_64"
-      if(os.path.exists("/usr/lib64/")):
-        libDir = "lib64"
-    elif osLinux.match(lines[0]):
-      osType = "Linux.i386"
-    elif osFreeBSD8x_64.match(lines[0]):
-      osType = "FreeBSD.8x.x86_64"
-      libDir = "lib64"
-    elif osFreeBSD8x_amd64.match(lines[0]):
-      osType = "FreeBSD.8x.amd64"
-      libDir = "lib64"
-    elif osFreeBSD8x.match(lines[0]):
-      osType = "FreeBSD.8x.i386"
-    elif osDarwin.match(lines[0]):
-      osType = "Darwin"
-    elif osCygwinW7_64.match(lines[0]):
-      osType = "Cygwin.W7_64"
-      libDir = "lib64"
-    elif osCygwinW7.match(lines[0]):
-      osType = "Cygwin.W7"
-    elif osCygwinW8_64.match(lines[0]):
-      osType = "Cygwin.W8_64"
-      libDir = "lib64"
-    elif osCygwinW8.match(lines[0]):
-      osType = "Cygwin.W8"
-    elif osCygwinW10_64.match(lines[0]):
-      osType = "Cygwin.W10_64"
-      libDir = "lib64"
-    elif osCygwinW10.match(lines[0]):
-      osType = "Cygwin.W10"
+      useDevtoolset  = True
+    elif osSLSoC5x_64     .match(lines[0]): osType = "Linux.SLSoC5x_64"
+    elif osSLSoC5x        .match(lines[0]): osType = "Linux.SLSoC5x"
+    elif osFedora_64      .match(lines[0]): osType = "Linux.fc_64"
+    elif osFedora         .match(lines[0]): osType = "Linux.fc"
+    elif osUbuntu1004     .match(lines[0]): osType = "Linux.Ubuntu1004"
+    elif osUbuntu1004_64  .match(lines[0]): osType = "Linux.Ubuntu1004_64"
+    elif osLinux_64       .match(lines[0]): osType = "Linux.x86_64"
+    elif osLinux          .match(lines[0]): osType = "Linux.i386"
+    elif osFreeBSD8x_64   .match(lines[0]): osType = "FreeBSD.8x.x86_64"
+    elif osFreeBSD8x_amd64.match(lines[0]): osType = "FreeBSD.8x.amd64"
+    elif osFreeBSD8x      .match(lines[0]): osType = "FreeBSD.8x.i386"
+    elif osDarwin         .match(lines[0]): osType = "Darwin"
+    elif osCygwinW7_64    .match(lines[0]): osType = "Cygwin.W7_64"
+    elif osCygwinW7       .match(lines[0]): osType = "Cygwin.W7"
+    elif osCygwinW8_64    .match(lines[0]): osType = "Cygwin.W8_64"
+    elif osCygwinW8       .match(lines[0]): osType = "Cygwin.W8"
+    elif osCygwinW10_64   .match(lines[0]): osType = "Cygwin.W10_64"
+    elif osCygwinW10      .match(lines[0]): osType = "Cygwin.W10"
     else:
       uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE )
       osType = uname.stdout.readlines()[0][:-1]
 
       print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
       print "          (using: \"%s\")" % osType
-
     ldLibraryPath = os.getenv('LD_LIBRARY_PATH')
-    if ldLibraryPath and 'devtoolset' in ldLibraryPath: useDevtoolset2 = False
+    if ldLibraryPath and 'devtoolset' in ldLibraryPath: useDevtoolset = False
     
-    if libDir == 'lib64' and not os.path.exists('/usr/lib64'):
-      libDir = 'lib'
-    
-    return (osType,libDir,useDevtoolset2)
+    return (osType,useDevtoolset)
 
 
 def guessShell ():
@@ -170,11 +134,11 @@ def guessShell ():
 
 if __name__ == "__main__":
 
-  osType,libDir,useDevtoolset2 = guessOs()
-  buildType                    = "Release"
-  linkType                     = "Shared"
-  rootDir                      = None
-  shellBin, isBourneShell      = guessShell()
+  osType,useDevtoolset    = guessOs()
+  buildType               = "Release"
+  linkType                = "Shared"
+  rootDir                 = None
+  shellBin, isBourneShell = guessShell()
 
   parser = optparse.OptionParser ()  
  # Build relateds.
@@ -185,9 +149,9 @@ if __name__ == "__main__":
   parser.add_option ( "--devel"          , action="store_true" ,                dest="devel"         )
   parser.add_option ( "--static"         , action="store_true" ,                dest="static"        )
   parser.add_option ( "--shared"         , action="store_true" ,                dest="shared"        )
-  parser.add_option ( "--chams"          , action="store_true" ,                dest="chams"         )
   parser.add_option ( "--no-python"      , action="store_true" ,                dest="nopython"      )
   parser.add_option ( "--root"           , action="store"      , type="string", dest="rootDir"       )
+  parser.add_option ( "--remove"         , action="store_true" ,                dest="remove"        )
   ( options, args ) = parser.parse_args ()
 
   if options.release:    buildType = "Release"
@@ -208,6 +172,32 @@ if __name__ == "__main__":
   strippedLibraryPath = scrubPath( "LD_LIBRARY_PATH" )
   strippedPythonPath  = scrubPath( "PYTHONPATH" )
 
+  if options.remove:
+    shellScript = 'echo "Removing Coriolis environment";'
+    if osType == "Darwin":
+      ldVar = 'DYLD_LIBRARY_PATH'
+    else:
+      ldVar = 'LD_LIBRARY_PATH'
+
+    if isBourneShell:
+      shellScript += 'export PATH={};hash -r;'.format(strippedPath)
+      shellScript += 'BOOTSTRAP_TOP="";CORIOLIS_TOP="";export -n BOOTSTRAP_TOP CORIOLIS_TOP;'
+      if strippedLibraryPath:
+        shellScript += 'export {}={};'.format(ldVar, strippedLibraryPath)
+      else:
+        shellScript += '{0}=""; export -n {0};'.format(ldVar)
+    else:
+      shellScript += 'setenv PATH {};rehash;'.format(strippedPath)
+      shellScript += 'unsetenv BOOTSTRAP_TOP CORIOLIS_TOP;'
+      if strippedLibraryPath:
+        shellScript += 'setenv {} {};'.format(ldVar, strippedLibraryPath)
+      else:
+        shellScript += 'unsetenv {};'.format(ldVar)
+
+    print(shellScript)
+    sys.exit(0)
+
+
   shellScriptSh = \
     'echo "%(MESSAGE)s";'                                          \
     'echo "Switching to Coriolis 2.x (%(buildDir)s)";'             \
@@ -227,6 +217,8 @@ if __name__ == "__main__":
 
 #   'setenv STRATUS_MAPPING_NAME "%(SYSCONF_DIR)s/stratus2sxlib.xml";' \
 
+  reDevtoolset = re.compile( r'/opt/rh/devtoolset-(?P<version>\d+)/root/etc/coriolis2.*' )
+
   buildDir  = buildType + "." + linkType
   scriptDir = os.path.dirname ( os.path.abspath(__file__) )
  #print "echo \"Script Location: %s\";" % scriptDir,
@@ -234,57 +226,69 @@ if __name__ == "__main__":
     coriolisTop  = "/usr"
     sysconfDir   = scriptDir
     shellMessage = "Using system-wide Coriolis 2 (/usr)"
-  elif scriptDir.startswith("/opt/rh/devtoolset-2/root/etc/coriolis2"): 
-    coriolisTop  = "/opt/rh/devtoolset-2/root/usr"
-    sysconfDir   = scriptDir
-    shellMessage = "Using system-wide devtoolset-2 Coriolis 2 (/opt/rh/devtoolset-2/root/usr)"
-  elif scriptDir.startswith(os.getenv("HOME")+"/nightly/coriolis-2.x/"): 
-    rootDir      = os.getenv("HOME") + "/nightly/coriolis-2.x"
-    coriolisTop  = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
-    sysconfDir   = scriptDir
-    shellMessage = "Using Nightly build Coriolis 2 (%s)" % coriolisTop
-  elif     scriptDir.startswith("/users/outil/coriolis/coriolis-2.x/") \
-        or scriptDir.startswith("/soc/coriolis2/"):
-    coriolisTop  = "/soc/coriolis2"
-    sysconfDir   = coriolisTop + "/etc/coriolis2"
-    shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"
   else:
-    if not rootDir:
-      rootDir = os.getenv("HOME") + "/coriolis-2.x"
-    coriolisTop  = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
-    sysconfDir   = coriolisTop + "/etc/coriolis2"
-    shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir
+    m = reDevtoolset.match( scriptDir )
+    if m:
+      coriolisTop  = "/opt/rh/devtoolset-%d/root/usr" % m.group('version')
+      sysconfDir   = scriptDir
+      shellMessage = "Using system-wide devtoolset-%(v)d Coriolis 2 (/opt/rh/devtoolset-%(v)d/root/usr)" \
+                     % { 'v':m.group('version') }
+    elif scriptDir.startswith(os.getenv("HOME")+"/nightly/coriolis-2.x/"): 
+      rootDir      = os.getenv("HOME") + "/nightly/coriolis-2.x"
+      coriolisTop  = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
+      sysconfDir   = scriptDir
+      shellMessage = "Using Nightly build Coriolis 2 (%s)" % coriolisTop
+    elif     scriptDir.startswith("/users/outil/coriolis/coriolis-2.x/") \
+          or scriptDir.startswith("/soc/coriolis2/"):
+      coriolisTop  = "/soc/coriolis2"
+      sysconfDir   = coriolisTop + "/etc/coriolis2"
+      shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"
+    else:
+      if not rootDir:
+        rootDir = os.getenv("HOME") + "/coriolis-2.x"
+      coriolisTop  = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
+      sysconfDir   = coriolisTop + "/etc/coriolis2"
+      shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir
 
   if osType.startswith("Cygwin"):
-    strippedPath = "%s/%s:%s" % ( coriolisTop, libDir, strippedPath )
-
-  absLibDir           = "%s/%s"     % ( coriolisTop, libDir )
-  strippedPath        = "%s/bin:%s" % ( coriolisTop, strippedPath )
-  strippedLibraryPath = "%s:%s"     % ( absLibDir  , strippedLibraryPath )
+    strippedPath = "%s/lib:%s" % ( coriolisTop, libDir, strippedPath )
 
   if not os.path.exists(coriolisTop):
     print 'echo "[ERROR] coriolisEnv.py, top directory <%s> do not exists."' % coriolisTop
     sys.exit( 1 )
 
+  for lib in [ 'lib64', 'lib' ]:
+    libDir    = lib
+    absLibDir = '{0}/{1}'.format( coriolisTop, lib )
+    if os.path.isdir(absLibDir): break
+    libDir    = None
+
+  if libDir is None:
+    print 'echo "[ERROR] coriolisEnv.py, library directory not found."'
+    sys.exit( 1 )
+
+  strippedPath        = "%s/bin:%s" % ( coriolisTop, strippedPath )
+  strippedLibraryPath = "%s:%s"     % ( absLibDir  , strippedLibraryPath )
+
   if not options.nopython:
     pyVersion = sys.version_info
     version   = "%d.%d" % (pyVersion[0],pyVersion[1])
-    if    osType.startswith("Linux.SL") \
-       or osType.startswith("Linux.sl") \
-       or osType.startswith("Linux.el") \
-       or osType.startswith("Linux.fc") \
-       or osType.startswith("Cygwin"):
-      sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version)
-    elif  osType.startswith("Darwin"):
-      sitePackagesDir = "%s/%s/site-packages" % (absLibDir,version)
-    else:
-      sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version)
+
+    sitePackagesDir = "sitePackageDir_has_been_not_found"
+    for pyPackageDir in [ "%s/python%s/site-packages" % (absLibDir,version)
+                        , "%s/python%s/dist-packages" % (absLibDir,version)
+                        , "%s/%s/site-packages"       % (absLibDir,version)
+                        ]:
+      if os.path.isdir(pyPackageDir):
+        sitePackagesDir = pyPackageDir
+        break
 
     strippedPythonPath = "%s:"                 % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/crlcore:"         % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/cumulus:"         % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/cumulus/plugins:" % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/stratus:"         % (sitePackagesDir) + strippedPythonPath
+    strippedPythonPath = "%s:"                 % (sysconfDir)      + strippedPythonPath
 
     shellScriptSh  += 'PYTHONPATH="%(PYTHONPATH)s";' \
                       'export PYTHONPATH;'
@@ -305,10 +309,10 @@ if __name__ == "__main__":
   if isBourneShell: shellScript = shellScriptSh
   else:             shellScript = shellScriptCsh
 
-  if useDevtoolset2:
+  if useDevtoolset:
     shellScript += \
-      ' echo "Launching a devtoolset-2 subshell though scl (CTRL+D to exit).";' \
-      ' scl enable devtoolset-2 %(SHELL)s'
+      ' echo "Launching a devtoolset-8 subshell though scl (CTRL+D to exit).";' \
+      ' scl enable devtoolset-8 %(SHELL)s'
 
   evalScript = shellScript % { "PATH"            : strippedPath
                              , "LD_LIBRARY_PATH" : strippedLibraryPath

bootstrap/docker/debian-10/Dockerfile.bash

@@ -0,0 +1,6 @@
+
+FROM debian10.coriolis
+
+COPY root/dot.bashrc  /root/.bashrc
+
+CMD [ "/bin/bash", "-i" ]

bootstrap/docker/debian-10/Dockerfile.coriolis

@@ -0,0 +1,10 @@
+
+FROM debian10.system
+
+COPY root/socInstaller.py       /root/socInstaller.py
+RUN  mkdir -p coriolis-2.x/src                       \
+ &&  git clone https://github.com/m-labs/nmigen.git  \
+ &&  cd nmigen                                       \
+ &&  python3 setup.py develop                        \
+ &&  /root/socInstaller.py --docker --profile=Debian10 --do-yosys --do-alliance --do-coriolis
+

bootstrap/docker/debian-10/Dockerfile.debug

@@ -0,0 +1,4 @@
+
+FROM debian10.libresoc
+
+CMD [ "/bin/bash", "-i" ]

bootstrap/docker/debian-10/Dockerfile.libresoc

@@ -0,0 +1,12 @@
+
+FROM debian10.coriolis
+
+# Cannot clone directly from LibreSOC repository as I need my
+# ssh key that I cannot forward to the docker build process.
+#
+# git clone ssh://gitolite3@libre-riscv.org:922/soclayout.git 
+
+COPY ./root/soclayout /root/coriolis-2.x/src/soclayout
+RUN  cd /root/coriolis-2.x/src/soclayout \
+ &&  git checkout 75e03eb
+

bootstrap/docker/debian-10/Dockerfile.system

@@ -0,0 +1,29 @@
+
+FROM debian:buster-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update                                                      \
+ && apt-get -y install build-essential binutils-dev                     \
+                       git cmake bison flex gcc python-dev              \
+                       libboost-all-dev libboost-python-dev             \
+                       zlib1g-dev libxml2-dev rapidjson-dev libbz2-dev  \
+                       qt4-dev-tools libqwt-dev python-qt4              \
+                       python3-setuptools                               \
+                                                                        \
+                       autotools-dev automake                           \
+                       libxt-dev libxpm-dev libmotif-dev                \
+                                                                        \
+                       tcl tcl-dev libffi6 libffi-dev libreadline-dev   \
+                                                                        \
+                       vim                                              \
+ && apt-get clean
+
+# If you want to build Alliance documentation, install those LaTeX
+# packages:
+#                      transfig texlive texlive-latex-extra
+#                      texlive-plain-generic texlive-pictures
+#                      imagemagick
+#
+# The packaged yosys 0.8 is too old to work with nMigen, must be 0.9.
+#                      yosys

bootstrap/docker/debian-10/docker-conf.sh

@@ -0,0 +1,4 @@
+
+    systemImage="debian10.system"
+  coriolisImage="debian10.coriolis"
+      bashImage="debian10.bash"

bootstrap/docker/debian-10/root/allianceInstaller.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+      srcDir=${HOME}/coriolis-2.x/src/alliance/alliance/src
+  commonRoot=${HOME}/coriolis-2.x/Linux.el7_64/Release.Shared
+    buildDir=${commonRoot}/build
+  installDir=${commonRoot}/install
+
+  export    ALLIANCE_TOP=${installDir}
+  export LD_LIBRARY_PATH=${installDir}/lib:${LD_LIBRARY_PATH}
+
+  cd ${srcDir}
+ # Skip doc generation to avoid pulling TeXLive in docker images.
+  sed -i 's,dirs="\$newdirs documentation",dirs="$newdirs",' ./autostuff
+  ./autostuff clean
+  ./autostuff
+  mkdir -p ${buildDir}
+  cd ${buildDir}
+  ${srcDir}/configure --prefix=${ALLIANCE_TOP} --enable-alc-shared
+  make -j1 install

bootstrap/docker/debian-10/root/dot.bashrc

@@ -0,0 +1,14 @@
+
+ echo "Running /root/.bashrc"
+
+ for archDir in `ls /root/coriolis-2.x/`; do
+   if [ "$archDir" = "src" ]; then continue; fi
+   break
+ done
+ echo "Found Coriolis architecture directory \"${archDir}\"."
+
+ installDir="/root/coriolis-2.x/${archDir}/Release.Shared/install"
+ . ${installDir}/etc/profile.d/alc_env.sh
+ eval `${installDir}/etc/coriolis2/coriolisEnv.py`
+
+ export QT_X11_NO_MITSHM=1

bootstrap/docker/debian-10/root/socInstaller.py

@@ -0,0 +1,650 @@
+#!/usr/bin/env python
+#
+# -*- mode:Python -*-
+#
+# This file is part of the Coriolis Software.
+# Copyright (c) UPMC 2015-2018, All Rights Reserved
+#
+# +-----------------------------------------------------------------+ 
+# |                   C O R I O L I S                               |
+# |         C o r i o l i s   I n s t a l l e r                     |
+# |                                                                 |
+# |  Authors     :                    Jean-Paul Chaput              |
+# |  E-mail      :       Jean-Paul.Chaput@asim.lip6.fr              |
+# | =============================================================== |
+# |  Python      :   "./socInstaller.py"                            |
+# +-----------------------------------------------------------------+
+#
+# WARNING:
+#   This script has been designed only for internal use in the
+#   LIP6/CIAN department. If you want to use it you will need to
+#   change the hardwired configuration.
+
+
+showTrace = True
+
+try:
+  import sys
+  import os.path
+  import shutil
+  import optparse
+  import time
+  import traceback
+  import distutils.sysconfig
+  import subprocess
+  import socket
+  import re
+  import bz2
+  import smtplib
+  from email.mime.text        import MIMEText
+  from email.mime.multipart   import MIMEMultipart
+  from email.mime.application import MIMEApplication
+except ImportError, e:
+  module = str(e).split()[-1]
+
+
+class ErrorMessage ( Exception ):
+
+    def __init__ ( self, code, *arguments ):
+        self._code   = code
+        self._errors = [ 'Malformed call to ErrorMessage()', '%s' % str(arguments) ]
+        
+        text = None
+        if len(arguments) == 1:
+          if isinstance(arguments[0],Exception): text = str(arguments[0]).split('\n')
+          else:
+            self._errors = arguments[0]
+        elif len(arguments) > 1:
+          text = list(arguments)
+        
+        if text:
+          self._errors = []
+          while len(text[0]) == 0: del text[0]
+        
+          lstrip = 0
+          if text[0].startswith('[ERROR]'): lstrip = 8
+        
+          for line in text:
+            if line[0:lstrip  ] == ' '*lstrip or \
+               line[0:lstrip-1] == '[ERROR]':
+              self._errors += [ line[lstrip:] ]
+            else:
+              self._errors += [ line.lstrip() ]
+        return
+
+    def __str__ ( self ):
+        if not isinstance(self._errors,list):
+          return "[ERROR] %s" % self._errors
+
+        formatted = "\n"
+        for i in range(len(self._errors)):
+          if i == 0: formatted += "[ERROR] %s" % self._errors[i]
+          else:      formatted += "        %s" % self._errors[i]
+          if i+1 < len(self._errors): formatted += "\n"
+        return formatted
+
+    def addMessage ( self, message ):
+        if not isinstance(self._errors,list):
+          self._errors = [ self._errors ]
+        if isinstance(message,list):
+          for line in message:
+              self._errors += [ line ]
+        else:
+          self._errors += [ message ]
+        return
+
+    def terminate ( self ):
+        print self
+        sys.exit(self._code)
+
+    @property
+    def code ( self ): return self._code
+
+
+class BadBinary ( ErrorMessage ):
+
+    def __init__ ( self, binary ):
+        ErrorMessage.__init__( self, 1, "Binary not found: <%s>." % binary )
+        return
+
+
+class BadReturnCode ( ErrorMessage ):
+
+    def __init__ ( self, status ):
+        ErrorMessage.__init__( self, 1, "Command returned status:%d." % status )
+        return
+
+
+class Command ( object ):
+
+    def __init__ ( self, arguments, fdLog=None ):
+        self.arguments = arguments
+        self.fdLog     = fdLog
+        
+        if self.fdLog != None and not isinstance(self.fdLog,file):
+          print '[WARNING] Command.__init__(): <fdLog> is neither None or a file.'
+        return
+
+    def _argumentsToStr ( self, arguments ):
+        s = ''
+        for argument in arguments:
+          if argument.find(' ') >= 0: s += ' "' + argument + '"'
+          else:                       s += ' '  + argument
+        return s
+
+    def log ( self, text ):
+        print text[:-1]
+        sys.stdout.flush()
+        sys.stderr.flush()
+        if isinstance(self.fdLog,file):
+          self.fdLog.write( text )
+          self.fdLog.flush()
+        return
+
+    def execute ( self ):
+        global conf
+        sys.stdout.flush()
+        sys.stderr.flush()
+        
+        homeDir = os.environ['HOME']
+        workDir = os.getcwd()
+        if homeDir.startswith(homeDir):
+           workDir = '~' + workDir[ len(homeDir) : ]
+        user = 'root'
+        if os.environ.has_key('USER'): user = os.environ['USER']
+        prompt = '%s@%s:%s$' % (user,conf.masterHost,workDir)
+        
+        try:
+          self.log( '%s%s\n' % (prompt,self._argumentsToStr(self.arguments)) )
+          print self.arguments
+          child = subprocess.Popen( self.arguments, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+        
+          while True:
+            line = child.stdout.readline()
+            if not line: break
+        
+            self.log( line )
+        except OSError, e:
+          raise BadBinary( self.arguments[0] )
+        
+        (pid,status) = os.waitpid( child.pid, 0 )
+        status >>= 8
+        if status != 0:
+          raise BadReturnCode( status )
+        
+        return
+
+
+class CommandArg ( object ):
+
+    def __init__ ( self, command, wd=None, host=None, fdLog=None ):
+        self.command = command
+        self.host    = host
+        self.wd      = wd
+        self.fdLog   = fdLog
+        return
+
+    def __str__ ( self ):
+        s = ''
+        if self.wd: s = 'cd %s && ' % self.wd
+
+        for i in range(len(self.command)):
+          if i: s += ' '
+          s += self.command[i]
+        return s
+
+    def getArgs ( self ):
+        if not self.host: return self.command
+        return [ 'ssh', self.host, str(self) ]
+
+    def execute ( self ):
+        if not self.host and self.wd: os.chdir( self.wd )
+        Command( self.getArgs(), self.fdLog ).execute()
+        return
+
+
+class YosysCommand ( CommandArg ):
+
+    def __init__ ( self, yosysBin, fdLog=None ):
+        CommandArg.__init__ ( self, [ yosysBin ], fdLog=fdLog )
+        return
+
+
+class AllianceCommand ( CommandArg ):
+
+    def __init__ ( self, alcBin, fdLog=None ):
+        CommandArg.__init__ ( self, [ alcBin ], fdLog=fdLog )
+        return
+
+
+class CoriolisCommand ( CommandArg ):
+
+    def __init__ ( self, ccbBin, rootDir, threads=1, otherArgs=[], fdLog=None ):
+        CommandArg.__init__ ( self, [ ccbBin
+                                    , '--root='+rootDir
+                                    , '--project=coriolis'
+                                    , '--make=-j%d install' % threads
+                                    ] + otherArgs
+                                  , fdLog=fdLog )
+        return
+
+
+class BenchsCommand ( CommandArg ):
+
+    def __init__ ( self, benchsDir, fdLog=None ):
+        CommandArg.__init__ ( self, [ '../bin/go.sh' ], wd=benchsDir, fdLog=fdLog )
+        return
+        
+
+
+class GitRepository ( object ):
+
+    @staticmethod
+    def getLocalRepository ( url ):
+        localRepo = url.split( '/' )[-1]
+        if localRepo.endswith('.git'):
+          localRepo = localRepo[:-4]
+        return localRepo
+
+    def __init__ ( self, url, cloneDir, fdLog=None ):
+        self.url       = url
+        self.cloneDir  = cloneDir
+        self.localRepo = GitRepository.getLocalRepository( url )
+        self.fdLog     = fdLog
+        return
+
+    @property
+    def localRepoDir ( self ): return self.cloneDir+'/'+self.localRepo
+
+    def removeLocalRepo ( self ):
+        if os.path.isdir(self.localRepoDir):
+          print 'Removing Git local repository: <%s>' % self.localRepoDir
+          shutil.rmtree( self.localRepoDir )
+        return
+
+    def clone ( self ):
+        print 'Clone/pull from:', self.url
+        if not os.path.isdir(self.cloneDir):
+          os.makedirs( self.cloneDir )
+        
+        if not os.path.isdir(self.localRepoDir):
+          os.chdir( self.cloneDir )
+          Command( [ 'git', 'clone', self.url ], self.fdLog ).execute()
+        else:
+          os.chdir( self.localRepoDir )
+          Command( [ 'git', 'pull' ], self.fdLog ).execute()
+        return
+
+    def checkout ( self, branch ):
+        os.chdir( self.localRepoDir )
+        Command( [ 'git', 'checkout', branch ], self.fdLog ).execute()
+        return
+
+
+class Configuration ( object ):
+
+    PrimaryNames = \
+        [ 'sender'      , 'receivers'
+        , 'coriolisRepo', 'benchsRepo' , 'supportRepos'
+        , 'homeDir'     , 'masterHost'
+        , 'debugArg'    , 'nightlyMode', 'dockerMode', 'chrootMode'
+        , 'rmSource'    , 'rmBuild'
+        , 'doGit'       , 'doAlliance' , 'doCoriolis', 'doBenchs', 'doSendReport'
+        , 'success'     , 'rcode'
+        ]
+    SecondaryNames = \
+        [ 'rootDir', 'srcDir', 'logDir', 'logs', 'fds', 'yosysBin', 'alcBin', 'ccbBin', 'benchsDir'
+        ]
+
+    def __init__ ( self ):
+        self._sender       = 'Jean-Paul.Chaput@soc.lip6.fr'
+        self._receivers    = [ 'Jean-Paul.Chaput@lip6.fr', ]
+        self._supportRepos = [ 'http://github.com/miloyip/rapidjson' ]
+        self._allianceRepo = 'https://gitlab.lip6.fr/jpc/alliance.git'
+        self._coriolisRepo = 'https://gitlab.lip6.fr/jpc/coriolis.git'
+        self._benchsRepo   = 'https://gitlab.lip6.fr/jpc/alliance-check-toolkit.git'
+        self._homeDir      = os.environ['HOME']
+        self._debugArg     = ''
+        self._rmSource     = False
+        self._rmBuild      = False
+        self._doGit        = True
+        self._doYosys      = False
+        self._doAlliance   = False
+        self._doCoriolis   = False
+        self._doBenchs     = False
+        self._doSendReport = False
+        self._nightlyMode  = False
+        self._dockerMode   = False
+        self._chrootMode   = None
+        self._logs         = { 'alliance':None, 'coriolis':None, 'benchs':None }
+        self._fds          = { 'alliance':None, 'coriolis':None, 'benchs':None }
+        self._ccbBin       = None
+        self._benchsDir    = None
+        self._masterHost   = self._detectMasterHost()
+        self._success      = False
+        self._rcode        = 0
+        
+        self._updateSecondaries()
+        return
+
+    def __setattr__ ( self, attribute, value ):
+        if attribute in Configuration.SecondaryNames:
+          print ErrorMessage( 1, 'Attempt to write in read-only attribute <%s> in Configuration.'%attribute )
+          return
+        
+        if attribute == 'masterHost' or attribute == '_masterHost':
+          if value == 'lepka':
+            print 'Never touch the Git tree when running on <lepka>.'
+            self._rmSource     = False
+            self._rmBuild      = False
+            self._doGit        = False
+            self._doSendReport = False
+        
+        if attribute[0] == '_':
+          self.__dict__[attribute] = value
+          return
+        
+        if   attribute == 'homeDir': value = os.path.expanduser(value)
+        
+        self.__dict__['_'+attribute] = value
+        self._updateSecondaries()
+        return
+
+    def __getattr__ ( self, attribute ):
+        if attribute[0] != '_': attribute = '_'+attribute
+        if not self.__dict__.has_key(attribute):
+          raise ErrorMessage( 1, 'Configuration has no attribute <%s>.'%attribute )
+        return self.__dict__[attribute]
+
+    def _updateSecondaries ( self ):
+        if self._nightlyMode:
+          self._rootDir = self._homeDir + '/nightly/coriolis-2.x'
+        else:
+          self._rootDir  = self._homeDir + '/coriolis-2.x'
+        self._srcDir     = self._rootDir + '/src'
+        self._logDir     = self._srcDir  + '/logs'
+        self._yosysBin   = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/yosysInstaller.sh'
+        self._alcBin     = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/allianceInstaller.sh'
+        self._ccbBin     = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/ccb.py'
+        self._benchsDir  = self._srcDir  + '/' + GitRepository.getLocalRepository(self._benchsRepo  ) + '/benchs'
+        self._masterHost = self._detectMasterHost()
+        return
+
+    def _detectMasterHost ( self ):
+        if self._chrootMode is None: return 'unknown'
+        if self._chrootMode: return 'chrooted-host'
+
+        masterHost = 'unknown'
+        hostname   = socket.gethostname()
+        hostAddr   = socket.gethostbyname(hostname)
+        
+        if hostname == 'lepka' and hostAddr == '127.0.0.1':
+          masterHost = 'lepka'
+        else:
+          masterHost = hostname.split('.')[0]
+        return masterHost
+
+    def openLog ( self, stem ):
+        if not os.path.isdir(self._logDir):
+          os.makedirs( self._logDir )
+        
+        index   = 0
+        timeTag = time.strftime( "%Y.%m.%d" )
+        while True:
+            logFile = os.path.join(self._logDir,"%s-%s-%02d.log" % (stem,timeTag,index))
+            if not os.path.isfile(logFile):
+                print "Report log: <%s>" % logFile
+                break
+            index += 1
+        fd = open( logFile, "w" )
+        self._logs[stem] = logFile
+        self._fds [stem] = fd
+        return
+
+    def closeLogs ( self ):
+        for fd in self._fds.values():
+          if fd: fd.close()
+        return
+
+    def compressLogs ( self ):
+        for log in self._logs.values():
+          if not log: continue
+        
+          fd   = open( log, 'r' )
+          bzfd = bz2.BZ2File( log+'.bz2', 'w' )
+        
+          for line in fd.readlines(): bzfd.write( line )
+        
+          bzfd.close()
+          fd.close()
+        
+          os.unlink( log )
+        return
+
+    def getCommands ( self, target ):
+        commands  = []
+
+        if self.doYosys:
+          if not os.path.isfile( self.yosysBin ):
+            raise ErrorMessage( 1, [ 'Cannot find <yosysInstaller.sh>, should be here:'
+                                   , '   <%s>' % self.yosysBin
+                                   ] )
+          commands.append( YosysCommand( self.yosysBin, fdLog=self.fds['yosys'] ) )
+
+        if self.doAlliance:
+          if not os.path.isfile( self.alcBin ):
+            raise ErrorMessage( 1, [ 'Cannot find <allianceInstaller.sh>, should be here:'
+                                   , '   <%s>' % self.alcBin
+                                   ] )
+          commands.append( AllianceCommand( self.alcBin, fdLog=self.fds['alliance'] ) )
+
+        if self.doCoriolis:
+          if not os.path.isfile( self.ccbBin ):
+            raise ErrorMessage( 1, [ 'Cannot find <ccb.py>, should be here:'
+                                   , '   <%s>' % self.ccbBin
+                                   ] )
+
+          otherArgs = []
+          if self.debugArg: otherArgs.append( self.debugArg )
+
+          if target == 'SL7_64':
+            otherArgs.append( '--project=support' )
+            commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs          , fdLog=self.fds['coriolis'] ) )
+            commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) )
+          elif target == 'SL6_64' or target == 'SL6':
+            otherArgs.append( '--project=support' )
+            otherArgs.append( '--devtoolset=8' )
+            commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 6, otherArgs          , fdLog=self.fds['coriolis'] ) )
+            commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) )
+          elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10':
+            if target == 'Ubuntu18': otherArgs.append( '--qt5' )
+            commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) )
+
+        if self.doBenchs:
+          commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) )
+        return commands
+
+
+class Report ( object ):
+
+    def __init__ ( self, conf ):
+        self.conf = conf
+        
+        commaspace = ', '
+        date       = time.strftime( "%A %d %B %Y" )
+        stateText  = 'FAILED'
+        modeText   = 'SoC installation'
+        if self.conf.success:     stateText = 'SUCCESS'
+        if self.conf.nightlyMode: modeText  = 'Nightly build'
+        
+        self.message = MIMEMultipart()
+        self.message['Subject'] = '[%s] Coriolis %s %s' % (stateText,modeText,date)
+        self.message['From'   ] = self.conf.sender
+        self.message['To'     ] = commaspace.join( self.conf.receivers )
+        self.attachements = []
+        
+        self.mainText  = '\n'
+        self.mainText += 'Salut le Crevard,\n'
+        self.mainText += '\n'
+        if self.conf.nightlyMode:
+          self.mainText += 'This is the nightly build report of Coriolis.\n'
+        else:
+          self.mainText += 'SoC installer report of Coriolis.\n'
+        self.mainText += '%s\n' % date
+        self.mainText += '\n'
+        if self.conf.success:
+          self.mainText += 'Build was SUCCESSFUL\n'
+        else:
+          self.mainText += 'Build has FAILED, please have a look to the attached log file(s).\n'
+        self.mainText += '\n'
+        self.mainText += 'Complete log file(s) can be found here:\n'
+        return
+
+    def attachLog ( self, logFile ):
+        if not logFile: return
+        
+        fd = open( logFile, 'rb' )
+        try:
+          fd.seek( -1024*100, os.SEEK_END )
+        except IOError, e:
+          pass
+        tailLines = ''
+        for line in fd.readlines()[1:]:
+          tailLines += line
+        fd.close()
+        self.mainText += '    <%s>\n' % logFile
+        
+        attachement = MIMEApplication(tailLines)
+        attachement.add_header( 'Content-Disposition', 'attachment', filename=os.path.basename(logFile) )
+        
+        self.attachements.append( attachement )
+        return
+
+    def send ( self ):
+        self.message.attach( MIMEText(self.mainText) )
+        for attachement in self.attachements:
+          self.message.attach( attachement )
+        
+        print "Sending mail report to:"
+        for receiver in self.conf.receivers: print '  <%s>' % receiver
+        session = smtplib.SMTP( 'localhost' )
+        session.sendmail( self.conf.sender, self.conf.receivers, self.message.as_string() )
+        session.quit()
+        return
+
+
+# ------------------------------------------------------------------- 
+# <socInstaller> Main Part.
+
+
+parser = optparse.OptionParser ()  
+parser.add_option ( "--debug"       , action="store_true" ,                dest="debug"        , help="Build a <Debug> aka (-g) version." )
+parser.add_option ( "--no-git"      , action="store_true" ,                dest="noGit"        , help="Do not pull/update Git repositories before building." )
+parser.add_option ( "--do-yosys"    , action="store_true" ,                dest="doYosys"      , help="Rebuild Yosys." )
+parser.add_option ( "--do-alliance" , action="store_true" ,                dest="doAlliance"   , help="Rebuild the Alliance tools." )
+parser.add_option ( "--do-coriolis" , action="store_true" ,                dest="doCoriolis"   , help="Rebuild the Coriolis tools." )
+parser.add_option ( "--do-report"   , action="store_true" ,                dest="doReport"     , help="Send a final report." )
+parser.add_option ( "--nightly"     , action="store_true" ,                dest="nightly"      , help="Perform a nighly build." )
+parser.add_option ( "--docker"      , action="store_true" ,                dest="docker"       , help="Perform a build inside a docker container." )
+parser.add_option ( "--chroot"      , action="store_true" ,                dest="chroot"       , help="Perform a build inside a chrooted environment." )
+parser.add_option ( "--benchs"      , action="store_true" ,                dest="benchs"       , help="Run the <alliance-checker-toolkit> sanity benchs." )
+parser.add_option ( "--rm-build"    , action="store_true" ,                dest="rmBuild"      , help="Remove the build/install directories." )
+parser.add_option ( "--rm-source"   , action="store_true" ,                dest="rmSource"     , help="Remove the Git source repositories." )
+parser.add_option ( "--rm-all"      , action="store_true" ,                dest="rmAll"        , help="Remove everything (source+build+install)." )
+parser.add_option ( "--root"        , action="store"      , type="string", dest="rootDir"      , help="The root directory (default: <~/coriolis-2.x/>)." )
+parser.add_option ( "--profile"     , action="store"      , type="string", dest="profile"      , help="The targeted OS for the build." )
+(options, args) = parser.parse_args ()
+
+
+conf = Configuration()
+
+try:
+    if options.debug:                     conf.debugArg     = '--debug' 
+    if options.nightly:                   conf.nightlyMode  = True
+    if options.docker:                    conf.dockerMode   = True
+    if options.chroot:                    conf.chrootMode   = True
+    if options.noGit:                     conf.doGit        = False
+    if options.doYosys:                   conf.doYosys      = True
+    if options.doAlliance:                conf.doAlliance   = True
+    if options.doCoriolis:                conf.doCoriolis   = True
+    if options.benchs:                    conf.doBenchs     = True
+    if options.doReport:                  conf.doSendReport = True
+    if options.rmSource or options.rmAll: conf.rmSource     = True
+    if options.rmBuild  or options.rmAll: conf.rmBuild      = True
+
+
+    if conf.doYosys:    conf.openLog( 'yosys'    )
+    if conf.doAlliance: conf.openLog( 'alliance' )
+    if conf.doCoriolis: conf.openLog( 'coriolis' )
+    if conf.doBenchs:   conf.openLog( 'benchs'   )
+
+    if conf.dockerMode: os.environ['USER'] = 'root'
+
+    gitSupports = []
+    for supportRepo in conf.supportRepos:
+        gitSupports.append( GitRepository( supportRepo, conf.srcDir+'/support' ) )
+    gitCoriolis = GitRepository( conf.coriolisRepo, conf.srcDir, conf.fds['coriolis'] )
+    gitBenchs   = GitRepository( conf.benchsRepo  , conf.srcDir, conf.fds['coriolis'] )
+
+    if conf.doAlliance:
+        gitAlliance = GitRepository( conf.allianceRepo, conf.srcDir, conf.fds['alliance'] )
+
+    if conf.doGit:
+        for gitSupport in gitSupports:
+            if conf.rmSource: gitSupport.removeLocalRepo()
+            gitSupport.clone()
+           #if gitSupport.url.endswith('rapidjson'):
+           #  gitSupport.checkout( 'a1c4f32' )
+        
+            if conf.doAlliance:
+                if conf.rmSource: gitAlliance.removeLocalRepo()
+                gitAlliance.clone   ()
+               #gitAlliance.checkout( 'devel' )
+            
+            if conf.doCoriolis:
+                if conf.rmSource: gitCoriolis.removeLocalRepo()
+                gitCoriolis.clone   ()
+                gitCoriolis.checkout( 'devel' )
+      
+        if conf.rmSource: gitBenchs.removeLocalRepo()
+        gitBenchs.clone()
+
+    if conf.rmBuild:
+        for entry in os.listdir(conf.rootDir):
+            if entry.startswith('Linux.'):
+                buildDir = conf.rootDir+'/'+entry
+                print 'Removing OS build directory: <%s>' % buildDir
+                shutil.rmtree( buildDir )
+
+    commands = conf.getCommands( options.profile )
+    for command in commands:
+        if command.host:
+            print 'Executing command on remote host <%s>:' % host
+        else:
+            print 'Executing command on *local* host:'
+        print '  %s' % str(command)
+        command.execute()
+
+    conf.closeLogs()
+
+    conf.success = True
+
+except ErrorMessage, e:
+    print e
+    conf.closeLogs()
+    conf.success = False
+    
+    if showTrace:
+        print '\nPython stack trace:'
+        traceback.print_tb( sys.exc_info()[2] )
+    conf.rcode = e.code
+
+if conf.doSendReport:
+    report = Report( conf )
+    report.attachLog( conf.logs['coriolis' ] )
+    report.attachLog( conf.logs['benchs'   ] )
+    report.send()
+
+conf.compressLogs()
+
+sys.exit( conf.rcode )

bootstrap/docker/debian-10/root/soclayout

@@ -0,0 +1 @@
+Subproject commit bd6b78003c0cc6579fbad73593e69f2714f3a770

bootstrap/docker/scientificlinux-7/Dockerfile.bash

@@ -0,0 +1,6 @@
+
+FROM sl7.coriolis
+
+COPY root/dot.bashrc  /root/.bashrc
+
+CMD [ "/bin/bash", "-i" ]

bootstrap/docker/scientificlinux-7/Dockerfile.coriolis

@@ -0,0 +1,6 @@
+
+FROM sl7.system
+
+COPY root/socInstaller.py       /root/socInstaller.py
+RUN  /root/socInstaller.py --docker --profile=SL7_64 --do-alliance --do-coriolis --benchs
+

bootstrap/docker/scientificlinux-7/Dockerfile.system

@@ -0,0 +1,25 @@
+
+FROM scientificlinux/sl:latest
+
+RUN yum -y update                                                \
+ && yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+ && yum -y install git cmake bison flex gcc-c++ libstdc++-devel  \
+                   make binutils-devel                           \
+                   boost-devel boost-python boost-filesystem     \
+                   boost-regex  boost-wave                       \
+                   python-devel libxml2-devel bzip2-devel        \
+                   qt-devel PyQt4                                \
+                                                                 \
+                   autoconf automake libtool                     \
+                   libX11-devel libXt-devel libXpm-devel         \
+                   motif motif-devel                             \
+                                                                 \
+                   python36-six                                  \
+                   vim-x11                                       \
+ && yum -y install http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS/qwt-6.1.2-4.fc23.x86_64.rpm                          \
+                   http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS/qwt-devel-6.1.2-4.fc23.x86_64.rpm                    \
+                   http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS/yosys-0.9-1.el7.soc.x86_64.rpm                       \
+                   http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS/python3-pyvcd-0.1.7-git2302c99.1.el7.soc.x86_64.rpm  \
+                   http://ftp.lip6.fr/pub/linux/distributions/slsoc/soc/7/addons/x86_64/RPMS/python3-nmigen-0.1-git57d95b7.1.el7.soc.x86_64.rpm   \
+ && yum clean all
+

bootstrap/docker/scientificlinux-7/docker-conf.sh

@@ -0,0 +1,4 @@
+
+    systemImage="sl7.system"
+  coriolisImage="sl7.coriolis"
+      bashImage="sl7.bash"

bootstrap/docker/scientificlinux-7/root/allianceInstaller.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+      srcDir=${HOME}/coriolis-2.x/src/alliance/alliance/src
+  commonRoot=${HOME}/coriolis-2.x/Linux.el7_64/Release.Shared
+    buildDir=${commonRoot}/build
+  installDir=${commonRoot}/install
+
+  export    ALLIANCE_TOP=${installDir}
+  export LD_LIBRARY_PATH=${installDir}/lib:${LD_LIBRARY_PATH}
+
+  cd ${srcDir}
+  sed -i 's,dirs="\$newdirs documentation",dirs="$newdirs",' ./autostuff
+  ./autostuff clean
+  ./autostuff
+  mkdir -p ${buildDir}
+  cd ${buildDir}
+  ${srcDir}/configure --prefix=${ALLIANCE_TOP} --enable-alc-shared
+  make -j1 install