Merge remote-tracking branch 'private/master' into dpl-fix-getMasterPwrs

Author: gudeh

src/OpenRoad.cc

@@ -273,8 +273,7 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   icewall_ = new pad::ICeWall(db_, logger_);
   dft_ = new dft::Dft(db_, sta_, logger_);
   example_ = new exa::Example(db_, logger_);
-  web_server_
-      = new web::WebServer(db_, sta_, logger_, tcl_interp, getThreadCount());
+  web_server_ = new web::WebServer(db_, sta_, logger_, tcl_interp);
 
   // Init components.
   Ord_Init(tcl_interp);
@@ -687,6 +686,9 @@ void OpenRoad::setThreadCount(int threads, bool print_info)
   if (global_router_ != nullptr) {
     global_router_->setNumThreads(threads_);
   }
+  if (web_server_ != nullptr) {
+    web_server_->setThreadCount(threads_);
+  }
 }
 
 void OpenRoad::setThreadCount(const char* threads, bool print_info)

src/odb/src/3dblox/dbvParser.cpp

@@ -235,8 +235,20 @@ void DbvParser::parseRegion(ChipletRegion& region,
     extractValue(region_node, "gds_layer", region.gds_layer);
   }
 
-  if (region_node["coords"]) {
+  if (!region_node["coords"]) {
+    logError("3DBV region " + region.name + " must specify coords.");
+  } else {
     parseCoordinates(region.coords, region_node["coords"]);
+    if (region.coords.size() != 4) {
+      if (region.coords.size() > 4) {
+        logError("3DBV region " + region.name
+                 + " must have exactly 4 coordinates. Polygonal regions are "
+                   "not yet supported.");
+      } else {
+        logError("3DBV region " + region.name
+                 + " must have exactly 4 coordinates.");
+      }
+    }
   }
 }
 

src/odb/test/BUILD

@@ -219,6 +219,7 @@ COMPULSORY_TESTS = [
 
 PASSFAIL_TESTS = [
     # pass-fail
+    "read_3dbv_fail",
     "read_def_virtual_invalid",
     "test_block",
     "test_bterm",
@@ -283,6 +284,8 @@ filegroup(
         "data/example2.bmap",
         "data/example3.bmap",
         "data/example4.bmap",
+        "data/example_no_coords.3dbv",
+        "data/example_polygon.3dbv",
         "data/floorplan_initialize.def",
         "data/floorplan_initialize.v",
         "data/floorplan_initialize2.def",

src/odb/test/CMakeLists.txt

@@ -73,6 +73,7 @@ or_integration_tests(
     write_macro_placement
   PASSFAIL_TESTS
     cpp_tests
+    read_3dbv_fail
     read_def_virtual_invalid
     test_block
     test_bterm

src/odb/test/data/example_no_coords.3dbv

@@ -0,0 +1,26 @@
+Header:
+  version: 2.5
+  unit: micron
+  precision: 2000
+
+ChipletDef:
+  SoC:
+    type: die
+    design_area: [955, 1082]
+    shrink: 1
+    tsv: false
+    thickness: 300
+    offset: [0, 0]
+    cad_layer:
+      108;101:
+        type: design_area
+    regions:
+      front_reg:
+        side: front
+      back_reg:
+        side: back
+        coords:
+          - [0, 0]
+          - [955, 0]
+          - [955, 1082]
+          - [0, 1082]

src/odb/test/data/example_polygon.3dbv

@@ -0,0 +1,32 @@
+Header:
+  version: 2.5
+  unit: micron
+  precision: 2000
+
+ChipletDef:
+  SoC:
+    type: die
+    design_area: [955, 1082]
+    shrink: 1
+    tsv: false
+    thickness: 300
+    offset: [0, 0]
+    cad_layer:
+      108;101:
+        type: design_area
+    regions:
+      front_reg:
+        side: front
+        coords:
+          - [0, 0]
+          - [955, 0]
+          - [955, 1082]
+          - [0, 1082]
+      back_reg:
+        side: back
+        coords:
+          - [0, 0]
+          - [955, 0]
+          - [955, 1082]
+          - [0, 1082]
+          - [100, 100]

src/odb/test/read_3dbv_fail.tcl

@@ -0,0 +1,25 @@
+source "helpers.tcl"
+
+# Test 1: Region with no coordinates
+set status [catch { read_3dbv "data/example_no_coords.3dbv" } msg]
+if { $status != 1 } {
+  puts "fail: read_3dbv accepted region without coordinates"
+  exit 1
+}
+if { ![regexp "ODB-0521" $msg] } {
+  puts "fail: unexpected error for no coords: $msg"
+  exit 1
+}
+
+# Test 2: Region with polygon (5 coordinates)
+set status [catch { read_3dbv "data/example_polygon.3dbv" } msg]
+if { $status != 1 } {
+  puts "fail: read_3dbv accepted region with 5 coordinates (polygon)"
+  exit 1
+}
+if { ![regexp "ODB-0521" $msg] } {
+  puts "fail: unexpected error for polygon: $msg"
+  exit 1
+}
+
+puts "pass"

src/odb/test/write_3dbv.3dbvok

@@ -33,4 +33,4 @@ ChipletDef:
           - [0, 0]
           - [955, 0]
           - [955, 1082]
-          - [0, 1082]
+          - [0, 1082]

src/pad/README.md

@@ -392,6 +392,7 @@ rdl_route
     [-spacing spacing]
     [-turn_penalty penalty]
     [-allow45]
+    [-fixed]
     [-max_iterations max_iterations]
     nets
 ```
@@ -408,6 +409,7 @@ rdl_route
 | `-turn_penalty` | Scaling factor to apply to discurage turning to allow for straighter routes. The default value is `2.0`, and the allowed values are floats. |
 | `-max_iterations` | Maximum number of router iterations. The default value is `10`. |
 | `-allow45` | Specifies that 45 degree routing is permitted. |
+| `-fixed` | When specified, routes will be marked as fixed. |
 | `nets` | Nets to route. |
 
 ### Selectively routing terminals

src/pad/include/pad/ICeWall.h

@@ -99,6 +99,7 @@ class ICeWall
                 int width = 0,
                 int spacing = 0,
                 bool allow45 = false,
+                bool fixed = false,
                 float turn_penalty = 2.0,
                 int max_iterations = 10);
   void routeRDLDebugGUI(bool enable);