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

New Mux1H constructor

Browse Source
This commit is contained in:
Henry Cook 2012-02-01 13:24:28 -08:00
parent 38c9105ea1
commit 281abfbccb
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,9 +289,9 @@ class MSHRFile extends Component {
val replay = (new ioDecoupled) { new Replay() }.flip() val replay = (new ioDecoupled) { new Replay() }.flip()
} }
val tag_mux = new Mux1H(NMSHR, PPN_BITS) val tag_mux = (new Mux1H(NMSHR)){ Bits(width = PPN_BITS) }
val mem_resp_idx_mux = new Mux1H(NMSHR, IDX_BITS) val mem_resp_idx_mux = (new Mux1H(NMSHR)){ Bits(width = IDX_BITS) }
val mem_resp_way_id_mux = new Mux1H(NMSHR, log2up(NWAYS)) val mem_resp_way_oh_mux = (new Mux1H(NMSHR)){ Bits(width = NWAYS) }
val meta_req_arb = (new Arbiter(NMSHR)) { new MetaArrayArrayReq() } val meta_req_arb = (new Arbiter(NMSHR)) { new MetaArrayArrayReq() }
val mem_req_arb = (new Arbiter(NMSHR)) { new MemReq() } val mem_req_arb = (new Arbiter(NMSHR)) { new MemReq() }
val replay_arb = (new Arbiter(NMSHR)) { new Replay() } val replay_arb = (new Arbiter(NMSHR)) { new Replay() }

55
rocket/src/main/scala/util.scala
View File

@ -72,24 +72,67 @@ object LFSR16
} }
} }
class Mux1H(n: Int, w: Int) extends Component object Mux1H
{
//TODO: cloning in(0) is unsafe if other elements have different widths, but
//is that even allowable?
def apply [T <: Data](n: Int, sel: Vec[Bool], in: Vec[T]): T = {
MuxCase(in(0), (0 until n).map( i => (sel(i), in(i))))
// val mux = (new Mux1H(n)){ in(0).clone }
// mux.io.sel <> sel
// mux.io.in <> in
// mux.io.out.asInstanceOf[T]
}
def apply [T <: Data](n: Int, sel: Seq[Bool], in: Vec[T]): T = {
MuxCase(in(0), (0 until n).map( i => (sel(i), in(i))))
// val mux = (new Mux1H(n)){ in(0).clone }
// for(i <- 0 until n) {
// mux.io.sel(i) := sel(i)
// }
// mux.io.in <> in.asOutput
// mux.io.out.asInstanceOf[T]
}
def apply [T <: Data](n: Int, sel: Bits, in: Vec[T]): T = {
MuxCase(in(0), (0 until n).map( i => (sel(i).toBool, in(i))))
// val mux = (new Mux1H(n)){ in(0).clone }
// for(i <- 0 until n) {
// mux.io.sel(i) := sel(i).toBool
// }
// mux.io.in := in
// mux.io.out
}
}
class Mux1H [T <: Data](n: Int)(gen: => T) extends Component
{ {
val io = new Bundle { val io = new Bundle {
val sel = Vec(n) { Bool(dir = INPUT) } val sel = Vec(n) { Bool(dir = INPUT) }
val in = Vec(n) { Bits(width = w, dir = INPUT) } val in = Vec(n) { gen }.asInput
val out = Bits(width = w, dir = OUTPUT) val out = gen.asOutput
} }
if (n > 1) { if (n > 2) {
var out = io.in(0) & Fill(w, io.sel(0)) var out = io.in(0).toBits & Fill(gen.getWidth, io.sel(0))
for (i <- 1 to n-1) for (i <- 1 to n-1)
out = out | (io.in(i) & Fill(w, io.sel(i))) out = out | (io.in(i).toBits & Fill(gen.getWidth, io.sel(i)))
io.out := out io.out := out
} else if (n == 2) {
io.out := Mux(io.sel(1), io.in(1), io.in(0))
} else { } else {
io.out := io.in(0) io.out := io.in(0)
} }
} }
class ioDecoupled[T <: Data]()(data: => T) extends Bundle class ioDecoupled[T <: Data]()(data: => T) extends Bundle
{ {
val valid = Bool(INPUT) val valid = Bool(INPUT)