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

client/master -> inner/outer

Browse Source
This commit is contained in:
Henry Cook 2014-04-29 16:49:18 -07:00
parent 52c6de5641
commit 0237229921
2 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
uncore/src/main/scala/cache.scala
View File

@ -191,8 +191,8 @@ class L2HellaCache(bankId: Int)(implicit conf: L2CacheConfig) extends CoherenceA
val tshrfile = Module(new TSHRFile(bankId)) val tshrfile = Module(new TSHRFile(bankId))
io.client <> tshrfile.io.client tshrfile.io.inner <> io.inner
io.master <> tshrfile.io.outer io.outer <> tshrfile.io.outer
io.incoherent <> tshrfile.io.incoherent io.incoherent <> tshrfile.io.incoherent
} }
@ -200,7 +200,7 @@ class L2HellaCache(bankId: Int)(implicit conf: L2CacheConfig) extends CoherenceA
class TSHRFile(bankId: Int)(implicit conf: L2CacheConfig) extends Module { class TSHRFile(bankId: Int)(implicit conf: L2CacheConfig) extends Module {
implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co) implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co)
val io = new Bundle { val io = new Bundle {
val client = (new InternalTileLinkIO).flip val inner = (new InternalTileLinkIO).flip
val outer = new UncachedTileLinkIO val outer = new UncachedTileLinkIO
val incoherent = Vec.fill(ln.nClients){Bool()}.asInput val incoherent = Vec.fill(ln.nClients){Bool()}.asInput
val meta_read_req = Decoupled(new MetaReadReq) val meta_read_req = Decoupled(new MetaReadReq)
@ -218,27 +218,27 @@ class TSHRFile(bankId: Int)(implicit conf: L2CacheConfig) extends Module {
trackerList.map(_.io.tile_incoherent := io.incoherent.toBits) trackerList.map(_.io.tile_incoherent := io.incoherent.toBits)
// Handle acquire transaction initiation // Handle acquire transaction initiation
val acquire = io.client.acquire val acquire = io.inner.acquire
val any_acquire_conflict = trackerList.map(_.io.has_acquire_conflict).reduce(_||_) val any_acquire_conflict = trackerList.map(_.io.has_acquire_conflict).reduce(_||_)
val block_acquires = any_acquire_conflict val block_acquires = any_acquire_conflict
val alloc_arb = Module(new Arbiter(Bool(), trackerList.size)) val alloc_arb = Module(new Arbiter(Bool(), trackerList.size))
for( i <- 0 until trackerList.size ) { for( i <- 0 until trackerList.size ) {
val t = trackerList(i).io.client val t = trackerList(i).io.inner
alloc_arb.io.in(i).valid := t.acquire.ready alloc_arb.io.in(i).valid := t.acquire.ready
t.acquire.bits := acquire.bits t.acquire.bits := acquire.bits
t.acquire.valid := alloc_arb.io.in(i).ready t.acquire.valid := alloc_arb.io.in(i).ready
} }
acquire.ready := trackerList.map(_.io.client.acquire.ready).reduce(_||_) && !block_acquires acquire.ready := trackerList.map(_.io.inner.acquire.ready).reduce(_||_) && !block_acquires
alloc_arb.io.out.ready := acquire.valid && !block_acquires alloc_arb.io.out.ready := acquire.valid && !block_acquires
// Handle probe request generation // Handle probe request generation
val probe_arb = Module(new Arbiter(new LogicalNetworkIO(new Probe), trackerList.size)) val probe_arb = Module(new Arbiter(new LogicalNetworkIO(new Probe), trackerList.size))
io.client.probe <> probe_arb.io.out io.inner.probe <> probe_arb.io.out
probe_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.client.probe } probe_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.inner.probe }
// Handle releases, which might be voluntary and might have data // Handle releases, which might be voluntary and might have data
val release = io.client.release val release = io.inner.release
val voluntary = co.isVoluntary(release.bits.payload) val voluntary = co.isVoluntary(release.bits.payload)
val any_release_conflict = trackerList.tail.map(_.io.has_release_conflict).reduce(_||_) val any_release_conflict = trackerList.tail.map(_.io.has_release_conflict).reduce(_||_)
val block_releases = Bool(false) val block_releases = Bool(false)
@ -246,26 +246,26 @@ class TSHRFile(bankId: Int)(implicit conf: L2CacheConfig) extends Module {
//val release_idx = Mux(voluntary, Mux(any_release_conflict, conflict_idx, UInt(0)), release.bits.payload.master_xact_id) // TODO: Add merging logic to allow allocated AcquireTracker to handle conflicts, send all necessary grants, use first sufficient response //val release_idx = Mux(voluntary, Mux(any_release_conflict, conflict_idx, UInt(0)), release.bits.payload.master_xact_id) // TODO: Add merging logic to allow allocated AcquireTracker to handle conflicts, send all necessary grants, use first sufficient response
val release_idx = Mux(voluntary, UInt(0), release.bits.payload.master_xact_id) val release_idx = Mux(voluntary, UInt(0), release.bits.payload.master_xact_id)
for( i <- 0 until trackerList.size ) { for( i <- 0 until trackerList.size ) {
val t = trackerList(i).io.client val t = trackerList(i).io.inner
t.release.bits := release.bits t.release.bits := release.bits
t.release.valid := release.valid && (release_idx === UInt(i)) && !block_releases t.release.valid := release.valid && (release_idx === UInt(i)) && !block_releases
} }
release.ready := Vec(trackerList.map(_.io.client.release.ready)).read(release_idx) && !block_releases release.ready := Vec(trackerList.map(_.io.inner.release.ready)).read(release_idx) && !block_releases
// Reply to initial requestor // Reply to initial requestor
val grant_arb = Module(new Arbiter(new LogicalNetworkIO(new Grant), trackerList.size)) val grant_arb = Module(new Arbiter(new LogicalNetworkIO(new Grant), trackerList.size))
io.client.grant <> grant_arb.io.out io.inner.grant <> grant_arb.io.out
grant_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.client.grant } grant_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.inner.grant }
// Free finished transactions // Free finished transactions
val ack = io.client.finish val ack = io.inner.finish
trackerList.map(_.io.client.finish.valid := ack.valid) trackerList.map(_.io.inner.finish.valid := ack.valid)
trackerList.map(_.io.client.finish.bits := ack.bits) trackerList.map(_.io.inner.finish.bits := ack.bits)
ack.ready := Bool(true) ack.ready := Bool(true)
// Create an arbiter for the one memory port // Create an arbiter for the one memory port
val outer_arb = Module(new UncachedTileLinkIOArbiterThatPassesId(trackerList.size)) val outer_arb = Module(new UncachedTileLinkIOArbiterThatPassesId(trackerList.size))
outer_arb.io.in zip trackerList map { case(arb, t) => arb <> t.io.master } outer_arb.io.in zip trackerList map { case(arb, t) => arb <> t.io.outer }
io.outer <> outer_arb.io.out io.outer <> outer_arb.io.out
} }
@ -273,18 +273,18 @@ class TSHRFile(bankId: Int)(implicit conf: L2CacheConfig) extends Module {
abstract class L2XactTracker()(implicit conf: L2CacheConfig) extends Module { abstract class L2XactTracker()(implicit conf: L2CacheConfig) extends Module {
implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co) implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co)
val io = new Bundle { val io = new Bundle {
val client = (new TileLinkIO).flip val inner = (new InternalTileLinkIO).flip
val master = new UncachedTileLinkIO val outer = new UncachedTileLinkIO
val tile_incoherent = Bits(INPUT, ln.nClients) val tile_incoherent = Bits(INPUT, ln.nClients)
val has_acquire_conflict = Bool(OUTPUT) val has_acquire_conflict = Bool(OUTPUT)
val has_release_conflict = Bool(OUTPUT) val has_release_conflict = Bool(OUTPUT)
} }
val c_acq = io.client.acquire.bits val c_acq = io.inner.acquire.bits
val c_rel = io.client.release.bits val c_rel = io.inner.release.bits
val c_gnt = io.client.grant.bits val c_gnt = io.inner.grant.bits
val c_ack = io.client.finish.bits val c_ack = io.inner.finish.bits
val m_gnt = io.master.grant.bits val m_gnt = io.outer.grant.bits
} }
@ -293,46 +293,46 @@ class L2VoluntaryReleaseTracker(trackerId: Int, bankId: Int)(implicit conf: L2Ca
val state = Reg(init=s_idle) val state = Reg(init=s_idle)
val xact = Reg{ new Release } val xact = Reg{ new Release }
val init_client_id = Reg(init=UInt(0, width = log2Up(ln.nClients))) val init_client_id = Reg(init=UInt(0, width = log2Up(ln.nClients)))
val incoming_rel = io.client.release.bits val incoming_rel = io.inner.release.bits
io.has_acquire_conflict := Bool(false) io.has_acquire_conflict := Bool(false)
io.has_release_conflict := co.isCoherenceConflict(xact.addr, incoming_rel.payload.addr) && io.has_release_conflict := co.isCoherenceConflict(xact.addr, incoming_rel.payload.addr) &&
(state != s_idle) (state != s_idle)
io.master.grant.ready := Bool(false) io.outer.grant.ready := Bool(false)
io.master.acquire.valid := Bool(false) io.outer.acquire.valid := Bool(false)
io.master.acquire.bits.header.src := UInt(bankId) io.outer.acquire.bits.header.src := UInt(bankId)
//io.master.acquire.bits.header.dst TODO //io.outer.acquire.bits.header.dst TODO
io.master.acquire.bits.payload := Acquire(co.getUncachedWriteAcquireType, io.outer.acquire.bits.payload := Acquire(co.getUncachedWriteAcquireType,
xact.addr, xact.addr,
UInt(trackerId), UInt(trackerId),
xact.data) xact.data)
io.client.acquire.ready := Bool(false) io.inner.acquire.ready := Bool(false)
io.client.probe.valid := Bool(false) io.inner.probe.valid := Bool(false)
io.client.release.ready := Bool(false) io.inner.release.ready := Bool(false)
io.client.grant.valid := Bool(false) io.inner.grant.valid := Bool(false)
io.client.grant.bits.header.src := UInt(bankId) io.inner.grant.bits.header.src := UInt(bankId)
io.client.grant.bits.header.dst := init_client_id io.inner.grant.bits.header.dst := init_client_id
io.client.grant.bits.payload := Grant(co.getGrantType(xact, UInt(0)), io.inner.grant.bits.payload := Grant(co.getGrantType(xact, UInt(0)),
xact.client_xact_id, xact.client_xact_id,
UInt(trackerId)) UInt(trackerId))
switch (state) { switch (state) {
is(s_idle) { is(s_idle) {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
when( io.client.release.valid ) { when( io.inner.release.valid ) {
xact := incoming_rel.payload xact := incoming_rel.payload
init_client_id := incoming_rel.header.src init_client_id := incoming_rel.header.src
state := Mux(co.messageHasData(incoming_rel.payload), s_mem, s_ack) state := Mux(co.messageHasData(incoming_rel.payload), s_mem, s_ack)
} }
} }
is(s_mem) { is(s_mem) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
when(io.master.acquire.ready) { state := s_ack } when(io.outer.acquire.ready) { state := s_ack }
} }
is(s_ack) { is(s_ack) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
when(io.client.grant.ready) { state := s_idle } when(io.inner.grant.ready) { state := s_idle }
} }
} }
} }
@ -361,7 +361,7 @@ class L2AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: L2CacheConfig
probe_initial_flags := Bits(0) probe_initial_flags := Bits(0)
if (ln.nClients > 1) { if (ln.nClients > 1) {
// issue self-probes for uncached read xacts to facilitate I$ coherence // issue self-probes for uncached read xacts to facilitate I$ coherence
val probe_self = Bool(true) //co.needsSelfProbe(io.client.acquire.bits.payload) val probe_self = Bool(true) //co.needsSelfProbe(io.inner.acquire.bits.payload)
val myflag = Mux(probe_self, Bits(0), UIntToOH(c_acq.header.src(log2Up(ln.nClients)-1,0))) val myflag = Mux(probe_self, Bits(0), UIntToOH(c_acq.header.src(log2Up(ln.nClients)-1,0)))
probe_initial_flags := ~(io.tile_incoherent | myflag) probe_initial_flags := ~(io.tile_incoherent | myflag)
} }
@ -369,37 +369,37 @@ class L2AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: L2CacheConfig
io.has_acquire_conflict := co.isCoherenceConflict(xact.addr, c_acq.payload.addr) && (state != s_idle) io.has_acquire_conflict := co.isCoherenceConflict(xact.addr, c_acq.payload.addr) && (state != s_idle)
io.has_release_conflict := co.isCoherenceConflict(xact.addr, c_rel.payload.addr) && (state != s_idle) io.has_release_conflict := co.isCoherenceConflict(xact.addr, c_rel.payload.addr) && (state != s_idle)
io.master.acquire.valid := Bool(false) io.outer.acquire.valid := Bool(false)
io.master.acquire.bits.header.src := UInt(bankId) io.outer.acquire.bits.header.src := UInt(bankId)
//io.master.acquire.bits.header.dst TODO //io.outer.acquire.bits.header.dst TODO
io.master.acquire.bits.payload := outer_read io.outer.acquire.bits.payload := outer_read
io.master.grant.ready := io.client.grant.ready io.outer.grant.ready := io.inner.grant.ready
io.client.probe.valid := Bool(false) io.inner.probe.valid := Bool(false)
io.client.probe.bits.header.src := UInt(bankId) io.inner.probe.bits.header.src := UInt(bankId)
io.client.probe.bits.header.dst := curr_p_id io.inner.probe.bits.header.dst := curr_p_id
io.client.probe.bits.payload := Probe(co.getProbeType(xact.a_type, UInt(0)), io.inner.probe.bits.payload := Probe(co.getProbeType(xact.a_type, UInt(0)),
xact.addr, xact.addr,
UInt(trackerId)) UInt(trackerId))
val grant_type = co.getGrantType(xact.a_type, init_sharer_cnt) val grant_type = co.getGrantType(xact.a_type, init_sharer_cnt)
io.client.grant.valid := Bool(false) io.inner.grant.valid := Bool(false)
io.client.grant.bits.header.src := UInt(bankId) io.inner.grant.bits.header.src := UInt(bankId)
io.client.grant.bits.header.dst := init_client_id io.inner.grant.bits.header.dst := init_client_id
io.client.grant.bits.payload := Grant(grant_type, io.inner.grant.bits.payload := Grant(grant_type,
xact.client_xact_id, xact.client_xact_id,
UInt(trackerId), UInt(trackerId),
m_gnt.payload.data) m_gnt.payload.data)
io.client.acquire.ready := Bool(false) io.inner.acquire.ready := Bool(false)
io.client.release.ready := Bool(false) io.inner.release.ready := Bool(false)
switch (state) { switch (state) {
is(s_idle) { is(s_idle) {
io.client.acquire.ready := Bool(true) io.inner.acquire.ready := Bool(true)
val needs_outer_write = co.messageHasData(c_acq.payload) val needs_outer_write = co.messageHasData(c_acq.payload)
val needs_outer_read = co.needsOuterRead(c_acq.payload.a_type, UInt(0)) val needs_outer_read = co.needsOuterRead(c_acq.payload.a_type, UInt(0))
when( io.client.acquire.valid ) { when( io.inner.acquire.valid ) {
xact := c_acq.payload xact := c_acq.payload
init_client_id := c_acq.header.src init_client_id := c_acq.header.src
init_sharer_cnt := UInt(ln.nClients) // TODO: Broadcast only init_sharer_cnt := UInt(ln.nClients) // TODO: Broadcast only
@ -415,18 +415,18 @@ class L2AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: L2CacheConfig
} }
is(s_probe) { is(s_probe) {
// Generate probes // Generate probes
io.client.probe.valid := probe_flags.orR io.inner.probe.valid := probe_flags.orR
when(io.client.probe.ready) { when(io.inner.probe.ready) {
probe_flags := probe_flags & ~(UIntToOH(curr_p_id)) probe_flags := probe_flags & ~(UIntToOH(curr_p_id))
} }
// Handle releases, which may have data to be written back // Handle releases, which may have data to be written back
when(io.client.release.valid) { when(io.inner.release.valid) {
when(co.messageHasData(c_rel.payload)) { when(co.messageHasData(c_rel.payload)) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_write_rel io.outer.acquire.bits.payload := outer_write_rel
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
if(ln.nClients > 1) release_count := release_count - UInt(1) if(ln.nClients > 1) release_count := release_count - UInt(1)
when(release_count === UInt(1)) { when(release_count === UInt(1)) {
state := Mux(pending_outer_write, s_mem_write, state := Mux(pending_outer_write, s_mem_write,
@ -434,7 +434,7 @@ class L2AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: L2CacheConfig
} }
} }
} .otherwise { } .otherwise {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
if(ln.nClients > 1) release_count := release_count - UInt(1) if(ln.nClients > 1) release_count := release_count - UInt(1)
when(release_count === UInt(1)) { when(release_count === UInt(1)) {
state := Mux(pending_outer_write, s_mem_write, state := Mux(pending_outer_write, s_mem_write,
@ -444,30 +444,30 @@ class L2AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: L2CacheConfig
} }
} }
is(s_mem_read) { is(s_mem_read) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_read io.outer.acquire.bits.payload := outer_read
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle) state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle)
} }
} }
is(s_mem_write) { is(s_mem_write) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_write_acq io.outer.acquire.bits.payload := outer_write_acq
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
state := Mux(pending_outer_read, s_mem_read, s_make_grant) state := Mux(pending_outer_read, s_mem_read, s_make_grant)
} }
} }
is(s_make_grant) { is(s_make_grant) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
when(io.client.grant.ready) { when(io.inner.grant.ready) {
state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle) state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle)
} }
} }
is(s_busy) { // Nothing left to do but wait for transaction to complete is(s_busy) { // Nothing left to do but wait for transaction to complete
when(io.master.grant.valid && m_gnt.payload.client_xact_id === UInt(trackerId)) { when(io.outer.grant.valid && m_gnt.payload.client_xact_id === UInt(trackerId)) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
} }
when(io.client.finish.valid && c_ack.payload.master_xact_id === UInt(trackerId)) { when(io.inner.finish.valid && c_ack.payload.master_xact_id === UInt(trackerId)) {
state := s_idle state := s_idle
} }
} }

160
uncore/src/main/scala/uncore.scala
View File

@ -9,8 +9,8 @@ trait CoherenceAgentConfiguration {
abstract class CoherenceAgent(implicit conf: CoherenceAgentConfiguration) extends Module { abstract class CoherenceAgent(implicit conf: CoherenceAgentConfiguration) extends Module {
val io = new Bundle { val io = new Bundle {
val client = (new TileLinkIO()(conf.tl)).flip val inner = (new TileLinkIO()(conf.tl)).flip
val master = new UncachedTileLinkIO()(conf.tl) val outer = new UncachedTileLinkIO()(conf.tl)
val incoherent = Vec.fill(conf.tl.ln.nClients){Bool()}.asInput val incoherent = Vec.fill(conf.tl.ln.nClients){Bool()}.asInput
} }
} }
@ -33,27 +33,27 @@ class L2CoherenceAgent(bankId: Int)(implicit conf: CoherenceAgentConfiguration)
trackerList.map(_.io.tile_incoherent := io.incoherent.toBits) trackerList.map(_.io.tile_incoherent := io.incoherent.toBits)
// Handle acquire transaction initiation // Handle acquire transaction initiation
val acquire = io.client.acquire val acquire = io.inner.acquire
val any_acquire_conflict = trackerList.map(_.io.has_acquire_conflict).reduce(_||_) val any_acquire_conflict = trackerList.map(_.io.has_acquire_conflict).reduce(_||_)
val block_acquires = any_acquire_conflict val block_acquires = any_acquire_conflict
val alloc_arb = Module(new Arbiter(Bool(), trackerList.size)) val alloc_arb = Module(new Arbiter(Bool(), trackerList.size))
for( i <- 0 until trackerList.size ) { for( i <- 0 until trackerList.size ) {
val t = trackerList(i).io.client val t = trackerList(i).io.inner
alloc_arb.io.in(i).valid := t.acquire.ready alloc_arb.io.in(i).valid := t.acquire.ready
t.acquire.bits := acquire.bits t.acquire.bits := acquire.bits
t.acquire.valid := alloc_arb.io.in(i).ready t.acquire.valid := alloc_arb.io.in(i).ready
} }
acquire.ready := trackerList.map(_.io.client.acquire.ready).reduce(_||_) && !block_acquires acquire.ready := trackerList.map(_.io.inner.acquire.ready).reduce(_||_) && !block_acquires
alloc_arb.io.out.ready := acquire.valid && !block_acquires alloc_arb.io.out.ready := acquire.valid && !block_acquires
// Handle probe request generation // Handle probe request generation
val probe_arb = Module(new Arbiter(new LogicalNetworkIO(new Probe), trackerList.size)) val probe_arb = Module(new Arbiter(new LogicalNetworkIO(new Probe), trackerList.size))
io.client.probe <> probe_arb.io.out io.inner.probe <> probe_arb.io.out
probe_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.client.probe } probe_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.inner.probe }
// Handle releases, which might be voluntary and might have data // Handle releases, which might be voluntary and might have data
val release = io.client.release val release = io.inner.release
val voluntary = co.isVoluntary(release.bits.payload) val voluntary = co.isVoluntary(release.bits.payload)
val any_release_conflict = trackerList.tail.map(_.io.has_release_conflict).reduce(_||_) val any_release_conflict = trackerList.tail.map(_.io.has_release_conflict).reduce(_||_)
val block_releases = Bool(false) val block_releases = Bool(false)
@ -61,45 +61,45 @@ class L2CoherenceAgent(bankId: Int)(implicit conf: CoherenceAgentConfiguration)
//val release_idx = Mux(voluntary, Mux(any_release_conflict, conflict_idx, UInt(0)), release.bits.payload.master_xact_id) // TODO: Add merging logic to allow allocated AcquireTracker to handle conflicts, send all necessary grants, use first sufficient response //val release_idx = Mux(voluntary, Mux(any_release_conflict, conflict_idx, UInt(0)), release.bits.payload.master_xact_id) // TODO: Add merging logic to allow allocated AcquireTracker to handle conflicts, send all necessary grants, use first sufficient response
val release_idx = Mux(voluntary, UInt(0), release.bits.payload.master_xact_id) val release_idx = Mux(voluntary, UInt(0), release.bits.payload.master_xact_id)
for( i <- 0 until trackerList.size ) { for( i <- 0 until trackerList.size ) {
val t = trackerList(i).io.client val t = trackerList(i).io.inner
t.release.bits := release.bits t.release.bits := release.bits
t.release.valid := release.valid && (release_idx === UInt(i)) && !block_releases t.release.valid := release.valid && (release_idx === UInt(i)) && !block_releases
} }
release.ready := Vec(trackerList.map(_.io.client.release.ready)).read(release_idx) && !block_releases release.ready := Vec(trackerList.map(_.io.inner.release.ready)).read(release_idx) && !block_releases
// Reply to initial requestor // Reply to initial requestor
val grant_arb = Module(new Arbiter(new LogicalNetworkIO(new Grant), trackerList.size)) val grant_arb = Module(new Arbiter(new LogicalNetworkIO(new Grant), trackerList.size))
io.client.grant <> grant_arb.io.out io.inner.grant <> grant_arb.io.out
grant_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.client.grant } grant_arb.io.in zip trackerList map { case (arb, t) => arb <> t.io.inner.grant }
// Free finished transactions // Free finished transactions
val ack = io.client.finish val ack = io.inner.finish
trackerList.map(_.io.client.finish.valid := ack.valid) trackerList.map(_.io.inner.finish.valid := ack.valid)
trackerList.map(_.io.client.finish.bits := ack.bits) trackerList.map(_.io.inner.finish.bits := ack.bits)
ack.ready := Bool(true) ack.ready := Bool(true)
// Create an arbiter for the one memory port // Create an arbiter for the one memory port
val outer_arb = Module(new UncachedTileLinkIOArbiterThatPassesId(trackerList.size)) val outer_arb = Module(new UncachedTileLinkIOArbiterThatPassesId(trackerList.size))
outer_arb.io.in zip trackerList map { case(arb, t) => arb <> t.io.master } outer_arb.io.in zip trackerList map { case(arb, t) => arb <> t.io.outer }
io.master <> outer_arb.io.out io.outer <> outer_arb.io.out
} }
abstract class XactTracker()(implicit conf: CoherenceAgentConfiguration) extends Module { abstract class XactTracker()(implicit conf: CoherenceAgentConfiguration) extends Module {
implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co) implicit val (tl, ln, co) = (conf.tl, conf.tl.ln, conf.tl.co)
val io = new Bundle { val io = new Bundle {
val client = (new TileLinkIO).flip val inner = (new TileLinkIO).flip
val master = new UncachedTileLinkIO val outer = new UncachedTileLinkIO
val tile_incoherent = Bits(INPUT, ln.nClients) val tile_incoherent = Bits(INPUT, ln.nClients)
val has_acquire_conflict = Bool(OUTPUT) val has_acquire_conflict = Bool(OUTPUT)
val has_release_conflict = Bool(OUTPUT) val has_release_conflict = Bool(OUTPUT)
} }
val c_acq = io.client.acquire.bits val c_acq = io.inner.acquire.bits
val c_rel = io.client.release.bits val c_rel = io.inner.release.bits
val c_gnt = io.client.grant.bits val c_gnt = io.inner.grant.bits
val c_ack = io.client.finish.bits val c_ack = io.inner.finish.bits
val m_gnt = io.master.grant.bits val m_gnt = io.outer.grant.bits
} }
@ -109,46 +109,46 @@ class VoluntaryReleaseTracker(trackerId: Int, bankId: Int)(implicit conf: Cohere
val state = Reg(init=s_idle) val state = Reg(init=s_idle)
val xact = Reg{ new Release } val xact = Reg{ new Release }
val init_client_id = Reg(init=UInt(0, width = log2Up(ln.nClients))) val init_client_id = Reg(init=UInt(0, width = log2Up(ln.nClients)))
val incoming_rel = io.client.release.bits val incoming_rel = io.inner.release.bits
io.has_acquire_conflict := Bool(false) io.has_acquire_conflict := Bool(false)
io.has_release_conflict := co.isCoherenceConflict(xact.addr, incoming_rel.payload.addr) && io.has_release_conflict := co.isCoherenceConflict(xact.addr, incoming_rel.payload.addr) &&
(state != s_idle) (state != s_idle)
io.master.grant.ready := Bool(false) io.outer.grant.ready := Bool(false)
io.master.acquire.valid := Bool(false) io.outer.acquire.valid := Bool(false)
io.master.acquire.bits.header.src := UInt(bankId) io.outer.acquire.bits.header.src := UInt(bankId)
//io.master.acquire.bits.header.dst TODO //io.outer.acquire.bits.header.dst TODO
io.master.acquire.bits.payload := Acquire(co.getUncachedWriteAcquireType, io.outer.acquire.bits.payload := Acquire(co.getUncachedWriteAcquireType,
xact.addr, xact.addr,
UInt(trackerId), UInt(trackerId),
xact.data) xact.data)
io.client.acquire.ready := Bool(false) io.inner.acquire.ready := Bool(false)
io.client.probe.valid := Bool(false) io.inner.probe.valid := Bool(false)
io.client.release.ready := Bool(false) io.inner.release.ready := Bool(false)
io.client.grant.valid := Bool(false) io.inner.grant.valid := Bool(false)
io.client.grant.bits.header.src := UInt(bankId) io.inner.grant.bits.header.src := UInt(bankId)
io.client.grant.bits.header.dst := init_client_id io.inner.grant.bits.header.dst := init_client_id
io.client.grant.bits.payload := Grant(co.getGrantType(xact, UInt(0)), io.inner.grant.bits.payload := Grant(co.getGrantType(xact, UInt(0)),
xact.client_xact_id, xact.client_xact_id,
UInt(trackerId)) UInt(trackerId))
switch (state) { switch (state) {
is(s_idle) { is(s_idle) {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
when( io.client.release.valid ) { when( io.inner.release.valid ) {
xact := incoming_rel.payload xact := incoming_rel.payload
init_client_id := incoming_rel.header.src init_client_id := incoming_rel.header.src
state := Mux(co.messageHasData(incoming_rel.payload), s_mem, s_ack) state := Mux(co.messageHasData(incoming_rel.payload), s_mem, s_ack)
} }
} }
is(s_mem) { is(s_mem) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
when(io.master.acquire.ready) { state := s_ack } when(io.outer.acquire.ready) { state := s_ack }
} }
is(s_ack) { is(s_ack) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
when(io.client.grant.ready) { state := s_idle } when(io.inner.grant.ready) { state := s_idle }
} }
} }
} }
@ -178,7 +178,7 @@ class AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: CoherenceAgentC
probe_initial_flags := Bits(0) probe_initial_flags := Bits(0)
if (ln.nClients > 1) { if (ln.nClients > 1) {
// issue self-probes for uncached read xacts to facilitate I$ coherence // issue self-probes for uncached read xacts to facilitate I$ coherence
val probe_self = Bool(true) //co.needsSelfProbe(io.client.acquire.bits.payload) val probe_self = Bool(true) //co.needsSelfProbe(io.inner.acquire.bits.payload)
val myflag = Mux(probe_self, Bits(0), UIntToOH(c_acq.header.src(log2Up(ln.nClients)-1,0))) val myflag = Mux(probe_self, Bits(0), UIntToOH(c_acq.header.src(log2Up(ln.nClients)-1,0)))
probe_initial_flags := ~(io.tile_incoherent | myflag) probe_initial_flags := ~(io.tile_incoherent | myflag)
} }
@ -186,37 +186,37 @@ class AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: CoherenceAgentC
io.has_acquire_conflict := co.isCoherenceConflict(xact.addr, c_acq.payload.addr) && (state != s_idle) io.has_acquire_conflict := co.isCoherenceConflict(xact.addr, c_acq.payload.addr) && (state != s_idle)
io.has_release_conflict := co.isCoherenceConflict(xact.addr, c_rel.payload.addr) && (state != s_idle) io.has_release_conflict := co.isCoherenceConflict(xact.addr, c_rel.payload.addr) && (state != s_idle)
io.master.acquire.valid := Bool(false) io.outer.acquire.valid := Bool(false)
io.master.acquire.bits.header.src := UInt(bankId) io.outer.acquire.bits.header.src := UInt(bankId)
//io.master.acquire.bits.header.dst TODO //io.outer.acquire.bits.header.dst TODO
io.master.acquire.bits.payload := outer_read io.outer.acquire.bits.payload := outer_read
io.master.grant.ready := io.client.grant.ready io.outer.grant.ready := io.inner.grant.ready
io.client.probe.valid := Bool(false) io.inner.probe.valid := Bool(false)
io.client.probe.bits.header.src := UInt(bankId) io.inner.probe.bits.header.src := UInt(bankId)
io.client.probe.bits.header.dst := curr_p_id io.inner.probe.bits.header.dst := curr_p_id
io.client.probe.bits.payload := Probe(co.getProbeType(xact.a_type, UInt(0)), io.inner.probe.bits.payload := Probe(co.getProbeType(xact.a_type, UInt(0)),
xact.addr, xact.addr,
UInt(trackerId)) UInt(trackerId))
val grant_type = co.getGrantType(xact.a_type, init_sharer_cnt) val grant_type = co.getGrantType(xact.a_type, init_sharer_cnt)
io.client.grant.valid := Bool(false) io.inner.grant.valid := Bool(false)
io.client.grant.bits.header.src := UInt(bankId) io.inner.grant.bits.header.src := UInt(bankId)
io.client.grant.bits.header.dst := init_client_id io.inner.grant.bits.header.dst := init_client_id
io.client.grant.bits.payload := Grant(grant_type, io.inner.grant.bits.payload := Grant(grant_type,
xact.client_xact_id, xact.client_xact_id,
UInt(trackerId), UInt(trackerId),
m_gnt.payload.data) m_gnt.payload.data)
io.client.acquire.ready := Bool(false) io.inner.acquire.ready := Bool(false)
io.client.release.ready := Bool(false) io.inner.release.ready := Bool(false)
switch (state) { switch (state) {
is(s_idle) { is(s_idle) {
io.client.acquire.ready := Bool(true) io.inner.acquire.ready := Bool(true)
val needs_outer_write = co.messageHasData(c_acq.payload) val needs_outer_write = co.messageHasData(c_acq.payload)
val needs_outer_read = co.needsOuterRead(c_acq.payload.a_type, UInt(0)) val needs_outer_read = co.needsOuterRead(c_acq.payload.a_type, UInt(0))
when( io.client.acquire.valid ) { when( io.inner.acquire.valid ) {
xact := c_acq.payload xact := c_acq.payload
init_client_id := c_acq.header.src init_client_id := c_acq.header.src
init_sharer_cnt := UInt(ln.nClients) // TODO: Broadcast only init_sharer_cnt := UInt(ln.nClients) // TODO: Broadcast only
@ -232,18 +232,18 @@ class AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: CoherenceAgentC
} }
is(s_probe) { is(s_probe) {
// Generate probes // Generate probes
io.client.probe.valid := probe_flags.orR io.inner.probe.valid := probe_flags.orR
when(io.client.probe.ready) { when(io.inner.probe.ready) {
probe_flags := probe_flags & ~(UIntToOH(curr_p_id)) probe_flags := probe_flags & ~(UIntToOH(curr_p_id))
} }
// Handle releases, which may have data to be written back // Handle releases, which may have data to be written back
when(io.client.release.valid) { when(io.inner.release.valid) {
when(co.messageHasData(c_rel.payload)) { when(co.messageHasData(c_rel.payload)) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_write_rel io.outer.acquire.bits.payload := outer_write_rel
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
if(ln.nClients > 1) release_count := release_count - UInt(1) if(ln.nClients > 1) release_count := release_count - UInt(1)
when(release_count === UInt(1)) { when(release_count === UInt(1)) {
state := Mux(pending_outer_write, s_mem_write, state := Mux(pending_outer_write, s_mem_write,
@ -251,7 +251,7 @@ class AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: CoherenceAgentC
} }
} }
} .otherwise { } .otherwise {
io.client.release.ready := Bool(true) io.inner.release.ready := Bool(true)
if(ln.nClients > 1) release_count := release_count - UInt(1) if(ln.nClients > 1) release_count := release_count - UInt(1)
when(release_count === UInt(1)) { when(release_count === UInt(1)) {
state := Mux(pending_outer_write, s_mem_write, state := Mux(pending_outer_write, s_mem_write,
@ -261,30 +261,30 @@ class AcquireTracker(trackerId: Int, bankId: Int)(implicit conf: CoherenceAgentC
} }
} }
is(s_mem_read) { is(s_mem_read) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_read io.outer.acquire.bits.payload := outer_read
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle) state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle)
} }
} }
is(s_mem_write) { is(s_mem_write) {
io.master.acquire.valid := Bool(true) io.outer.acquire.valid := Bool(true)
io.master.acquire.bits.payload := outer_write_acq io.outer.acquire.bits.payload := outer_write_acq
when(io.master.acquire.ready) { when(io.outer.acquire.ready) {
state := Mux(pending_outer_read, s_mem_read, s_make_grant) state := Mux(pending_outer_read, s_mem_read, s_make_grant)
} }
} }
is(s_make_grant) { is(s_make_grant) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
when(io.client.grant.ready) { when(io.inner.grant.ready) {
state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle) state := Mux(co.requiresAckForGrant(grant_type), s_busy, s_idle)
} }
} }
is(s_busy) { // Nothing left to do but wait for transaction to complete is(s_busy) { // Nothing left to do but wait for transaction to complete
when(io.master.grant.valid && m_gnt.payload.client_xact_id === UInt(trackerId)) { when(io.outer.grant.valid && m_gnt.payload.client_xact_id === UInt(trackerId)) {
io.client.grant.valid := Bool(true) io.inner.grant.valid := Bool(true)
} }
when(io.client.finish.valid && c_ack.payload.master_xact_id === UInt(trackerId)) { when(io.inner.finish.valid && c_ack.payload.master_xact_id === UInt(trackerId)) {
state := s_idle state := s_idle
} }
} }