[sw,otbn] Re-enable secAdd for OTBN smoke test

Signed-off-by: Hakim Filali <hfilali@lowrisc.org>

Author: h-filali

hw/ip/otbn/dv/smoke/smoke_expected.txt

@@ -35,7 +35,7 @@ x26 | 0x00000016
 x27 | 0x0000001a
 x28 | 0x00400000
 x29 | 0x00018000
-x30 | 0x53bcb7d3
+x30 | 0x9ccf1600
 x31 | 0x00000804
 
 Final Bignum Register Values:
@@ -71,5 +71,5 @@ w26 | 0x78fccc06_2228e9d6_89c9b54f_887cf1ee_efbafabd_f9bfd9ee_baeebbbb_dbff9bfa
 w27 | 0x28a88802_00088990_8888a00a_88189108_828aa820_09981808_8822aa2a_11109898
 w28 | 0xd25666ac_bbb1704f_23631fe5_11e568d7_6d30528f_f027c1f7_32cc1191_caef0343
 w29 | 0x4f0d4b81_9f24f0c1_64341d3c_26628bdb_5763bcdf_63388709_e0654fef_eb0953c2
-w30 | 0x2167f87d_e9ee7ac7_ffa3d88b_ab123192_aee49292_4efa2ec9_b55098e0_68ba2fa1
-w31 | 0x37adadae_f9dbff5e_73880075_5466a52c_67a8c221_6978ad1b_25769434_0f09b7c8
+w30 | 0x0fa66f64_739babfd_463a6559_44ad0257_98ef0ef8_84628bf7_edbbd1d6_8b78539b
+w31 | 0x00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000

hw/ip/otbn/dv/smoke/smoke_test.s

@@ -372,17 +372,24 @@ bn.wsrr w13, MAI_IN0_S1
 bn.wsrr w14, MAI_IN1_S0
 bn.wsrr w15, MAI_IN1_S1
 
-# TODO: uncomment the code below once the OTBNsim model of MAI is aligned with the RTL implementation.
 # Execute SecAdd on MAI
-# li x30, 0x2f
-# csrrw x0, MAI_CTRL, x30
+li x30, 0x2f
+csrrw x0, MAI_CTRL, x30
 
 # Poll for completion of MAI execution
-# jal x1, mai_poll_busy
+jal x1, mai_poll_busy
 
 # Read back results from MAI
-# bn.wsrr w30, MAI_RES_S0
-# bn.wsrr w31, MAI_RES_S1
+bn.wsrr w30, MAI_RES_S0
+bn.wsrr w31, MAI_RES_S1
+# SecAdd result: in0[k] = w12[k] ^ w13[k], in1[k] = w14[k] ^ w15[k],
+# w30[k] = in0[k] + in1[k] mod 2^32 for each 32-bit coefficient k.
+# in0 = 0x8d09995b_664e0f38_de9ee010_e8d217a0_98ef0d70_8f12b880_edbbce4e_b598fc3d
+# in1 = 0x829cd609_0d4d9cc5_679b8549_5bdaeab7_00000188_f54fd377_00000388_d5df575e
+# w30 = in0 + in1 mod 2^32 per lane = 0x0fa66f64_739babfd_463a6559_44ad0257_98ef0ef8_84628bf7_edbbd1d6_8b78539b
+bn.xor w30, w30, w31
+# w31 = 0x00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000
+bn.xor w31, w31, w31
 
 # Read from URND in the OTBN Verilator smoke test and 0x0 when running on the FPGA or chip-level test
 .ifnotdef deterministic

sw/device/tests/otbn_isa_test.c

@@ -31,7 +31,7 @@ static const otbn_addr_t kWdrState = OTBN_ADDR_T_INIT(smoke_test, wdr_state);
 enum {
   kNumExpectedGprs = 30,
   kNumExpectedWdrs = 32,
-  kExpectedInstrCount = 299,
+  kExpectedInstrCount = 322,
 };
 
 // The expected values of the GPRs and WDRs are taken from
@@ -104,10 +104,10 @@ static const uint32_t kExpectedWdrs[kNumExpectedWdrs][8] = {
             0x23631fe5, 0xbbb1704f, 0xd25666ac},
     [29] = {0xeb0953c2, 0xe0654fef, 0x63388709, 0x5763bcdf, 0x26628bdb,
             0x64341d3c, 0x9f24f0c1, 0x4f0d4b81},
-    [30] = {0x68ba2fa1, 0xb55098e0, 0x4efa2ec9, 0xaee49292, 0xab123192,
-            0xffa3d88b, 0xe9ee7ac7, 0x2167f87d},
-    [31] = {0x0f09b7c8, 0x25769434, 0x6978ad1b, 0x67a8c221, 0x5466a52c,
-            0x73880075, 0xf9dbff5e, 0x37adadae},
+    [30] = {0x8b78539b, 0xedbbd1d6, 0x84628bf7, 0x98ef0ef8, 0x44ad0257,
+            0x463a6559, 0x739babfd, 0x0fa66f64},
+    [31] = {0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+            0x00000000, 0x00000000, 0x00000000},
 };
 
 bool test_main(void) {