Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD: submodule tacit & tacit decoder #2172

Merged
merged 19 commits into from
Feb 8, 2025
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,9 @@
[submodule "generators/vexiiriscv"]
path = generators/vexiiriscv
url = https://github.com/ucb-bar/vexiiriscv-tile.git
[submodule "software/tacit_decoder"]
path = software/tacit_decoder
url = [email protected]:ucb-bar/tacit_decoder.git
[submodule "generators/tacit"]
path = generators/tacit
url = [email protected]:ucb-bar/tacit.git
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 6 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ lazy val chipyard = (project in file("generators/chipyard"))
dsptools, rocket_dsp_utils,
gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
constellation, mempress, barf, shuttle, caliptra_aes, rerocc,
compressacc, saturn, ara, firrtl2_bridge, vexiiriscv)
compressacc, saturn, ara, firrtl2_bridge, vexiiriscv, tacit)
.settings(libraryDependencies ++= rocketLibDeps.value)
.settings(
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -253,6 +253,11 @@ lazy val nvdla = (project in file("generators/nvdla"))
.settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings)

lazy val tacit = (project in file("generators/tacit"))
.dependsOn(rocketchip, shuttle)
.settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings)

lazy val caliptra_aes = (project in file("generators/caliptra-aes-acc"))
.dependsOn(rocketchip, rocc_acc_utils, testchipip)
.settings(libraryDependencies ++= rocketLibDeps.value)
Expand Down
2 changes: 2 additions & 0 deletions generators/chipyard/src/main/scala/DigitalTop.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import chisel3._

import freechips.rocketchip.subsystem._
import freechips.rocketchip.system._
import freechips.rocketchip.trace._
import org.chipsalliance.cde.config.Parameters
import freechips.rocketchip.devices.tilelink._

Expand All @@ -13,6 +14,7 @@ import freechips.rocketchip.devices.tilelink._

// DOC include start: DigitalTop
class DigitalTop(implicit p: Parameters) extends ChipyardSystem
with tacit.CanHaveTraceSinkDMA
with testchipip.tsi.CanHavePeripheryUARTTSI // Enables optional UART-based TSI transport
with testchipip.boot.CanHavePeripheryCustomBootPin // Enables optional custom boot pin
with testchipip.boot.CanHavePeripheryBootAddrReg // Use programmable boot address register
Expand Down
10 changes: 10 additions & 0 deletions generators/chipyard/src/main/scala/config/RocketConfigs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,13 @@ class SV48RocketConfig extends Config(
new freechips.rocketchip.rocket.WithSV48 ++
new freechips.rocketchip.rocket.WithNHugeCores(1) ++
new chipyard.config.AbstractConfig)

class LTraceEncoderRocketConfig extends Config(
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
new tacit.WithTraceSinkDMA(1) ++
new tacit.WithTraceSinkAlways(0) ++
new chipyard.config.WithArbiterMonitor ++
new chipyard.config.WithLTraceEncoder ++
new chipyard.config.WithNPerfCounters(29) ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new freechips.rocketchip.rocket.WithNHugeCores(1) ++
new chipyard.config.AbstractConfig)
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ class GemminiShuttleConfig extends Config(
new gemmini.DefaultGemminiConfig ++ // use Gemmini systolic array GEMM accel
new shuttle.common.WithNShuttleCores ++
new chipyard.config.AbstractConfig)

class TacitShuttleConfig extends Config(
// new tacit.WithTraceSinkDMA(1) ++
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
new tacit.WithTraceSinkAlways(0) ++
new chipyard.config.WithArbiterMonitor ++
new chipyard.config.WithLTraceEncoder ++
new freechips.rocketchip.subsystem.WithoutTLMonitors ++
new shuttle.common.WithNShuttleCores ++
new chipyard.config.AbstractConfig)
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ import org.chipsalliance.cde.config.{Field, Parameters, Config}
import freechips.rocketchip.tile._
import freechips.rocketchip.subsystem._
import freechips.rocketchip.rocket.{RocketCoreParams, MulDivParams, DCacheParams, ICacheParams}
import freechips.rocketchip.diplomacy._

import cva6.{CVA6TileAttachParams}
import sodor.common.{SodorTileAttachParams}
import ibex.{IbexTileAttachParams}
import vexiiriscv.{VexiiRiscvTileAttachParams}
import testchipip.cosim.{TracePortKey, TracePortParams}
import barf.{TilePrefetchingMasterPortParams}

import freechips.rocketchip.trace.{TraceEncoderParams, TraceCoreParams}
import tacit.{TacitEncoder}
import shuttle.common.{ShuttleTileAttachParams}
class WithL2TLBs(entries: Int) extends Config((site, here, up) => {
case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
Expand Down Expand Up @@ -64,6 +67,46 @@ class WithNPerfCounters(n: Int = 29) extends Config((site, here, up) => {
}
})

class WithLTraceEncoder extends Config((site, here, up) => {
case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
traceParams = Some(TraceEncoderParams(
encoderBaseAddr = 0x3000000 + tp.tileParams.tileId * 0x1000,
buildEncoder = (p: Parameters) => LazyModule(new TacitEncoder(new TraceCoreParams(
nGroups = 1,
iretireWidth = 1,
xlen = tp.tileParams.core.xLen,
iaddrWidth = tp.tileParams.core.xLen
),
bufferDepth = 16,
coreStages = 5)(p)),
useArbiterMonitor = false
)),
core = tp.tileParams.core.copy(enableTraceCoreIngress=true)))
case tp: ShuttleTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
traceParams = Some(TraceEncoderParams(
encoderBaseAddr = 0x3000000 + tp.tileParams.tileId * 0x1000,
buildEncoder = (p: Parameters) => LazyModule(new TacitEncoder(new TraceCoreParams(
nGroups = tp.tileParams.core.retireWidth,
iretireWidth = 1,
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
xlen = tp.tileParams.core.xLen,
iaddrWidth = tp.tileParams.core.xLen
), bufferDepth = 16, coreStages = 5)(p)),
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
useArbiterMonitor = false
)),
core = tp.tileParams.core.copy(enableTraceCoreIngress=true)))
}
})

class WithArbiterMonitor extends Config((site, here, up) => {
jerryz123 marked this conversation as resolved.
Show resolved Hide resolved
case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
traceParams = Some(tp.tileParams.traceParams.get.copy(useArbiterMonitor = true))))
case tp: ShuttleTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
traceParams = Some(tp.tileParams.traceParams.get.copy(useArbiterMonitor = true))))
}
})

class WithNPMPs(n: Int = 8) extends Config((site, here, up) => {
case TilesLocated(InSubsystem) => up(TilesLocated(InSubsystem), site) map {
case tp: RocketTileAttachParams => tp.copy(tileParams = tp.tileParams.copy(
Expand Down
1 change: 1 addition & 0 deletions generators/tacit
Submodule tacit added at edbae8
1 change: 1 addition & 0 deletions software/tacit_decoder
Submodule tacit_decoder added at a14803