[bazel] Pass copt and features through the OT transition

1. Pass the `copt` and `features` values through the OT platform transition. 2. Convert the aes_smoketest to the `opentitan_test` rule. Signed-off-by: Chris Frantz <[email protected]>
lowRISC · Jan 8, 2024 · 49b57c5 · 49b57c5
1 parent 0877240
commit 49b57c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/ci/scripts/run-english-breakfast-verilator-tests.sh b/ci/scripts/run-english-breakfast-verilator-tests.sh
@@ -25,13 +25,16 @@ ci/bazelisk.sh build  \
 
 # Run the one test.
 # This needs to be run outside the bazel sandbox, so we do not use `bazel run`
+#
+# NOTE: we specify `-type f` in the find commands to avoid finding any
+# additional symlinks bazel might have prepared when building the test targets.
 bazel-bin/sw/host/opentitantool/opentitantool \
     --rcfile="" \
     --logging=info \
     --interface=verilator \
     --verilator-bin=$BIN_DIR/hw/top_englishbreakfast/Vchip_englishbreakfast_verilator \
-    --verilator-rom="$(find bazel-out/* -name 'test_rom_sim_verilator.32.vmem')" \
-    --verilator-flash="$(find bazel-out/* -name 'aes_smoketest_prog_sim_verilator.64.scr.vmem')" \
+    --verilator-rom="$(find bazel-out/* -type f -name 'test_rom_sim_verilator.32.vmem')" \
+    --verilator-flash="$(find bazel-out/* -type f -name 'aes_smoketest_sim_verilator.64.vmem')" \
     console \
     --exit-failure="(FAIL|FAULT).*\n" \
     --exit-success="PASS.*\n" \

diff --git a/hw/top_englishbreakfast/util/prepare_sw.py b/hw/top_englishbreakfast/util/prepare_sw.py
@@ -30,7 +30,7 @@
     '//sw/device/lib/testing/test_rom',
     '//sw/device/sca:aes_serial',
     '//sw/device/examples/hello_world',
-    '//sw/device/tests:aes_smoketest_prog',
+    '//sw/device/tests:aes_smoketest_sim_verilator',
 ]
 
 
@@ -182,6 +182,7 @@ def main():
         'build',
         '--features=-rv32_bitmanip',
         '--copt=-DOT_IS_ENGLISH_BREAKFAST_REDUCED_SUPPORT_FOR_INTERNAL_USE_ONLY_',
+        '--define=DISABLE_VERILATOR_BUILD=true',
     ] + BAZEL_BINARIES)
 
 

diff --git a/rules/rv.bzl b/rules/rv.bzl
@@ -21,16 +21,23 @@ PER_DEVICE_DEPS = {
 def _opentitan_transition_impl(settings, attr):
     return {
         "//command_line_option:platforms": attr.platform,
+        "//command_line_option:copt": settings["//command_line_option:copt"],
+        "//command_line_option:features": settings["//command_line_option:features"],
         "//hw/bitstream/universal:rom": "//hw/bitstream/universal:none",
         "//hw/bitstream/universal:otp": "//hw/bitstream/universal:none",
         "//hw/bitstream/universal:env": "//hw/bitstream/universal:none",
     }
 
 opentitan_transition = transition(
     implementation = _opentitan_transition_impl,
-    inputs = [],
+    inputs = [
+        "//command_line_option:copt",
+        "//command_line_option:features",
+    ],
     outputs = [
         "//command_line_option:platforms",
+        "//command_line_option:copt",
+        "//command_line_option:features",
         "//hw/bitstream/universal:rom",
         "//hw/bitstream/universal:otp",
         "//hw/bitstream/universal:env",

diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
@@ -141,13 +141,10 @@ alias(
     visibility = ["//visibility:private"],
 )
 
-# TODO(#19926): The `opentitan_test` rule doesn't propagate --copt accross all
-# dependencies, causing issues when compiling targets against
-# --copt=-DOT_IS_ENGLISH_BREAKFAST_REDUCED_SUPPORT_FOR_INTERNAL_USE_ONLY_.
-# Using `opentitan_functest` as a workaround.
-opentitan_functest(
+opentitan_test(
     name = "aes_smoketest",
     srcs = ["aes_smoketest.c"],
+    exec_env = EARLGREY_TEST_ENVS,
     deps = [
         "//hw/ip/aes:model",
         "//hw/top_earlgrey/sw/autogen:top_earlgrey",