From b2dc4752e1511488cc5fac2b1a0c9007428d2186 Mon Sep 17 00:00:00 2001 From: Guillaume Chauvon <94678394+Gchauvon@users.noreply.github.com> Date: Thu, 30 Jun 2022 11:56:35 +0200 Subject: [PATCH] Enable CVXIF for target cv32a60X and add renaming for cvxif when using 3 operands (#925) * re_name.sv: add condition related to CVXIF to rename 3rd operand * cv32a60x_pkg.sv: set CVXIFEn to 1 --- core/include/cv32a60x_config_pkg.sv | 2 +- core/re_name.sv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/include/cv32a60x_config_pkg.sv b/core/include/cv32a60x_config_pkg.sv index 8038675a00..a9b2cb5efc 100644 --- a/core/include/cv32a60x_config_pkg.sv +++ b/core/include/cv32a60x_config_pkg.sv @@ -18,7 +18,7 @@ package cva6_config_pkg; localparam CVA6ConfigF8En = 0; localparam CVA6ConfigFVecEn = 0; - localparam CVA6ConfigCvxifEn = 0; + localparam CVA6ConfigCvxifEn = 1; localparam CVA6ConfigCExtEn = 1; localparam CVA6ConfigAExtEn = 0; diff --git a/core/re_name.sv b/core/re_name.sv index 9e776603a2..eb0c336295 100644 --- a/core/re_name.sv +++ b/core/re_name.sv @@ -69,7 +69,7 @@ module re_name import ariane_pkg::*; ( issue_instr_o.rs2 = { ENABLE_RENAME & name_bit_rs2, issue_instr_i.rs2[4:0] }; // re-name the third operand in imm if it's actually an operand - if (is_imm_fpr(issue_instr_i.op)) begin + if (is_imm_fpr(issue_instr_i.op) || (issue_instr_i.op == OFFLOAD && ariane_pkg::NR_RGPR_PORTS == 3)) begin issue_instr_o.result = { ENABLE_RENAME & name_bit_rs3, issue_instr_i.result[4:0]}; end // re-name the destination register