Add back i2s_tx and atomics tests

Change-Id: Id2ee09fccc8afca873be543665c9973e8b8dbb72

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 72ab72b..0f25c26 100644
--- a/hw/top_matcha/dv/chip_sim_cfg.hjson
+++ b/hw/top_matcha/dv/chip_sim_cfg.hjson
@@ -510,8 +510,8 @@
     {
       name: chip_sw_atomics_test
       uvm_test_seq: chip_sw_base_vseq
-      sw_images: ["//sw/device/tests:atomics_test:1:ot_flash_binary:matcha"]
-      en_run_modes: ["sw_test_mode_test_rom"]
+      sw_images: ["//sw/device/tests/smc:smc_atomics_test:6:matcha"]
+      en_run_modes: ["sw_test_mode_test_simple_sec"]
       run_opts:["+sw_test_timeout_ns=40_000_000"]
     }
     {
@@ -560,7 +560,7 @@
       name: chip_sw_smc_i2s_tx_test
       uvm_test_seq: chip_sw_base_vseq
       sw_images: ["//sw/device/tests/smc:smc_i2s_tx_test:6:matcha"]
-      en_run_modes: ["sw_test_mode_test_rom"]
+      en_run_modes: ["sw_test_mode_test_simple_sec"]
       run_opts:["+sw_test_timeout_ns=40_000_000"]
     }
     {
@@ -2013,6 +2013,7 @@
       tests: [
         "chip_sw_alert_test",
         "chip_sw_aon_timer_smoketest",
+        "chip_sw_atomics_test",
         "chip_sw_cam_ctrl_test",
         "chip_sw_clkmgr_smoketest",
         "chip_sw_crt_test",
@@ -2033,6 +2034,7 @@
         "chip_sw_smc_ctrl_test",
         "chip_sw_smc_env_test",
         "chip_sw_smc_i2s_rx_test",
+        "chip_sw_smc_i2s_tx_test",
         "chip_sw_smc_interrupt_boundary_test",
         "chip_sw_smc_isp_wrapper_irq_test",
         "chip_sw_smc_isp_wrapper_test",
@@ -2065,6 +2067,7 @@
         "chip_sw_alert_test",
         "chip_sw_aon_timer_smoketest",
         "chip_sw_ast_clk_rst_inputs",
+        "chip_sw_atomics_test",
         "chip_sw_cam_ctrl_test",
         "chip_sw_clkmgr_off_peri",
         "chip_sw_clkmgr_smoketest",
@@ -2108,6 +2111,7 @@
         "chip_sw_smc_ctrl_test",
         "chip_sw_smc_env_test",
         "chip_sw_smc_i2s_rx_test",
+        "chip_sw_smc_i2s_tx_test",
         "chip_sw_smc_interrupt_boundary_test",
         "chip_sw_smc_isp_wrapper_irq_test",
         "chip_sw_smc_isp_wrapper_test",

sw/device/tests/smc/BUILD

diff --git a/sw/device/tests/smc/BUILD b/sw/device/tests/smc/BUILD
index ede3404..66f08d0 100644
--- a/sw/device/tests/smc/BUILD
+++ b/sw/device/tests/smc/BUILD
@@ -347,8 +347,8 @@
     ],
     deps = [
         "//sw/device/lib/dif:i2s",
+        "//sw/device/lib/dif:rv_plic_smc",
         "//sw/device/tests:test_lib_smc",
-        "@lowrisc_opentitan//sw/device/lib/dif:rv_plic",
         "@lowrisc_opentitan//sw/device/lib/runtime:irq",
     ],
 )
@@ -365,8 +365,8 @@
     ],
     deps = [
         "//sw/device/lib/dif:i2s",
+        "//sw/device/lib/dif:rv_plic_smc",
         "//sw/device/tests:test_lib_smc",
-        "@lowrisc_opentitan//sw/device/lib/dif:rv_plic",
         "@lowrisc_opentitan//sw/device/lib/runtime:irq",
     ],
 )

sw/device/tests/smc/smc_i2s_tx_test.c

diff --git a/sw/device/tests/smc/smc_i2s_tx_test.c b/sw/device/tests/smc/smc_i2s_tx_test.c
index 7f14988..efd556c 100644
--- a/sw/device/tests/smc/smc_i2s_tx_test.c
+++ b/sw/device/tests/smc/smc_i2s_tx_test.c
@@ -125,7 +125,7 @@
                                    48);  // divide by 96
   mmio_region_write32(i2s.base_addr, I2S_CTRL_REG_OFFSET, reg_val);
 
-  uint32_t samples_to_tx = kDeviceType == kDeviceSimVerilator
+  uint32_t samples_to_tx = kDeviceType == kDeviceSimVerilator || kDeviceType == kDeviceSimDV
                                ? 6
                                : (i2s_440hz_audio_tx_len / sizeof(uint32_t));
   while (tx_audio_count < samples_to_tx) {