riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

nack CPU requests during any replay

Browse Source
This commit is contained in:
Andrew Waterman 2012-02-21 18:52:18 -08:00
parent 62837537f4
commit 3eebf40310
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rocket/src/main/scala/nbdcache.scala
View File

@ -854,9 +854,10 @@ class HellaCacheUniproc extends HellaCache with ThreeStateIncoherence {
data_arb.io.in(2).valid := drain_store_val data_arb.io.in(2).valid := drain_store_val
data_arb.io.in(2).bits.way_en := p_store_way_oh data_arb.io.in(2).bits.way_en := p_store_way_oh
val drain_store = drain_store_val && data_arb.io.in(2).ready val drain_store = drain_store_val && data_arb.io.in(2).ready
val p_store_rdy = !p_store_valid || drain_store val p_amo = Reg(resetVal = Bool(false))
val p_amo = Reg(tag_hit && r_req_amo && p_store_rdy && !p_store_match || r_replay_amo, resetVal = Bool(false)) val p_store_rdy = !(p_store_valid && !drain_store) && !(replayer.io.data_req.valid || r_replay_amo || p_amo)
p_store_valid := !p_store_rdy || (tag_hit && r_req_store) || p_amo p_amo := tag_hit && r_req_amo && p_store_rdy && !p_store_match || r_replay_amo
p_store_valid := p_store_valid && !drain_store || (tag_hit && r_req_store && p_store_rdy) || p_amo
// writeback // writeback
val wb_rdy = wb_arb.io.in(1).ready && !p_store_idx_match val wb_rdy = wb_arb.io.in(1).ready && !p_store_idx_match
@ -913,7 +914,7 @@ class HellaCacheUniproc extends HellaCache with ThreeStateIncoherence {
// replays // replays
val replay = replayer.io.data_req.bits val replay = replayer.io.data_req.bits
val stall_replay = r_cpu_req_val_ && r_req_store || r_replay_amo || p_amo || p_store_valid val stall_replay = r_replay_amo || p_amo || p_store_valid
val replay_val = replayer.io.data_req.valid && !stall_replay val replay_val = replayer.io.data_req.valid && !stall_replay
val replay_rdy = data_arb.io.in(1).ready val replay_rdy = data_arb.io.in(1).ready
data_arb.io.in(1).bits.inner_req.offset := replay.offset(offsetmsb,ramindexlsb) data_arb.io.in(1).bits.inner_req.offset := replay.offset(offsetmsb,ramindexlsb)