Synthesizable rvvi tracer output G/FPRs.

This commit is contained in:
Rose Thompson 2024-01-23 16:27:50 -06:00
parent cacbcb6fcf
commit 0babb011c2

View File

@ -36,13 +36,20 @@ module rvvisynth import cvw::*; #(parameter cvw_t P,
output logic [12+MAX_CSR*(P.XLEN+12)-1:0] CSRs
);
logic [P.XLEN-1:0] PCM, PCW;
// pipeline controlls
logic StallW, FlushW;
// required
logic [P.XLEN-1:0] PCM, PCW;
logic InstrValidM, InstrValidW;
logic [31:0] InstrRawD, InstrRawE, InstrRawM, InstrRawW;
logic [63:0] Mcycle, Minstret;
logic TrapM, TrapW;
logic [1:0] PrivilegeModeW;
// registers gpr and fpr
logic GPRWen, FPRWen;
logic [4:0] GPRAddr, FPRAddr;
logic [P.XLEN-1:0] GPRValue, FPRValue;
logic [P.XLEN-1:0] XLENZeros;
// get signals from the core.
assign StallW = testbench.dut.core.StallW;
@ -54,6 +61,16 @@ module rvvisynth import cvw::*; #(parameter cvw_t P,
assign Minstret = testbench.dut.core.priv.priv.csr.counters.counters.HPMCOUNTER_REGW[2];
assign TrapM = testbench.dut.core.TrapM;
assign PrivilegeModeW = testbench.dut.core.priv.priv.privmode.PrivilegeModeW;
assign GPRAddr = testbench.dut.core.ieu.dp.regf.a3;
assign GPRWen = testbench.dut.core.ieu.dp.regf.we3;
assign GPRValue = testbench.dut.core.ieu.dp.regf.wd3;
assign FPRAddr = testbench.dut.core.fpu.fpu.fregfile.a4;
assign FPRWen = testbench.dut.core.fpu.fpu.fregfile.we4;
assign FPRValue = testbench.dut.core.fpu.fpu.fregfile.wd4;
//
assign XLENZeros = '0;
// start out easy and just populate Required
// PC, inst, mcycle, minstret, trap, mode
@ -67,6 +84,10 @@ module rvvisynth import cvw::*; #(parameter cvw_t P,
assign valid = InstrValidW & ~StallW;
assign Required = {PrivilegeModeW, TrapW, Minstret, Mcycle, InstrRawW, PCW};
assign Registers = {FPRWen, GPRWen} == 2'b11 ? {FPRValue, FPRAddr, GPRValue, GPRAddr, FPRWen, GPRWen} :
{FPRWen, GPRWen} == 2'b01 ? {XLENZeros, 5'b0, GPRValue, GPRAddr, FPRWen, GPRWen} :
{FPRWen, GPRWen} == 2'b10 ? {FPRValue, FPRAddr, XLENZeros, 5'b0, FPRWen, GPRWen} :
{XLENZeros, 5'b0, XLENZeros, 5'b0, FPRWen, GPRWen};
endmodule