Skip to content

fix(arch): align Mill modules with updated Chipyard #96

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.

Sign up for GitHub

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

Open
daiyongyuan wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

fix(arch): align Mill modules with updated Chipyard #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions arch/build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,10 @@ object nvdla extends SbtModule {
os.pwd / "thirdparty" / "chipyard" / "generators" / "nvdla"
override def scalaVersion = "2.13.16"

// Add rocket-chip as a dependency
// NVDLA config fragments use the subsystem injector API from testchipip.
override def moduleDeps = Seq(
rocketchip
rocketchip,
testchipip
)

override def ivyDeps = Agg(
Expand All @@ -365,10 +366,11 @@ object fft_generator extends SbtModule {
os.pwd / "thirdparty" / "chipyard" / "generators" / "fft-generator"
override def scalaVersion = "2.13.16"

// Add rocket-chip and rocket-dsp-utils as dependencies (as per build.sbt)
// FFT configs use the subsystem injector API from testchipip.
override def moduleDeps = Seq(
rocketchip,
rocket_dsp_utils
rocket_dsp_utils,
testchipip
)

override def ivyDeps = Agg(
Expand Down Expand Up @@ -967,7 +969,10 @@ object firechip_bridgestubs extends SbtModule {

// Add chipyard, firesim_lib, and firechip_bridgeinterfaces as dependencies
override def sources = T.sources {
super.sources().filterNot(path => path.path.last.toString == "SimpleNICBridge.scala")
os.walk(millSourcePath / "src" / "main" / "scala")
.filter(path => path.ext == "scala")
.filterNot(path => path.last.toString == "SimpleNICBridge.scala")
.map(PathRef(_))
}

override def moduleDeps = Seq(
Expand Down
Loading