commit 53505027fd480ad8ff998200771ae89b0229b2ef
author kunb <kunb@google.com> Fri Oct 20 14:18:19 2023 -0700
committer kunb <kunb@google.com> Mon Oct 23 11:24:32 2023 -0700
tree 4d60ca0d70a1e41752116cce14c94b82dd9da51e
parent 4b2ce5798cb88bbdb408f1e30cd80902e236731d

Add aes tests to edacloud

Change-Id: I0b188e299a3ed1512d5a7076310342ac5a4d4eda

hw/top_matcha/dv/chip_sim_cfg.hjson

diff --git a/hw/top_matcha/dv/chip_sim_cfg.hjson b/hw/top_matcha/dv/chip_sim_cfg.hjson
index 270ee39..74ec047 100644
--- a/hw/top_matcha/dv/chip_sim_cfg.hjson
+++ b/hw/top_matcha/dv/chip_sim_cfg.hjson
@@ -1293,28 +1293,28 @@
     {
       name: chip_sw_aes_enc
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aes_smoketest:1"]
+      sw_images: ["//sw/device/tests:aes_smoketest:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=22_000_000"]
     }
     {
       name: chip_sw_aes_enc_jitter_en
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aes_smoketest:1"]
+      sw_images: ["//sw/device/tests:aes_smoketest:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=26_000_000", "+en_jitter=1"]
     }
     {
       name: chip_sw_aes_idle
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:aes_idle_test:1"]
+      sw_images: ["//sw/device/tests:aes_idle_test:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
       run_opts: ["+sw_test_timeout_ns=25_000_000"]
     }
     {
       name: chip_sw_aes_masking_off
       uvm_test_seq: chip_sw_aes_masking_off_vseq
-      sw_images: ["//sw/device/tests:aes_masking_off_test:1"]
+      sw_images: ["//sw/device/tests:aes_masking_off_test:1:matcha"]
       en_run_modes: ["sw_test_mode_test_rom"]
     }
     {
@@ -2055,6 +2055,7 @@
     {
       name: edacloud
       tests: [
+        "chip_sw_aes_enc",
         "chip_sw_alert_test",
         "chip_sw_aon_timer_smoketest",
         "chip_sw_atomics_test",
@@ -2112,6 +2113,10 @@
         "chip_plic_all_irqs",
         "chip_rv_dm_lc_disabled",
         "chip_rv_dm_ndm_reset_req",
+        "chip_sw_aes_enc",
+        "chip_sw_aes_enc_jitter_en",
+        "chip_sw_aes_idle",
+        "chip_sw_aes_masking_off",
         "chip_sw_aes_smoketest",
         "chip_sw_alert_handler_escalation",
         "chip_sw_alert_handler_ping_timeout",
@@ -2238,6 +2243,10 @@
         "chip_plic_all_irqs",
         "chip_rv_dm_lc_disabled",
         "chip_rv_dm_ndm_reset_req",
+        "chip_sw_aes_enc",
+        "chip_sw_aes_enc_jitter_en",
+        "chip_sw_aes_idle",
+        "chip_sw_aes_masking_off",
         "chip_sw_aes_smoketest",
         "chip_sw_alert_handler_escalation",
         "chip_sw_alert_handler_ping_timeout",

sw/device/tests/BUILD

diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index 0ca35ef..030acc6 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -1259,6 +1259,31 @@
     ],
 )
 
+matcha_dv_test(
+    name = "aes_idle_test",
+    srcs = ["@lowrisc_opentitan//sw/device/tests:aes_idle_test.c"],
+    deps = [
+        ":test_dv_lib_opentitan",
+        "//sw/device/lib/dif:clkmgr",
+        "//sw/device/lib/testing:clkmgr_testutils",
+        "@lowrisc_opentitan//hw/ip/aes:model",
+        "@lowrisc_opentitan//sw/device/lib/dif:aes",
+        "@lowrisc_opentitan//sw/device/lib/testing:aes_testutils",
+        "@lowrisc_opentitan//sw/device/lib/testing:entropy_testutils",
+    ],
+)
+
+matcha_dv_test(
+    name = "aes_masking_off_test",
+    srcs = ["@lowrisc_opentitan//sw/device/tests:aes_masking_off_test.c"],
+    deps = [
+        ":test_dv_lib_opentitan",
+        "@lowrisc_opentitan//hw/ip/aes:model",
+        "@lowrisc_opentitan//sw/device/lib/dif:aes",
+        "@lowrisc_opentitan//sw/device/lib/testing:aes_testutils",
+    ],
+)
+
 # Smoke tests
 matcha_dv_test(
     name = "aes_smoketest",