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

Migrate T1 to FixedIOModule #679

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Migrate T1 to FixedIOModule #679

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
0c6a3b5
[deps] Bump T1 dependencies
sequencer Jul 25, 2024
b656234
[rtl] migrate T1 to FixedIOModule
sequencer Jul 19, 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
2 changes: 1 addition & 1 deletion build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object v {
val scala = "2.13.14"
val mainargs = ivy"com.lihaoyi::mainargs:0.5.0"
val oslib = ivy"com.lihaoyi::os-lib:0.9.1"
val upickle = ivy"com.lihaoyi::upickle:3.1.3"
val upickle = ivy"com.lihaoyi::upickle:3.3.1"
val spire = ivy"org.typelevel::spire:latest.integration"
val evilplot = ivy"io.github.cibotech::evilplot:latest.integration"
}
Expand Down
335 changes: 187 additions & 148 deletions ipemu/src/TestBench.scala
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 33 additions & 13 deletions nix/t1/_sources/generated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,29 @@
},
"version": "4a81e23e1794844b36c53385d343475d4d7eca49"
},
"berkeley-hardfloat": {
"cargoLocks": null,
"date": "2024-06-05",
"extract": null,
"name": "berkeley-hardfloat",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "ucb-bar",
"repo": "berkeley-hardfloat",
"rev": "26f00d00c3f3f57480065e02bfcfde3d3b41ec51",
"sha256": "sha256-gA1Ol7xnzC+10lGwK9+ftfJcMhKsC0KhjENQvUg3u88=",
"type": "github"
},
"version": "26f00d00c3f3f57480065e02bfcfde3d3b41ec51"
},
"chisel": {
"cargoLocks": null,
"date": "2024-07-12",
"date": "2024-07-25",
"extract": null,
"name": "chisel",
"passthru": null,
Expand All @@ -33,11 +53,11 @@
"name": null,
"owner": "chipsalliance",
"repo": "chisel",
"rev": "ae5434977a0c0ede55a46847bfcbc8dbf2286c35",
"sha256": "sha256-POPpNMnbe4IidbqSlrgBzWHRn6eeL6gh+MuT3v6bw2w=",
"rev": "73e96ea5db53ad176e6a9011fc42c888c901d7e2",
"sha256": "sha256-VvK0NfvXh4oHn2rj2OWTe1zpONt6ReyvhMGDxa3ikE4=",
"type": "github"
},
"version": "ae5434977a0c0ede55a46847bfcbc8dbf2286c35"
"version": "73e96ea5db53ad176e6a9011fc42c888c901d7e2"
},
"chisel-interface": {
"cargoLocks": null,
Expand All @@ -61,7 +81,7 @@
},
"riscv-opcodes": {
"cargoLocks": null,
"date": "2024-04-10",
"date": "2024-07-24",
"extract": null,
"name": "riscv-opcodes",
"passthru": null,
Expand All @@ -73,15 +93,15 @@
"name": null,
"owner": "riscv",
"repo": "riscv-opcodes",
"rev": "9fa26954e79d4403eedcbe1b35395001bbbeb8b1",
"sha256": "sha256-Gt3v8/VVNhB4IFL7kud8Y7EnSM2/2H4urV1AmBviP9E=",
"rev": "07b21cc5143a15959eda12e30aa40cea0971efe0",
"sha256": "sha256-B9njfBxZfm7xkSKBD8JOUWIKEzL8ra/X9FKC3CJ2gK8=",
"type": "github"
},
"version": "9fa26954e79d4403eedcbe1b35395001bbbeb8b1"
"version": "07b21cc5143a15959eda12e30aa40cea0971efe0"
},
"rvdecoderdb": {
"cargoLocks": null,
"date": "2024-01-28",
"date": "2024-07-25",
"extract": null,
"name": "rvdecoderdb",
"passthru": null,
Expand All @@ -93,10 +113,10 @@
"name": null,
"owner": "sequencer",
"repo": "rvdecoderdb",
"rev": "d65525e7e18004b0877d8fbe2c435296ab986f44",
"sha256": "sha256-MzEoFjyUgarR62ux4ngYNFOgvAoeasdr1EVhaCvuh+Q=",
"rev": "6f22826d2c8facb6bf0b41f4bea26a2225751220",
"sha256": "sha256-4Hwa2Z4mmALy4ZElWzxFgqC+7EsyBhahVYlVUzyYKF4=",
"type": "github"
},
"version": "d65525e7e18004b0877d8fbe2c435296ab986f44"
},
"version": "6f22826d2c8facb6bf0b41f4bea26a2225751220"
}
}
32 changes: 16 additions & 16 deletions nix/t1/_sources/generated.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
};
berkeley-hardfloat = {
pname = "berkeley-hardfloat";
version = "b3c8a38c286101973b3bc071f7918392343faba7";
version = "26f00d00c3f3f57480065e02bfcfde3d3b41ec51";
src = fetchFromGitHub {
owner = "ucb-bar";
repo = "berkeley-hardfloat";
rev = "b3c8a38c286101973b3bc071f7918392343faba7";
rev = "26f00d00c3f3f57480065e02bfcfde3d3b41ec51";
fetchSubmodules = false;
sha256 = "sha256-3j6K/qFuH8PqJT6zHVTIphq9HWxmSGoIqDo9GV1bxmU=";
sha256 = "sha256-gA1Ol7xnzC+10lGwK9+ftfJcMhKsC0KhjENQvUg3u88=";
};
date = "2023-10-25";
date = "2024-06-05";
};
chisel = {
pname = "chisel";
version = "ae5434977a0c0ede55a46847bfcbc8dbf2286c35";
version = "73e96ea5db53ad176e6a9011fc42c888c901d7e2";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "chisel";
rev = "ae5434977a0c0ede55a46847bfcbc8dbf2286c35";
rev = "73e96ea5db53ad176e6a9011fc42c888c901d7e2";
fetchSubmodules = false;
sha256 = "sha256-POPpNMnbe4IidbqSlrgBzWHRn6eeL6gh+MuT3v6bw2w=";
sha256 = "sha256-VvK0NfvXh4oHn2rj2OWTe1zpONt6ReyvhMGDxa3ikE4=";
};
date = "2024-07-12";
date = "2024-07-25";
};
chisel-interface = {
pname = "chisel-interface";
Expand All @@ -51,26 +51,26 @@
};
riscv-opcodes = {
pname = "riscv-opcodes";
version = "9fa26954e79d4403eedcbe1b35395001bbbeb8b1";
version = "07b21cc5143a15959eda12e30aa40cea0971efe0";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-opcodes";
rev = "9fa26954e79d4403eedcbe1b35395001bbbeb8b1";
rev = "07b21cc5143a15959eda12e30aa40cea0971efe0";
fetchSubmodules = false;
sha256 = "sha256-Gt3v8/VVNhB4IFL7kud8Y7EnSM2/2H4urV1AmBviP9E=";
sha256 = "sha256-B9njfBxZfm7xkSKBD8JOUWIKEzL8ra/X9FKC3CJ2gK8=";
};
date = "2024-04-10";
date = "2024-07-24";
};
rvdecoderdb = {
pname = "rvdecoderdb";
version = "d65525e7e18004b0877d8fbe2c435296ab986f44";
version = "6f22826d2c8facb6bf0b41f4bea26a2225751220";
src = fetchFromGitHub {
owner = "sequencer";
repo = "rvdecoderdb";
rev = "d65525e7e18004b0877d8fbe2c435296ab986f44";
rev = "6f22826d2c8facb6bf0b41f4bea26a2225751220";
fetchSubmodules = false;
sha256 = "sha256-MzEoFjyUgarR62ux4ngYNFOgvAoeasdr1EVhaCvuh+Q=";
sha256 = "sha256-4Hwa2Z4mmALy4ZElWzxFgqC+7EsyBhahVYlVUzyYKF4=";
};
date = "2024-01-28";
date = "2024-07-25";
};
}
2 changes: 1 addition & 1 deletion nix/t1/omreader.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ let
./../../common.sc
];
};
millDepsHash = "sha256-ZwIl6YsaGde3ikbzxLzY2+/XTc5O2dQrOMKcwhKEq+k=";
millDepsHash = "sha256-vrxTqskAH7H598ZWRC/+KAXOQlQ6f+gL9c0hvD25xOM=";
nativeBuildInputs = [ submodules.setupHook ];
};

Expand Down
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 @@ -41,7 +41,7 @@ let
./../../common.sc
];
};
millDepsHash = "sha256-ZwIl6YsaGde3ikbzxLzY2+/XTc5O2dQrOMKcwhKEq+k=";
millDepsHash = "sha256-vrxTqskAH7H598ZWRC/+KAXOQlQ6f+gL9c0hvD25xOM=";
nativeBuildInputs = [ submodules.setupHook ];
};

Expand Down
2 changes: 1 addition & 1 deletion script/build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trait ScriptModule extends ScalaModule {
val scala3 = "3.3.3"
val mainargs = ivy"com.lihaoyi::mainargs:0.5.0"
val oslib = ivy"com.lihaoyi::os-lib:0.10.0"
val upickle = ivy"com.lihaoyi::upickle:3.1.3"
val upickle = ivy"com.lihaoyi::upickle:3.3.1"

def scalaVersion = scala3
def scalacOptions = Seq("-new-syntax")
Expand Down
2 changes: 1 addition & 1 deletion script/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
./build.sc
];
};
millDepsHash = "sha256-J8bBgM/F+8x8EQ1DR6Va/ZY2hnsjkkzk4a+ctDMKK3k=";
millDepsHash = "sha256-89K7QEq3k50gvs4sbXu7rHajC4tmnQCqB4m5ybBTn6k=";
};

passthru.withLsp = self.overrideAttrs (old: {
Expand Down
Loading