[bazel] Allocate CW310s based on extra resources

WIP requires custom bazel binary. Don't merge until bazel is updated to reflect upstream changes. Removes the external tag in preference for a custom resource as handled by bazelbuild/bazel#16785 Signed-off-by: Drew Macrae <[email protected]>
lowRISC · Dec 23, 2022 · a2232f3 · a2232f3
1 parent 5603629
commit a2232f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -50,6 +50,9 @@ test:local_test_jobs_per_cpus --local_test_jobs=HOST_CPUS*0.22
 # Empirically 72 cores can support 16 simultaneous tests, but not 17. Setting
 # this will ignore tags like "cpu:5"
 
+# Allow bazel to allocate tests to 1 cw310 board.
+test --local_extra_resources=cw310=1
+
 # We have verilator tests that take more than an hour to complete
 test --test_timeout=60,300,1500,7200
 

diff --git a/rules/opentitan_gdb_test.bzl b/rules/opentitan_gdb_test.bzl
@@ -237,7 +237,7 @@ def opentitan_gdb_fpga_cw310_test(
     _opentitan_gdb_fpga_cw310_test(
         tags = tags + [
             "cw310",
-            "exclusive",  # Prevent FPGA tests from running concurrently.
+            "resources:cw310:1",  # Prevent FPGA tests from running concurrently.
             "jtag",
         ],
         opentitantool_cw310_uarts = select({

diff --git a/rules/opentitan_test.bzl b/rules/opentitan_test.bzl
@@ -221,7 +221,7 @@ def cw310_params(
     ]
     required_tags = [
         "cw310",
-        "exclusive",
+        "resources:cw310:1",
     ]
     kwargs.update(
         args = default_args + args,

diff --git a/sw/device/silicon_creator/rom/e2e/BUILD b/sw/device/silicon_creator/rom/e2e/BUILD
@@ -3455,7 +3455,6 @@ test_suite(
         rom_kind = "Rom",
         tags = [
             "cw310_rom",
-            "exclusive",
             "vivado",
         ] + maybe_skip_in_ci(lc_state_val),
     )