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

[build system] add axi4 build target from chisel-interface #656

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 15 additions & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import coursier.maven.MavenRepository
import $file.dependencies.chisel.build
import $file.dependencies.arithmetic.common
import $file.dependencies.tilelink.common
import $file.dependencies.`chisel-interface`.common
import $file.dependencies.`berkeley-hardfloat`.common
import $file.dependencies.rvdecoderdb.common
import $file.common
Expand Down Expand Up @@ -66,6 +67,20 @@ trait TileLink
def chiselPluginIvy = None
}

object axi4 extends AXI4

trait AXI4 extends millbuild.dependencies.`chisel-interface`.common.AXI4Module {
override def millSourcePath = os.pwd / "dependencies" / "chisel-interface" / "axi4"
def scalaVersion = v.scala

def mainargsIvy = v.mainargs

def chiselModule = Some(chisel)
def chiselPluginJar = T(Some(chisel.pluginModule.jar()))
def chiselIvy = None
def chiselPluginIvy = None
}

object hardfloat extends Hardfloat

trait Hardfloat
Expand Down Expand Up @@ -184,7 +199,6 @@ trait Macros
}

// we maintain our own Rocket for T1

object rocket extends Rocket

trait Rocket
Expand Down
20 changes: 20 additions & 0 deletions nix/t1/_sources/generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,26 @@
},
"version": "0baa8fdf9b3688236d81797f5105bed45e06bdb5"
},
"chisel-interface": {
"cargoLocks": null,
"date": "2024-06-17",
"extract": null,
"name": "chisel-interface",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "chipsalliance",
"repo": "chisel-interface",
"rev": "79703e44fb6010a535e6750249f6be0471fa0046",
"sha256": "sha256-1VTN2OfsauJvf+JM/j0uhvixD0+aCnyGOoO74YrCFPA=",
"type": "github"
},
"version": "79703e44fb6010a535e6750249f6be0471fa0046"
},
"diplomacy": {
"cargoLocks": null,
"date": "2024-04-25",
Expand Down
12 changes: 12 additions & 0 deletions nix/t1/_sources/generated.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@
};
date = "2024-06-20";
};
chisel-interface = {
pname = "chisel-interface";
version = "79703e44fb6010a535e6750249f6be0471fa0046";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "chisel-interface";
rev = "79703e44fb6010a535e6750249f6be0471fa0046";
fetchSubmodules = false;
sha256 = "sha256-1VTN2OfsauJvf+JM/j0uhvixD0+aCnyGOoO74YrCFPA=";
};
date = "2024-06-17";
};
diplomacy = {
pname = "diplomacy";
version = "055be698f4ad55bf4a90b3d5e31d4344be5f788b";
Expand Down
5 changes: 5 additions & 0 deletions nix/t1/nvfetcher.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ src.git = "https://github.com/chipsalliance/chisel"
src.branch = "main"
fetch.github = "chipsalliance/chisel"

[chisel-interface]
src.git = "https://github.com/chipsalliance/chisel-interface"
src.branch = "master"
fetch.github = "chipsalliance/chisel-interface"

[rvdecoderdb]
src.git = "https://github.com/sequencer/rvdecoderdb"
src.branch = "master"
Expand Down
Loading