Skip to content

Commit b698f0c

Browse files
committed
Move SubsystemInjector API to testchipip
1 parent 06a818a commit b698f0c

File tree

6 files changed

+8
-4
lines changed

6 files changed

+8
-4
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ lazy val constellation = (project in file("generators/constellation"))
194194
.settings(commonSettings)
195195

196196
lazy val fft_generator = (project in file("generators/fft-generator"))
197-
.dependsOn(rocketchip, rocket_dsp_utils)
197+
.dependsOn(rocketchip, rocket_dsp_utils, testchipip)
198198
.settings(libraryDependencies ++= rocketLibDeps.value)
199199
.settings(commonSettings)
200200

@@ -244,7 +244,7 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
244244
.settings(commonSettings)
245245

246246
lazy val radiance = (project in file("generators/radiance"))
247-
.dependsOn(rocketchip, gemmini)
247+
.dependsOn(rocketchip, gemmini, testchipip)
248248
.settings(libraryDependencies ++= rocketLibDeps.value)
249249
.settings(libraryDependencies ++= Seq(
250250
"edu.berkeley.cs" %% "chiseltest" % chiselTestVersion,
@@ -260,7 +260,7 @@ lazy val gemmini = freshProject("gemmini", file("generators/gemmini"))
260260
.settings(commonSettings)
261261

262262
lazy val nvdla = (project in file("generators/nvdla"))
263-
.dependsOn(rocketchip)
263+
.dependsOn(rocketchip, testchipip)
264264
.settings(libraryDependencies ++= rocketLibDeps.value)
265265
.settings(commonSettings)
266266

generators/chipyard/src/main/scala/DigitalTop.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class DigitalTop(implicit p: Parameters) extends ChipyardSystem
1818
with testchipip.tsi.CanHavePeripheryUARTTSI // Enables optional UART-based TSI transport
1919
with testchipip.boot.CanHavePeripheryCustomBootPin // Enables optional custom boot pin
2020
with testchipip.cosim.CanHaveTraceIO // Enables optionally adding trace IO
21+
with testchipip.soc.CanHaveSubsystemInjectors // Enables the subsystem injector API
2122
with testchipip.soc.CanHaveSwitchableOffchipBus // Enables optional off-chip-bus with interface-switch
2223
with testchipip.iceblk.CanHavePeripheryBlockDevice // Enables optionally adding the block device
2324
with testchipip.serdes.CanHavePeripheryTLSerial // Enables optionally adding the tl-serial interface

generators/chipyard/src/main/scala/example/InitZero.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import freechips.rocketchip.subsystem._
66
import org.chipsalliance.cde.config.{Parameters, Field, Config}
77
import freechips.rocketchip.diplomacy.{LazyModule, LazyModuleImp, IdRange}
88
import freechips.rocketchip.tilelink._
9+
import testchipip.soc.{SubsystemInjector, SubsystemInjectorKey}
910

1011
case class InitZeroConfig(base: BigInt, size: BigInt)
1112
case object InitZeroKey extends Field[Option[InitZeroConfig]](None)

generators/chipyard/src/main/scala/example/dsptools/GenericFIR.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import freechips.rocketchip.tilelink._
1313
import freechips.rocketchip.subsystem._
1414
import fixedpoint._
1515
import fixedpoint.{fromIntToBinaryPoint, fromSIntToFixedPoint, fromUIntToFixedPoint}
16+
import testchipip.soc.{SubsystemInjector, SubsystemInjectorKey}
1617

1718
// FIR params
1819
case class GenericFIRParams(

generators/chipyard/src/main/scala/example/dsptools/StreamingPassthrough.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.chipsalliance.cde.config.{Parameters, Field, Config}
1212
import freechips.rocketchip.diplomacy._
1313
import freechips.rocketchip.tilelink._
1414
import freechips.rocketchip.subsystem._
15+
import testchipip.soc.{SubsystemInjector, SubsystemInjectorKey}
1516

1617
// Simple passthrough to use as testbed sanity check
1718
// StreamingPassthrough params

0 commit comments

Comments
 (0)