Merge branch 'main' into user/dev/michnorris/abr_promote_regress

chipsalliance · Oct 23, 2024 · d8b2f74 · d8b2f74
2 parents 2b9153e + 194af97
commit d8b2f74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/decompose/rtl/decompose.sv b/src/decompose/rtl/decompose.sv
@@ -32,6 +32,8 @@
 // 2. r1 --> pass to sample inball/hash interface
 // 3. z_neq_z -->  store in a buffer that is ready by makehint simultaneously when it reads main mem
 
+`include "abr_prim_assert.sv"
+
 module decompose 
     import mldsa_params_pkg::*;
     import decompose_defines_pkg::*;
@@ -245,4 +247,9 @@ module decompose
         .w1_encode_done(w1_encode_done)
     );
 
+
+    `ABR_ASSERT_MUTEX(ASSERT_R0_CORNER_MUTEX, {r_corner[0], r1[0]}, clk, reset_n)
+    `ABR_ASSERT_MUTEX(ASSERT_R1_CORNER_MUTEX, {r_corner[1], r1[1]}, clk, reset_n)
+    `ABR_ASSERT_MUTEX(ASSERT_R2_CORNER_MUTEX, {r_corner[2], r1[2]}, clk, reset_n)
+    `ABR_ASSERT_MUTEX(ASSERT_R3_CORNER_MUTEX, {r_corner[3], r1[3]}, clk, reset_n)
 endmodule
diff --git a/src/decompose/rtl/decompose_r1_lut.sv b/src/decompose/rtl/decompose_r1_lut.sv
@@ -33,6 +33,7 @@ module decompose_r1_lut
     );
 
     always_comb begin
+        r_corner = 'b0;
         if      (r <=   MLDSA_GAMMA2)  r1 = 'd0;
         else if (r <= 3*MLDSA_GAMMA2)  r1 = 'd1;
         else if (r <= 5*MLDSA_GAMMA2)  r1 = 'd2;
@@ -49,14 +50,13 @@ module decompose_r1_lut
         else if (r <= 27*MLDSA_GAMMA2) r1 = 'd13;
         else if (r <= 29*MLDSA_GAMMA2) r1 = 'd14;
         else if (r <= 31*MLDSA_GAMMA2) r1 = 'd15;
-        else                     r1 = 'd0;
+        else 
+            begin                     
+                r1 = 'd0;
+                r_corner = 'b1;
+            end
     end
 
     always_comb z_nez = (r1 != 'h0);
 
-    always_comb begin
-        if (r >= 31*MLDSA_GAMMA2) r_corner = 'b1;
-        else r_corner = 'b0;
-    end
-
 endmodule