resources: Merge branch stable into develop
Change-Id: I6ad0717bd7fefc73862bbfcfd09ec81f6fc8ddee
diff --git a/README.md b/README.md
index 53c2f7f..b507bc1 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/v20-1 and are compiled from
+are under http://dist.gem5.org/dist/develop 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-0/test-progs/riscv-tests/dhrystone.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/dhrystone.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/median.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/median.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/mm.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/mm.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/mt-matmul.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/mt-matmul.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/mt-vvadd.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/mt-vvadd.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/multiply.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/multiply.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/pmp.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/pmp.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/qsort.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/qsort.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/rsort.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/rsort.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/spmv.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/spmv.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/towers.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/towers.riscv>
-<http://dist.gem5.org/dist/v21-0/test-progs/riscv-tests/vvadd.riscv>
+<http://dist.gem5.org/dist/develop/test-progs/riscv-tests/vvadd.riscv>
## Resource: simple
@@ -241,86 +241,85 @@
### simple Pre-built binaries
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_pthread_create_seq>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_pthread_create_seq>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_pthread_create_para>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_pthread_create_para>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_pthread_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_pthread_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_atomic>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_atomic>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_pthread_cond>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_pthread_cond>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_std_thread>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_std_thread>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_std_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_std_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/x86/test_std_condition_variable>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/x86/test_std_condition_variable>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_pthread_create_seq>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_pthread_create_seq>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_pthread_create_para>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_pthread_create_para>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_pthread_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_pthread_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_atomic>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_atomic>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_pthread_cond>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_pthread_cond>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_std_thread>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_std_thread>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_std_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_std_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch32/test_std_condition_variable>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch32/test_std_condition_variable>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_pthread_create_seq>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_pthread_create_para>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_pthread_create_para>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_pthread_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_pthread_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_atomic>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_atomic>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_pthread_cond>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_pthread_cond>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_std_thread>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_std_thread>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_std_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_std_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/aarch64/test_std_condition_variable>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/aarch64/test_std_condition_variable>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_pthread_create_seq>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_pthread_create_para>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_pthread_create_para>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_pthread_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_pthread_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_atomic>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_atomic>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_pthread_cond>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_pthread_cond>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_std_thread>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_std_thread>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_std_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_std_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/riscv64/test_std_condition_variable>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/riscv64/test_std_condition_variable>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_pthread_create_seq>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_pthread_create_seq>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_pthread_create_para>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_pthread_create_para>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_pthread_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_pthread_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_atomic>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_atomic>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_pthread_cond>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_pthread_cond>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_std_thread>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_std_thread>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_std_mutex>
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_std_mutex>
-<http://dist.gem5.org/dist/v21-0/test-progs/pthreads/sparc64/test_std_condition_variable>
-
+<http://dist.gem5.org/dist/develop/test-progs/pthreads/sparc64/test_std_condition_variable>
## Resource: Square
@@ -337,7 +336,7 @@
### Square Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/square/square.o>
+<http://dist.gem5.org/dist/develop/test-progs/square/square.o>
# Resource: HSA Agent Packet Example
@@ -391,21 +390,21 @@
## Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/2dshfl>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/2dshfl>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/dynamic_shared>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/dynamic_shared>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/inline_asm>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/inline_asm>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/MatrixTranspose>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/MatrixTranspose>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/sharedMemory>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/sharedMemory>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/shfl>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/shfl>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/stream>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/stream>
-<http://dist.gem5.org/dist/v21-0/test-progs/hip-samples/unroll>
+<http://dist.gem5.org/dist/develop/test-progs/hip-samples/unroll>
# Resource: Heterosync
@@ -428,7 +427,7 @@
## Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
+<http://dist.gem5.org/dist/develop/test-progs/heterosync/gcn3/allSyncPrims-1kernel>
# Resource: lulesh
@@ -466,7 +465,7 @@
## Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/lulesh/lulesh>
+<http://dist.gem5.org/dist/develop/test-progs/lulesh/lulesh>
# Resource: halo-finder (HACC)
@@ -511,7 +510,7 @@
## Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/halo-finder/ForceTreeTest>
+<http://dist.gem5.org/dist/develop/test-progs/halo-finder/ForceTreeTest>
# Resource: DNNMark
@@ -602,7 +601,7 @@
## Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/pennant/pennant>
+<http://dist.gem5.org/dist/develop/test-progs/pennant/pennant>
## Resource: SPEC 2006
@@ -652,7 +651,7 @@
### GAPBS Pre-built disk image
-<http://dist.gem5.org/dist/v21-0/images/x86/ubuntu-18-04/gapbs.img.gz>.
+<http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/gapbs.img.gz>.
## Resource: PARSEC Benchmark Suite
@@ -673,7 +672,7 @@
### GAPBS Pre-built disk image
-<http://dist.gem5.org/dist/v21-0/images/x86/ubuntu-18-04/parsec.img.gz>.
+<http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/parsec.img.gz>.
## Resource: NAS Parallel Benchmarks (NPB) Tests
@@ -700,7 +699,7 @@
### NPB Pre-built disk image
-<http://dist.gem5.org/dist/v21-0/images/x86/ubuntu-18-04/npb.img.gz>
+<http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/npb.img.gz>
## Resource: Linux Boot Tests
@@ -755,7 +754,7 @@
### Insttest Pre-built binary
-<http://dist.gem5.org/dist/v21-0/test-progs/insttest/bin/sparc/linux/insttest>
+<http://dist.gem5.org/dist/develop/test-progs/insttest/bin/sparc/linux/insttest>
## Resource: Linux Kernel Binary
@@ -768,10 +767,10 @@
### Linux Kernel Pre-built binaries
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.4.186>
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.9.186>
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.14.134>
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83>
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.4.186>
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.9.186>
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.14.134>
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83>
## Licensing
diff --git a/src/boot-exit/README.md b/src/boot-exit/README.md
index 82965f4..9a54bed 100644
--- a/src/boot-exit/README.md
+++ b/src/boot-exit/README.md
@@ -85,7 +85,7 @@
```
Once this process succeeds, the disk image can be found on `boot-exit/boot-exit-image/boot-exit`.
-A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/v21-0/images/x86/ubuntu-18-04/boot-exit.img.gz).
+A disk image already created following the above instructions can be found, gzipped, [here](http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/boot-exit.img.gz).
## gem5 Run Scripts
diff --git a/src/boot-exit/configs/system/ruby_system.py b/src/boot-exit/configs/system/ruby_system.py
index 30eebd4..687e252 100755
--- a/src/boot-exit/configs/system/ruby_system.py
+++ b/src/boot-exit/configs/system/ruby_system.py
@@ -147,8 +147,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/boot-exit/configs/system/system.py b/src/boot-exit/configs/system/system.py
index d92cd72..b6ad6b9 100755
--- a/src/boot-exit/configs/system/system.py
+++ b/src/boot-exit/configs/system/system.py
@@ -233,8 +233,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/gapbs/README.md b/src/gapbs/README.md
index cb739c9..a877aa6 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 provided configuration scripts, may be used to run GAPBS within gem5 simulations.
-A pre-build disk image, for X86, can be found, gzipped, here: <http://dist.gem5.org/dist/v21-0/images/x86/ubuntu-18-04/gapbs.img.gz>.
+A pre-build disk image, for X86, can be found, gzipped, here: <http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/gapbs.img.gz>.
## Building the Disk Image
@@ -45,7 +45,7 @@
gem5 scripts which configure the system and run the simulation are available in `configs/`.
The main script `run_gapbs.py` expects following arguments:
-* **kernel** : A manditory positional argument. The path to the Linux kernel. GAPBS has been tested with [vmlinux-5.2.3](http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-5.2.3). See `src/linux-kernel` for information on building a linux kernel for gem5.
+* **kernel** : A manditory positional argument. The path to the Linux kernel. GAPBS has been tested with [vmlinux-5.2.3](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3). See `src/linux-kernel` for information on building a linux kernel for gem5.
* **disk** : A manditory positional argument. The path to the disk image.
diff --git a/src/gapbs/configs/system/ruby_system.py b/src/gapbs/configs/system/ruby_system.py
index e7c1135..38960f9 100644
--- a/src/gapbs/configs/system/ruby_system.py
+++ b/src/gapbs/configs/system/ruby_system.py
@@ -150,8 +150,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/gapbs/configs/system/system.py b/src/gapbs/configs/system/system.py
index 3287c3e..70a6255 100644
--- a/src/gapbs/configs/system/system.py
+++ b/src/gapbs/configs/system/system.py
@@ -259,8 +259,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/linux-kernel/README.md b/src/linux-kernel/README.md
index 1ffdd5e..445051a 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-0/kernels/x86/static/vmlinux-4.4.186)
-- [vmlinux-4.9.186](http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.9.186)
-- [vmlinux-4.14.134](http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.14.134)
-- [vmlinux-4.19.83](http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83)
-- [vmlinux-5.4.49](http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-5.4.49)
+- [vmlinux-4.4.186](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.4.186)
+- [vmlinux-4.9.186](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.9.186)
+- [vmlinux-4.14.134](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.14.134)
+- [vmlinux-4.19.83](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83)
+- [vmlinux-5.4.49](http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.4.49)
**Licensing:**
diff --git a/src/npb/README.md b/src/npb/README.md
index 85e7a71..e8c8f0f 100644
--- a/src/npb/README.md
+++ b/src/npb/README.md
@@ -81,15 +81,14 @@
```
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-0/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/develop/images/x86/ubuntu-18-04/npb.img.gz).
## gem5 Run Scripts
The gem5 scripts which configure the system and run simulation are available in configs-npb-tests/.
The main script `run_npb.py` expects following arguments:
-**kernel:** path to the Linux kernel. This disk image has been tested with version 4.19.83, available at <http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83>. More info on building Linux Kernels can be found in the `src/linux-kernels` directory.
+**kernel:** path to the Linux kernel. This disk image has been tested with version 4.19.83, available at <http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83>. More info on building Linux Kernels can be found in the `src/linux-kernels` directory.
**disk:** path to the npb disk image.
diff --git a/src/npb/configs/system/ruby_system.py b/src/npb/configs/system/ruby_system.py
index 4d313bb..6b3435a 100755
--- a/src/npb/configs/system/ruby_system.py
+++ b/src/npb/configs/system/ruby_system.py
@@ -157,8 +157,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/npb/configs/system/system.py b/src/npb/configs/system/system.py
index 23b8b60..e7a0753 100755
--- a/src/npb/configs/system/system.py
+++ b/src/npb/configs/system/system.py
@@ -306,8 +306,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/parsec/README.md b/src/parsec/README.md
index dfc1c8d..336e8ef 100644
--- a/src/parsec/README.md
+++ b/src/parsec/README.md
@@ -79,7 +79,7 @@
There are two sets of run scripts and system configuration files in the directory. The scripts found in `configs` use the classic memory system while the scripts in `configs-mesi-two-level` use the ruby memory system with MESI_Two_Level cache coherency protocol. The parameters used in the both sets of experiments are explained below:
-* **kernel**: The path to the linux kernel. We have verified capatibility with kernel version 4.19.83 which you can download at <http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83>. More information on building kernels for gem5 can be around in `src/linux-kernel`.
+* **kernel**: The path to the linux kernel. We have verified capatibility with kernel version 4.19.83 which you can download at <http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83>. More information on building kernels for gem5 can be around in `src/linux-kernel`.
* **disk**: The path to the PARSEC disk-image.
* **cpu**: The type of cpu to use. There are two supported options: `kvm` (KvmCPU) and `timing` (TimingSimpleCPU).
* **benchmark**: The PARSEC workload to run. They include `blackscholes`, `bodytrack`, `canneal`, `dedup`, `facesim`, `ferret`, `fluidanimate`, `freqmine`, `raytrace`, `streamcluster`, `swaptions`, `vips`, `x264`. For more information on the workloads can be found at <https://parsec.cs.princeton.edu/>.
diff --git a/src/parsec/configs-mesi-two-level/system/ruby_system.py b/src/parsec/configs-mesi-two-level/system/ruby_system.py
index d0adcc7..b6a647e 100755
--- a/src/parsec/configs-mesi-two-level/system/ruby_system.py
+++ b/src/parsec/configs-mesi-two-level/system/ruby_system.py
@@ -161,8 +161,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/parsec/configs/system/ruby_system.py b/src/parsec/configs/system/ruby_system.py
index 30eebd4..687e252 100644
--- a/src/parsec/configs/system/ruby_system.py
+++ b/src/parsec/configs/system/ruby_system.py
@@ -147,8 +147,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/parsec/configs/system/system.py b/src/parsec/configs/system/system.py
index fe4d198..c2360c0 100644
--- a/src/parsec/configs/system/system.py
+++ b/src/parsec/configs/system/system.py
@@ -250,8 +250,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/riscv-fs/configs-riscv-fs/system/system.py b/src/riscv-fs/configs-riscv-fs/system/system.py
index 5032664..0150972 100755
--- a/src/riscv-fs/configs-riscv-fs/system/system.py
+++ b/src/riscv-fs/configs-riscv-fs/system/system.py
@@ -184,8 +184,6 @@
self.platform.attachOffChipIO(self.iobus)
def setupIntrCtrl(self):
- self.intrctrl = IntrControl()
-
# Set the frequency of RTC (real time clock) used by
# CLINT (core level interrupt controller).
# This frequency is 1MHz in SiFive's U54MC.
diff --git a/src/spec-2006/README.md b/src/spec-2006/README.md
index 1bbf527..15706be 100644
--- a/src/spec-2006/README.md
+++ b/src/spec-2006/README.md
@@ -85,7 +85,7 @@
`kernel`: required, a positional argument specifying the path to the Linux
kernel. We have tested using version 4.19.83, which can be downloaded from
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83>. Info on
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83>. Info on
building Linux kernels for gem5 can be found in `src/linux-kernel`
`disk`: required, a positional argument specifying the path to the disk image
diff --git a/src/spec-2006/configs/system/ruby_system.py b/src/spec-2006/configs/system/ruby_system.py
index 4860504..1ffea57 100755
--- a/src/spec-2006/configs/system/ruby_system.py
+++ b/src/spec-2006/configs/system/ruby_system.py
@@ -163,8 +163,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/spec-2006/configs/system/system.py b/src/spec-2006/configs/system/system.py
index a5fbe16..b6e434e 100644
--- a/src/spec-2006/configs/system/system.py
+++ b/src/spec-2006/configs/system/system.py
@@ -281,8 +281,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/spec-2017/README.md b/src/spec-2017/README.md
index 63eade4..a51ba89 100644
--- a/src/spec-2017/README.md
+++ b/src/spec-2017/README.md
@@ -86,7 +86,7 @@
`kernel`: required, a positional argument specifying the path to the Linux
kernel. This has been tested with version 4.19.83, available at
-<http://dist.gem5.org/dist/v21-0/kernels/x86/static/vmlinux-4.19.83>. Info on
+<http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-4.19.83>. Info on
building Linux kernels can be found in `src/linux-kernels`.
`disk`: required, a positional argument specifying the path to the disk image
diff --git a/src/spec-2017/configs/system/ruby_system.py b/src/spec-2017/configs/system/ruby_system.py
index 4860504..1ffea57 100755
--- a/src/spec-2017/configs/system/ruby_system.py
+++ b/src/spec-2017/configs/system/ruby_system.py
@@ -163,8 +163,6 @@
# so the port isn't connected twice.
self.pc.attachIO(self.iobus, [self.pc.south_bridge.ide.dma])
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/spec-2017/configs/system/system.py b/src/spec-2017/configs/system/system.py
index de2afc8..a35e570 100644
--- a/src/spec-2017/configs/system/system.py
+++ b/src/spec-2017/configs/system/system.py
@@ -283,8 +283,6 @@
self.iocache.cpu_side = self.iobus.mem_side_ports
self.iocache.mem_side = self.membus.cpu_side_ports
- self.intrctrl = IntrControl()
-
###############################################
# Add in a Bios information structure.
diff --git a/src/square/README.md b/src/square/README.md
index 84039ab..9d366e1 100644
--- a/src/square/README.md
+++ b/src/square/README.md
@@ -22,8 +22,7 @@
The compiled binary can be found in the `bin` directory.
-A pre-built binary can be found at <http://dist.gem5.org/dist/v21-0/test-progs/square/square.o>.
-
+A pre-built binary can be found at <http://dist.gem5.org/dist/develop/test-progs/square/square.o>.
## Compiling GN3_X86/gem5.opt
