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

JTAG: Use sorted map for stability (#1073)

Browse Source 
* JTAG: Use sorted map for stability

Otherwise the generated FIRRTL/Verilog is non deterministic

* jtag : parens for clarity

* jtag: Use deterministic ListMap and sort for stability

* JTAG: use slightly clearer SortedMap (clearer to me anyway)

* jtag: whitespace cleanup
This commit is contained in:
Megan Wachs 2017-10-31 15:33:41 -07:00 committed by GitHub
parent 3db066303b
commit f86489b59e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/devices/debug/DebugTransport.scala
View File

@ -243,7 +243,8 @@ class DebugTransportModuleJTAG(debugAddrBits: Int, c: JtagDTMConfig)
idcode.mfrId := io.jtag_mfr_id idcode.mfrId := io.jtag_mfr_id
val tapIO = JtagTapGenerator(irLength = 5, val tapIO = JtagTapGenerator(irLength = 5,
instructions = Map(dtmJTAGAddrs.DMI_ACCESS -> dmiAccessChain, instructions = Map(
dtmJTAGAddrs.DMI_ACCESS -> dmiAccessChain,
dtmJTAGAddrs.DTM_INFO -> dtmInfoChain), dtmJTAGAddrs.DTM_INFO -> dtmInfoChain),
icode = Some(dtmJTAGAddrs.IDCODE) icode = Some(dtmJTAGAddrs.IDCODE)
) )

9
src/main/scala/jtag/JtagTap.scala
View File

@ -2,6 +2,8 @@
package freechips.rocketchip.jtag package freechips.rocketchip.jtag
import scala.collection.SortedMap
import chisel3._ import chisel3._
import chisel3.util._ import chisel3.util._
import freechips.rocketchip.config.Parameters import freechips.rocketchip.config.Parameters
@ -203,9 +205,12 @@ object JtagTapGenerator {
bypassChain.io.chainIn := controllerInternal.io.dataChainOut // for simplicity, doesn't visibly affect anything else bypassChain.io.chainIn := controllerInternal.io.dataChainOut // for simplicity, doesn't visibly affect anything else
require(allInstructions.size > 0, "Seriously? JTAG TAP with no instructions?") require(allInstructions.size > 0, "Seriously? JTAG TAP with no instructions?")
val chainToIcode = allInstructions groupBy { case (icode, chain) => chain } map { // Need to ensure that this mapping is ordered to produce deterministic verilog,
// and neither Map nor groupBy are deterministic.
// Therefore, we first sort by IDCODE, then sort the groups by the first IDCODE in each group.
val chainToIcode = (SortedMap(allInstructions.toList:_*).groupBy { case (icode, chain) => chain } map {
case (chain, icodeToChain) => chain -> icodeToChain.keys case (chain, icodeToChain) => chain -> icodeToChain.keys
} }).toList.sortBy(_._2.head)
val chainToSelect = chainToIcode map { val chainToSelect = chainToIcode map {
case (chain, icodes) => { case (chain, icodes) => {