From ae304a8aa129efe7b1ac0552de9c489a0b5e2553 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Sat, 27 Mar 2021 11:40:16 -0700 Subject: [PATCH 01/15] Add repo to run CI --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- toolchains/esp-tools/riscv-isa-sim | 2 +- toolchains/esp-tools/riscv-pk | 2 +- toolchains/esp-tools/riscv-tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 9f53229398..0ff3683edf 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 9f532293985d08b0c176d96c7b650e5f433780e1 +Subproject commit 0ff3683edfc7e49521d65fe4789f4dbb1cb9c8ac diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 86265d02e8..8feafa0208 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 86265d02e8abea3b367114393d6b0661fd35b156 +Subproject commit 8feafa0208c959c60cc53bc8235e16251c96d3d4 diff --git a/toolchains/esp-tools/riscv-pk b/toolchains/esp-tools/riscv-pk index a3e4ac61d2..2ebf3bacce 160000 --- a/toolchains/esp-tools/riscv-pk +++ b/toolchains/esp-tools/riscv-pk @@ -1 +1 @@ -Subproject commit a3e4ac61d2b1ff37a22b9193b85d3b94273e80cb +Subproject commit 2ebf3bacce4631390361a72b99b86f3b2c8dc041 diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests index e116930c7d..39d57cd262 160000 --- a/toolchains/esp-tools/riscv-tests +++ b/toolchains/esp-tools/riscv-tests @@ -1 +1 @@ -Subproject commit e116930c7d4a30fc2a1378417089a089e9e4cad0 +Subproject commit 39d57cd2624a7e4b4fd5fdc69a7f4cc318196b5f From 53daab2164b32cd4839898ec575b694b188c6934 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Wed, 14 Apr 2021 16:35:34 -0700 Subject: [PATCH 02/15] Test removing xhwacha --- toolchains/esp-tools/riscv-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests index 39d57cd262..5374d52bf9 160000 --- a/toolchains/esp-tools/riscv-tests +++ b/toolchains/esp-tools/riscv-tests @@ -1 +1 @@ -Subproject commit 39d57cd2624a7e4b4fd5fdc69a7f4cc318196b5f +Subproject commit 5374d52bf9207516ea6fc5ea383af60b07653985 From 27d9228bea2bca250a5f0c5b515264220b844ead Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Thu, 15 Apr 2021 12:13:49 -0700 Subject: [PATCH 03/15] Manually apply hwacha changes to binutils --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- toolchains/esp-tools/riscv-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 0ff3683edf..0409defbcd 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 0ff3683edfc7e49521d65fe4789f4dbb1cb9c8ac +Subproject commit 0409defbcdedffbebd1aac5ea700988999dca71d diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests index 5374d52bf9..0ee4ae34bf 160000 --- a/toolchains/esp-tools/riscv-tests +++ b/toolchains/esp-tools/riscv-tests @@ -1 +1 @@ -Subproject commit 5374d52bf9207516ea6fc5ea383af60b07653985 +Subproject commit 0ee4ae34bf23475ca879cefb39b9f078d0362c12 From b77afa34d6dbad4649ab14b99b74f8831a7fbac4 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Thu, 15 Apr 2021 15:39:59 -0700 Subject: [PATCH 04/15] change asm instruction format --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 0409defbcd..286b5bcfed 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 0409defbcdedffbebd1aac5ea700988999dca71d +Subproject commit 286b5bcfed988a7636b1cbdb22d3ab09bf5def4d From f76601c260c131304d2acd01261f543eccfcedb4 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Sun, 23 May 2021 11:31:00 -0700 Subject: [PATCH 05/15] Fixed unmatched version for custom extension --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 286b5bcfed..598390b1a8 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 286b5bcfed988a7636b1cbdb22d3ab09bf5def4d +Subproject commit 598390b1a8b3e7d00cdb635100bad21bfde85351 From a5cf4ad42b22a63dbf3dc8427ee484bd2eddc0b7 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Mon, 24 May 2021 01:16:38 -0700 Subject: [PATCH 06/15] Pass local build --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 598390b1a8..0142457f4f 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 598390b1a8b3e7d00cdb635100bad21bfde85351 +Subproject commit 0142457f4f4ccd33cfc0258d643e8d0acfdba706 From cbefcd5ccbfa0b2c9754b4e7b85197ec606d28f7 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Mon, 24 May 2021 18:15:59 -0700 Subject: [PATCH 07/15] Finished bump --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- toolchains/esp-tools/riscv-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 0142457f4f..5d45e7748f 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 0142457f4f4ccd33cfc0258d643e8d0acfdba706 +Subproject commit 5d45e7748f49c3687d1857c9399b28ba96325c05 diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests index 0ee4ae34bf..8b4192c95b 160000 --- a/toolchains/esp-tools/riscv-tests +++ b/toolchains/esp-tools/riscv-tests @@ -1 +1 @@ -Subproject commit 0ee4ae34bf23475ca879cefb39b9f078d0362c12 +Subproject commit 8b4192c95bc72a47cdcd64a2bbc812fc69c2a7eb From 5890d74f871c45fc52b86d867d6c75cf9be0d716 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Tue, 25 May 2021 12:00:11 -0700 Subject: [PATCH 08/15] Add multiple extension support to the bump --- toolchains/esp-tools/riscv-isa-sim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 8feafa0208..1c52121694 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 8feafa0208c959c60cc53bc8235e16251c96d3d4 +Subproject commit 1c52121694b4390cabcafe7562da32ead8e6ca06 From a18f74053f6f0a90ad97e262cddfc112f172c784 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Thu, 3 Jun 2021 18:45:28 -0700 Subject: [PATCH 09/15] Remove hvsetvl --- toolchains/esp-tools/riscv-gnu-toolchain | 2 +- toolchains/esp-tools/riscv-isa-sim | 2 +- toolchains/esp-tools/riscv-tests | 2 +- toolchains/riscv-tools/riscv-gnu-toolchain | 2 +- toolchains/riscv-tools/riscv-isa-sim | 2 +- toolchains/riscv-tools/riscv-tests | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolchains/esp-tools/riscv-gnu-toolchain b/toolchains/esp-tools/riscv-gnu-toolchain index 5d45e7748f..e0ffff1b48 160000 --- a/toolchains/esp-tools/riscv-gnu-toolchain +++ b/toolchains/esp-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 5d45e7748f49c3687d1857c9399b28ba96325c05 +Subproject commit e0ffff1b48859eeddfb44c5739e03075186ca723 diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 1c52121694..2f8211022e 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 1c52121694b4390cabcafe7562da32ead8e6ca06 +Subproject commit 2f8211022e7f69aee2b41454a37a67395aa9b3e9 diff --git a/toolchains/esp-tools/riscv-tests b/toolchains/esp-tools/riscv-tests index 8b4192c95b..7c3dfd3205 160000 --- a/toolchains/esp-tools/riscv-tests +++ b/toolchains/esp-tools/riscv-tests @@ -1 +1 @@ -Subproject commit 8b4192c95bc72a47cdcd64a2bbc812fc69c2a7eb +Subproject commit 7c3dfd3205fa90104db06346e797a8eeea149207 diff --git a/toolchains/riscv-tools/riscv-gnu-toolchain b/toolchains/riscv-tools/riscv-gnu-toolchain index 2855d823a6..88b004d4c2 160000 --- a/toolchains/riscv-tools/riscv-gnu-toolchain +++ b/toolchains/riscv-tools/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 2855d823a6e93d50af604264b02ced951e80de67 +Subproject commit 88b004d4c2a7d4e4f08b17ee32d2d4b9c194114e diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim index acd953afd2..06f630cb30 160000 --- a/toolchains/riscv-tools/riscv-isa-sim +++ b/toolchains/riscv-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit acd953afd2f52d64e2264c2c7c713dc0ad614406 +Subproject commit 06f630cb30c60c32452058710e98c7b05106b7f5 diff --git a/toolchains/riscv-tools/riscv-tests b/toolchains/riscv-tools/riscv-tests index 19bfdab48c..1ce128fa78 160000 --- a/toolchains/riscv-tools/riscv-tests +++ b/toolchains/riscv-tools/riscv-tests @@ -1 +1 @@ -Subproject commit 19bfdab48c2a6da4a2c67d5779757da7b073811d +Subproject commit 1ce128fa78c24bb0ed399c647e7139322b5353a7 From f8f7d36294b57b5089e77b67a77964e3c2e4795a Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Fri, 4 Jun 2021 00:51:09 -0700 Subject: [PATCH 10/15] Fix conflict --- toolchains/esp-tools/riscv-isa-sim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 2f8211022e..88c223fe7a 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 2f8211022e7f69aee2b41454a37a67395aa9b3e9 +Subproject commit 88c223fe7a83c11bd8a4583d24845821e86fb3d0 From 95e245aea50f1d27a0cd5b00384c6e8377105264 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Sun, 6 Jun 2021 00:14:45 -0700 Subject: [PATCH 11/15] Change spike version --- toolchains/esp-tools/riscv-isa-sim | 2 +- toolchains/riscv-tools/riscv-isa-sim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchains/esp-tools/riscv-isa-sim b/toolchains/esp-tools/riscv-isa-sim index 88c223fe7a..6c758c8510 160000 --- a/toolchains/esp-tools/riscv-isa-sim +++ b/toolchains/esp-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 88c223fe7a83c11bd8a4583d24845821e86fb3d0 +Subproject commit 6c758c8510183b4ea6c2927ad8e19aa86f228adf diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim index 06f630cb30..bf4b1e09ed 160000 --- a/toolchains/riscv-tools/riscv-isa-sim +++ b/toolchains/riscv-tools/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 06f630cb30c60c32452058710e98c7b05106b7f5 +Subproject commit bf4b1e09ed8e7a11ecff9891b12ce5d7f3375722 From 798d523c79fff365cdedc7107981d3b1900344d4 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Sun, 6 Jun 2021 01:03:41 -0700 Subject: [PATCH 12/15] Update sha3 repo --- .circleci/run-tests.sh | 3 +++ generators/sha3 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh index 5ea53c7826..10fd58fb4c 100755 --- a/.circleci/run-tests.sh +++ b/.circleci/run-tests.sh @@ -65,6 +65,9 @@ case $1 in $LOCAL_SIM_DIR/simulator-chipyard-GemminiRocketConfig $GEMMINI_SOFTWARE_DIR/build/bareMetalC/mvin_mvout-baremetal ;; chipyard-sha3) + export RISCV=$LOCAL_ESP_DIR + export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib + export PATH=$RISCV/bin:$PATH (cd $LOCAL_CHIPYARD_DIR/generators/sha3/software && ./build.sh) $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/benchmarks/bare/sha3-rocc.riscv ;; diff --git a/generators/sha3 b/generators/sha3 index 74e41f5792..21035e4985 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 74e41f579213549501ccf292d101f9db73ee2347 +Subproject commit 21035e498573b0e541cb87fe330e9d8dcfc88238 From 56f595b3c0a13bf4a732a46d5ed424e56e4f1eb7 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Sun, 6 Jun 2021 13:29:04 -0700 Subject: [PATCH 13/15] Fix toolchain used for sha3 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe932ecc57..3d4ef14e5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -287,6 +287,7 @@ jobs: executor: main-env steps: - run-tests: + tools-version: "esp-tools" group-key: "group-accels" project-key: "chipyard-sha3" chipyard-streaming-fir-run-tests: From 00da2c10176e3cd67b24d8b1641aac0027851fd1 Mon Sep 17 00:00:00 2001 From: alonamid Date: Wed, 9 Jun 2021 11:10:58 -0700 Subject: [PATCH 14/15] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d4ef14e5d..1b9c6d863f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 parameters: tools-cache-version: type: string - default: "v9" + default: "v10" # default execution env.s executors: From 65784ab47265729f1867612883a5f0e121685fc3 Mon Sep 17 00:00:00 2001 From: Zitao Fang Date: Wed, 9 Jun 2021 16:58:59 -0700 Subject: [PATCH 15/15] Update riscv-pk --- toolchains/esp-tools/riscv-pk | 2 +- toolchains/riscv-tools/riscv-pk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchains/esp-tools/riscv-pk b/toolchains/esp-tools/riscv-pk index 2ebf3bacce..e8e6b3aaee 160000 --- a/toolchains/esp-tools/riscv-pk +++ b/toolchains/esp-tools/riscv-pk @@ -1 +1 @@ -Subproject commit 2ebf3bacce4631390361a72b99b86f3b2c8dc041 +Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3 diff --git a/toolchains/riscv-tools/riscv-pk b/toolchains/riscv-tools/riscv-pk index a3e4ac61d2..e8e6b3aaee 160000 --- a/toolchains/riscv-tools/riscv-pk +++ b/toolchains/riscv-tools/riscv-pk @@ -1 +1 @@ -Subproject commit a3e4ac61d2b1ff37a22b9193b85d3b94273e80cb +Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3