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

Conditionalize some covers that are sometimes impossible (#1043)

Browse Source
This commit is contained in:
Andrew Waterman 2017-10-10 17:14:33 -07:00 committed by GitHub
parent ef28ce8d2f
commit b2bc46471b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/rocket/DCache.scala
View File

@ -393,7 +393,6 @@ class DCacheModule(outer: DCache) extends HellaCacheModule(outer) {
val a_size = mtSize(s2_req.typ) val a_size = mtSize(s2_req.typ)
val a_data = Fill(beatWords, pstore1_data) val a_data = Fill(beatWords, pstore1_data)
val acquire = if (edge.manager.anySupportAcquireB) { val acquire = if (edge.manager.anySupportAcquireB) {
ccover(tl_out.b.valid && !tl_out.b.ready, "BLOCK_B", "D$ B-channel blocked")
edge.AcquireBlock(UInt(0), acquire_address, lgCacheBlockBytes, s2_grow_param)._2 // Cacheability checked by tlb edge.AcquireBlock(UInt(0), acquire_address, lgCacheBlockBytes, s2_grow_param)._2 // Cacheability checked by tlb
} else { } else {
Wire(new TLBundleA(edge.bundle)) Wire(new TLBundleA(edge.bundle))
@ -655,6 +654,8 @@ class DCacheModule(outer: DCache) extends HellaCacheModule(outer) {
io.cpu.s2_xcpt := 0.U.asTypeOf(io.cpu.s2_xcpt) io.cpu.s2_xcpt := 0.U.asTypeOf(io.cpu.s2_xcpt)
} }
assert(!(s2_valid_masked && s2_req.cmd.isOneOf(M_XLR, M_XSC))) assert(!(s2_valid_masked && s2_req.cmd.isOneOf(M_XLR, M_XSC)))
} else {
ccover(tl_out.b.valid && !tl_out.b.ready, "BLOCK_B", "D$ B-channel blocked")
} }
// uncached response // uncached response

6
src/main/scala/rocket/PTW.scala
View File

@ -279,8 +279,10 @@ class PTW(n: Int)(implicit edge: TLEdgeOut, p: Parameters) extends CoreModule()(
count := pgLevels-1 count := pgLevels-1
} }
ccover(io.mem.s2_nack, "NACK", "D$ nacked page-table access") if (usingVM) {
ccover(io.mem.resp.valid && io.mem.s2_xcpt.ae.ld, "AE", "access exception while walking page table") ccover(io.mem.s2_nack, "NACK", "D$ nacked page-table access")
ccover(state === s_wait2 && io.mem.s2_xcpt.ae.ld, "AE", "access exception while walking page table")
}
def ccover(cond: Bool, label: String, desc: String)(implicit sourceInfo: SourceInfo) = def ccover(cond: Bool, label: String, desc: String)(implicit sourceInfo: SourceInfo) =
cover(cond, s"PTW_$label", "MemorySystem;;" + desc) cover(cond, s"PTW_$label", "MemorySystem;;" + desc)