From 6d1da366fec5766fb1c25f4558ab2e128524cb56 Mon Sep 17 00:00:00 2001 From: Brendan Sweeney Date: Mon, 17 Jan 2022 03:49:42 -0600 Subject: [PATCH 1/5] Remove MaxPermSize See ucb-bar#1079. This option ceased doing things after Java 8 (released in 2014), and openJDK considers having it included an error. This commit is a redo of a previous one. --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index dd40f565..d41473b2 100644 --- a/variables.mk +++ b/variables.mk @@ -160,7 +160,7 @@ sim_common_files ?= $(build_dir)/sim_files.common.f # java arguments used in sbt ######################################################################################### JAVA_HEAP_SIZE ?= 8G -export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -XX:MaxPermSize=256M -Djava.io.tmpdir=$(base_dir)/.java_tmp +export JAVA_TOOL_OPTIONS ?= -Xmx$(JAVA_HEAP_SIZE) -Xss8M -Djava.io.tmpdir=$(base_dir)/.java_tmp ######################################################################################### # default sbt launch command From aae667803f59068f874d9ea55de751959efa8863 Mon Sep 17 00:00:00 2001 From: Hasan Genc Date: Mon, 17 Jan 2022 09:47:15 -0800 Subject: [PATCH 2/5] bump gemmini to v0.6.2 --- generators/gemmini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/gemmini b/generators/gemmini index 7ac61db6..72461235 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 7ac61db64fecbc8918b3039d738513b4a03337ca +Subproject commit 72461235cc955a48f45ae3fefc7dfd68e27bc284 From ffd530ec20ce17e0fa1e1848a0019876e8da8165 Mon Sep 17 00:00:00 2001 From: John Fang Date: Tue, 18 Jan 2022 13:51:08 -0800 Subject: [PATCH 3/5] Sodor bump to fixed 5-stage hazard check (#1086) --- generators/riscv-sodor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/riscv-sodor b/generators/riscv-sodor index 449354c2..66c0a7e1 160000 --- a/generators/riscv-sodor +++ b/generators/riscv-sodor @@ -1 +1 @@ -Subproject commit 449354c27bf07ccc865dc6c005df1d08eaf5b01c +Subproject commit 66c0a7e18264c1827b8802105931eacc90b2e4c7 From 283cc2b194cf0f241a7f6c12be0001965b93eb3b Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 19 Jan 2022 11:24:52 -0800 Subject: [PATCH 4/5] Run CI only on dev/master/main branches/PRs --- .github/workflows/chipyard-run-tests.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index 689892bf..78bca006 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -1,6 +1,18 @@ name: chipyard-ci-process -on: [push] +on: + # run ci when pushing to dev, master, and main only + push: + branches: + - dev + - master + - main + # run ci on pull requests targeting dev, master, main only + pull_request: + branches: + - dev + - master + - main env: tools-cache-version: v13 From 914713a1be2cee9df9306a3e65759b6be6727045 Mon Sep 17 00:00:00 2001 From: Abraham Gonzalez Date: Wed, 19 Jan 2022 20:39:50 -0800 Subject: [PATCH 5/5] Only run on pull_requests --- .github/workflows/chipyard-run-tests.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index 78bca006..560cd142 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -1,13 +1,7 @@ name: chipyard-ci-process on: - # run ci when pushing to dev, master, and main only - push: - branches: - - dev - - master - - main - # run ci on pull requests targeting dev, master, main only + # run ci on pull requests targeting dev, master, main only (since the ci runs on the merge commit) pull_request: branches: - dev