From a2232f31a62765f036165362deb88b27965d2661 Mon Sep 17 00:00:00 2001
From: Drew Macrae <drewmacrae@google.com>
Date: Thu, 17 Nov 2022 14:00:47 -0500
Subject: [PATCH] [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 https://github.com/bazelbuild/bazel/pull/16785

Signed-off-by: Drew Macrae <drewmacrae@google.com>
---
 .bazelrc                                | 3 +++
 rules/opentitan_gdb_test.bzl            | 2 +-
 rules/opentitan_test.bzl                | 2 +-
 sw/device/silicon_creator/rom/e2e/BUILD | 1 -
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 161691c2c3937..1178cefef9302 100644
--- 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
index 411254ac847e6..8c71079513988 100644
--- 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
index e5a59c0150f04..51d47f786396a 100644
--- 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
index f7157e092817c..a75a3e6df5b7e 100644
--- 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),
     )