Merge branch 'fixedio-t1' into rocket-t1

chipsalliance · Jul 24, 2024 · 9a5c5e3 · 9a5c5e3
2 parents 56575f7 + ce9d594
commit 9a5c5e3
Show file tree

Hide file tree

Showing 7 changed files with 410 additions and 330 deletions.
diff --git a/build.sc b/build.sc
@@ -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"
 }

diff --git a/ipemu/src/TestBench.scala b/ipemu/src/TestBench.scala
diff --git a/nix/t1/_sources/generated.json b/nix/t1/_sources/generated.json
@@ -1,102 +1,122 @@
 {
-  "arithmetic": {
-    "cargoLocks": null,
-    "date": "2024-01-23",
-    "extract": null,
-    "name": "arithmetic",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "sequencer",
-      "repo": "arithmetic",
-      "rev": "4a81e23e1794844b36c53385d343475d4d7eca49",
-      "sha256": "sha256-tQwzECNOXhuKzpwRD+iKSEJYl1/wlhMQTJULJSCdTrY=",
-      "type": "github"
+    "arithmetic": {
+        "cargoLocks": null,
+        "date": "2024-01-23",
+        "extract": null,
+        "name": "arithmetic",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "sequencer",
+            "repo": "arithmetic",
+            "rev": "4a81e23e1794844b36c53385d343475d4d7eca49",
+            "sha256": "sha256-tQwzECNOXhuKzpwRD+iKSEJYl1/wlhMQTJULJSCdTrY=",
+            "type": "github"
+        },
+        "version": "4a81e23e1794844b36c53385d343475d4d7eca49"
     },
-    "version": "4a81e23e1794844b36c53385d343475d4d7eca49"
-  },
-  "chisel": {
-    "cargoLocks": null,
-    "date": "2024-07-12",
-    "extract": null,
-    "name": "chisel",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "chipsalliance",
-      "repo": "chisel",
-      "rev": "ae5434977a0c0ede55a46847bfcbc8dbf2286c35",
-      "sha256": "sha256-POPpNMnbe4IidbqSlrgBzWHRn6eeL6gh+MuT3v6bw2w=",
-      "type": "github"
+    "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"
     },
-    "version": "ae5434977a0c0ede55a46847bfcbc8dbf2286c35"
-  },
-  "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"
+    "chisel": {
+        "cargoLocks": null,
+        "date": "2024-07-22",
+        "extract": null,
+        "name": "chisel",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "chipsalliance",
+            "repo": "chisel",
+            "rev": "fe6a52e80935613cfd09455ee969ef2b2dcc082a",
+            "sha256": "sha256-90HkfnCZJjM9aOunx445Fr208juyRxODpVSS+RF6sLk=",
+            "type": "github"
+        },
+        "version": "fe6a52e80935613cfd09455ee969ef2b2dcc082a"
     },
-    "version": "79703e44fb6010a535e6750249f6be0471fa0046"
-  },
-  "riscv-opcodes": {
-    "cargoLocks": null,
-    "date": "2024-04-10",
-    "extract": null,
-    "name": "riscv-opcodes",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "riscv",
-      "repo": "riscv-opcodes",
-      "rev": "9fa26954e79d4403eedcbe1b35395001bbbeb8b1",
-      "sha256": "sha256-Gt3v8/VVNhB4IFL7kud8Y7EnSM2/2H4urV1AmBviP9E=",
-      "type": "github"
+    "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"
     },
-    "version": "9fa26954e79d4403eedcbe1b35395001bbbeb8b1"
-  },
-  "rvdecoderdb": {
-    "cargoLocks": null,
-    "date": "2024-06-28",
-    "extract": null,
-    "name": "rvdecoderdb",
-    "passthru": null,
-    "pinned": false,
-    "src": {
-      "deepClone": false,
-      "fetchSubmodules": false,
-      "leaveDotGit": false,
-      "name": null,
-      "owner": "sequencer",
-      "repo": "rvdecoderdb",
-      "rev": "b90db1a8f582dff4aa91a5f0a85feb29d27a95e4",
-      "sha256": "sha256-1ix9qJYKd6YqfLfdCm8KopCAhsBJ4qr6yqtqhchgeeU=",
-      "type": "github"
+    "riscv-opcodes": {
+        "cargoLocks": null,
+        "date": "2024-07-16",
+        "extract": null,
+        "name": "riscv-opcodes",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "riscv",
+            "repo": "riscv-opcodes",
+            "rev": "048218e19195949342636ff69f4b743da167f91f",
+            "sha256": "sha256-XKrgkXJd+K2/ZQ/0p8rU2lKSR1tD4icugzY3Llokwe0=",
+            "type": "github"
+        },
+        "version": "048218e19195949342636ff69f4b743da167f91f"
     },
-    "version": "d65525e7e18004b0877d8fbe2c435296ab986f44"
-  }
+    "rvdecoderdb": {
+        "cargoLocks": null,
+        "date": "2024-07-06",
+        "extract": null,
+        "name": "rvdecoderdb",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "sequencer",
+            "repo": "rvdecoderdb",
+            "rev": "e58432b5888616984e4efcb151009ec4bdf0f88f",
+            "sha256": "sha256-1ix9qJYKd6YqfLfdCm8KopCAhsBJ4qr6yqtqhchgeeU=",
+            "type": "github"
+        },
+        "version": "e58432b5888616984e4efcb151009ec4bdf0f88f"
+    }
 }
diff --git a/nix/t1/_sources/generated.nix b/nix/t1/_sources/generated.nix
@@ -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 = "fe6a52e80935613cfd09455ee969ef2b2dcc082a";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel";
-      rev = "ae5434977a0c0ede55a46847bfcbc8dbf2286c35";
+      rev = "fe6a52e80935613cfd09455ee969ef2b2dcc082a";
       fetchSubmodules = false;
-      sha256 = "sha256-POPpNMnbe4IidbqSlrgBzWHRn6eeL6gh+MuT3v6bw2w=";
+      sha256 = "sha256-90HkfnCZJjM9aOunx445Fr208juyRxODpVSS+RF6sLk=";
     };
-    date = "2024-07-12";
+    date = "2024-07-22";
   };
   chisel-interface = {
     pname = "chisel-interface";
@@ -51,26 +51,26 @@
   };
   riscv-opcodes = {
     pname = "riscv-opcodes";
-    version = "9fa26954e79d4403eedcbe1b35395001bbbeb8b1";
+    version = "048218e19195949342636ff69f4b743da167f91f";
     src = fetchFromGitHub {
       owner = "riscv";
       repo = "riscv-opcodes";
-      rev = "9fa26954e79d4403eedcbe1b35395001bbbeb8b1";
+      rev = "048218e19195949342636ff69f4b743da167f91f";
       fetchSubmodules = false;
-      sha256 = "sha256-Gt3v8/VVNhB4IFL7kud8Y7EnSM2/2H4urV1AmBviP9E=";
+      sha256 = "sha256-XKrgkXJd+K2/ZQ/0p8rU2lKSR1tD4icugzY3Llokwe0=";
     };
-    date = "2024-04-10";
+    date = "2024-07-16";
   };
   rvdecoderdb = {
     pname = "rvdecoderdb";
-    version = "b90db1a8f582dff4aa91a5f0a85feb29d27a95e4";
+    version = "e58432b5888616984e4efcb151009ec4bdf0f88f";
     src = fetchFromGitHub {
       owner = "sequencer";
       repo = "rvdecoderdb";
-      rev = "b90db1a8f582dff4aa91a5f0a85feb29d27a95e4";
+      rev = "e58432b5888616984e4efcb151009ec4bdf0f88f";
       fetchSubmodules = false;
       sha256 = "sha256-1ix9qJYKd6YqfLfdCm8KopCAhsBJ4qr6yqtqhchgeeU=";
     };
-    date = "2024-06-28";
+    date = "2024-07-06";
   };
 }
diff --git a/nix/t1/nvfetcher.toml b/nix/t1/nvfetcher.toml
@@ -10,7 +10,7 @@ fetch.github = "ucb-bar/berkeley-hardfloat"
 
 [chisel]
 src.git = "https://github.com/chipsalliance/chisel"
-src.branch = "main"
+src.branch = "sequencer/t1"
 fetch.github = "chipsalliance/chisel"
 
 [chisel-interface]

diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix
@@ -44,7 +44,7 @@ let
           ./../../common.sc
         ];
       };
-      millDepsHash = "sha256-ZwIl6YsaGde3ikbzxLzY2+/XTc5O2dQrOMKcwhKEq+k=";
+      millDepsHash = "sha256-vrxTqskAH7H598ZWRC/+KAXOQlQ6f+gL9c0hvD25xOM=";
       nativeBuildInputs = [ submodules.setupHook ];
     };