Merge remote-tracking branch 'upstream/master' into gpl-placement-perturbation

Signed-off-by: Drew Lewis <cannada@google.com>

# Conflicts:
#	test/ibex_sky130hs.metrics_limits

Author: calewis

MODULE.bazel

@@ -266,3 +266,12 @@ single_version_override(
     patches = ["//bazel:boost_context_disable_parse_headers.patch"],
     version = BOOST_VERSION,
 )
+
+# scip 9.2.3's tinycthread uses bare C11 <threads.h> names. Backport
+# scipopt/scip@cc917e07 (TNY_ prefix) until a fixed release lands in BCR.
+single_version_override(
+    module_name = "scip",
+    patch_strip = 1,
+    patches = ["//bazel:scip_tinycthread_tny_prefix.patch"],
+    version = "9.2.3",
+)

bazel/scip_tinycthread_tny_prefix.patch

@@ -0,0 +1,47 @@
+Backport scipopt/scip@cc917e07: prefix tinycthread once_flag/call_once
+with TNY_ to avoid clash with C11 <threads.h>. Drop when included in a
+BCR scip release > 9.2.3.
+
+diff --git a/src/tinycthread/tinycthread.c b/src/tinycthread/tinycthread.c
+--- a/src/tinycthread/tinycthread.c
++++ b/src/tinycthread/tinycthread.c
+@@ -895,7 +895,7 @@ int _tthread_timespec_get(struct timespec *ts, int base)
+ #endif /* _TTHREAD_EMULATE_TIMESPEC_GET_ */
+
+ #if defined(_TTHREAD_WIN32_)
+-void call_once(once_flag *flag, void (*func)(void))
++void TNY_call_once(TNY_once_flag *flag, void (*func)(void))
+ {
+   /* The idea here is that we use a spin lock (via the
+      InterlockedCompareExchange function) to restrict access to the
+diff --git a/src/tinycthread/tinycthread.h b/src/tinycthread/tinycthread.h
+--- a/src/tinycthread/tinycthread.h
++++ b/src/tinycthread/tinycthread.h
+@@ -447,11 +447,11 @@ int tss_set(tss_t key, void *val);
+   typedef struct {
+     LONG volatile status;
+     CRITICAL_SECTION lock;
+-  } once_flag;
+-  #define ONCE_FLAG_INIT {0,}
++  } TNY_once_flag;
++  #define TNY_ONCE_FLAG_INIT {0,}
+ #else
+-  #define once_flag pthread_once_t
+-  #define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
++  #define TNY_once_flag pthread_once_t
++  #define TNY_ONCE_FLAG_INIT PTHREAD_ONCE_INIT
+ #endif
+
+ /** Invoke a callback exactly once
+@@ -460,9 +460,9 @@ int tss_set(tss_t key, void *val);
+  * @param func Callback to invoke.
+  */
+ #if defined(_TTHREAD_WIN32_)
+-  void call_once(once_flag *flag, void (*func)(void));
++  void TNY_call_once(TNY_once_flag *flag, void (*func)(void));
+ #else
+-  #define call_once(flag,func) pthread_once(flag,func)
++  #define TNY_call_once(flag,func) pthread_once(flag,func)
+ #endif
+
+ #ifdef __cplusplus

src/cts/test/hier_insertion_delay.ok

@@ -50,6 +50,7 @@ Using 2 tracks default min distance between IO pins.
 [InitialPlace]  Iter: 3 conjugate gradient residual: 0.00000012 HPWL: 1229790
 [InitialPlace]  Iter: 4 conjugate gradient residual: 0.00000012 HPWL: 1229790
 [InitialPlace]  Iter: 5 conjugate gradient residual: 0.00000012 HPWL: 1229790
+[WARNING DPL-0404] Macro inst_0 is placed but not fixed; treating it as fixed during legalization. Mark it FIXED to silence this warning.
 [INFO DPL-0006] Core area: 47872.02 um^2, Instances area: 1357.12 um^2, Utilization: 2.8%
 [INFO DPL-0005] Diamond search max displacement: +/- 500 sites horizontally, +/- 100 rows vertically.
 [INFO DPL-1101] Legalizing using diamond search.
@@ -64,11 +65,11 @@ Total Placement Failures:          0
 ---------------------------------------
 Placement Analysis
 ---------------------------------
-total displacement       9387.3 u
-average displacement       33.6 u
-max displacement           51.8 u
+total displacement      10261.3 u
+average displacement       36.8 u
+max displacement           56.4 u
 original HPWL             605.0 u
-legalized HPWL            641.4 u
+legalized HPWL            640.2 u
 delta HPWL                    6 %
 
 [INFO CTS-0050] Root buffer is CLKBUF_X3.
@@ -109,13 +110,13 @@ delta HPWL                    6 %
 [INFO CTS-0204] A clustering solution was found from clustering size of 10 and clustering diameter of 60.
 [INFO CTS-0205] Better solution may be possible if either -sink_clustering_size, -sink_clustering_max_diameter, or both options are omitted to enable automatic clustering.
 [INFO CTS-0019]  Total number of sinks after clustering: 28.
-[INFO CTS-0024]  Normalized sink region: [(0.369143, 0.371964), (5.02957, 6.24)].
-[INFO CTS-0025]     Width:  4.6604.
-[INFO CTS-0026]     Height: 5.8680.
+[INFO CTS-0024]  Normalized sink region: [(0.806143, 0.417571), (4.959, 6.37757)].
+[INFO CTS-0025]     Width:  4.1529.
+[INFO CTS-0026]     Height: 5.9600.
  Level 1
     Direction: Vertical
     Sinks per sub-region: 14
-    Sub-region size: 4.6604 X 2.9340
+    Sub-region size: 4.1529 X 2.9800
 [INFO CTS-0034]     Segment length (rounded): 1.
 [INFO CTS-0032]  Stop criterion found. Max number of sinks is 15.
 [INFO CTS-0035]  Number of sinks covered: 28.
@@ -136,7 +137,7 @@ delta HPWL                    6 %
 [INFO CTS-0098] Clock net "clk_regs"
 [INFO CTS-0099]  Sinks 280
 [INFO CTS-0100]  Leaf buffers 28
-[INFO CTS-0101]  Average sink wire length 31.00 um
+[INFO CTS-0101]  Average sink wire length 27.32 um
 [INFO CTS-0102]  Path depth 2 - 3
 [INFO CTS-0207]  Dummy loads inserted 2
 [INFO CTS-0033] Balancing latency for clock core