From 1ae7a9376cb2a0ec631eb1d634171f767327a20c Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Fri, 13 Jun 2014 03:25:52 -0700 Subject: [PATCH] Fix unhandled LLC writeback hazard --- uncore/src/main/scala/llc.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uncore/src/main/scala/llc.scala b/uncore/src/main/scala/llc.scala index 382a5f96..8da87042 100644 --- a/uncore/src/main/scala/llc.scala +++ b/uncore/src/main/scala/llc.scala @@ -438,10 +438,11 @@ class DRAMSideLLC(sets: Int, ways: Int, outstanding: Int, refill_cycles: Int, ta replay_s2_rdy := s3_rdy && !tag_we io.cpu.resp <> data.io.resp - io.cpu.req_cmd.ready := !s1_valid && !s2_valid && !replay_s2 && !tag_we io.cpu.req_data.ready := writeback.io.data(1).ready || data.io.req_data.ready io.mem.req_cmd <> memCmdArb.io.out io.mem.req_data <> writeback.io.mem.req_data + io.cpu.req_cmd.ready := !(s1_valid || s2_valid || replay_s2 || tag_we || + io.cpu.req_cmd.bits.rw && io.cpu.req_data.ready) } class HellaFlowQueue[T <: Data](val entries: Int)(data: => T) extends Module