resources: Cleaned up spec 2006
Mostly renaming things to conform to how they are named for spec 2017.
Change-Id: I3b4705488d9cf0c1512ea16377ff5eff8933b4ac
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/31116
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby R. Bruce <bbruce@ucdavis.edu>
diff --git a/src/spec2006-tests/README.md b/src/spec-2006/README.md
similarity index 85%
rename from src/spec2006-tests/README.md
rename to src/spec-2006/README.md
index 26fe5b1..3122f90 100644
--- a/src/spec2006-tests/README.md
+++ b/src/spec-2006/README.md
@@ -1,4 +1,4 @@
-# SPEC 2006 tests
+# SPEC 2006
This document aims to provide instructions to create a gem5-compatible disk
image containing the SPEC 2006 benchmark suite and also to provide necessary
configuration files.
@@ -10,24 +10,24 @@
In this tutorial, we assume that the file `CPU2006v1.0.1.iso` contains the SPEC
benchmark suite, and we provide the scripts that are made specifically for
SPEC 2006 version 1.0.1.
-Throughout the this document, the root folder is `src/spec2006-tests/`.
+Throughout the this document, the root folder is `src/spec-2006/`.
All commands should be run from the assumed root folder.
The layout of the folder after the scripts are run is as follows,
```
-spec2006-tests/
+spec-2006/
|___ gem5/ # gem5 folder
|
|___ disk-image/
| |___ shared/
- | |___ spec2006/
- | | |___ spec2006-image/
+ | |___ spec-2006/
+ | | |___ spec-2006-image/
| | | |___ spec2006 # the disk image will be generated here
- | | |___ spec2006.json # the Packer script
+ | | |___ spec-2006.json # the Packer script
| |___ CPU2006v1.0.1.iso # SPEC 2006 ISO (add here)
|
- |___ configs-spec2006-tests
+ |___ configs
| |___ system
| |___ run_spec.py # gem5 config file
|
@@ -54,11 +54,11 @@
cd disk-image
wget https://releases.hashicorp.com/packer/1.4.3/packer_1.4.3_linux_amd64.zip #(download the packer binary)
unzip packer_1.4.3_linux_amd64.zip
-./packer validate spec2006/spec2006.json #validate the Packer script
-./packer build spec2006/spec2006.json
+./packer validate spec-2006/spec-2006.json #validate the Packer script
+./packer build spec-2006/spec-2006.json
```
-The path to the disk image is `spec2006/spec2006-image/spec2006`.
+The path to the disk image is `spec-2006/spec-2006-image/spec2006`.
Please refer to [this tutorial](https://gem5art.readthedocs.io/en/latest/tutorials/spec2006-tutorial.html#preparing-scripts-to-modify-the-disk-image)
for more information about the scripts used in this document.
@@ -69,7 +69,7 @@
## gem5 Configuration Scripts
gem5 scripts which configure the system and run the simulation are available
-in `configs-spec2006-tests/`.
+in `configs/`.
The main script `run_spec.py` expects following arguments:
`usage: run_spec.py [-h] [-l] [-z] kernel disk cpu benchmark size`
@@ -109,13 +109,10 @@
Assume the compiled Linux kernel is available in the assumed root folder, the
following is an example of running a SPEC 2006 workload in full system mode,
`
-gem5/build/X86/gem5.opt configs-spec2006-tests/run_spec.py -z vmlinux-4.19.83 disk-image/spec2006/spec2006-image/spec2006 atomic 403.gcc test
+gem5/build/X86/gem5.opt configs/run_spec.py -z vmlinux-4.19.83 disk-image/spec2006/spec2006-image/spec2006 atomic 403.gcc test
`
## Working Status
Status of these benchmarks runs with respect to gem5-20, linux kernel version
-4.19.83 and gcc version 7.5.0 is
+4.19.83 and gcc version 7.5.0 can be found
[here](https://www.gem5.org/documentation/benchmark_status/#spec-2006-tests)
-
-
-
diff --git a/src/spec2006-tests/configs-spec2006-tests/run_spec.py b/src/spec-2006/configs/run_spec.py
similarity index 100%
rename from src/spec2006-tests/configs-spec2006-tests/run_spec.py
rename to src/spec-2006/configs/run_spec.py
diff --git a/src/spec2006-tests/configs-spec2006-tests/system/__init__.py b/src/spec-2006/configs/system/__init__.py
similarity index 100%
rename from src/spec2006-tests/configs-spec2006-tests/system/__init__.py
rename to src/spec-2006/configs/system/__init__.py
diff --git a/src/spec2006-tests/configs-spec2006-tests/system/caches.py b/src/spec-2006/configs/system/caches.py
similarity index 100%
rename from src/spec2006-tests/configs-spec2006-tests/system/caches.py
rename to src/spec-2006/configs/system/caches.py
diff --git a/src/spec2006-tests/configs-spec2006-tests/system/fs_tools.py b/src/spec-2006/configs/system/fs_tools.py
similarity index 100%
rename from src/spec2006-tests/configs-spec2006-tests/system/fs_tools.py
rename to src/spec-2006/configs/system/fs_tools.py
diff --git a/src/spec2006-tests/configs-spec2006-tests/system/system.py b/src/spec-2006/configs/system/system.py
similarity index 100%
rename from src/spec2006-tests/configs-spec2006-tests/system/system.py
rename to src/spec-2006/configs/system/system.py
diff --git a/src/spec2006-tests/disk-image/shared/preseed.cfg b/src/spec-2006/disk-image/shared/preseed.cfg
similarity index 100%
rename from src/spec2006-tests/disk-image/shared/preseed.cfg
rename to src/spec-2006/disk-image/shared/preseed.cfg
diff --git a/src/spec2006-tests/disk-image/shared/serial-getty@.service b/src/spec-2006/disk-image/shared/serial-getty@.service
similarity index 100%
rename from src/spec2006-tests/disk-image/shared/serial-getty@.service
rename to src/spec-2006/disk-image/shared/serial-getty@.service
diff --git a/src/spec2006-tests/disk-image/spec2006/install-spec2006.sh b/src/spec-2006/disk-image/spec-2006/install-spec2006.sh
similarity index 100%
rename from src/spec2006-tests/disk-image/spec2006/install-spec2006.sh
rename to src/spec-2006/disk-image/spec-2006/install-spec2006.sh
diff --git a/src/spec2006-tests/disk-image/spec2006/post-installation.sh b/src/spec-2006/disk-image/spec-2006/post-installation.sh
similarity index 100%
rename from src/spec2006-tests/disk-image/spec2006/post-installation.sh
rename to src/spec-2006/disk-image/spec-2006/post-installation.sh
diff --git a/src/spec2006-tests/disk-image/spec2006/runscript.sh b/src/spec-2006/disk-image/spec-2006/runscript.sh
similarity index 100%
rename from src/spec2006-tests/disk-image/spec2006/runscript.sh
rename to src/spec-2006/disk-image/spec-2006/runscript.sh
diff --git a/src/spec2006-tests/disk-image/spec2006/spec2006.json b/src/spec-2006/disk-image/spec-2006/spec-2006.json
similarity index 92%
rename from src/spec2006-tests/disk-image/spec2006/spec2006.json
rename to src/spec-2006/disk-image/spec-2006/spec-2006.json
index 3424bb9..1edfc3d 100644
--- a/src/spec2006-tests/disk-image/spec2006/spec2006.json
+++ b/src/spec-2006/disk-image/spec-2006/spec-2006.json
@@ -36,7 +36,7 @@
"iso_checksum_type": "{{ user `iso_checksum_type` }}",
"iso_urls": [ "{{ user `iso_url` }}" ],
"memory": "{{ user `vm_memory`}}",
- "output_directory": "spec2006/{{ user `image_name` }}-image",
+ "output_directory": "spec-2006/{{ user `image_name` }}-image",
"qemuargs":
[
[ "-cpu", "host" ],
@@ -64,12 +64,12 @@
},
{
"type": "file",
- "source": "spec2006/runscript.sh",
+ "source": "spec-2006/runscript.sh",
"destination": "/home/gem5/"
},
{
"type": "file",
- "source": "spec2006/CPU2006v1.0.1.iso",
+ "source": "spec-2006/CPU2006v1.0.1.iso",
"destination": "/home/gem5/"
},
{
@@ -77,8 +77,8 @@
"execute_command": "echo '{{ user `ssh_password` }}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
"scripts":
[
- "spec2006/post-installation.sh",
- "spec2006/install-spec2006.sh"
+ "spec-2006/post-installation.sh",
+ "spec-2006/install-spec2006.sh"
]
}
],
@@ -100,7 +100,7 @@
"ssh_username": "gem5",
"vm_cpus": "4",
"vm_memory": "8192",
- "image_name": "spec2006"
+ "image_name": "spec-2006"
}
}
