From 948aed394d2d28d44303196482228c9a414e508b Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Fri, 11 Jun 2021 19:37:50 -0400 Subject: [PATCH 1/3] Bump firemarshal to release v1.12.0 --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index 22f9101d..daf1040c 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit 22f9101d456f36d9580bd3327a1613e39812d06d +Subproject commit daf1040c0f0ec449734cd183be876880357644fc From e6bdbbdcc879ac6b6b60ddab3a88689e9c1532a9 Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Fri, 11 Jun 2021 19:38:10 -0400 Subject: [PATCH 2/3] Bump the sha3 repo to get software updates for the tutorial --- generators/sha3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/sha3 b/generators/sha3 index 21035e49..63eda826 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 21035e498573b0e541cb87fe330e9d8dcfc88238 +Subproject commit 63eda8268c16c502cada9944ae41b584e6e32789 From 9c80b66f0ae2826ee23b705307c921e0f9d01e6f Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Sat, 12 Jun 2021 00:01:08 -0400 Subject: [PATCH 3/3] Fix path in CI test script for new sha3 directory structure --- .circleci/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh index 10fd58fb..ab3cf5cc 100755 --- a/.circleci/run-tests.sh +++ b/.circleci/run-tests.sh @@ -69,7 +69,7 @@ case $1 in 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 + $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/tests/bare/sha3-rocc.riscv ;; chipyard-streaming-passthrough) make -C $LOCAL_CHIPYARD_DIR/tests