From 0b7c828b5d5ec5c8395ae7e81836cb194e72ed9b Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Wed, 21 Oct 2015 09:15:51 -0700 Subject: [PATCH] go back to using standard LockingArbiter --- rocket/src/main/scala/nbdcache.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocket/src/main/scala/nbdcache.scala b/rocket/src/main/scala/nbdcache.scala index 70f64167..7b6d4a11 100644 --- a/rocket/src/main/scala/nbdcache.scala +++ b/rocket/src/main/scala/nbdcache.scala @@ -405,7 +405,7 @@ class MSHRFile(implicit p: Parameters) extends L1HellaCacheModule()(p) { val refillMux = Wire(Vec(new L1RefillReq, nMSHRs)) val meta_read_arb = Module(new Arbiter(new L1MetaReadReq, nMSHRs)) val meta_write_arb = Module(new Arbiter(new L1MetaWriteReq, nMSHRs)) - val mem_req_arb = Module(new JunctionsCountingArbiter( + val mem_req_arb = Module(new LockingArbiter( new Acquire, nMSHRs + nIOMSHRs, outerDataBeats, @@ -948,7 +948,7 @@ class HellaCache(implicit p: Parameters) extends L1HellaCacheModule()(p) { metaWriteArb.io.in(0) <> mshrs.io.meta_write // probes and releases - val releaseArb = Module(new JunctionsCountingArbiter(new Release, 2, outerDataBeats, (r: Release) => r.hasMultibeatData())) + val releaseArb = Module(new LockingArbiter(new Release, 2, outerDataBeats, (r: Release) => r.hasMultibeatData())) io.mem.release <> releaseArb.io.out prober.io.req.valid := io.mem.probe.valid && !lrsc_valid