Updated regression tests for redundancy

Author: Maurus Item

scripts/non-regression_test.sh

@@ -29,39 +29,28 @@ PARAMS=(
 )
 
 run_regr() {
-    local use_ecc=$1
     make golden M=$M N=$N K=$K > /dev/null
-    make all 1>/dev/null 2>&1
-    if [[ $use_ecc -eq 1 ]]; then
-        timeout $BASE_TIMEOUT make run USE_ECC=1 1>/dev/null 2>&1
-    else
-        timeout $BASE_TIMEOUT make run 1>/dev/null 2>&1
-    fi
+    make all USE_REDUNDANCY=$SW_REDUNDANCY 1>/dev/null 2>&1
+    timeout $BASE_TIMEOUT make run USE_ECC=$USE_ECC USE_REDUNDANCY=$HW_REDUNDANCY 1>/dev/null 2>&1
+
     if [[ $? -eq 124 ]]; then
-        echo "ERROR : M=$M N=$N K=$K"
+        echo "ERROR : M=$M N=$N K=$K, ECC=$USE_ECC, HW_RED=$HW_REDUNDANCY, SW_RED=${SW_REDUNDANCY}"
     else
-        echo "OK    : M=$M N=$N K=$K"
+        echo "OK    : M=$M N=$N K=$K, ECC=$USE_ECC, HW_RED=$HW_REDUNDANCY, SW_RED=${SW_REDUNDANCY}"
     fi
 }
 
-i=0
-while [[ $i -lt ${#PARAMS[@]} ]]; do
-    M=${PARAMS[$i]}
-    N=${PARAMS[$((i + 1))]}
-    K=${PARAMS[$((i + 2))]}
-    i=$((i + 3))
-
-    run_regr 0
-done
-
-# Second loop: USE_ECC=1
-echo "Running with USE_ECC=1"
-i=0
-while [[ $i -lt ${#PARAMS[@]} ]]; do
-    M=${PARAMS[$i]}
-    N=${PARAMS[$((i + 1))]}
-    K=${PARAMS[$((i + 2))]}
-    i=$((i + 3))
-
-    run_regr 1
+for SW_REDUNDANCY in 0 1; do
+    for HW_REDUNDANCY in 0 1; do
+        for USE_ECC in 0 1; do
+            i=0
+            while [[ $i -lt ${#PARAMS[@]} ]]; do
+                M=$((${PARAMS[$i]} / (1 + $SW_REDUNDANCY)))
+                N=${PARAMS[$((i + 1))]}
+                K=${PARAMS[$((i + 2))]}
+                i=$((i + 3))        
+                run_regr
+            done
+        done
+    done
 done