From 7cfb69e2d5a16ca7383adf9583d8eb91f58b4bbc Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Mon, 13 Nov 2017 17:32:54 -0800 Subject: [PATCH] Queue: silence some warnings --- src/main/scala/amba/axi4/Deinterleaver.scala | 4 ++-- src/main/scala/rocket/DCache.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/amba/axi4/Deinterleaver.scala b/src/main/scala/amba/axi4/Deinterleaver.scala index b7624258..bdc9db39 100644 --- a/src/main/scala/amba/axi4/Deinterleaver.scala +++ b/src/main/scala/amba/axi4/Deinterleaver.scala @@ -40,9 +40,9 @@ class AXI4Deinterleaver(maxReadBytes: Int)(implicit p: Parameters) extends LazyM val qs = Seq.tabulate(endId) { i => val depth = edgeOut.master.masters.find(_.id.contains(i)).flatMap(_.maxFlight).getOrElse(0) if (depth > 0) { - Module(new Queue(out.r.bits, beats)).io + Module(new Queue(out.r.bits.cloneType, beats)).io } else { - Wire(new QueueIO(out.r.bits, beats)) + Wire(new QueueIO(out.r.bits.cloneType, beats)) } } diff --git a/src/main/scala/rocket/DCache.scala b/src/main/scala/rocket/DCache.scala index 1f28ffc4..e1daa23b 100644 --- a/src/main/scala/rocket/DCache.scala +++ b/src/main/scala/rocket/DCache.scala @@ -99,7 +99,7 @@ class DCacheModule(outer: DCache) extends HellaCacheModule(outer) { val (tl_out_c, release_queue_empty) = if (cacheParams.acquireBeforeRelease) { - val q = Module(new Queue(tl_out.c.bits, cacheDataBeats, flow = true)) + val q = Module(new Queue(tl_out.c.bits.cloneType, cacheDataBeats, flow = true)) tl_out.c <> q.io.deq (q.io.enq, q.io.count === 0) } else {