From 0d2097be0c5f132409b2fb49035796527694d43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me?= <124148386+cathales@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:54:52 +0200
Subject: [PATCH] Fix minstret (#2471)

---
 .gitlab-ci/expected_synth.yml | 2 +-
 core/cva6.sv                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/expected_synth.yml b/.gitlab-ci/expected_synth.yml
index 1d9ac0d44d..821ccb5003 100644
--- a/.gitlab-ci/expected_synth.yml
+++ b/.gitlab-ci/expected_synth.yml
@@ -1,2 +1,2 @@
 cv32a65x:
-  gates: 171460
+  gates: 170380
diff --git a/core/cva6.sv b/core/cva6.sv
index 82ca7b7f26..419f72d892 100644
--- a/core/cva6.sv
+++ b/core/cva6.sv
@@ -1062,7 +1062,7 @@ module cva6
       .*
   );
 
-  assign commit_ack = commit_ack_commit_id & ~commit_drop_id_commit;
+  assign commit_ack = commit_macro_ack & ~commit_drop_id_commit;
 
   // ---------
   // CSR
@@ -1078,7 +1078,7 @@ module cva6
       .flush_o                 (flush_csr_ctrl),
       .halt_csr_o              (halt_csr_ctrl),
       .commit_instr_i          (commit_instr_id_commit),
-      .commit_ack_i            (commit_macro_ack),
+      .commit_ack_i            (commit_ack),
       .boot_addr_i             (boot_addr_i[CVA6Cfg.VLEN-1:0]),
       .hart_id_i               (hart_id_i[CVA6Cfg.XLEN-1:0]),
       .ex_i                    (ex_commit),
@@ -1715,7 +1715,7 @@ module cva6
 
       .lsu_ctrl_i  (rvfi_lsu_ctrl),
       .wbdata_i    (wbdata_ex_id),
-      .commit_ack_i(commit_macro_ack),
+      .commit_ack_i(commit_ack),
       .mem_paddr_i (rvfi_mem_paddr),
       .debug_mode_i(debug_mode),
       .wdata_i     (wdata_commit_id),