Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/54466 )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: stdlib: Update the stdlib resource downloader for versions
......................................................................
stdlib: Update the stdlib resource downloader for versions
The 'resources.json' file in gem5 resources is used to lookup resources.
The stdlib resource downloader was hardcoded to the 'resources.json'
stored in the gem5 resources stable branch. This change allows the gem5
downloader to obtain the specific resources.json.
Change-Id: Ie119ed9326b359055bf5bc347ca89336a5cc2e5d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54466
Maintainer: Bobby Bruce <[email protected]>
Reviewed-by: Bobby Bruce <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/python/gem5/resources/downloader.py
1 file changed, 44 insertions(+), 4 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/gem5/resources/downloader.py
b/src/python/gem5/resources/downloader.py
index 86ddefb..2cb73ba 100644
--- a/src/python/gem5/resources/downloader.py
+++ b/src/python/gem5/resources/downloader.py
@@ -41,13 +41,16 @@
information about resources from resources.gem5.org.
"""
+def _resources_json_version_required() -> str:
+ """
+ Specifies the version of resources.json to obtain.
+ """
+ return "21.2"
def _get_resources_json_uri() -> str:
- # TODO: This is hardcoded to develop. This will need updated for each
- # release to the stable branch.
uri = (
"https://gem5.googlesource.com/public/gem5-resources/";
- + "+/refs/heads/develop/resources.json?format=TEXT"
+ + "+/refs/heads/stable/resources.json?format=TEXT"
)
return uri
@@ -64,8 +67,27 @@
# text. Therefore when we open the URL we receive the JSON in base64
# format. Conversion is needed before it can be loaded.
with urllib.request.urlopen(_get_resources_json_uri()) as url:
- return json.loads(base64.b64decode(url.read()).decode("utf-8"))
+ to_return =
json.loads(base64.b64decode(url.read()).decode("utf-8"))
+ # If the current version pulled is not correct, look up the
+ # "previous-versions" field to find the correct one.
+ version = _resources_json_version_required()
+ if to_return["version"] != version:
+ if version in to_return["previous-versions"].keys():
+ with urllib.request.urlopen(
+ to_return["previous-versions"][version]
+ ) as url:
+ to_return = json.loads(
+ base64.b64decode(url.read()).decode("utf-8")
+ )
+ else:
+ # This should never happen, but we thrown an exception to
explain
+ # that we can't find the version.
+ raise Exception(
+ f"Version '{version}' of resources.json cannot be found."
+ )
+
+ return to_return
def _get_url_base() -> str:
"""
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54466
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: Ie119ed9326b359055bf5bc347ca89336a5cc2e5d
Gerrit-Change-Number: 54466
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
