From abbd9ce9053ff622d7b2810e38708ed6aaa952b3 Mon Sep 17 00:00:00 2001
From: Abraham Gonzalez <abe.gonzalez@berkeley.edu>
Date: Tue, 5 Nov 2019 07:20:54 +0000
Subject: [PATCH 1/6] templates for issues and prs [skip ci]

---
 .github/ISSUE_TEMPLATE.md        | 28 ++++++++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..df4daa2e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+<!-- choose all that apply -->
+**Type of issue**: bug report | feature request | question | other enhancement
+
+<!-- if the issue is NOT a question, fill out the following sections -->
+
+<!-- choose one -->
+**Impact**: no rtl change | rtl refactoring | new rtl | unknown
+
+<!-- choose one -->
+**Development Phase**: request | proposal
+
+**Other information**
+<!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context -->
+
+<!-- if the current behavior is a bug, please provide the following steps to reproduce the problem -->
+
+**What is the current behavior?**
+
+**What is the expected behavior?**
+
+**Please tell us about your environment:**
+<!--    (examples)
+    - version: `chipyard git commit hash`
+    - os: `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
+    - other: `prior steps taken/documentation followed/...`
+-->
+
+**What is the use case for changing the behavior?**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..fe031ca1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+**Related issue**: <!-- if applicable -->
+
+<!-- choose one -->
+**Type of change**: bug fix | new feature | other enhancement
+
+<!-- choose one -->
+**Impact**: no rtl change | rtl refactoring | new rtl | unknown
+
+<!-- choose one -->
+**Development Phase**: proposal |  implementation
+
+**Release Notes**
+<!-- Text from here to the end of the body will be considered for inclusion in the release notes for the version containing this pull request. -->

From c39ba5713c939ddb50e916971bc999b7256d89c9 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Wed, 6 Nov 2019 13:38:41 -0800
Subject: [PATCH 2/6] split issue templates [skip ci]

---
 .github/ISSUE_TEMPLATE.md                 | 28 -----------------------
 .github/ISSUE_TEMPLATE/bug-report.md      | 23 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature-request.md | 11 +++++++++
 .github/ISSUE_TEMPLATE/other.md           |  6 +++++
 .github/ISSUE_TEMPLATE/question.md        | 13 +++++++++++
 .github/PULL_REQUEST_TEMPLATE.md          |  5 +---
 6 files changed, 54 insertions(+), 32 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/other.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index df4daa2e..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- choose all that apply -->
-**Type of issue**: bug report | feature request | question | other enhancement
-
-<!-- if the issue is NOT a question, fill out the following sections -->
-
-<!-- choose one -->
-**Impact**: no rtl change | rtl refactoring | new rtl | unknown
-
-<!-- choose one -->
-**Development Phase**: request | proposal
-
-**Other information**
-<!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context -->
-
-<!-- if the current behavior is a bug, please provide the following steps to reproduce the problem -->
-
-**What is the current behavior?**
-
-**What is the expected behavior?**
-
-**Please tell us about your environment:**
-<!--    (examples)
-    - version: `chipyard git commit hash`
-    - os: `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
-    - other: `prior steps taken/documentation followed/...`
--->
-
-**What is the use case for changing the behavior?**
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..4da4667e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Report a problem with Chipyard
+labels: bug
+
+---
+
+<!-- choose one -->
+**Impact**: rtl | software | unknown | other
+
+**What is the current behavior?**
+
+**What is the expected behavior?**
+
+**Please tell us about your environment:**
+<!--    (examples)
+    - version: `chipyard git commit hash`
+    - os: `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
+    - other: `prior steps taken/documentation followed/...`
+-->
+
+**Other information**
+<!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, ... -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..66e68155
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Propose a change to Chipyard
+
+---
+
+<!-- choose one -->
+**Impact**: rtl | software | unknown | other
+
+**Description**
+<!-- include detailed explanation, related issues, links for us to have context, ... -->
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 00000000..b41a5e5c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,6 @@
+---
+name: Other
+about: Something else!
+
+---
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..b8c3f482
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,13 @@
+---
+name: Question
+about: Ask a question
+labels: question
+
+---
+
+<!-- have you looked at the Chipyard documentation? -->
+<!-- have you looked at the subproject documentation/githubs? -->
+<!-- for example: -->
+<!--   rocketchip: https://github.com/chipsalliance/rocket-chip/issues -->
+<!--   boom: https://github.com/riscv-boom/riscv-boom/issues -->
+<!--   firesim: https://github.com/firesim/firesim/issues -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fe031ca1..4949e777 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,10 +4,7 @@
 **Type of change**: bug fix | new feature | other enhancement
 
 <!-- choose one -->
-**Impact**: no rtl change | rtl refactoring | new rtl | unknown
-
-<!-- choose one -->
-**Development Phase**: proposal |  implementation
+**Impact**: rtl change | software change | unknown | other
 
 **Release Notes**
 <!-- Text from here to the end of the body will be considered for inclusion in the release notes for the version containing this pull request. -->

From 8439f1d5e18a9b798f62c3f84807ad39eeda7f15 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Wed, 6 Nov 2019 13:42:03 -0800
Subject: [PATCH 3/6] re-add motivating example to feature request issue [skip
 ci]

---
 .github/ISSUE_TEMPLATE/feature-request.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 66e68155..70e2081d 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -9,3 +9,5 @@ about: Propose a change to Chipyard
 
 **Description**
 <!-- include detailed explanation, related issues, links for us to have context, ... -->
+
+**What is a motivating example for changing the behavior?**

From d9b6b86b462729dc99a380573977e716c8b1d308 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 7 Nov 2019 13:43:59 -0800
Subject: [PATCH 4/6] bump barstools

---
 tools/barstools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/barstools b/tools/barstools
index 26096e07..3bba55cc 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 26096e07f6ce3e12b2114132c2859ef56fb0cfaf
+Subproject commit 3bba55ccc89518ddeb3ed78774dd6e68d938c07a

From 542b165fd61a96779b8e8c09aa1dc10a4ef3c7dd Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Mon, 11 Nov 2019 11:13:14 -0800
Subject: [PATCH 5/6] cleanup build script for ci | bump firesim

---
 .circleci/do-firesim-build.sh | 1 -
 sims/firesim                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/do-firesim-build.sh b/.circleci/do-firesim-build.sh
index ecb965b2..5eb42e56 100755
--- a/.circleci/do-firesim-build.sh
+++ b/.circleci/do-firesim-build.sh
@@ -15,7 +15,6 @@ trap clean EXIT
 
 cd $LOCAL_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
-cd sims/firesim/sim/midas && git submodule update --init
 
 # set stricthostkeychecking to no (must happen before rsync)
 run "echo \"Ping $SERVER\""
diff --git a/sims/firesim b/sims/firesim
index afad1b6a..9d807922 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit afad1b6accfaba5efbc0cfeea66372abae5ab2eb
+Subproject commit 9d80792262eb3f15e20bc6f7f4016cb049efefda

From 77deedbfb8edcc28a114d5678a5ba35dab0c1fc6 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Mon, 11 Nov 2019 15:04:16 -0800
Subject: [PATCH 6/6] bump firesim for midaexamples fix

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 9d807922..c3a4731a 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 9d80792262eb3f15e20bc6f7f4016cb049efefda
+Subproject commit c3a4731a604973d7b2b420a308116e9e3e093dc3