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.

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

Jump to bottom

[build system] enable panamaconverter #491

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[build system] enable panamaconverter #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eebf33
[build system] enable binder
SpriteOvO Mar 29, 2024
7b3b7c0
[WIP] try to fix
SpriteOvO Apr 6, 2024
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
10 changes: 9 additions & 1 deletion nix/overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,22 @@ in

# Override "nixpkgs" circt with "nixpkgs-for-circt".
# To update the "nixpkgs-for-circt" input, run `nix flake lock --update-input nixpkgs-for-circt`.
circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt;
espresso = final.callPackage ./pkgs/espresso.nix { };
dramsim3 = final.callPackage ./pkgs/dramsim3.nix { };
libspike = final.callPackage ./pkgs/libspike.nix { };
buddy-mlir = final.callPackage ./pkgs/buddy-mlir.nix { };
fetchMillDeps = final.callPackage ./pkgs/mill-builder.nix { };
circt-full = final.callPackage ./pkgs/circt-full.nix { };

circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt.overrideAttrs (oldAttrs: rec {
patches = [
(prev.fetchpatch {
url = "https://github.com/llvm/circt/pull/6893.patch";
sha256 = "sha256-PaWMYFtKMaBLVhoqLAHh97lRlolsIwyQcHOAJNTAZFo=";
})
];
});

mill = let jre = final.jdk21; in
(prev.mill.override { inherit jre; }).overrideAttrs (_: {
passthru = { inherit jre; };
Expand Down
8 changes: 4 additions & 4 deletions nix/t1/_sources/generated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"chisel": {
"cargoLocks": null,
"date": "2024-03-27",
"date": "2024-04-06",
"extract": null,
"name": "chisel",
"passthru": null,
Expand All @@ -73,11 +73,11 @@
"name": null,
"owner": "chipsalliance",
"repo": "chisel",
"rev": "9177535ff1be47ffd99034bf0154c0f1ec637419",
"sha256": "sha256-smqNuOnmz+MeVGyS7mdIzegniQ/6EJH4CFqK4JntvrI=",
"rev": "88942f925dd184b3bb626e4e6442c3edf1c421d1",
"sha256": "sha256-WFQ/MyZu2Tt8/Zw23hJaEJil3mRDOYUKO2dqAMr7WAc=",
"type": "github"
},
"version": "9177535ff1be47ffd99034bf0154c0f1ec637419"
"version": "88942f925dd184b3bb626e4e6442c3edf1c421d1"
},
"diplomacy": {
"cargoLocks": null,
Expand Down
8 changes: 4 additions & 4 deletions nix/t1/_sources/generated.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
};
chisel = {
pname = "chisel";
version = "9177535ff1be47ffd99034bf0154c0f1ec637419";
version = "88942f925dd184b3bb626e4e6442c3edf1c421d1";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "chisel";
rev = "9177535ff1be47ffd99034bf0154c0f1ec637419";
rev = "88942f925dd184b3bb626e4e6442c3edf1c421d1";
fetchSubmodules = false;
sha256 = "sha256-smqNuOnmz+MeVGyS7mdIzegniQ/6EJH4CFqK4JntvrI=";
sha256 = "sha256-WFQ/MyZu2Tt8/Zw23hJaEJil3mRDOYUKO2dqAMr7WAc=";
};
date = "2024-03-27";
date = "2024-04-06";
};
diplomacy = {
pname = "diplomacy";
Expand Down
6 changes: 3 additions & 3 deletions nix/t1/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ lib.makeScope newScope
ip = {
recurseForDerivations = true;

mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ip"; /* use-binder = true; */ };
mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ip"; use-binder = true; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename to use-panamaconverter

rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.ip.mlirbc; };

emu-mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ipemu"; /* use-binder = true; */ };
emu-mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "ipemu"; use-binder = true; };
emu-rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.ip.emu-mlirbc; };

emu = innerSelf.callPackage ./ipemu.nix { rtl = innerSelf.ip.emu-rtl; stdenv = moldStdenv; };
Expand All @@ -81,7 +81,7 @@ lib.makeScope newScope
subsystem = {
recurseForDerivations = true;

mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "subsystem"; /* use-binder = true; */ };
mlirbc = innerSelf.callPackage ./mlirbc.nix { target = "subsystem"; use-binder = true; };
rtl = innerSelf.callPackage ./rtl.nix { mlirbc = innerSelf.subsystem.mlirbc; };
};
})
Expand Down
2 changes: 1 addition & 1 deletion nix/t1/nvfetcher.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fetch.github = "chipsalliance/rocket-chip-inclusive-cache"

[chisel]
src.git = "https://github.com/chipsalliance/chisel"
src.branch = "main"
src.branch = "binder-large-integer"
fetch.github = "chipsalliance/chisel"

[rvdecoderdb]
Expand Down
1 change: 1 addition & 0 deletions nix/t1/result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/nix/store/in7jgajijq1ilgyb75w123rj4k2cjy26-t1-subsystem-blastoise-mlirbc
2 changes: 1 addition & 1 deletion nix/t1/t1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ let

mkdir -p $configgen/bin $elaborator/bin
makeWrapper ${jdk21}/bin/java $configgen/bin/configgen --add-flags "-jar $out/share/java/configgen.jar"
makeWrapper ${jdk21}/bin/java $elaborator/bin/elaborator --add-flags "--enable-preview -Djava.library.path=${circt-full}/lib -jar $out/share/java/elaborator.jar"
makeWrapper ${jdk21}/bin/java $elaborator/bin/elaborator --add-flags "--enable-preview -Djava.library.path=${circt-full}/lib -Xmx64G -jar $out/share/java/elaborator.jar"
'';
};
in
Expand Down