Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into lrufixes

Browse Source
This commit is contained in:
Rose Thompson 2024-11-13 10:34:21 -06:00
commit 77d47e531f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testbench/common/loggers.sv
View File

@ -46,12 +46,13 @@ module loggers import cvw::*; #(parameter cvw_t P,
// performance counter logging // performance counter logging
logic BeginSample; logic BeginSample;
logic StartSample, EndSample; logic StartSample, EndSample;
if((PrintHPMCounters || BPRED_LOGGER) && P.ZICNTR_SUPPORTED) begin : HPMCSample if((PrintHPMCounters | BPRED_LOGGER) & P.ZICNTR_SUPPORTED) begin : HPMCSample
integer HPMCindex; integer HPMCindex;
logic StartSampleFirst; logic StartSampleFirst;
logic StartSampleDelayed, BeginDelayed; logic StartSampleDelayed, BeginDelayed;
logic EndSampleFirst; logic EndSampleFirst;
logic [P.XLEN-1:0] InitialHPMCOUNTERH[P.COUNTERS-1:0]; logic [P.XLEN-1:0] InitialHPMCOUNTERH[P.COUNTERS-1:0];
logic EndSampleDelayed;
string HPMCnames[] = '{"Mcycle", string HPMCnames[] = '{"Mcycle",
"------", "------",
@ -80,6 +81,7 @@ module loggers import cvw::*; #(parameter cvw_t P,
"Divide Cycles" "Divide Cycles"
}; };
always_comb always_comb
if (TEST == "embench") begin if (TEST == "embench") begin
StartSampleFirst = FunctionName.FunctionName.FunctionName == "start_trigger"; StartSampleFirst = FunctionName.FunctionName.FunctionName == "start_trigger";
@ -92,14 +94,13 @@ module loggers import cvw::*; #(parameter cvw_t P,
EndSampleFirst = '0; EndSampleFirst = '0;
end end
// this code needs to be with embench and coremark but not the else condition flopr #(1) EndSampleReg(clk, reset, EndSampleFirst, EndSampleDelayed);
if (TEST == "embench" | TEST == "coremark") begin always_comb
logic EndSampleDelayed; if (TEST == "embench" | TEST == "coremark") begin
flopr #(1) EndSampleReg(clk, reset, EndSampleFirst, EndSampleDelayed); EndSample = EndSampleFirst & ~ EndSampleDelayed;
assign EndSample = EndSampleFirst & ~ EndSampleDelayed; end else begin
end else begin EndSample = DCacheFlushStart & ~DCacheFlushDone;
assign EndSample = DCacheFlushStart & ~DCacheFlushDone; end
end
/* /*
if(TEST == "embench") begin if(TEST == "embench") begin