aff1e7b64c
This patch includes several changes to the gem5 tools interface to the
gem5-resources infrastructure. These are:
* The old download and JSON query functions have been removed from the
downloader module. These functions were used for directly downloading
and inspecting the resource JSON file, hosted at
https://resources.gem5.org/resources. This information is now obtained
via `gem5.client`. If a resources JSON file is specified as a client,
it should conform to the new schema:
https//resources.gem5.org/gem5-resources-schema.json. The old schema
(pre-v23.0) is no longer valid. Tests have been updated to reflect
this change. Those which tested these old functions have been removed.
* Unused imports have been removed.
* For the resource query functions, and those tasked with obtaining the
resources, the parameter `gem5_version` has been added. In all cases
it does the same thing:
* It will filter results based on compatibility to the
`gem5_version` specified. If no resources are compatible the
latest version of that resource is chosen (though a warning is
thrown).
* By default it is set to the current gem5 version.
* It is optional. If `None`, this filtering functionality is not
carried out.
* Tests have been updated to fix the version to “develop” so the
they do not break between versions.
* The `gem5_version` parameters will filter using a logic which will
base compatibility on the specificity of the gem5-version specified in
a resource’s data. If a resource has a compatible gem5-version of
“v18.4” it will be compatible with any minor/hotfix version within the
v18.4 release (this can be seen as matching on “v18.4.*.*”.) Likewise,
if a resource has a compatible gem5-version of “v18.4.1” then it’s
only compatible with the v18.4.1 release but any of it’s hot fix
releases (“v18.4.1.*”).
* The ‘list_resources’ function has been updated to use the
“gem5.client” APIs to get resource information from the clients
(MongoDB or a JSON file). This has been designed to remain backwards
compatible to as much as is possible, though, due to schema changes,
the function does search across all versions of gem5.
* `get_resources` function was added to the `AbstractClient`. This is a
more general function than `get_resource_by_id`. It was
primarily created to handle the `list_resources` update but is a
useful update to the API. The `get_resource_by_id` function has been
altered to function as a wrapped to the `get_resources` function.
* Removed “GEM5_RESOURCE_JSON” code has been removed. This is no longer
used.
* Tests have been cleaned up a little bit to be easier to read.
* Some docstrings have been updated.
Things that are left TODO with this code:
* The client_wrapper/client/abstract_client abstractions are rather
pointless. In particular the client_wrapper and client classes could
be merged.
* The downloader module no longer does much and should have its
functions merged into other modules.
* With the addition of the `get_resources` function, much of the code in
the `AbstractClient` could be simplified.
Change-Id: I0ce48e88b93a2b9db53d4749861fa0b5f9472053
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71506
Reviewed-by: Kunal Pai <kunpai@ucdavis.edu>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
(cherry picked from commit 82587ce71b)
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71739
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
57 lines
1.9 KiB
JSON
57 lines
1.9 KiB
JSON
[
|
|
{
|
|
"category": "disk-image",
|
|
"id": "x86-ubuntu-18.04-img",
|
|
"description": "This is a test resource",
|
|
"architecture": "X86",
|
|
"size": 688119691,
|
|
"tags": [
|
|
"x86",
|
|
"fullsystem"
|
|
],
|
|
"is_zipped": true,
|
|
"md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
|
|
"source": "src/x86-ubuntu",
|
|
"url": "http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
|
|
"root_partition": "1",
|
|
"code_examples": [],
|
|
"license": "",
|
|
"author": [
|
|
"Ayaz Akram"
|
|
],
|
|
"source_url": "https://github.com/gem5/gem5-resources/tree/develop/src/x86-ubuntu",
|
|
"resource_version": "1.0.0",
|
|
"gem5_versions": [
|
|
"develop"
|
|
],
|
|
"example_usage": "get_resource(resource_name=\"x86-ubuntu-18.04-img\")"
|
|
},
|
|
{
|
|
"category": "disk-image",
|
|
"id": "x86-ubuntu-18.04-img",
|
|
"description": "A disk image containing Ubuntu 18.04 for x86. This image will run an `m5 readfile` instruction after booting. If no script file is specified an `m5 exit` instruction will be executed.",
|
|
"architecture": "X86",
|
|
"size": 688119691,
|
|
"tags": [
|
|
"x86",
|
|
"fullsystem"
|
|
],
|
|
"is_zipped": true,
|
|
"md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
|
|
"source": "src/x86-ubuntu",
|
|
"url": "http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
|
|
"root_partition": "1",
|
|
"code_examples": [],
|
|
"license": "",
|
|
"author": [
|
|
"Ayaz Akram"
|
|
],
|
|
"source_url": "https://github.com/gem5/gem5-resources/tree/develop/src/x86-ubuntu",
|
|
"resource_version": "1.1.0",
|
|
"gem5_versions": [
|
|
"develop"
|
|
],
|
|
"example_usage": "get_resource(resource_name=\"x86-ubuntu-18.04-img\")"
|
|
}
|
|
]
|