commit ecd9c1aecea6d719f14062899629c52dbbbf5c37
author Bobby R. Bruce <bbruce@ucdavis.edu> Wed Jul 08 14:49:09 2020 -0700
committer Bobby R. Bruce <bbruce@ucdavis.edu> Wed Jul 08 21:53:36 2020 +0000
tree 64a0a83b5757fa3ce2fc86b83705d1414666431e
parent 93703d115e481e2f8bc9b45adf5b7890d0328086

resources: Fixing some incorrect paths in spec '17

In spec-2017.json, the paths were incorrect due to a previous edit.
These have been updated.

Change-Id: Ib788b6d2f83aad1238a073e16544d09196245bed
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/31117
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby R. Bruce <bbruce@ucdavis.edu>

src/spec-2017/README.md

diff --git a/src/spec-2017/README.md b/src/spec-2017/README.md
index 7c4730b..32d53bf 100644
--- a/src/spec-2017/README.md
+++ b/src/spec-2017/README.md
@@ -23,7 +23,7 @@
   |      |___ shared/
   |      |___ spec-2017/
   |      |      |___ spec-2017-image/
-  |      |      |      |___ spec2017           # the disk image will be generated here
+  |      |      |      |___ spec-2017          # the disk image will be generated here
   |      |      |___ spec-2017.json            # the Packer script
   |      |___ cpu2017-1.1.0.iso                # SPEC 2017 ISO (add here)
   |
@@ -59,7 +59,7 @@
 ./packer build spec-2017/spec-2017.json
 ```
 
-The path to the disk image is `spec-2017/spec-2017-image/spec2017`.
+The path to the disk image is `spec-2017/spec-2017-image/spec-2017`.
 Please refer to [this tutorial](https://gem5art.readthedocs.io/en/latest/tutorials/spec2017-tutorial.html#preparing-scripts-to-modify-the-disk-image)
 for more information about the scripts used in this document.
 
@@ -110,7 +110,7 @@
 Assume the compiled Linux kernel is available in the assumed root folder, the
 following is an example of running a SPEC 2017 workload in full system mode,
 `
-gem5/build/X86/gem5.opt configs/run_spec.py -z vmlinux-4.19.83 disk-image/spec-2017/spec-2017-image/spec2017 atomic 403.gcc test
+gem5/build/X86/gem5.opt configs/run_spec.py -z vmlinux-4.19.83 disk-image/spec-2017/spec-2017-image/spec-2017 atomic 403.gcc test
 `
 
 ## Working Status

src/spec-2017/disk-image/spec-2017/spec-2017.json

diff --git a/src/spec-2017/disk-image/spec-2017/spec-2017.json b/src/spec-2017/disk-image/spec-2017/spec-2017.json
index e20eeeb..b750f14 100644
--- a/src/spec-2017/disk-image/spec-2017/spec-2017.json
+++ b/src/spec-2017/disk-image/spec-2017/spec-2017.json
@@ -36,7 +36,7 @@
             "iso_checksum_type": "{{ user `iso_checksum_type` }}",
             "iso_urls": [ "{{ user `iso_url` }}" ],
             "memory": "{{ user `vm_memory`}}",
-            "output_directory": "spec2017/{{ user `image_name` }}-image",
+            "output_directory": "spec-2017/{{ user `image_name` }}-image",
             "qemuargs":
             [
                 [ "-cpu", "host" ],
@@ -64,12 +64,12 @@
         },
         {
             "type": "file",
-            "source": "spec2017/runscript.sh",
+            "source": "spec-2017/runscript.sh",
             "destination": "/home/gem5/"
         },
         {
             "type": "file",
-            "source": "spec2017/cpu2017-1.1.0.iso",
+            "source": "spec-2017/cpu2017-1.1.0.iso",
             "destination": "/home/gem5/"
         },
         {
@@ -77,8 +77,8 @@
             "execute_command": "echo '{{ user `ssh_password` }}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
             "scripts":
             [
-                "spec2017/post-installation.sh",
-                "spec2017/install-spec2017.sh"
+                "spec-2017/post-installation.sh",
+                "spec-2017/install-spec2017.sh"
             ]
         }
     ],
@@ -100,7 +100,7 @@
         "ssh_username": "gem5",
         "vm_cpus": "4",
         "vm_memory": "8192",
-        "image_name": "spec2017"
+        "image_name": "spec-2017"
   }
 
 }