From 6e851473c3a3a44cb30854873d4e3938a8adff8b Mon Sep 17 00:00:00 2001 From: chick Date: Thu, 11 Feb 2021 13:05:50 -0800 Subject: [PATCH 1/7] [DO NOT MERGE] This is to test changes to barstools --- tools/barstools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/barstools b/tools/barstools index 689ebdc0..f37385ca 160000 --- a/tools/barstools +++ b/tools/barstools @@ -1 +1 @@ -Subproject commit 689ebdc06e29028861f3282d9af6f2304541c9db +Subproject commit f37385ca587ecbde2b7a85113a1061e1b9fd9bab From 3723a53ea3da9f7c5f25c9e3b69a10beee4714b2 Mon Sep 17 00:00:00 2001 From: chick Date: Thu, 18 Feb 2021 09:53:18 -0800 Subject: [PATCH 2/7] trying new fixes for barstools, get all transforms in right order --- tools/barstools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/barstools b/tools/barstools index f37385ca..bbc88008 160000 --- a/tools/barstools +++ b/tools/barstools @@ -1 +1 @@ -Subproject commit f37385ca587ecbde2b7a85113a1061e1b9fd9bab +Subproject commit bbc8800840b32a4fb53487519a0f9223a198a352 From 6024feb27a35addf5f66bad1136b11e5cd1d54a5 Mon Sep 17 00:00:00 2001 From: chick Date: Thu, 18 Feb 2021 18:21:29 -0800 Subject: [PATCH 3/7] try latest changes to circle ci settings --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7081658..09339c6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ parameters: executors: main-env: docker: - - image: ucbbar/chipyard-image:1.0.1 + - image: ucbbar/chipyard-ci-image:84cfc73 environment: JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit @@ -112,7 +112,7 @@ commands: default: "run-tests.sh" timeout: type: string - default: "10m" + default: "20m" steps: - setup-tools: tools-version: "<< parameters.tools-version >>" @@ -231,7 +231,7 @@ jobs: - run-tests: group-key: "group-cores" project-key: "chipyard-hetero" - timeout: "15m" + timeout: "20m" chipyard-boom-run-tests: executor: main-env steps: From 0ca13a4ac43daffb1753d3c57c5fdf305ea42572 Mon Sep 17 00:00:00 2001 From: chick Date: Fri, 19 Feb 2021 14:34:25 -0800 Subject: [PATCH 4/7] Revert "try latest changes to circle ci settings" This reverts commit 6024feb27a35addf5f66bad1136b11e5cd1d54a5. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09339c6e..b7081658 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ parameters: executors: main-env: docker: - - image: ucbbar/chipyard-ci-image:84cfc73 + - image: ucbbar/chipyard-image:1.0.1 environment: JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit @@ -112,7 +112,7 @@ commands: default: "run-tests.sh" timeout: type: string - default: "20m" + default: "10m" steps: - setup-tools: tools-version: "<< parameters.tools-version >>" @@ -231,7 +231,7 @@ jobs: - run-tests: group-key: "group-cores" project-key: "chipyard-hetero" - timeout: "20m" + timeout: "15m" chipyard-boom-run-tests: executor: main-env steps: From 12d45533bf8d11313923704e5f29421df627d0e1 Mon Sep 17 00:00:00 2001 From: chick Date: Fri, 19 Feb 2021 14:38:56 -0800 Subject: [PATCH 5/7] undo circleci docker image change test; up 2 timeouts --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7081658..8d81c12e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,7 +112,7 @@ commands: default: "run-tests.sh" timeout: type: string - default: "10m" + default: "20m" steps: - setup-tools: tools-version: "<< parameters.tools-version >>" @@ -231,7 +231,7 @@ jobs: - run-tests: group-key: "group-cores" project-key: "chipyard-hetero" - timeout: "15m" + timeout: "20m" chipyard-boom-run-tests: executor: main-env steps: From 5b6a2b3fc0a9d8420610fd2c8d83521a4d7f0a48 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 22 Feb 2021 11:46:30 -0800 Subject: [PATCH 6/7] Bump barstools --- tools/barstools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/barstools b/tools/barstools index bbc88008..a3711c4e 160000 --- a/tools/barstools +++ b/tools/barstools @@ -1 +1 @@ -Subproject commit bbc8800840b32a4fb53487519a0f9223a198a352 +Subproject commit a3711c4e19911b57b21bdcf8d459d19795f3201d From 08555dbafc007adff03540add7e3349df971c031 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Mon, 22 Feb 2021 11:47:14 -0800 Subject: [PATCH 7/7] Use origin/dev config.yml --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d81c12e..7dcbc809 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ parameters: executors: main-env: docker: - - image: ucbbar/chipyard-image:1.0.1 + - image: ucbbar/chipyard-ci-image:9c650dea environment: JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit @@ -112,7 +112,7 @@ commands: default: "run-tests.sh" timeout: type: string - default: "20m" + default: "25m" steps: - setup-tools: tools-version: "<< parameters.tools-version >>" @@ -520,4 +520,3 @@ workflows: - prepare-chipyard-fpga: requires: - install-riscv-toolchain -