From d9d1efd6b3c8cfa4fa2b5d53513ae664d4e9a8a7 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 20 Apr 2023 12:03:24 -0700 Subject: [PATCH 1/7] Update FS --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 8c85960b93..8c301ad57b 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 8c85960b939a0090de30a31936981972874d979d +Subproject commit 8c301ad57ba962bf61838308b09121fcda6e190c From 2bf8f258adf175b929a04e0493b665830a681b8b Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 20 Apr 2023 13:22:19 -0700 Subject: [PATCH 2/7] Bump Gemmini --- generators/gemmini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/gemmini b/generators/gemmini index 965ea0b3c5..80e7376cf5 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 965ea0b3c5ffd7b68e6bf5a50ea9ff0750a5b988 +Subproject commit 80e7376cf554ed302975d72ed091ac86a9e553e8 From e2cf26ed9351d5cabfc481e99711dc30af4d0db2 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 20 Apr 2023 13:27:36 -0700 Subject: [PATCH 3/7] Bump Changelog --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3644fa296c..6867e1d252 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,30 @@ This changelog follows the format defined here: https://keepachangelog.com/en/1.0.0/ +## [1.9.1] - 2023-04-21 + +Various fixes for Linux boot, More Chip/bringup examples, Chisel 3.5.6 bump + +### Added +* QoL improvement to IOBinders + custom ChipTop example by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1399 +* PLL integration example + FlatChipTop/TestHarness by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1427 +* Bump TestChipIp to improve default serial_tl behavior by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1435 +* Bump testchipip to standardize TL serdesser bundle params by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1446 + +### Changed +* New Scala-based Config Finder by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1424 +* Bump to latest rocket-chip/chisel3.5.6 by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1411 +* Resolve merge conflicts in chisel3.5.6 bump by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1430 +* bump testchipip by @joey0320 in https://github.com/ucb-bar/chipyard/pull/1434 +* ADD: improve Makefile in tests/, add explicit arch flags by @T-K-233 in https://github.com/ucb-bar/chipyard/pull/1439 +* Various submodule bumps by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1448 + +### Fixed +* Various improvements and fixes by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1420 +* Ensure conda cleanup regex properly filters out non-numeric chars by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1425 +* Fix ChipLikeQuadRocketConfig crossing by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1436 +* Uniquify module names that are common to Top & Model by @joey0320 in https://github.com/ucb-bar/chipyard/pull/1442 + ## [1.9.0] - 2023-03-23 Faster FIRRTL build support work CIRCT. New software support for RISC-V GCC12 and Linux 6.2. Various bumps and fixes of all submodules. From 3c043ee27f26a831f27cb9b8aa4db7426faeacd7 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 21 Apr 2023 14:37:29 -0700 Subject: [PATCH 4/7] Use $RISCV includes for tests --- tests/Makefile | 5 +++-- tests/encoding.h | 1 - tests/hello.c | 2 +- tests/mt-hello.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 120000 tests/encoding.h diff --git a/tests/Makefile b/tests/Makefile index 28976a6a6e..b61bfb30a3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,7 +2,8 @@ # RISCV Toolchain ################################# -PREFIX = riscv64-unknown-elf- +PREFIX_NO_MINUS = riscv64-unknown-elf +PREFIX = $(PREFIX_NO_MINUS)- GCC = $(PREFIX)gcc CXX = $(PREFIX)g++ @@ -21,7 +22,7 @@ ARCH = rv64imafdc ABI = lp64d ARCHFLAGS = -march=$(ARCH) -mabi=$(ABI) -CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall +CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall -I$(RISCV)/$(PREFIX_NO_MINUS)/include CFLAGS += $(ARCHFLAGS) LDFLAGS = -static diff --git a/tests/encoding.h b/tests/encoding.h deleted file mode 120000 index f398b1630c..0000000000 --- a/tests/encoding.h +++ /dev/null @@ -1 +0,0 @@ -../toolchains/riscv-tools/riscv-tests/env/encoding.h \ No newline at end of file diff --git a/tests/hello.c b/tests/hello.c index dbfbfe5693..7709f91a3d 100644 --- a/tests/hello.c +++ b/tests/hello.c @@ -1,5 +1,5 @@ #include -#include "encoding.h" +#include "riscv-pk/encoding.h" #include "marchid.h" int main(void) { diff --git a/tests/mt-hello.c b/tests/mt-hello.c index 5ab47a562f..2ba0e32f5a 100644 --- a/tests/mt-hello.c +++ b/tests/mt-hello.c @@ -1,4 +1,4 @@ -#include "encoding.h" +#include "riscv-pk/encoding.h" #include #include "marchid.h" From d61be5cb1ca896c2fa9e88dfa3990cf1972dfc12 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Sat, 6 May 2023 19:27:31 -0700 Subject: [PATCH 5/7] Remove unnecessary include from tests/Makefile --- tests/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index b61bfb30a3..28976a6a6e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,8 +2,7 @@ # RISCV Toolchain ################################# -PREFIX_NO_MINUS = riscv64-unknown-elf -PREFIX = $(PREFIX_NO_MINUS)- +PREFIX = riscv64-unknown-elf- GCC = $(PREFIX)gcc CXX = $(PREFIX)g++ @@ -22,7 +21,7 @@ ARCH = rv64imafdc ABI = lp64d ARCHFLAGS = -march=$(ARCH) -mabi=$(ABI) -CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall -I$(RISCV)/$(PREFIX_NO_MINUS)/include +CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall CFLAGS += $(ARCHFLAGS) LDFLAGS = -static From 49dd3860db90dec2b59e35d8c99a4bc7648a66ae Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Sat, 6 May 2023 19:31:15 -0700 Subject: [PATCH 6/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6867e1d252..8e7ed00315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Various fixes for Linux boot, More Chip/bringup examples, Chisel 3.5.6 bump * PLL integration example + FlatChipTop/TestHarness by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1427 * Bump TestChipIp to improve default serial_tl behavior by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1435 * Bump testchipip to standardize TL serdesser bundle params by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1446 +* HarnessBinder asserts to catch bad clock generation by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1460 ### Changed * New Scala-based Config Finder by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1424 @@ -19,12 +20,15 @@ Various fixes for Linux boot, More Chip/bringup examples, Chisel 3.5.6 bump * bump testchipip by @joey0320 in https://github.com/ucb-bar/chipyard/pull/1434 * ADD: improve Makefile in tests/, add explicit arch flags by @T-K-233 in https://github.com/ucb-bar/chipyard/pull/1439 * Various submodule bumps by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1448 +* Support not instantiating tile reset/clock contorl features by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1459 ### Fixed * Various improvements and fixes by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1420 * Ensure conda cleanup regex properly filters out non-numeric chars by @abejgonzalez in https://github.com/ucb-bar/chipyard/pull/1425 * Fix ChipLikeQuadRocketConfig crossing by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1436 * Uniquify module names that are common to Top & Model by @joey0320 in https://github.com/ucb-bar/chipyard/pull/1442 +* Support for no-bootROM systems by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1458 +* Support for no-UART systems by @jerryz123 in https://github.com/ucb-bar/chipyard/pull/1457 ## [1.9.0] - 2023-03-23 From 20fb8d2556b0fe2aa4ea1e03630b5feb1a4af7f4 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Sun, 7 May 2023 11:51:17 -0700 Subject: [PATCH 7/7] Update README.md --- README.md | 3 --- sims/firesim | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index a21b142edd..91aa07efe8 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,6 @@ # Chipyard Framework [![Test](https://github.com/ucb-bar/chipyard/actions/workflows/chipyard-run-tests.yml/badge.svg)](https://github.com/ucb-bar/chipyard/actions) -| We're running the First FireSim and Chipyard User/Developer Workshop at ASPLOS 2023 on March 26, 2023! This workshop will feature a full-day of submitted talks from users and developers in the FireSim and Chipyard community. Learn more and **submit your work** on the [2023 Workshop Page](https://fires.im/workshop-2023/)! | -|-----| - ## Quick Links * **Stable Documentation**: https://chipyard.readthedocs.io/ diff --git a/sims/firesim b/sims/firesim index 8c301ad57b..3ae68ec307 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 8c301ad57ba962bf61838308b09121fcda6e190c +Subproject commit 3ae68ec3076c010c633ded369fd3874ec2e5e557