resources: Update versioning to gem5 v21-2

Change-Id: I78cb1ca896710c1d0cbbcf755a8051fae73a34a4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/54563
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby Bruce <bbruce@ucdavis.edu>
diff --git a/README.md b/README.md
index 694d6c5..0f6a1a6 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@
 
 The compiled resources for gem5 can be found under
 http://dist.gem5.org/dist/{VERSION}. E.g. compiled resources for gem5 v20.2
-are under http://dist.gem5.org/dist/develop and are compiled from
+are under http://dist.gem5.org/dist/v20-2 and are compiled from
 gem5-resources v20.2. http://dist.gem5.org/dist/develop is kept in sync
 with the develop branch, and therefore should not be depended upon for stable,
 regular usage.
@@ -96,29 +96,29 @@
 
 ### RISCV Tests Pre-built binaries
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/dhrystone.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/dhrystone.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/median.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/median.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mm.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/mm.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mt-matmul.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/mt-matmul.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/mt-vvadd.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/mt-vvadd.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/multiply.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/multiply.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/pmp.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/pmp.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/qsort.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/qsort.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/rsort.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/rsort.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/spmv.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/spmv.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/towers.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/towers.riscv>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/riscv-tests/vvadd.riscv>
+<http://dist.gem5.org/dist/v21-2/test-progs/riscv-tests/vvadd.riscv>
 
 ## Resource: simple
 
@@ -241,85 +241,85 @@
 
 ### simple Pre-built binaries
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_create_seq>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_pthread_create_seq>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_create_para>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_pthread_create_para>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_pthread_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_atomic>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_atomic>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_pthread_cond>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_pthread_cond>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_thread>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_std_thread>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_std_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/x86/test_std_condition_variable>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/x86/test_std_condition_variable>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_create_seq>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_pthread_create_seq>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_create_para>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_pthread_create_para>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_pthread_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_atomic>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_atomic>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_pthread_cond>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_pthread_cond>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_thread>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_std_thread>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_std_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch32/test_std_condition_variable>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch32/test_std_condition_variable>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_pthread_create_seq>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_create_para>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_pthread_create_para>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_pthread_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_atomic>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_atomic>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_pthread_cond>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_pthread_cond>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_thread>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_std_thread>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_std_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/aarch64/test_std_condition_variable>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/aarch64/test_std_condition_variable>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_pthread_create_seq>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_create_para>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_pthread_create_para>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_pthread_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_atomic>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_atomic>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_pthread_cond>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_pthread_cond>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_thread>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_std_thread>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_std_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/riscv64/test_std_condition_variable>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/riscv64/test_std_condition_variable>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_pthread_create_seq>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_pthread_create_para>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_pthread_create_para>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_pthread_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_pthread_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_atomic>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_atomic>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_pthread_cond>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_pthread_cond>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_std_thread>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_std_thread>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_std_mutex>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_std_mutex>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pthreads/sparc64/test_std_condition_variable>
+<http://dist.gem5.org/dist/v21-2/test-progs/pthreads/sparc64/test_std_condition_variable>
 
 ## Resource: Square
 
@@ -390,21 +390,21 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/2dshfl>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/2dshfl>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/dynamic_shared>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/dynamic_shared>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/inline_asm>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/inline_asm>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/MatrixTranspose>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/MatrixTranspose>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/sharedMemory>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/sharedMemory>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/shfl>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/shfl>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/stream>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/stream>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/unroll>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/unroll>
 
 # Resource: Heterosync
 
@@ -427,7 +427,7 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
+<http://dist.gem5.org/dist/v21-2/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
 
 # Resource: lulesh
 
@@ -465,7 +465,7 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/lulesh/lulesh>
+<http://dist.gem5.org/dist/v21-2/test-progs/lulesh/lulesh>
 
 # Resource: halo-finder (HACC)
 
@@ -510,7 +510,7 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/halo-finder/ForceTreeTest>
+<http://dist.gem5.org/dist/v21-2/test-progs/halo-finder/ForceTreeTest>
 
 # Resource: DNNMark
 
@@ -596,7 +596,7 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pennant/pennant>
+<http://dist.gem5.org/dist/v21-2/test-progs/pennant/pennant>
 
 ## Resource: SPEC 2006
 
@@ -646,7 +646,7 @@
 
 ### GAPBS Pre-built disk image
 
-<http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/gapbs.img.gz>.
+<http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/gapbs.img.gz>.
 
 ## Resource: PARSEC Benchmark Suite
 
@@ -667,7 +667,7 @@
 
 ### GAPBS Pre-built disk image
 
-<http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/parsec.img.gz>.
+<http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/parsec.img.gz>.
 
 ## Resource: NAS Parallel Benchmarks (NPB) Tests
 
@@ -694,7 +694,7 @@
 
 ### NPB Pre-built disk image
 
-<http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/npb.img.gz>
+<http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/npb.img.gz>
 
 
 ## Resource: Linux Boot Tests
@@ -718,11 +718,11 @@
 
 ### RISCV Full System pre-built disk image
 
-<http://dist.gem5.org/dist/develop/images/riscv/busybox/riscv-disk.img.gz>
+<http://dist.gem5.org/dist/v21-2/images/riscv/busybox/riscv-disk.img.gz>
 
 ### RISCV Full System pre-built Linux bootloader
 
-<http://dist.gem5.org/dist/develop/kernels/riscv/static/bootloader-vmlinux-5.10>
+<http://dist.gem5.org/dist/v21-2/kernels/riscv/static/bootloader-vmlinux-5.10>
 
 
 ## Resource: RISCV Full System with Disk Image
@@ -735,7 +735,7 @@
 
 ### RISCV Full System pre-built Linux bootloader with embedded workload
 
-<http://dist.gem5.org/dist/develop/misc/riscv/bbl-busybox-boot-exit>
+<http://dist.gem5.org/dist/v21-2/misc/riscv/bbl-busybox-boot-exit>
 
 
 ## Resource: Insttest
@@ -767,7 +767,7 @@
 
 ### Insttest Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/insttest/bin/sparc/linux/insttest>
+<http://dist.gem5.org/dist/v21-2/test-progs/insttest/bin/sparc/linux/insttest>
 
 ## Resource: Linux Kernel Binary
 
@@ -780,10 +780,10 @@
 
 ### Linux Kernel Pre-built binaries
 
-<http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.4.186>
-<http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.9.186>
-<http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.14.134>
-<http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.19.83>
+<http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.4.186>
+<http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.9.186>
+<http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.14.134>
+<http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.19.83>
 
 ## Licensing
 
diff --git a/src/gapbs/README.md b/src/gapbs/README.md
index c8d34a3..81d8c5d 100644
--- a/src/gapbs/README.md
+++ b/src/gapbs/README.md
@@ -12,7 +12,7 @@
 
 This document provides instructions to create a GAP Benchmark Suite (GAPBS) disk image, which, along with an example script, may be used to run GAPBS within gem5 simulations. The example script uses a pre-built disk-image.
 
-A pre-built disk image, for X86, can be found, gzipped, here: <http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/gapbs.img.gz>.
+A pre-built disk image, for X86, can be found, gzipped, here: <http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/gapbs.img.gz>.
 
 ## Building the Disk Image
 
diff --git a/src/gpu/DNNMark/README.md b/src/gpu/DNNMark/README.md
index 79256bc..4acd9b8 100644
--- a/src/gpu/DNNMark/README.md
+++ b/src/gpu/DNNMark/README.md
@@ -27,8 +27,8 @@
 `-v ${PWD}:${PWD}` in the docker run commands
 ```
 cd src/gpu/DNNMark
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu ./setup.sh HIP
-docker run --rm -v ${PWD}:${PWD} -w ${PWD}/build -u $UID:$GID gcr.io/gem5-test/gcn-gpu make
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 ./setup.sh HIP
+docker run --rm -v ${PWD}:${PWD} -w ${PWD}/build -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make
 ```
 
 DNNMark uses MIOpen kernels, which are unable to be compiled on-the-fly in gem5.
@@ -38,7 +38,7 @@
 To generate the MIOpen kernels:
 ```
 cd src/gpu/DNNMark
-docker run --rm -v ${PWD}:${PWD} -v${PWD}/cachefiles:/root/.cache/miopen/2.9.0 -w ${PWD} gcr.io/gem5-test/gcn-gpu python3 generate_cachefiles.py cachefiles.csv [--gfx-version={gfx801,gfx803}] [--num-cus=N]
+docker run --rm -v ${PWD}:${PWD} -v${PWD}/cachefiles:/root/.cache/miopen/2.9.0 -w ${PWD} gcr.io/gem5-test/gcn-gpu:v21-2 python3 generate_cachefiles.py cachefiles.csv [--gfx-version={gfx801,gfx803}] [--num-cus=N]
 ```
 
 Due to the large amounts of memory that need to be set up for DNNMark, we have
@@ -56,13 +56,13 @@
 To build GCN3_X86:
 ```
 # Working directory is your gem5 directory
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu scons -sQ -j$(nproc) build/GCN3_X86/gem5.opt
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 scons -sQ -j$(nproc) build/GCN3_X86/gem5.opt
 ```
 
 To run one of the benchmarks (fwd softmax) in gem5:
 ```
 # Assuming gem5 and gem5-resources are sub-directories of the current directory
-docker run --rm -v ${PWD}:${PWD} -v ${PWD}/gem5-resources/src/gpu/DNNMark/cachefiles:/root/.cache/miopen/2.9.0 -w ${PWD} gcr.io/gem5-test/gcn-gpu gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --benchmark-root=gem5-resources/src/gpu/DNNMark/build/benchmarks/test_fwd_softmax -cdnnmark_test_fwd_softmax --options="-config gem5-resources/src/gpu/DNNMark/config_example/softmax_config.dnnmark -mmap gem5-resources/src/gpu/DNNMark/mmap.bin"
+docker run --rm -v ${PWD}:${PWD} -v ${PWD}/gem5-resources/src/gpu/DNNMark/cachefiles:/root/.cache/miopen/2.9.0 -w ${PWD} gcr.io/gem5-test/gcn-gpu:v21-2 gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --benchmark-root=gem5-resources/src/gpu/DNNMark/build/benchmarks/test_fwd_softmax -cdnnmark_test_fwd_softmax --options="-config gem5-resources/src/gpu/DNNMark/config_example/softmax_config.dnnmark -mmap gem5-resources/src/gpu/DNNMark/mmap.bin"
 ```
 
 Information from the original DNNMark README included below.
diff --git a/src/gpu/halo-finder/README.md b/src/gpu/halo-finder/README.md
index e52b069..fa87353 100644
--- a/src/gpu/halo-finder/README.md
+++ b/src/gpu/halo-finder/README.md
@@ -59,4 +59,4 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/halo-finder/ForceTreeTest>
+<http://dist.gem5.org/dist/v21-2/test-progs/halo-finder/ForceTreeTest>
diff --git a/src/gpu/heterosync/README.md b/src/gpu/heterosync/README.md
index c7c3d51..83bd3c5 100644
--- a/src/gpu/heterosync/README.md
+++ b/src/gpu/heterosync/README.md
@@ -21,7 +21,7 @@
 ## Compilation
 ```
 cd src/gpu/heterosync
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make release-gfx8
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make release-gfx8
 ```
 
 The release-gfx8 target builds for gfx801, a GCN3-based APU, and gfx803, a
@@ -33,12 +33,12 @@
 HeteroSync has multiple applications that can be run (see below).  For example, to run sleepMutex with 10 ld/st per thread, 16 WGs, and 4 iterations of the critical section:
 
 ```
-docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:latest gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n 3 -c bin/allSyncPrims-1kernel --options="sleepMutex 10 16 4"
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:v21-2 gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n 3 -c bin/allSyncPrims-1kernel --options="sleepMutex 10 16 4"
 ```
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
+<http://dist.gem5.org/dist/v21-2/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
 
 Information from original HeteroSync README included below:
 
diff --git a/src/gpu/hip-samples/README.md b/src/gpu/hip-samples/README.md
index 467705b..f81c923 100644
--- a/src/gpu/hip-samples/README.md
+++ b/src/gpu/hip-samples/README.md
@@ -28,7 +28,7 @@
 
 ```
 cd src/gpu/hip-samples
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make
 ```
 
 Individual programs can be made by specifying the name of the program
@@ -38,18 +38,18 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/2dshfl>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/2dshfl>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/dynamic_shared>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/dynamic_shared>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/inline_asm>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/inline_asm>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/MatrixTranspose>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/MatrixTranspose>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/sharedMemory>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/sharedMemory>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/shfl>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/shfl>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/stream>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/stream>
 
-<http://dist.gem5.org/dist/v21-1/test-progs/hip-samples/unroll>
+<http://dist.gem5.org/dist/v21-2/test-progs/hip-samples/unroll>
diff --git a/src/gpu/hsa-agent-pkt/README.md b/src/gpu/hsa-agent-pkt/README.md
index 4d20e10..a2dc866 100644
--- a/src/gpu/hsa-agent-pkt/README.md
+++ b/src/gpu/hsa-agent-pkt/README.md
@@ -29,7 +29,7 @@
 
 ```
 cd src/gpu/hsa-agent-pkt
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make gfx8-apu
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make gfx8-apu
 ```
 
 The compiled binary can be found in `src/gpu/hsa-agent-pkt/bin`
diff --git a/src/gpu/lulesh/README.md b/src/gpu/lulesh/README.md
index a0726c4..7f07853 100644
--- a/src/gpu/lulesh/README.md
+++ b/src/gpu/lulesh/README.md
@@ -20,7 +20,7 @@
 ## Compilation and Running
 ```
 cd src/gpu/lulesh
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make
 ```
 
 By default, the makefile builds for gfx801, and is placed in the `src/gpu/lulesh/bin` folder.
@@ -30,7 +30,7 @@
 
 ```
 # Working directory is your gem5 directory
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu scons -sQ -j$(nproc) build/GCN3_X86/gem5.opt
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 scons -sQ -j$(nproc) build/GCN3_X86/gem5.opt
 ```
 
 The following command shows how to run lulesh
@@ -42,7 +42,7 @@
 
 ```
 # Assuming gem5 and gem5-resources are in your working directory
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --mem-size=8GB --benchmark-root=gem5-resources/src/gpu/lulesh/bin -clulesh
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --mem-size=8GB --benchmark-root=gem5-resources/src/gpu/lulesh/bin -clulesh
 ```
 
 ## Pre-built binary
diff --git a/src/gpu/pennant/README.md b/src/gpu/pennant/README.md
index 5c1108f..0c025e4 100644
--- a/src/gpu/pennant/README.md
+++ b/src/gpu/pennant/README.md
@@ -20,7 +20,7 @@
 
 ```
 cd src/gpu/pennant
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make
 ```
 
 By default, the binary is built for gfx801 and is placed in `src/gpu/pennant/build`
@@ -31,7 +31,7 @@
 
 ```
 # Assuming gem5 and gem5-resources are in your working directory
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --benchmark-root=gem5-resources/src/gpu/pennant/build -cpennant --options="gem5-resources/src/gpu/pennant/test/noh/noh.pnt"
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n3 --benchmark-root=gem5-resources/src/gpu/pennant/build -cpennant --options="gem5-resources/src/gpu/pennant/test/noh/noh.pnt"
 ```
 
 The output gets placed in `src/gpu/pennant/test/noh/`, and the file `noh.xy`
@@ -40,7 +40,7 @@
 
 ## Pre-built binary
 
-<http://dist.gem5.org/dist/v21-1/test-progs/pennant/pennant>
+<http://dist.gem5.org/dist/v21-2/test-progs/pennant/pennant>
 
 The information from the original PENNANT README is included below.
 
diff --git a/src/gpu/square/README.md b/src/gpu/square/README.md
index 28db907..dbf274b 100644
--- a/src/gpu/square/README.md
+++ b/src/gpu/square/README.md
@@ -18,14 +18,14 @@
 By default, square will build for all supported GPU types (gfx801, gfx803)
 ```
 cd src/gpu/square
-docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu make
+docker run --rm -v ${PWD}:${PWD} -w ${PWD} -u $UID:$GID gcr.io/gem5-test/gcn-gpu:v21-2 make
 ```
 
 The compiled binary can be found in the `bin` directory.
 
 ## Pre-built binary
 
-A pre-built binary can be found at <http://dist.gem5.org/dist/v21-1/test-progs/square/square>.
+A pre-built binary can be found at <http://dist.gem5.org/dist/v21-2/test-progs/square/square>.
 
 ## Compiling GCN3_X86/gem5.opt
 
@@ -34,11 +34,11 @@
 ```
 git clone https://gem5.googlesource.com/public/gem5
 cd gem5
-docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:latest scons build/GCN3_X86/gem5.opt -j <num cores>
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:v21-2 scons build/GCN3_X86/gem5.opt -j <num cores>
 ```
 
 ## Running Square on GCN3_X86/gem5.opt
 
 ```
-docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:latest gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n 3 -c bin/square
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) gcr.io/gem5-test/gcn-gpu:v21-2 gem5/build/GCN3_X86/gem5.opt gem5/configs/example/apu_se.py -n 3 -c bin/square
 ```
diff --git a/src/linux-kernel/README.md b/src/linux-kernel/README.md
index 8a7c438..e13b662 100644
--- a/src/linux-kernel/README.md
+++ b/src/linux-kernel/README.md
@@ -66,11 +66,11 @@
 

 The pre-build compiled Linux binaries can be downloaded from the following links:

 

-- [vmlinux-4.4.186](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.4.186)

-- [vmlinux-4.9.186](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.9.186)

-- [vmlinux-4.14.134](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.14.134)

-- [vmlinux-4.19.83](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-4.19.83)

-- [vmlinux-5.4.49](http://dist.gem5.org/dist/v21-1/kernels/x86/static/vmlinux-5.4.49)

+- [vmlinux-4.4.186](http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.4.186)

+- [vmlinux-4.9.186](http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.9.186)

+- [vmlinux-4.14.134](http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.14.134)

+- [vmlinux-4.19.83](http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-4.19.83)

+- [vmlinux-5.4.49](http://dist.gem5.org/dist/v21-2/kernels/x86/static/vmlinux-5.4.49)

 

 

 **Licensing:**

diff --git a/src/npb/README.md b/src/npb/README.md
index 0ef8530..c55f832 100644
--- a/src/npb/README.md
+++ b/src/npb/README.md
@@ -72,7 +72,7 @@
 ```
 
 Once this process succeeds, the created disk image can be found on `npb/npb-image/npb`.
-A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/npb.img.gz).
+A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/npb.img.gz).
 
 ## Simulating NPB using an example script
 
diff --git a/src/riscv-fs/README.md b/src/riscv-fs/README.md
index e5bad0e..11e2ce2 100644
--- a/src/riscv-fs/README.md
+++ b/src/riscv-fs/README.md
@@ -112,7 +112,7 @@
 ```
 
 This should generate a `vmlinux` image in the `linux` directory.
-A pre-built RISC-V 5.10 linux kernel can be downloaded [here](http://dist.gem5.org/dist/v21-1/kernels/riscv/static/vmlinux-5.10).
+A pre-built RISC-V 5.10 linux kernel can be downloaded [here](http://dist.gem5.org/dist/v21-2/kernels/riscv/static/vmlinux-5.10).
 
 ## Bootloader (bbl)
 
@@ -142,7 +142,7 @@
 ```
 
 This will produce a `bbl` bootloader binary with linux kernel in `riscv-pk/build` directory.
-A pre-built copy of this bootloard binary, with the linux kernel can be downloaded [here](http://dist.gem5.org/dist/develop/kernels/riscv/static/bootloader-vmlinux-5.10).
+A pre-built copy of this bootloard binary, with the linux kernel can be downloaded [here](http://dist.gem5.org/dist/v21-2/kernels/riscv/static/bootloader-vmlinux-5.10).
 
 ## Busy Box
 
@@ -226,7 +226,7 @@
 ```
 
 The disk image `riscv_disk` is ready to use.
-A pre-built, gzipped, disk image can be downloaded [here](http://dist.gem5.org/dist/develop/images/riscv/busybox/riscv-disk.img.gz).
+A pre-built, gzipped, disk image can be downloaded [here](http://dist.gem5.org/dist/v21-2/images/riscv/busybox/riscv-disk.img.gz).
 
 **Note:** If you need to resize the disk image once it is created, you can do the following:
 
diff --git a/src/riscv-ubuntu/README.md b/src/riscv-ubuntu/README.md
index a46bb3c..b51394d 100644
--- a/src/riscv-ubuntu/README.md
+++ b/src/riscv-ubuntu/README.md
@@ -198,7 +198,7 @@
 
 # Pre-built disk image
 
-A pre-build, gzipped, disk image is available at <http://dist.gem5.org/dist/develop/images/riscv/ubuntu-20-04/riscv-ubuntu.img.gz>. **Note**: The password set for the `ubuntu` user is `helloworld`.
+A pre-build, gzipped, disk image is available at <http://dist.gem5.org/dist/v21-2/images/riscv/ubuntu-20-04/riscv-ubuntu.img.gz>. **Note**: The password set for the `ubuntu` user is `helloworld`.
 
 # Using the Disk Image
 This disk image is used in the following gem5 example RISCV config files, found within the gem5 repository:
diff --git a/src/x86-ubuntu/README.md b/src/x86-ubuntu/README.md
index d1f6f08..0eeace1 100644
--- a/src/x86-ubuntu/README.md
+++ b/src/x86-ubuntu/README.md
@@ -80,7 +80,7 @@
 ```
 
 Once this process succeeds, the disk image can be found on `x86-ubuntu/x86-ubuntu-image/x86-ubuntu`.
-A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/v21-1/images/x86/ubuntu-18-04/x86-ubuntu.img.gz).
+A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/v21-2/images/x86/ubuntu-18-04/x86-ubuntu.img.gz).
 
 
 ## gem5 Run Scripts