commit 9a188cf064a0c17ad2568124be60e7150570f320
author Srikrishna Iyer <sriyer@google.com> Sat Aug 20 09:50:37 2022 -0700
committer Srikrishna Iyer <46467186+sriyerg@users.noreply.github.com> Mon Aug 22 23:58:01 2022 -0700
tree 21d5aea80aba8dffde948176ad7be43f37ea995c
parent 5cc1df18941fb5323bc12cbbbdbcba331770d1f0

[sw] Use rv_core_ibex_testutils in tests

Signed-off-by: Srikrishna Iyer <sriyer@google.com>

sw/device/tests/BUILD

diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index e0b5921..7f58a7e 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -1452,6 +1452,7 @@
         "//sw/device/lib/dif:rv_core_ibex",
         "//sw/device/lib/runtime:log",
         "//sw/device/lib/testing:entropy_testutils",
+        "//sw/device/lib/testing:rv_core_ibex_testutils",
         "//sw/device/lib/testing/test_framework:check",
         "//sw/device/lib/testing/test_framework:ottf_main",
     ],

sw/device/tests/rv_core_ibex_rnd_test.c

diff --git a/sw/device/tests/rv_core_ibex_rnd_test.c b/sw/device/tests/rv_core_ibex_rnd_test.c
index 94e1bd0..9c06d36 100644
--- a/sw/device/tests/rv_core_ibex_rnd_test.c
+++ b/sw/device/tests/rv_core_ibex_rnd_test.c
@@ -9,6 +9,7 @@
 #include "sw/device/lib/runtime/ibex.h"
 #include "sw/device/lib/runtime/log.h"
 #include "sw/device/lib/testing/entropy_testutils.h"
+#include "sw/device/lib/testing/rv_core_ibex_testutils.h"
 #include "sw/device/lib/testing/test_framework/check.h"
 #include "sw/device/lib/testing/test_framework/ottf_main.h"
 
@@ -26,12 +27,6 @@
 #define RANDOM_DATA_READS 32
 #define MAX_STATUS_CHECKS 1024
 
-static bool get_rnd_status(const dif_rv_core_ibex_t *rv_core_ibex) {
-  dif_rv_core_ibex_rnd_status_t rnd_status;
-  CHECK_DIF_OK(dif_rv_core_ibex_get_rnd_status(rv_core_ibex, &rnd_status));
-  return rnd_status != 0;
-}
-
 bool test_main(void) {
   // Verify the functionality of the random number generation CSRs.
 
@@ -51,11 +46,9 @@
   uint32_t rnd_data;
   uint32_t previous_rnd_data = 0;
   for (int i = 0; i < RANDOM_DATA_READS; i++) {
-    IBEX_SPIN_FOR(get_rnd_status(&rv_core_ibex), MAX_STATUS_CHECKS);
-    CHECK_DIF_OK(dif_rv_core_ibex_read_rnd_data(&rv_core_ibex, &rnd_data));
+    rnd_data =
+        rv_core_ibex_testutils_get_rnd_data(&rv_core_ibex, MAX_STATUS_CHECKS);
     CHECK(rnd_data != previous_rnd_data);
-    CHECK(rnd_data != 0);
-    CHECK(rnd_data != UINT32_MAX);
     previous_rnd_data = rnd_data;
   }
 
@@ -71,7 +64,8 @@
 
   // Check to see that we can really do an RND while status is invalid before
   // and after.
-  IBEX_SPIN_FOR(get_rnd_status(&rv_core_ibex), MAX_STATUS_CHECKS);
+  IBEX_SPIN_FOR(rv_core_ibex_testutils_is_rnd_data_valid(&rv_core_ibex),
+                MAX_STATUS_CHECKS);
   uint32_t status_value =
       rv_core_ibex_check_rnd_read_possible_while_status_invalid();
   CHECK(status_value == 0);