Merge pull request #3009 from Pinata-Consulting/bazel-orfs-bump

bazel: bump and prune testing

Author: maliberty

flow/MODULE.bazel

@@ -9,7 +9,7 @@ module(
 bazel_dep(name = "bazel-orfs")
 git_override(
     module_name = "bazel-orfs",
-    commit = "a33cd61ae13d2c4eb8d00e4475bfe214c828bc64",
+    commit = "41354d9de46816b79858e43baadf701cf7e997e5",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -50,9 +50,9 @@ orfs.default(
     # and update "image" to point to the local image.
 
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-2581-g11b93cfa",
+    image = "docker.io/openroad/orfs:v3.0-2707-g044183f3",
     # image = "gcr.io/ascenium/orfs-megaboom/flow-ubuntu22.04-builder:3d2c3d-2",
-    sha256 = "6b778fcdc3c7ba5cc5250cde588c43a63c45ffb3126ee072596a4173fe4d7101",
+    sha256 = "34db776930937b94b22f96b68feea87381de70727d12efc47f342b88c8cb3db6",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

flow/MODULE.bazel.lock

@@ -1,15 +1,6 @@
-load("@bazel-orfs//:sweep.bzl", "orfs_sweep")
-load("//util:plot_congestion.bzl", "plot_congestion")
+load("@bazel-orfs//:openroad.bzl", "orfs_flow")
 
-# Format densities, rounding to 2 decimal places.
-SWEEPS = {
-    "PLACE_DENSITY": [str(0.60 + x * 0.01 + 0.005)[:4] for x in range(20)],
-    "CORE_UTILIZATION": [str(40 + x * 5) for x in range(4)],
-}
-
-SWEEP = "PLACE_DENSITY"
-
-orfs_sweep(
+orfs_flow(
     name = "ethmac_lvt",
     arguments = {
         # Faster builds
@@ -32,28 +23,9 @@ orfs_sweep(
         "ADDITIONAL_GDS": "$(PLATFORM_DIR)/gds/asap7sc7p5t_28_R_220121a.gds",
         "ADDITIONAL_LEFS": "$(PLATFORM_DIR)/lef/asap7sc7p5t_28_R_1x_220121a.lef",
     },
-    other_variants = {"base": {}},
     sources = {
         "SDC_FILE": [":constraint.sdc"],
     },
-    sweep = {
-        value: {
-            "arguments": {
-                SWEEP: value,
-            },
-            "previous_stage": {
-                "floorplan": "ethmac_lvt_synth",
-            },
-        }
-        for value in SWEEPS[SWEEP]
-    },
     top = "ethmac",
     verilog_files = ["//designs/src/ethmac_lvt:verilog"],
 )
-
-plot_congestion(
-    name = "plot",
-    srcs = [":ethmac_lvt_{value}_grt".format(value = value) for value in SWEEPS[SWEEP]],
-    argument = SWEEP,
-    values = SWEEPS[SWEEP],
-)

flow/designs/asap7/ethmac_lvt/BUILD.bazel

@@ -3,8 +3,8 @@ load("//util:plot_congestion.bzl", "plot_congestion")
 
 # Format densities, rounding to 2 decimal places.
 SWEEPS = {
-    "PLACE_DENSITY": [str(0.35 + x * 0.01 + 0.005)[:4] for x in range(65)],
-    "CORE_UTILIZATION": [str(40 + x * 5) for x in range(4)],
+    "PLACE_DENSITY": [str(0.35 + x * 0.1 + 0.05)[:4] for x in range(4)],
+    "CORE_UTILIZATION": [str(40 + x * 50) for x in range(4)],
 }
 
 SWEEP = "PLACE_DENSITY"

flow/designs/asap7/gcd/BUILD.bazel

@@ -1,13 +1,4 @@
 load("@bazel-orfs//:openroad.bzl", "orfs_flow")
-load("@bazel-orfs//:sweep.bzl", "orfs_sweep")
-load("//util:plot_congestion.bzl", "plot_congestion")
-
-# Format densities, rounding to 2 decimal places.
-SWEEPS = {
-    "PLACE_DENSITY": [str(0.82 + x * 0.01 + 0.005)[:4] for x in range(10)],
-}
-
-SWEEP = "PLACE_DENSITY"
 
 filegroup(
     name = "mock-array-constraints",
@@ -38,13 +29,15 @@ orfs_flow(
         "MACRO_PLACE_HALO": "0 2.16",
         "RTLMP_BOUNDARY_WT": "0",
         "PDN_TCL": "$(PLATFORM_DIR)/openRoad/pdn/BLOCKS_grid_strategy.tcl",
-        "MACRO_HALO_X": "0.5",
-        "MACRO_HALO_Y": "0.5",
+        "MACRO_ROWS_HALO_X": "0.5",
+        "MACRO_ROWS_HALO_Y": "0.5",
         "MACRO_BLOCKAGE_HALO": "0",
         "MAX_ROUTING_LAYER": "M9",
         "GDS_ALLOW_EMPTY": "Element",
-        "PWR_NETS_VOLTAGEsS": "",
+        "PWR_NETS_VOLTAGES": "",
         "GND_NETS_VOLTAGES": "",
+        "IO_PLACER_V": "M5 M7",
+        "IO_PLACER_H": "M4 M6",
     },
     macros = ["Element_generate_abstract"],
     sources = {
@@ -65,7 +58,7 @@ filegroup(
     visibility = [":__subpackages__"],
 )
 
-orfs_sweep(
+orfs_flow(
     name = "Element",
     abstract_stage = "route",
     arguments = {
@@ -84,28 +77,9 @@ orfs_sweep(
         "CORE_AREA": "1.08 1.08 42.120000000000005 42.120000000000005",
         "PDN_TCL": "$(PLATFORM_DIR)/openRoad/pdn/BLOCK_grid_strategy.tcl",
     },
-    other_variants = {"base": {}},
     sources = {
         "IO_CONSTRAINTS": [":mock-array-element-io"],
         "SDC_FILE": [":mock-array-constraints"],
     },
-    sweep = {
-        value: {
-            "arguments": {
-                SWEEP: value,
-            },
-            "previous_stage": {
-                "floorplan": "Element_synth",
-            },
-        }
-        for value in SWEEPS[SWEEP]
-    },
     verilog_files = ["//designs/src/mock-array:verilog"],
 )
-
-plot_congestion(
-    name = "plot",
-    srcs = [":Element_{value}_grt".format(value = value) for value in SWEEPS[SWEEP]],
-    argument = SWEEP,
-    values = SWEEPS[SWEEP],
-)

flow/designs/asap7/mock-array/BUILD.bazel

@@ -117,5 +117,6 @@ orfs_flow(
         "SDC_FILE": [":constraint.sdc"],
         "SYNTH_NETLIST_FILES": [":netlists_canonicalized"],
     },
+    tags = ["manual"],
     verilog_files = [],
 )

flow/designs/asap7/swerv_wrapper/BUILD.bazel

@@ -4,7 +4,7 @@ def plot_congestion(name, srcs, argument, values):
     native.filegroup(
         name = "{name}_congestion".format(name = name),
         srcs = srcs,
-        output_group = "congestion.rpt",
+        output_group = "5_global_route.rpt",
     )
 
     native.genrule(