Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

re-integrated TagController

Browse Source
This commit is contained in:
Franz Fuchs
2021-09-24 11:39:23 +01:00
parent 4cfac08bca
commit db9b5c7f54
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/RISCV_HPM_Events

Submodule libs/RISCV_HPM_Events updated: bf5107c39c...9e345b27e8

2
libs/TagController

Submodule libs/TagController updated: 7c9ac94d1d...99c43e8138

8
src_Core/CPU/Core.bsv
View File

@@ -212,7 +212,7 @@ interface Core;
`ifdef PERFORMANCE_MONITORING
method Action events_llc(EventsLL events);
method Action events_tgc(EventsCacheCore events);
method Action events_tgc(EventsTGC events);
`endif
endinterface
@@ -1150,7 +1150,7 @@ module mkCore#(CoreId coreId)(Core);
// different fields than the TLB, which makes it safe to combine them
Reg#(EventsLL) events_llc_reg <- mkRegU;
Reg#(EventsCacheCore) events_tgc_reg <- mkRegU;
Reg#(EventsTGC) events_tgc_reg <- mkRegU;
rule report_events;
EventsCore events = unpack(pack(commitStage.events));
events.evt_REDIRECT = zeroExtend(pack(fetchStage.redirect_evt));
@@ -1160,7 +1160,7 @@ module mkCore#(CoreId coreId)(Core);
EventsCore core_evts = unpack(pack(coreFix.memExeIfc.events) | pack(hpm_core_events[0]));
EventsL1I imem_evts = unpack(pack(iMem.events) | pack(iTlb.events));
EventsL1D dmem_evts = unpack(pack(dMem.events) | pack(dTlb.events));
EventsCacheCore tgc_evts = events_tgc_reg;
EventsTGC tgc_evts = events_tgc_reg;
EventsLL llmem_evts = unpack(pack(events_llc_reg) | pack(l2Tlb.events));
Maybe#(EventsTransExe) mab_trans_exe = tagged Invalid;
@@ -1182,7 +1182,7 @@ module mkCore#(CoreId coreId)(Core);
let ev_struct = HPMEvents{mab_EventsCore: tagged Valid core_evts, mab_EventsL1I: tagged Valid imem_evts,
mab_EventsL1D: tagged Valid dmem_evts, mab_EventsLL: tagged Valid llmem_evts,
mab_EventsCacheCore: tagged Valid tgc_evts, mab_EventsTransExe: mab_trans_exe,
mab_EventsTGC: tagged Valid tgc_evts, mab_EventsTransExe: mab_trans_exe,
mab_AXI4_Slave_Events: tagged Invalid, mab_AXI4_Master_Events: tagged Invalid};
let events = generateHPMVector(ev_struct);

2
src_Core/CPU/Proc.bsv
View File

@@ -179,7 +179,7 @@ module mkProc (Proc_IFC);
endrule
`ifdef PERFORMANCE_MONITORING
Reg#(EventsCacheCore) events_tgc_reg <- mkRegU;
Reg#(EventsTGC) events_tgc_reg <- mkRegU;
rule broadcastPerfEvents;
for(Integer j = 0; j < valueof(CoreNum); j = j+1) begin
core[j].events_llc(llc.events);

2
src_Core/CPU/Proc_IFC.bsv
View File

@@ -130,7 +130,7 @@ interface Proc_IFC;
`endif
`ifdef PERFORMANCE_MONITORING
method Action events_tgc(EventsCacheCore events);
method Action events_tgc(EventsTGC events);
`endif
endinterface

13
src_Core/Core/CoreW.bsv
View File

@@ -60,6 +60,7 @@ import GetPut_Aux :: *;
import Routable :: *;
import AXI4 :: *;
import TagControllerAXI :: *;
import CacheCore :: *;
// ================================================================
// Project imports
@@ -178,7 +179,17 @@ module mkCoreW #(Reset dm_power_on_reset)
mkConnection(proc.master0, tagController.slave, reset_by all_harts_reset);
`ifdef PERFORMANCE_MONITORING
rule report_tagController_events;
EventsCacheCore evts = tagController.events;
EventsCacheCore cache_core_evts = tagController.events;
EventsTGC evts = unpack(0);
evts.evt_WRITE = zeroExtend(pack(cache_core_evts.evt_WRITE));
evts.evt_WRITE_MISS = zeroExtend(pack(cache_core_evts.evt_WRITE_MISS));
evts.evt_READ = zeroExtend(pack(cache_core_evts.evt_READ));
evts.evt_READ_MISS = zeroExtend(pack(cache_core_evts.evt_READ_MISS));
evts.evt_EVICT = zeroExtend(pack(cache_core_evts.evt_EVICT));
`ifdef USECAP
evts.evt_SET_TAG_WRITE = zeroExtend(pack(cache_core_evts.evt_SET_TAG_WRITE));
evts.evt_SET_TAG_READ = zeroExtend(pack(cache_core_evts.evt_SET_TAG_READ));
`endif
proc.events_tgc(evts);
endrule
`endif