commit 81e6fa6b60f5841bf9b7665da6ef2b251ef07538
author Bobby R. Bruce <bbruce@ucdavis.edu> Fri Oct 14 11:33:10 2022 -0700
committer Bobby Bruce <bbruce@ucdavis.edu> Fri Oct 14 22:26:24 2022 +0000
tree d98964ca0ccf3bfe47717f4d5f82a39ce6df960c
parent a018c5f8b290f59229b24c0fa332d4ac0a5c9a5c

resources: Update resources for simpoints-se-example

These new resoruces allow for us to better set a workload in the
'configs/example/gem5_library/checkpoints/simpoints-se-restore.py'
script. This change also ensures backwards compatbility with older
versions of this configuraiton.

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

resources.json

diff --git a/resources.json b/resources.json
index ae27aa8..a565da1 100644
--- a/resources.json
+++ b/resources.json
@@ -44,7 +44,7 @@
         {
             "type": "workload",
             "name": "x86-print-this-15000-with-simpoints",
-            "documentation": "This workload is used in the 'configs/example/gem5_library/checkpoints/simpoints-se-checkpoint.py' and 'configs/example/gem5_library/checkpoints/simpoints-se-restore.py' example configuration scripts.",
+            "documentation": "This workload is used in the 'configs/example/gem5_library/checkpoints/simpoints-se-checkpoint.py' example configuration script.",
             "function": "set_se_simpoint_workload",
             "resources": {
                 "binary": "x86-print-this",
@@ -55,6 +55,20 @@
             }
         },
         {
+            "type": "workload",
+            "name": "x86-print-this-15000-with-simpoints-and-checkpoint",
+            "documentation": "This workload is used in the 'configs/example/gem5_library/checkpoints/simpoints-se-restore.py' example configuration script.",
+            "function": "set_se_simpoint_workload",
+            "resources": {
+                "binary": "x86-print-this",
+                "simpoint": "x86-print-this-1500-simpoints",
+                "checkpoint_dir": "simpoints-se-checkpoints-v22-1-v2"
+            },
+            "additional_params" :{
+                "arguments": ["print this", 15000]
+            }
+        },
+        {
             "type": "resource",
             "name": "x86-print-this-1500-simpoints",
             "documentation": "Simpoints for running the 'x86-print-this' resource with the parameters `\"print this\" 15000`. This is encapsulated in the 'x86-print-this-15000-with-simpoints' workload.",
@@ -93,7 +107,7 @@
         {
             "type": "resource",
             "name" : "simpoints-se-checkpoints-v22-1",
-            "documentation" : "Checkpoints used in 'configs/example/gem5_library/checkpoints/simpoints-se-restore.py'.",
+            "documentation" : "Checkpoints used in 'configs/example/gem5_library/checkpoints/simpoints-se-restore.py'. This is deprecated, 'simpoints-se-checkpits-v22-1-v2' should be used instead. This resource will be removed in future releases of gem5.",
             "architecture": "X86",
             "is_zipped" : true,
             "md5sum" : "ebab7fffb11e93f2aa6ccfed9a0f692a",
@@ -103,6 +117,17 @@
         },
         {
             "type": "resource",
+            "name" : "simpoints-se-checkpoints-v22-1-v2",
+            "documentation" : "Checkpoints used in 'configs/example/gem5_library/checkpoints/simpoints-se-restore.py'.",
+            "architecture": "X86",
+            "is_zipped" : true,
+            "md5sum" : "c88e51cca030720f4cc3e1d24a5cfd75",
+            "source" : null,
+            "is_tar_archive" : true,
+            "url": "{url_base}/checkpoints/simpoints-se-checkpoints-example-20221014.tar.gz"
+        },
+        {
+            "type": "resource",
             "name" : "riscv-hello-example-checkpoint-v22-1",
             "documentation" : "A checkpoint used in 'configs/example/gem5_library/checkpoints/riscv-hello-restore-checkpoint.py'. Used for v22.1 onwards.",
             "architecture": "RISCV",