derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Improve Pyunit tests gem5 Resources' downloads (#79)

Browse Source 
* tests: Remove large files from resource specialization tests

These tests were downloading resources (but not actually using them) to
ensure the `obtain_resources` function returned the correct
specialization and was parsing the data correctly. As these resources
were never used, this patch removes the downloading of large files in
this case, replacing them with smaller binaries.

Change-Id: I7b33aa6be8ec65b296b470cd50b128c084f2b71f

* tests: Rename 'looppoint-json...' example specailization

Appending '-example' to the end avoids any name clashes.
'looppoint-json-restore-resources-region-1' shares this ID with a real
resources in gem5 Resources.

Change-Id: I9853e97cb71e768c46ad173b5a497609f4acc3b2

* tests: Remove disk image download from Workload Checks

This download is big and unecessary (the workload is never run as part
of the test). This patch changes this test to instead download a small
binary in it's palce (again, this does not matter as this is never
actually run as a disk image).

Change-Id: I74034ebcf5f2501917847c258570e88a8f653a5d

* tests: Update IDs in Pyunit Workload checks

Some of these IDs clash with real workloads/resources in gem5 Resources.
To avoid any possible clashes or confusions, all the mock
resources/workloads in this suite of tests has been renamed with
'-example' appending on the end of the ID.

Change-Id: Ifd907b2321416bf05e8c4e646024d179da2ca487
This commit is contained in:
Bobby R. Bruce
2023-07-14 06:31:34 -07:00
committed by GitHub
parent 18470b4747
commit bc99a6e346
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pyunit/stdlib/resources/pyunit_resource_specialization.py
View File

@@ -278,7 +278,7 @@ class ResourceSpecializationSuite(unittest.TestCase):
Looppoint JSON file."""
resource = obtain_resource(
resource_id="looppoint-json-restore-resource-region-1",
resource_id="looppoint-json-restore-resource-region-1-example",
resource_directory=self.get_resource_dir(),
resource_version="1.0.0",
gem5_version="develop",

2
tests/pyunit/stdlib/resources/pyunit_workload_checks.py
View File

@@ -65,7 +65,7 @@ class CustomWorkloadTestSuite(unittest.TestCase):
function="set_se_binary_workload",
parameters={
"binary": obtain_resource(
"x86-hello64-static", gem5_version="develop"
"x86-hello64-static-example", gem5_version="develop"
),
"arguments": ["hello", 6],
},

18
tests/pyunit/stdlib/resources/refs/resource-specialization.json
View File

@@ -19,9 +19,9 @@
"id": "disk-image-example",
"description": "disk-image documentation.",
"architecture": "X86",
"is_zipped": true,
"md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
"url": "http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
"is_zipped": false,
"md5sum": "71b2cb004fe2cda4556f0b1a38638af6",
"url": "http://dist.gem5.org/dist/develop/test-progs/hello/bin/arm/linux/hello64-static",
"source": "src/x86-ubuntu",
"root_partition": "1",
"resource_version": "1.0.0",
@@ -64,9 +64,9 @@
"description": "checkpoint-example documentation.",
"architecture": "RISCV",
"is_zipped": false,
"md5sum": "3a57c1bb1077176c4587b8a3bf4f8ace",
"source": null,
"is_tar_archive": true,
"md5sum": "3a57c1bb1077176c4587b8a3bf4f8ace",
"url": "http://dist.gem5.org/dist/develop/checkpoints/riscv-hello-example-checkpoint.tar",
"resource_version": "1.0.0",
"gem5_versions": [
@@ -93,8 +93,8 @@
"id": "file-example",
"description": null,
"is_zipped": false,
"md5sum": "2efd144c11829ab18d54eae6371e120a",
"url": "http://dist.gem5.org/dist/develop/checkpoints/riscv-hello-example-checkpoint.tar",
"md5sum": "71b2cb004fe2cda4556f0b1a38638af6",
"url": "http://dist.gem5.org/dist/develop/test-progs/hello/bin/arm/linux/hello64-static",
"source": null,
"resource_version": "1.0.0",
"gem5_versions": [
@@ -106,10 +106,10 @@
"category": "directory",
"id": "directory-example",
"description": "directory-example documentation.",
"is_zipped": false,
"md5sum": "3a57c1bb1077176c4587b8a3bf4f8ace",
"source": null,
"is_zipped": false,
"is_tar_archive": true,
"md5sum": "3a57c1bb1077176c4587b8a3bf4f8ace",
"url": "http://dist.gem5.org/dist/develop/checkpoints/riscv-hello-example-checkpoint.tar",
"resource_version": "1.0.0",
"gem5_versions": [
@@ -177,7 +177,7 @@
},
{
"category": "looppoint-json",
"id": "looppoint-json-restore-resource-region-1",
"id": "looppoint-json-restore-resource-region-1-example",
"description": "A looppoint json file resource.",
"is_zipped": false,
"region_id": "1",

16
tests/pyunit/stdlib/resources/refs/workload-checks.json
View File

@@ -1,7 +1,7 @@
[
{
"category": "kernel",
"id": "x86-linux-kernel-5.2.3",
"id": "x86-linux-kernel-5.2.3-example",
"description": "The linux kernel (v5.2.3), compiled to X86.",
"architecture": "X86",
"is_zipped": false,
@@ -15,12 +15,12 @@
},
{
"category": "disk-image",
"id": "x86-ubuntu-18.04-img",
"id": "x86-ubuntu-18.04-img-example",
"description": "A disk image containing Ubuntu 18.04 for x86..",
"architecture": "X86",
"is_zipped": true,
"md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
"url": "http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
"is_zipped": false,
"md5sum": "dbf120338b37153e3334603970cebd8c",
"url": "http://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static",
"source": "src/x86-ubuntu",
"root_partition": "1",
"resource_version": "1.0.0",
@@ -34,8 +34,8 @@
"description": "Description of workload here",
"function": "set_kernel_disk_workload",
"resources": {
"kernel": "x86-linux-kernel-5.2.3",
"disk-image": "x86-ubuntu-18.04-img"
"kernel": "x86-linux-kernel-5.2.3-example",
"disk-image": "x86-ubuntu-18.04-img-example"
},
"additional_params": {
"readfile_contents": "echo 'Boot successful'; m5 exit"
@@ -47,7 +47,7 @@
},
{
"category": "binary",
"id": "x86-hello64-static",
"id": "x86-hello64-static-example",
"description": "A 'Hello World!' binary.",
"architecture": "X86",
"is_zipped": false,