Merge remote-tracking branch 'private/master' into dpl-dpo-load-macro-flipping

Author: gudeh

MODULE.bazel

@@ -78,7 +78,7 @@ bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
 bazel_dep(name = "fmt", version = "11.2.0.bcr.1")
 bazel_dep(name = "git", version = "2.54.0")
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
-bazel_dep(name = "openmp", version = "21.1.5.bcr.1")
+bazel_dep(name = "openmp", version = "21.1.5.bcr.2")
 bazel_dep(name = "or-tools", version = "9.15")
 bazel_dep(name = "spdlog", version = "1.15.1")
 bazel_dep(name = "sv-lang", version = "10.0.1-20260316-f04e8156")

MODULE.bazel.lock

@@ -23,7 +23,10 @@ def _tcl_encode_or_impl(ctx):
         outputs = [output_file],
         inputs = ctx.files.srcs,
         arguments = [args],
-        tools = [ctx.executable._encode_script],
+        tools = depset(
+            direct = [ctx.executable._encode_script],
+            transitive = [ctx.toolchains["@rules_python//python:toolchain_type"].py3_runtime.files] if ctx.toolchains["@rules_python//python:toolchain_type"].py3_runtime and ctx.toolchains["@rules_python//python:toolchain_type"].py3_runtime.files else [],
+        ),
         executable = ctx.toolchains["@rules_python//python:toolchain_type"].py3_runtime.interpreter,
     )
     return [DefaultInfo(files = depset([output_file]))]

bazel/tcl_encode_or.bzl

@@ -883,9 +883,35 @@ _install_bazel() {
             _execute "Installing bazelisk..." mv bazelisk "${bazel_prefix}/bin/bazelisk"
         )
         if _command_exists "apt-get"; then
+            # Ubuntu 26.04 ships the libxml2 runtime with soname
+            # libxml2.so.16, but the prebuilt LLVM toolchain (lld) pulled in
+            # by the Bazel build is linked against the old libxml2.so.2.
+            # Pull in libxml2-dev there (and add a compatibility symlink
+            # below); older Ubuntu still provides .so.2 via libxml2.
+            local ubuntu_version=""
+            if [[ -f /etc/os-release ]]; then
+                ubuntu_version=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release | sed 's/"//g')
+            fi
+            local libxml2_pkg="libxml2"
+            if [[ -n "${ubuntu_version}" ]] && _version_compare "${ubuntu_version}" -ge "26.04"; then
+                libxml2_pkg="libxml2-dev"
+            fi
             _execute "Installing bazel required libraries..." \
                 apt-get -y install --no-install-recommends \
-                libc6-dev libxml2 libtinfo6 zlib1g libstdc++6
+                libc6-dev "${libxml2_pkg}" libtinfo6 zlib1g libstdc++6
+            # lld only uses libxml2 for Windows COFF manifests, never during a
+            # Linux link, so the .so.16 -> .so.2 compatibility symlink is safe.
+            # Gated to 26.04+ only.
+            if [[ -n "${ubuntu_version}" ]] && _version_compare "${ubuntu_version}" -ge "26.04"; then
+                local libdir="/usr/lib/$(uname -m)-linux-gnu"
+                local libxml2_so
+                libxml2_so=$(ls "${libdir}"/libxml2.so.* 2>/dev/null \
+                    | grep -v 'libxml2.so.2$' | head -n1)
+                if [[ ! -e "${libdir}/libxml2.so.2" && -n "${libxml2_so}" ]]; then
+                    _execute "Adding libxml2.so.2 compatibility symlink for prebuilt LLVM lld..." \
+                        ln -sf "$(basename "${libxml2_so}")" "${libdir}/libxml2.so.2"
+                fi
+            fi
         elif _command_exists "yum"; then
             _execute "Installing bazel required libraries..." \
                 yum install -y \

etc/DependencyInstaller.sh

@@ -73,6 +73,9 @@ detailed_placement
     [-report_file_name filename]
     [-use_negotiation]
     [-abacus]
+    [-site_search_window sites]
+    [-row_search_window rows]
+    [-drc_penalty penalty]
 ```
 
 #### Options
@@ -86,6 +89,9 @@ detailed_placement
 | `-report_file_name` | File name for saving the report to (e.g. `report.json`.) |
 | `-use_negotiation` | Use the NegotiationLegalizer instead of the default diamond search engine. |
 | `-abacus` | Enable the Abacus pre-pass within the NegotiationLegalizer. Only effective when `-use_negotiation` is set. |
+| `-site_search_window` | NegotiationLegalizer: maximum number of sites a cell may be moved left or right of its initial position. Default `20`, `0` allowed (no horizontal movement). |
+| `-row_search_window` | NegotiationLegalizer: maximum number of rows a cell may be moved up or down from its initial position. Default `5`, `0` allowed (no row changes). |
+| `-drc_penalty` | NegotiationLegalizer: priority to DRC violations, ramped up each iteration to push DRC cleanup later in the run. Lower values tolerate DRC violations early on while overlaps are resolved. Default `5`, `0` allowed (disables the escalating per-candidate penalty, DRC-violating cells still accrue history cost separately). |
 
 ### Set Placement Padding
 

src/dpl/README.md

@@ -105,12 +105,18 @@ class Opendp
 
   // legalize/report
   // max_displacment is in sites. use zero for defaults.
+  // site_search_window/row_search_window/drc_penalty use a negative value to
+  // mean "unset" (use the negotiation legalizer's own default); 0 is a valid
+  // explicit value for all three.
   void detailedPlacement(int max_displacement_x,
                          int max_displacement_y,
                          const std::string& report_file_name = std::string(""),
                          bool incremental = false,
                          bool use_negotiation = false,
-                         bool run_abacus = false);
+                         bool run_abacus = false,
+                         int site_search_window = -1,
+                         int row_search_window = -1,
+                         double drc_penalty = -1.0);
   void reportLegalizationStats() const;
 
   void setPaddingGlobal(int left, int right);
@@ -120,6 +126,8 @@ class Opendp
   void setJumpMoves(int jump_moves);
   void setIterativePlacement(bool iterative);
   void setDeepIterativePlacement(bool deep_iterative);
+  void setNegotiationDebugInterval(int iterative_jump);
+  void setNegotiationDebugStart(int iterative_start);
 
   // Global padding.
   int padGlobalLeft() const;
@@ -398,6 +406,8 @@ class Opendp
   int move_count_ = 1;
   bool iterative_debug_ = false;
   bool deep_iterative_debug_ = false;
+  int negotiation_debug_interval_ = 1;
+  int negotiation_debug_start_ = 0;
   bool incremental_ = false;
   bool use_negotiation_ = false;
 

src/dpl/include/dpl/Opendp.h

@@ -95,6 +95,16 @@ void NegotiationLegalizer::legalize()
              1,
              "NegotiationLegalizer: starting legalization.");
 
+  logger_->info(utl::DPL,
+                1103,
+                "NegotiationLegalizer search window: +/-{} sites horizontally, "
+                "+/-{} rows vertically.",
+                site_search_window_,
+                row_search_window_);
+
+  logger_->info(
+      utl::DPL, 1104, "NegotiationLegalizer DRC penalty: {}.", drc_penalty_);
+
   double init_from_db_s{0}, build_grid_s{0}, fence_regions_s{0}, abacus_s{0};
   double negotiation_s{0}, post_neg_sync_s{0}, metrics_s{0}, flush_s{0},
       orient_s{0};
@@ -114,7 +124,6 @@ void NegotiationLegalizer::legalize()
 
   if (debug_observer_) {
     debug_observer_->startPlacement(db_->getChip()->getBlock());
-    debugPause("Pause after initFromDb.");
   }
 
   {
@@ -137,6 +146,8 @@ void NegotiationLegalizer::legalize()
     initFenceRegions();
   }
 
+  debugPause("Pause after initialization.");
+
   debugPrint(logger_,
              utl::DPL,
              "negotiation",
@@ -225,12 +236,17 @@ void NegotiationLegalizer::legalize()
   }
 
   if (debug_observer_) {
-    setDplPositions();
+    commitNegotiationPosToDpl();
     // this flush may imply functional changes. It hides initial movements for
     // clean debugging negotiation phase.
-    flushToDb();
+    logger_->report(
+        "Committing post-init positions to odb; debug move line drawings will "
+        "exclude gpl-to-init displacement.");
+    commitNegotiationPosToOdb();
     pushNegotiationPixels();
-    logger_->report("Pause after Abacus pass.");
+    logger_->report(run_abacus_
+                        ? "Pause after initialization: Abacus executed."
+                        : "Pause after initialization: Abacus skipped.");
     debug_observer_->redrawAndPause();
   }
 
@@ -302,12 +318,6 @@ void NegotiationLegalizer::legalize()
       maxDisp,
       nViol);
 
-  {
-    utl::DebugScopedTimer t(
-        flush_s, logger_, utl::DPL, "negotiation_runtime", 1, "flushToDb: {}");
-    flushToDb();
-  }
-
   {
     utl::DebugScopedTimer t(orient_s,
                             logger_,
@@ -348,7 +358,7 @@ void NegotiationLegalizer::legalize()
              "negotiation {:.1f}ms ({:.0f}%), "
              "postNegSync {:.1f}ms ({:.0f}%), "
              "metrics {:.1f}ms ({:.0f}%), "
-             "flushToDb {:.1f}ms ({:.0f}%), "
+             "commitNegotiationPosToOdb {:.1f}ms ({:.0f}%), "
              "orientUpdate {:.1f}ms ({:.0f}%)",
              to_ms(total_s),
              to_ms(init_from_db_s),
@@ -369,13 +379,16 @@ void NegotiationLegalizer::legalize()
              pct(flush_s),
              to_ms(orient_s),
              pct(orient_s));
+
+  debugPause("Pause after legalization complete.");
 }
 
 // ===========================================================================
-// flushToDb – write current cell positions to ODB so the GUI reflects them
+// commitNegotiationPosToOdb – write current cell positions to ODB so the GUI
+// reflects them
 // ===========================================================================
 
-void NegotiationLegalizer::flushToDb()
+void NegotiationLegalizer::commitNegotiationPosToOdb()
 {
   const Grid* dplGrid = opendp_->grid_.get();
   for (const auto& cell : cells_) {
@@ -454,17 +467,18 @@ void NegotiationLegalizer::debugPause(const std::string& msg)
   if (!debug_observer_) {
     return;
   }
-  setDplPositions();
+  commitNegotiationPosToDpl();
   pushNegotiationPixels();
   logger_->report("{}", msg);
   debug_observer_->redrawAndPause();
 }
 
 // ===========================================================================
-// setDplPositions – pass the positions to the DPL original structure (Node)
+// commitNegotiationPosToDpl – pass the positions to the DPL original structure
+// (Node)
 // ===========================================================================
 
-void NegotiationLegalizer::setDplPositions()
+void NegotiationLegalizer::commitNegotiationPosToDpl()
 {
   if (!network_) {
     return;

src/dpl/src/NegotiationLegalizer.cpp

@@ -7,6 +7,7 @@
 #include <cmath>
 #include <limits>
 #include <string>
+#include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -30,18 +31,19 @@ class Edge;
 // Constants  (defaults match the NBLG paper)
 // ---------------------------------------------------------------------------
 constexpr int kInfCost = std::numeric_limits<int>::max() / 2;
-constexpr int kHorizWindow = 20;    // search width, current row (sites)
-constexpr int kAdjWindow = 5;       // search width, adjacent rows
-constexpr int kMaxIterNeg = 400;    // negotiation phase-1 limit
-constexpr int kMaxIterNeg2 = 1000;  // negotiation phase-2 limit
-constexpr int kIsolationPt = 1;     // isolation-point parameter I
-constexpr double kMfDefault = 1.5;  // max-disp penalty multiplier
-constexpr int kThDefault = 30;      // max-disp threshold (sites)
-constexpr double kHfDefault = 1.0;  // history-cost increment factor
-constexpr double kAlpha = 0.7;      // adaptive-pf α
-constexpr double kBeta = 10.0;      // adaptive-pf β
-constexpr double kGamma = 0.005;    // adaptive-pf γ
-constexpr int kIth = 300;           // pf ramp-up threshold iteration
+constexpr int kSiteSearchWindow = 20;  // search width, current row (sites)
+constexpr int kRowSearchWindow = 5;    // search width, adjacent rows
+constexpr double kDrcPenalty = 5.0;    // base DRC penalty (scaled per iter)
+constexpr int kMaxIterNeg = 400;       // negotiation phase-1 limit
+constexpr int kMaxIterNeg2 = 1000;     // negotiation phase-2 limit
+constexpr int kIsolationPt = 1;        // isolation-point parameter I
+constexpr double kMfDefault = 1.5;     // max-disp penalty multiplier
+constexpr int kThDefault = 30;         // max-disp threshold (sites)
+constexpr double kHfDefault = 1.0;     // history-cost increment factor
+constexpr double kAlpha = 0.7;         // adaptive-pf α
+constexpr double kBeta = 10.0;         // adaptive-pf β
+constexpr double kGamma = 0.005;       // adaptive-pf γ
+constexpr int kIth = 300;              // pf ramp-up threshold iteration
 
 // ---------------------------------------------------------------------------
 // FenceRect / FenceRegion
@@ -129,15 +131,16 @@ class NegotiationLegalizer
   void legalize();
 
   // Pass positions back to the DPL original structure.
-  void setDplPositions();
+  void commitNegotiationPosToDpl();
 
   // Tuning knobs (all have paper-default values)
   void setRunAbacus(bool run) { run_abacus_ = run; }
   void setMf(double mf) { max_disp_multiplier_ = mf; }
   void setTh(int th) { max_disp_threshold_ = th; }
   void setMaxIterNeg(int n) { max_iter_neg_ = n; }
-  void setHorizWindow(int w) { horiz_window_ = w; }
-  void setAdjWindow(int w) { adj_window_ = w; }
+  void setSiteSearchWindow(int w) { site_search_window_ = w; }
+  void setRowSearchWindow(int w) { row_search_window_ = w; }
+  void setDrcPenalty(double p) { drc_penalty_ = p; }
   void setNumThreads(int n) { num_threads_ = n; }
 
   // Metrics (valid after legalize())
@@ -150,7 +153,8 @@ class NegotiationLegalizer
   bool initFromDb();
   void buildGrid();
   void initFenceRegions();
-  void flushToDb();  // Write current cell positions to ODB (for GUI updates)
+  void commitNegotiationPosToOdb();  // Write current cell positions to ODB (for
+                                     // GUI updates)
   void pushNegotiationPixels();
   void debugPause(const std::string& msg);
 
@@ -165,7 +169,8 @@ class NegotiationLegalizer
   void runNegotiation(const std::vector<int>& illegalCells);
   int negotiationIter(std::vector<int>& activeCells,
                       int iter,
-                      bool updateHistory);
+                      bool updateHistory,
+                      bool print_row);
   void ripUp(int cell_idx);
   void place(int cell_idx, int x, int y);
   [[nodiscard]] std::pair<int, int> findBestLocation(int cell_idx,
@@ -177,6 +182,15 @@ class NegotiationLegalizer
   void updateDrcHistoryCosts(const std::vector<int>& activeCells);
   void sortByNegotiationOrder(std::vector<int>& indices) const;
 
+  // Print a stuck-cell summary (overall counts + per-height breakdown).
+  // No-op when both counts are zero.
+  void printStuckSummary(
+      const char* label,
+      int no_cand_count,
+      int same_pos_count,
+      const std::unordered_map<int, int>& no_cand_by_height,
+      const std::unordered_map<int, int>& same_pos_by_height) const;
+
   // Post-optimisation
   void greedyImprove(int passes);
   void cellSwap();
@@ -252,8 +266,23 @@ class NegotiationLegalizer
   double max_disp_multiplier_{kMfDefault};  // mf on the paper
   int max_disp_threshold_{kThDefault};      // th on the paper
   int max_iter_neg_{kMaxIterNeg};
-  int horiz_window_{kHorizWindow};
-  int adj_window_{kAdjWindow};
+  int site_search_window_{kSiteSearchWindow};
+  int current_iter_{0};  // updated at the start of each negotiationIter call
+
+  // Last-iteration stats, kept so runNegotiation can print the final row.
+  int last_iter_{-1};
+  int last_printed_iter_{-1};
+  int last_violations_{0};
+  int last_illegal_cells_{0};
+  int last_illegal_sites_{0};
+
+  // Cells that actually changed position during the current negotiation
+  // iteration. Passed to the debug observer so cells from prior iterations
+  // are rendered in grey while current-iteration movers keep directional
+  // colors.
+  std::unordered_set<odb::dbInst*> current_iter_movers_;
+  int row_search_window_{kRowSearchWindow};
+  double drc_penalty_{kDrcPenalty};
   int num_threads_{1};
   bool run_abacus_{false};
 
@@ -265,6 +294,21 @@ class NegotiationLegalizer
   mutable double prof_drc_s_{0};
   mutable int prof_candidates_evaluated_{0};
   mutable int prof_candidates_filtered_{0};
+
+  // Stuck-cell tallies for the current runNegotiation call. Reset at the
+  // start of runNegotiation and printed at the end. The per-height maps are
+  // keyed by cell.height (row units).
+  mutable int stuck_no_candidate_count_{0};
+  mutable int stuck_same_pos_count_{0};
+  mutable std::unordered_map<int, int> stuck_no_candidate_by_height_;
+  mutable std::unordered_map<int, int> stuck_same_pos_by_height_;
+
+  // Per-iteration variants. Reset at the start of each negotiationIter and
+  // printed at the end of that iteration.
+  mutable int stuck_no_candidate_count_iter_{0};
+  mutable int stuck_same_pos_count_iter_{0};
+  mutable std::unordered_map<int, int> stuck_no_candidate_by_height_iter_;
+  mutable std::unordered_map<int, int> stuck_same_pos_by_height_iter_;
 };
 
 }  // namespace dpl