Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved more logic inside the dcache memory.

Browse Source
This commit is contained in:
Ross Thompson 2021-08-25 13:17:07 -05:00
parent 35e57a7c61
commit 2ccf479354
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wally-pipelined/src/cache/DCacheMem.sv vendored
View File

@ -41,16 +41,20 @@ module DCacheMem #(parameter NUMLINES=512, parameter BLOCKLEN = 256, TAGLEN = 26
input logic ClearValid, input logic ClearValid,
input logic SetDirty, input logic SetDirty,
input logic ClearDirty, input logic ClearDirty,
input logic SelEvict,
input logic VictimWay,
output logic [BLOCKLEN-1:0] ReadData, output logic [BLOCKLEN-1:0] ReadDataBlockWayMaskedM,
output logic [TAGLEN-1:0] ReadTag, output logic WayHit,
output logic Valid, output logic VictimDirtyWay,
output logic Dirty, output logic [TAGLEN-1:0] VictimTagWay
output logic WayHit
); );
logic [NUMLINES-1:0] ValidBits, DirtyBits; logic [NUMLINES-1:0] ValidBits, DirtyBits;
logic [BLOCKLEN-1:0] ReadDataBlockWayM;
logic [TAGLEN-1:0] ReadTag;
logic Valid;
logic Dirty;
genvar words; genvar words;
@ -60,7 +64,7 @@ module DCacheMem #(parameter NUMLINES=512, parameter BLOCKLEN = 256, TAGLEN = 26
.WIDTH(NUMLINES)) .WIDTH(NUMLINES))
CacheDataMem(.clk(clk), CacheDataMem(.clk(clk),
.Addr(Adr), .Addr(Adr),
.ReadData(ReadData[(words+1)*`XLEN-1:words*`XLEN]), .ReadData(ReadDataBlockWayM[(words+1)*`XLEN-1:words*`XLEN]),
.WriteData(WriteData[(words+1)*`XLEN-1:words*`XLEN]), .WriteData(WriteData[(words+1)*`XLEN-1:words*`XLEN]),
.WriteEnable(WriteEnable & WriteWordEnable[words])); .WriteEnable(WriteEnable & WriteWordEnable[words]));
end end
@ -75,8 +79,11 @@ module DCacheMem #(parameter NUMLINES=512, parameter BLOCKLEN = 256, TAGLEN = 26
.WriteEnable(TagWriteEnable)); .WriteEnable(TagWriteEnable));
assign WayHit = Valid & (ReadTag == MemPAdrM[`PA_BITS-1:OFFSETLEN+INDEXLEN]); assign WayHit = Valid & (ReadTag == MemPAdrM[`PA_BITS-1:OFFSETLEN+INDEXLEN]);
assign SelectedWay = SelEvict ? VictimWay : WayHit;
assign ReadDataBlockWayMaskedM = SelectedWay ? ReadDataBlockWayM : '0; // first part of AO mux.
assign VictimDirtyWay = VictimWay & Dirty & Valid;
assign VictimTagWay = VictimWay ? ReadTag : '0;
always_ff @(posedge clk, posedge reset) begin always_ff @(posedge clk, posedge reset) begin
if (reset) if (reset)

21
wally-pipelined/src/cache/dcache.sv vendored
View File

@ -95,17 +95,14 @@ module dcache
logic [BLOCKLEN-1:0] DCacheMemWriteData; logic [BLOCKLEN-1:0] DCacheMemWriteData;
logic SetValidM, ClearValidM; logic SetValidM, ClearValidM;
logic SetDirtyM, ClearDirtyM; logic SetDirtyM, ClearDirtyM;
logic [BLOCKLEN-1:0] ReadDataBlockWayM [NUMWAYS-1:0];
logic [BLOCKLEN-1:0] ReadDataBlockWayMaskedM [NUMWAYS-1:0]; logic [BLOCKLEN-1:0] ReadDataBlockWayMaskedM [NUMWAYS-1:0];
logic [TAGLEN-1:0] ReadTag [NUMWAYS-1:0]; logic [NUMWAYS-1:0] WayHit;
logic [NUMWAYS-1:0] Valid, Dirty, WayHit, SelectedWay;
logic CacheHit; logic CacheHit;
logic [NUMWAYS-2:0] ReplacementBits [NUMLINES-1:0]; logic [NUMWAYS-2:0] ReplacementBits [NUMLINES-1:0];
logic [NUMWAYS-2:0] BlockReplacementBits; logic [NUMWAYS-2:0] BlockReplacementBits;
logic [NUMWAYS-2:0] NewReplacement; logic [NUMWAYS-2:0] NewReplacement;
logic [BLOCKLEN-1:0] ReadDataBlockM; logic [BLOCKLEN-1:0] ReadDataBlockM;
logic [`XLEN-1:0] ReadDataBlockSetsM [(WORDSPERLINE)-1:0]; logic [`XLEN-1:0] ReadDataBlockSetsM [(WORDSPERLINE)-1:0];
logic [`XLEN-1:0] VictimReadDataBlockSetsM [(WORDSPERLINE)-1:0];
logic [`XLEN-1:0] ReadDataWordM, ReadDataWordMuxM; logic [`XLEN-1:0] ReadDataWordM, ReadDataWordMuxM;
logic [`XLEN-1:0] FinalWriteDataM, FinalAMOWriteDataM; logic [`XLEN-1:0] FinalWriteDataM, FinalAMOWriteDataM;
logic [BLOCKLEN-1:0] FinalWriteDataWordsM; logic [BLOCKLEN-1:0] FinalWriteDataWordsM;
@ -223,17 +220,15 @@ module dcache
.ClearValid(ClearValidM), .ClearValid(ClearValidM),
.SetDirty(SetDirtyM), .SetDirty(SetDirtyM),
.ClearDirty(ClearDirtyM), .ClearDirty(ClearDirtyM),
.ReadData(ReadDataBlockWayM[way]), .SelEvict,
.ReadTag(ReadTag[way]), .VictimWay(VictimWay[way]),
.Valid(Valid[way]), .ReadDataBlockWayMaskedM(ReadDataBlockWayMaskedM[way]),
.Dirty(Dirty[way]), .WayHit(WayHit[way]),
.WayHit(WayHit[way])); .VictimDirtyWay(VictimDirtyWay[way]),
assign SelectedWay[way] = SelEvict ? VictimWay[way] : WayHit[way]; .VictimTagWay(VictimTagWay[way]));
assign ReadDataBlockWayMaskedM[way] = SelectedWay[way] ? ReadDataBlockWayM[way] : '0; // first part of AO mux.
// the cache block candiate for eviction // the cache block candiate for eviction
assign VictimDirtyWay[way] = VictimWay[way] & Dirty[way] & Valid[way];
assign VictimTagWay[way] = VictimWay[way] ? ReadTag[way] : '0;
end end
endgenerate endgenerate