Changes to make the X_if addition compatible with the golden version of the core, minus the rf_we line (#289)

Author: cairo-caplan

rtl/cve2_decoder.sv

@@ -660,6 +660,7 @@ module cve2_decoder #(
     // insufficient privileges), or when accessing non-available registers in RV32E,
     // these cases are not handled here
     if (illegal_insn) begin
+      // rf_we           = 1'b0;
       data_req_o      = 1'b0;
       data_we_o       = 1'b0;
       jump_in_dec_o   = 1'b0;

rtl/cve2_id_stage.sv

@@ -418,12 +418,19 @@ module cve2_id_stage #(
 
   // Register file write data mux
   always_comb begin : rf_wdata_id_mux
-    unique case (rf_wdata_sel)
-      RF_WD_EX:     rf_wdata_id_o   = result_ex_i;
-      RF_WD_CSR:    rf_wdata_id_o   = csr_rdata_i;
-      RF_WD_COPROC: rf_wdata_id_o   = x_result_i.data;
-      default:      rf_wdata_id_o   = result_ex_i;
-    endcase
+    if (XInterface)
+      unique case (rf_wdata_sel)
+        RF_WD_EX:     rf_wdata_id_o   = result_ex_i;
+        RF_WD_CSR:    rf_wdata_id_o   = csr_rdata_i;
+        RF_WD_COPROC: rf_wdata_id_o   = x_result_i.data;
+        default:      rf_wdata_id_o   = result_ex_i;
+      endcase
+    else
+      unique case (rf_wdata_sel)
+        RF_WD_EX:     rf_wdata_id_o   = result_ex_i;
+        RF_WD_CSR:    rf_wdata_id_o   = csr_rdata_i;
+        default:      rf_wdata_id_o   = result_ex_i;
+      endcase
   end
 
   /////////////
@@ -711,7 +718,6 @@ module cve2_id_stage #(
     stall_branch            = 1'b0;
     stall_alu               = 1'b0;
     stall_coproc            = 1'b0;
-    stall_coproc            = 1'b0;
     branch_set_raw_d        = 1'b0;
     jump_set_raw            = 1'b0;
     perf_branch_o           = 1'b0;
@@ -800,7 +806,7 @@ module cve2_id_stage #(
             stall_multdiv   = multdiv_en_dec;
             stall_branch    = branch_in_dec;
             stall_jump      = jump_in_dec;
-            stall_coproc    = illegal_insn_dec;
+            stall_coproc    = XInterface & illegal_insn_dec;
           end
         end
 

scripts/sec/sec.sh

@@ -100,13 +100,21 @@ elif [[ "${target_tool}" == "mentor" ]]; then
 
 elif [[ "${target_tool}" == "yosys" ]]; then
     echo "Using Yosys EQY"
-    eqy -f yosys/sec.eqy -j $(($(nproc)/2)) -d ${report_dir} &> ${report_dir}/output.yosys.log
+
+    if ! [ -x "$(command -v eqy)" ]; then
+        echo "Yosys EQY (eqy) could not be found"
+        exit 1
+    fi
+
+    eqy -f yosys/sec.eqy -j $(($(nproc)/2)) -d ${report_dir} &> /dev/null
+    mv ${report_dir}/logfile.txt ${report_dir}/output.yosys.log
     rm yosys/golden_io.txt
 
     if [ -f "${report_dir}/PASS" ]; then 
         RESULT=0
     elif [ -f "${report_dir}/FAIL" ]; then 
         RESULT=1
+        echo "Check ${report_dir}/output.yosys.log"
     else
         echo "Failed to run Yosys EQY"
         exit 1