website: Merge branch 'stable' into develop

Change-Id: I9ae6914a9d05f98954c683fa680f5f00aa09102f
diff --git a/_data/documentation.yml b/_data/documentation.yml
index f8a4105..f414506 100755
--- a/_data/documentation.yml
+++ b/_data/documentation.yml
@@ -48,6 +48,10 @@
         - page: v21.1.0.0
+        - page: v21.1.0.1
+          url:
+        - page: v21.1.0.2
+          url:
     - title: gem5 Resources
       id: gem5_resources
diff --git a/_pages/documentation/general_docs/building/ b/_pages/documentation/general_docs/building/
index 89e8f29..ce8174a 100644
--- a/_pages/documentation/general_docs/building/
+++ b/_pages/documentation/general_docs/building/
@@ -153,6 +153,7 @@
 * X86
diff --git a/_pages/documentation/general_docs/gpu_models/ b/_pages/documentation/general_docs/gpu_models/
index 15b9eb3..76e300f 100644
--- a/_pages/documentation/general_docs/gpu_models/
+++ b/_pages/documentation/general_docs/gpu_models/
@@ -18,13 +18,11 @@
 ## **Using the model**
-Currently, the GCN3 GPU model in gem5 is only supported on the develop branch.
-Thus, you should use the develop branch when running the GCN3 model.
-We expect this support to be integrated into the gem5-v21.0 release.
+Currently, the GCN3 GPU model in gem5 is supported on the stable and develop branch.
 The [gem5 repository]( comes with a dockerfile located in `util/dockerfiles/gcn-gpu/`. This dockerfile contains the drivers and libraries needed to run the GPU model. A pre-built version of the docker image is hosted at ``.
-The [gem5-resources repository]( also comes with a sample application (square) that can be used to verify that the model runs correctly.
+The [gem5-resources repository]( also comes with a number of sample applications that can be used to verify that the model runs correctly.  We recommend users start with [square](, as it is a simple, heavily tested application that should run relatively quickly.
 #### Using the image
 The docker image can either be built or pulled from
@@ -42,26 +40,10 @@
 You can also put `` as the image in the docker run command without pulling beforehand and it will be pulled automatically.
 #### Building gem5 using the image
-The following command assumes the gem5 directory is a subdirectory of your current directory
-docker run --rm -v $PWD/gem5:/gem5 -w /gem5 <image_name> scons -sQ -j$(nproc) build/GCN3_X86/gem5.opt
+See square in [gem5 resources]( for an example of how to build gem5 in the docker.  Note: these directions assume you are pulling the latest image automatically.
-#### Building a GPU application using the image
-The following command assumes the gem5-resources directory is a subdirectory of your current directory
-docker run --rm -v $PWD/gem5-resources:$PWD/gem5-resources -w $PWD/gem5-resources/src/square <image_name> make gfx8-apu
-#### Running the sample application
-The following command assumes that gem5 and gem5-resources are subdirectories of your current directory
-docker run --rm -v $PWD/gem5:/gem5 -v $PWD/gem5-resources:/gem5-resources \
-                -w /gem5 <image_name> \
-                build/GCN3_X86/gem5.opt configs/example/ -n2 \
-                --benchmark-root=/gem5-resources/src/square/bin \
-                -c square.o
+#### Building & running a GPU application using the image
+See [gem5 resources]( for examples of how to build and run GPU applications in the docker.
 ## **ROCm**
@@ -81,7 +63,7 @@
 The `src/dev/hsa/kfd_ioctl.h` header must match the `kfd_ioctl.h` header that comes with ROCt. The emulated driver relies on that file to interpret the `ioctl()` codes the thunk uses.
 #### ROCm toolchain and software stack
-The GCN3 model supports ROCm version 1.6
+The GCN3 model supports ROCm version 4.0.
 The following ROCm components are required:
 * [Heterogeneous Compute Compiler (HCC)](
@@ -92,7 +74,6 @@
 The following additional components are used to build and run machine learning programs:
 * [hipBLAS](
 * [rocBLAS](
-* [MIOpenGEMM](
 * [MIOpen](
 * [rocm-cmake](
diff --git a/_pages/ b/_pages/
index 46e7d0e..983639d 100644
--- a/_pages/
+++ b/_pages/
@@ -59,27 +59,36 @@
 ### What version of gem5 should I use?
-The gem5 git repository has two branches: `develop` and `master`. The `develop`
+The gem5 git repository has two branches: `develop` and `stable`. The `develop`
 branch contains the very latest gem5 changes **but is not stable**. It is
 frequently updated. **The `develop` branch should only be used when
 contributing the the gem5 project** (please see our [Contributing Guide](
 /contributing) for more information on how to submit code to gem5).
-The master branch contains stable gem5 code. The HEAD of the master branch
+The stable branch contains stable gem5 code. The HEAD of the stable branch
 points towards the latest gem5 release. We would advise researchers use the
 latest stable release of gem5 and report which version was used when publishing
 results (use `git describe` to see latest gem5 release version number).
 If replicating previous work, please find which version of gem5 was used. This
-version should be tagged on the `master` branch and can thereby be checked-out
+version should be tagged on the `stable` branch and can thereby be checked-out
 on a new branch using `git checkout -b {branch} {version}`.
 E.g., to checkout `v19.0.0` on a new branch called `version19`:
 `git checkout -b version19 v19.0.0`. A complete list of released gem5
-versions can be determined by executing `git tag` on the `master` branch.
+versions can be determined by executing `git tag` on the `stable` branch.
 ### How should I cite gem5?
-You should always cite the [gem5 paper](
+You should cite the [gem5-20 paper](
+The gem5 Simulator: Version 20.0+. Jason Lowe-Power, Abdul Mutaal Ahmad, Ayaz Akram, Mohammad Alian, Rico Amslinger, Matteo Andreozzi, Adrià Armejach, Nils Asmussen, Brad Beckmann, Srikant Bharadwaj, Gabe Black, Gedare Bloom, Bobby R. Bruce, Daniel Rodrigues Carvalho, Jeronimo Castrillon, Lizhong Chen, Nicolas Derumigny, Stephan Diestelhorst, Wendy Elsasser, Carlos Escuin, Marjan Fariborz, Amin Farmahini-Farahani, Pouya Fotouhi, Ryan Gambord, Jayneel Gandhi, Dibakar Gope, Thomas Grass, Anthony Gutierrez, Bagus Hanindhito, Andreas Hansson, Swapnil Haria, Austin Harris, Timothy Hayes, Adrian Herrera, Matthew Horsnell, Syed Ali Raza Jafri, Radhika Jagtap, Hanhwi Jang, Reiley Jeyapaul, Timothy M. Jones, Matthias Jung, Subash Kannoth, Hamidreza Khaleghzadeh, Yuetsu Kodama, Tushar Krishna, Tommaso Marinelli, Christian Menard, Andrea Mondelli, Miquel Moreto, Tiago Mück, Omar Naji, Krishnendra Nathella, Hoa Nguyen, Nikos Nikoleris, Lena E. Olson, Marc Orr, Binh Pham, Pablo Prieto, Trivikram Reddy, Alec Roelke, Mahyar Samani, Andreas Sandberg, Javier Setoain, Boris Shingarov, Matthew D. Sinclair, Tuan Ta, Rahul Thakur, Giacomo Travaglini, Michael Upton, Nilay Vaish, Ilias Vougioukas, William Wang, Zhengrong Wang, Norbert Wehn, Christian Weis, David A. Wood, Hongil Yoon, Éder F. Zulian. ArXiv Preprint ArXiv:2007.03152, 2021.
+[Download the .bib file.](/assets/files/gem5-20.bib)
+You may also cite the [original gem5 paper](
 The gem5 Simulator. Nathan Binkert, Bradford Beckmann, Gabriel Black, Steven K. Reinhardt, Ali Saidi, Arkaprava Basu, Joel Hestness, Derek R. Hower, Tushar Krishna, Somayeh Sardashti, Rathijit Sen, Korey Sewell, Muhammad Shoaib, Nilay Vaish, Mark D. Hill, and David A. Wood. May 2011, ACM SIGARCH Computer Architecture News.
@@ -93,7 +102,7 @@
 ### How should I refer to gem5?
-"gem5" should *always* have a lowercase "g". 
+"gem5" should *always* have a lowercase "g".
 If it makes you uncomfortable beginning a sentence with a lowercase letter or your editor requires a capital letter, you can instead refer to gem5 as "The gem5 Simulator".
 ### Can I use the gem5 logo?
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
index 591052a..a218cc0 100755
--- a/_sass/_layout.scss
+++ b/_sass/_layout.scss
@@ -200,6 +200,24 @@
+/**** Testing status ****/
+div.testing-status {
+  overflow: auto;
+  width: 60%;
+  margin: auto;
+  text-align: center;
+  .testing-title {
+    float: left;
+    padding-top: 1em;
+  }
+  .testing-info {
+    overflow: hidden;
+    ul {
+      list-style: none;
+    }
+  }
 /**** CARD ****/
 div.card {
diff --git a/assets/files/gem5-20.bib b/assets/files/gem5-20.bib
new file mode 100644
index 0000000..57b86c4
--- /dev/null
+++ b/assets/files/gem5-20.bib
@@ -0,0 +1,86 @@
+  author    = {Jason Lowe{-}Power and
+               Abdul Mutaal Ahmad and
+               Ayaz Akram and
+               Mohammad Alian and
+               Rico Amslinger and
+               Matteo Andreozzi and
+               Adri{\`{a}} Armejach and
+               Nils Asmussen and
+               Srikant Bharadwaj and
+               Gabe Black and
+               Gedare Bloom and
+               Bobby R. Bruce and
+               Daniel Rodrigues Carvalho and
+               Jer{\'{o}}nimo Castrill{\'{o}}n and
+               Lizhong Chen and
+               Nicolas Derumigny and
+               Stephan Diestelhorst and
+               Wendy Elsasser and
+               Marjan Fariborz and
+               Amin Farmahini Farahani and
+               Pouya Fotouhi and
+               Ryan Gambord and
+               Jayneel Gandhi and
+               Dibakar Gope and
+               Thomas Grass and
+               Bagus Hanindhito and
+               Andreas Hansson and
+               Swapnil Haria and
+               Austin Harris and
+               Timothy Hayes and
+               Adrian Herrera and
+               Matthew Horsnell and
+               Syed Ali Raza Jafri and
+               Radhika Jagtap and
+               Hanhwi Jang and
+               Reiley Jeyapaul and
+               Timothy M. Jones and
+               Matthias Jung and
+               Subash Kannoth and
+               Hamidreza Khaleghzadeh and
+               Yuetsu Kodama and
+               Tushar Krishna and
+               Tommaso Marinelli and
+               Christian Menard and
+               Andrea Mondelli and
+               Tiago M{\"{u}}ck and
+               Omar Naji and
+               Krishnendra Nathella and
+               Hoa Nguyen and
+               Nikos Nikoleris and
+               Lena E. Olson and
+               Marc S. Orr and
+               Binh Pham and
+               Pablo Prieto and
+               Trivikram Reddy and
+               Alec Roelke and
+               Mahyar Samani and
+               Andreas Sandberg and
+               Javier Setoain and
+               Boris Shingarov and
+               Matthew D. Sinclair and
+               Tuan Ta and
+               Rahul Thakur and
+               Giacomo Travaglini and
+               Michael Upton and
+               Nilay Vaish and
+               Ilias Vougioukas and
+               Zhengrong Wang and
+               Norbert Wehn and
+               Christian Weis and
+               David A. Wood and
+               Hongil Yoon and
+               {\'{E}}der F. Zulian},
+  title     = {The gem5 Simulator: Version 20.0+},
+  journal   = {CoRR},
+  volume    = {abs/2007.03152},
+  year      = {2020},
+  url       = {},
+  eprinttype = {arXiv},
+  eprint    = {2007.03152},
+  timestamp = {Thu, 23 Sep 2021 09:45:13 +0200},
+  biburl    = {},
+  bibsource = {dblp computer science bibliography,}
diff --git a/index.html b/index.html
index ded5574..448cebc 100755
--- a/index.html
+++ b/index.html
@@ -22,6 +22,18 @@
   <a href=""><button type="button" class="btn btn-outline-primary">Code Review</button></a>
   <a href=""><button type="button" class="btn btn-outline-primary">gem5-20+ paper</button></a>
+  <div class="testing-status">
+    <div class="testing-title">
+    <h3>Testing Status:</h3>
+    </div>
+    <div class="testing-info">
+    <ul>
+      <li><a href=''><img src='${startTime}%20ago%20for%20${duration}'></a></li>
+      <li><a href=''><img src='${startTime}%20ago%20for%20${duration}'></a></li>
+      <li><a href=''><img src='${startTime}%20ago%20for%20${duration}'></a></li>
+    </ul>
+    </div>
+  </div>
@@ -123,7 +135,8 @@
       <div class="card">
         <div class="card-body">
           <a href=""><img src="assets/img/external_logos/nsf.png" alt="NSF logo"></a>
-          This project is funded in part by NSF award number CNS 1925724.
+          This project is funded in part by NSF through the CCRI program, award number CNS 1925724. <br/>
+          <a href="">Click here for other CCRI-funded infrastructures</a>