From 2a5e35369edd150926e238d4a5559631ed0cbce7 Mon Sep 17 00:00:00 2001 From: Matteo Perotti Date: Mon, 2 Sep 2024 17:28:33 +0200 Subject: [PATCH] [hardware] Fix rebase issues --- hardware/src/masku/masku.sv | 3 ++- hardware/src/masku/masku_operands.sv | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hardware/src/masku/masku.sv b/hardware/src/masku/masku.sv index f386a9c96..0af784f2e 100644 --- a/hardware/src/masku/masku.sv +++ b/hardware/src/masku/masku.sv @@ -115,7 +115,8 @@ module masku import ara_pkg::*; import rvv_pkg::*; #( // Performs all shuffling and deshuffling of mask operands (including masks for mask instructions) // Furthermore, it buffers certain operands that would create long critical paths masku_operands #( - .NrLanes ( NrLanes ) + .NrLanes ( NrLanes ), + .pe_req_t ( pe_req_t ) ) i_masku_operands ( .clk_i ( clk_i ), .rst_ni ( rst_ni ), diff --git a/hardware/src/masku/masku_operands.sv b/hardware/src/masku/masku_operands.sv index 86b5e6988..7b79d0514 100644 --- a/hardware/src/masku/masku_operands.sv +++ b/hardware/src/masku/masku_operands.sv @@ -17,7 +17,8 @@ // module masku_operands import ara_pkg::*; import rvv_pkg::*; #( - parameter int unsigned NrLanes = 0 + parameter int unsigned NrLanes = 0, + parameter type pe_req_t = logic ) ( input logic clk_i, input logic rst_ni,