1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307
|
@@ -3,8 +3,9 @@ package freechips.rocketchip.diplomacy import chisel3._ -import chisel3.experimental.{DataMirror, SourceInfo} -import chisel3.experimental.DataMirror.internal.chiselTypeClone +import chisel3.experimental.SourceInfo +import chisel3.reflect.DataMirror +import chisel3.reflect.DataMirror.internal.chiselTypeClone import org.chipsalliance.cde.config.Parameters import freechips.rocketchip.util.DataToAugmentedData
@@ -3,9 +3,8 @@ package freechips.rocketchip.diplomacy import chisel3._ -import chisel3.internal.sourceinfo.{SourceInfo, UnlocatableSourceInfo} import chisel3.{Module, RawModule, Reset, withClockAndReset} -import chisel3.experimental.{ChiselAnnotation, CloneModuleAsRecord} +import chisel3.experimental.{ChiselAnnotation, CloneModuleAsRecord, SourceInfo, UnlocatableSourceInfo} import firrtl.passes.InlineAnnotation import org.chipsalliance.cde.config.Parameters
@@ -186,7 +186,7 @@ class TagMan(val logNumTags : Int) extends Module { io.tagOut := nextTag // Is the next tag available? - io.available := ~MuxLookup(nextTag, true.B, inUseMap) + io.available := ~MuxLookup(nextTag, true.B)(inUseMap) // When user takes a tag when (io.take) { @@ -249,8 +249,7 @@ class TraceGenerator(val params: TraceGenParams)(implicit val p: Parameters) ext val addrBagIndices = (0 to addressBagLen-1). map(i => i.U(logAddressBagLen.W)) - val randAddrFromBag = MuxLookup(randAddrBagIndex, 0.U, - addrBagIndices.zip(bagOfAddrs)) + val randAddrFromBag = MuxLookup(randAddrBagIndex, 0.U)(addrBagIndices.zip(bagOfAddrs)) // Random address from the address bag or the extra addresses. @@ -268,8 +267,8 @@ class TraceGenerator(val params: TraceGenParams)(implicit val p: Parameters) ext // A random address from the extra addresses. val randAddrFromExtra = Cat(0.U, - MuxLookup(randExtraAddrIndex, 0.U, - extraAddrIndices.zip(extraAddrs)), 0.U(3.W)) + MuxLookup(randExtraAddrIndex, 0.U) + (extraAddrIndices.zip(extraAddrs)), 0.U(3.W)) Frequency(List( (1, randAddrFromBag), @@ -279,8 +278,7 @@ class TraceGenerator(val params: TraceGenParams)(implicit val p: Parameters) ext val allAddrs = extraAddrs ++ bagOfAddrs val allAddrIndices = (0 until totalNumAddrs) .map(i => i.U(log2Ceil(totalNumAddrs).W)) - val initAddr = MuxLookup(initCount, 0.U, - allAddrIndices.zip(allAddrs)) + val initAddr = MuxLookup(initCount, 0.U)(allAddrIndices.zip(allAddrs)) // Random opcodes // --------------
@@ -3,7 +3,7 @@ package freechips.rocketchip.jtag import chisel3._ -import chisel3.experimental.DataMirror +import chisel3.reflect.DataMirror import chisel3.internal.firrtl.KnownWidth import chisel3.util.{Cat, Valid}
@@ -5,7 +5,7 @@ package freechips.rocketchip.rocket import chisel3._ import chisel3.util._ -import chisel3.internal.InstanceId +import chisel3.InstanceId import org.chipsalliance.cde.config.Parameters import freechips.rocketchip.subsystem.CacheBlockBytes import freechips.rocketchip.tile.HasCoreParameters
@@ -561,7 +561,7 @@ class DCacheModule(outer: DCache) extends HellaCacheModule(outer) { val put = edge.Put(a_source, access_address, a_size, a_data)._2 val putpartial = edge.Put(a_source, access_address, a_size, a_data, a_mask)._2 val atomics = if (edge.manager.anySupportLogical) { - MuxLookup(s2_req.cmd, WireDefault(0.U.asTypeOf(new TLBundleA(edge.bundle))), Array( + MuxLookup(s2_req.cmd, WireDefault(0.U.asTypeOf(new TLBundleA(edge.bundle))))(Array( M_XA_SWAP -> edge.Logical(a_source, access_address, a_size, a_data, TLAtomics.SWAP)._2, M_XA_XOR -> edge.Logical(a_source, access_address, a_size, a_data, TLAtomics.XOR) ._2, M_XA_OR -> edge.Logical(a_source, access_address, a_size, a_data, TLAtomics.OR) ._2,
@@ -82,7 +82,7 @@ class IOMSHR(id: Int)(implicit edge: TLEdgeOut, p: Parameters) extends L1HellaCa val get = edge.Get(a_source, a_address, a_size)._2 val put = edge.Put(a_source, a_address, a_size, a_data)._2 val atomics = if (edge.manager.anySupportLogical) { - MuxLookup(req.cmd, (0.U).asTypeOf(new TLBundleA(edge.bundle)), Array( + MuxLookup(req.cmd, (0.U).asTypeOf(new TLBundleA(edge.bundle)))(Array( M_XA_SWAP -> edge.Logical(a_source, a_address, a_size, a_data, TLAtomics.SWAP)._2, M_XA_XOR -> edge.Logical(a_source, a_address, a_size, a_data, TLAtomics.XOR) ._2, M_XA_OR -> edge.Logical(a_source, a_address, a_size, a_data, TLAtomics.OR) ._2,
@@ -384,10 +384,10 @@ class Rocket(tile: RocketTile)(implicit p: Parameters) extends CoreModule()(p) val ex_rs = for (i <- 0 until id_raddr.size) yield Mux(ex_reg_rs_bypass(i), bypass_mux(ex_reg_rs_lsb(i)), Cat(ex_reg_rs_msb(i), ex_reg_rs_lsb(i))) val ex_imm = ImmGen(ex_ctrl.sel_imm, ex_reg_inst) - val ex_op1 = MuxLookup(ex_ctrl.sel_alu1, 0.S, Seq( + val ex_op1 = MuxLookup(ex_ctrl.sel_alu1, 0.S)(Seq( A1_RS1 -> ex_rs(0).asSInt, A1_PC -> ex_reg_pc.asSInt)) - val ex_op2 = MuxLookup(ex_ctrl.sel_alu2, 0.S, Seq( + val ex_op2 = MuxLookup(ex_ctrl.sel_alu2, 0.S)(Seq( A2_RS2 -> ex_rs(1).asSInt, A2_IMM -> ex_imm, A2_SIZE -> Mux(ex_reg_rvc, 2.S, 4.S)))
@@ -57,16 +57,16 @@ class ScratchpadSlavePort(address: Seq[AddressSet], coreDataBytes: Int, usingAto def formCacheReq(a: TLBundleA) = { val req = Wire(new HellaCacheReq) - req.cmd := MuxLookup(a.opcode, M_XRD, Array( + req.cmd := MuxLookup(a.opcode, M_XRD)(Array( TLMessages.PutFullData -> M_XWR, TLMessages.PutPartialData -> M_PWR, - TLMessages.ArithmeticData -> MuxLookup(a.param, M_XRD, Array( + TLMessages.ArithmeticData -> MuxLookup(a.param, M_XRD)(Array( TLAtomics.MIN -> M_XA_MIN, TLAtomics.MAX -> M_XA_MAX, TLAtomics.MINU -> M_XA_MINU, TLAtomics.MAXU -> M_XA_MAXU, TLAtomics.ADD -> M_XA_ADD)), - TLMessages.LogicalData -> MuxLookup(a.param, M_XRD, Array( + TLMessages.LogicalData -> MuxLookup(a.param, M_XRD)(Array( TLAtomics.XOR -> M_XA_XOR, TLAtomics.OR -> M_XA_OR, TLAtomics.AND -> M_XA_AND,
@@ -178,7 +178,7 @@ class TLAtomicAutomata(logical: Boolean = true, arithmetic: Boolean = true, conc when (en) { r.fifoId := a_fifoId r.bits := in.a.bits - r.lut := MuxLookup(in.a.bits.param(1, 0), 0.U(4.W), Array( + r.lut := MuxLookup(in.a.bits.param(1, 0), 0.U(4.W))(Array( TLAtomics.AND -> 0x8.U, TLAtomics.OR -> 0xe.U, TLAtomics.XOR -> 0x6.U,
@@ -4,7 +4,6 @@ package freechips.rocketchip.tilelink import chisel3._ import chisel3.util._ -import chisel3.internal.sourceinfo.SourceInfo import chisel3.experimental.SourceInfo import org.chipsalliance.cde.config.Parameters import freechips.rocketchip.util._ @@ -274,17 +273,17 @@ class TLEdge( // Does the request need T permissions to be executed? def needT(a: TLBundleA): Bool = { - val acq_needT = MuxLookup(a.param, WireDefault(Bool(), DontCare), Array( + val acq_needT = MuxLookup(a.param, WireDefault(Bool(), DontCare))(Array( TLPermissions.NtoB -> false.B, TLPermissions.NtoT -> true.B, TLPermissions.BtoT -> true.B)) - MuxLookup(a.opcode, WireDefault(Bool(), DontCare), Array( + MuxLookup(a.opcode, WireDefault(Bool(), DontCare))(Array( TLMessages.PutFullData -> true.B, TLMessages.PutPartialData -> true.B, TLMessages.ArithmeticData -> true.B, TLMessages.LogicalData -> true.B, TLMessages.Get -> false.B, - TLMessages.Hint -> MuxLookup(a.param, WireDefault(Bool(), DontCare), Array( + TLMessages.Hint -> MuxLookup(a.param, WireDefault(Bool(), DontCare))(Array( TLHints.PREFETCH_READ -> false.B, TLHints.PREFETCH_WRITE -> true.B)), TLMessages.AcquireBlock -> acq_needT,
@@ -275,7 +275,7 @@ class TLFragmenter(val minSize: Int, val maxSize: Int, val alwaysMin: Boolean = val maxLgHint = Mux1H(find, maxLgHints) val limit = if (alwaysMin) lgMinSize else - MuxLookup(in_a.bits.opcode, lgMinSize, Array( + MuxLookup(in_a.bits.opcode, lgMinSize)(Array( TLMessages.PutFullData -> maxLgPutFull, TLMessages.PutPartialData -> maxLgPutPartial, TLMessages.ArithmeticData -> maxLgArithmetic,
@@ -180,7 +180,7 @@ class TLFuzzer( // Pick a specific message to try to send val a_type_sel = noiseMaker(3, inc, 0) - val legal = legal_dest && MuxLookup(a_type_sel, glegal, Seq( + val legal = legal_dest && MuxLookup(a_type_sel, glegal)(Seq( "b000".U -> glegal, "b001".U -> (pflegal && !noModify.B), "b010".U -> (pplegal && !noModify.B), @@ -188,7 +188,7 @@ class TLFuzzer( "b100".U -> (llegal && !noModify.B), "b101".U -> hlegal)) - val bits = MuxLookup(a_type_sel, gbits, Seq( + val bits = MuxLookup(a_type_sel, gbits)(Seq( "b000".U -> gbits, "b001".U -> pfbits, "b010".U -> ppbits,
@@ -81,7 +81,7 @@ class ClientMetadata extends Bundle { import ClientStates._ val c = categorize(cmd) //assert(c - MuxLookup(Cat(c, param), Nothing, Seq( + MuxLookup(Cat(c, param), Nothing)(Seq( //(effect param) -> (next) Cat(rd, toB) -> Branch, Cat(rd, toT) -> Trunk, @@ -137,7 +137,7 @@ class ClientMetadata extends Bundle { private def cmdToPermCap(cmd: UInt): UInt = { import MemoryOpCategories._ import TLPermissions._ - MuxLookup(cmd, toN, Seq( + MuxLookup(cmd, toN)(Seq( M_FLUSH -> toN, M_PRODUCE -> toB, M_CLEAN -> toT))
@@ -4,8 +4,8 @@ package freechips.rocketchip.util import chisel3._ import scala.collection.immutable.ListMap -import chisel3.internal.requireIsChiselType -import chisel3.experimental.DataMirror.internal.chiselTypeClone +import chisel3.experimental.requireIsChiselType +import chisel3.reflect.DataMirror.internal.chiselTypeClone final class RecordMap[T <: Data] (eltMap: ListMap[String, T]) extends Record { @@ -13,7 +13,7 @@ final class RecordMap[T <: Data] (eltMap: ListMap[String, T]) eltMap.foreach { case (name, elt) => requireIsChiselType(elt, name) } // This is needed for Record - val elements = ListMap[String, T]() ++ eltMap.mapValues(chiselTypeClone(_).asInstanceOf[T]) // mapValues return value is lazy + val elements = ListMap[String, T]() ++ eltMap.view.mapValues(chiselTypeClone(_).asInstanceOf[T]) // mapValues return value is lazy def apply(x: Int) = elements.values.toSeq(x) def apply(x: String) = elements.get(x)
@@ -4,7 +4,6 @@ package freechips.rocketchip.util import chisel3._ -import chisel3.experimental.ChiselEnum // Definitions for Trace core Interface defined in RISC-V Processor Trace Specification V1.0 object TraceItype extends ChiselEnum {
|