Chris January has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31076 )
Change subject: fastmodel: Fix hierachical Iris component names.
......................................................................
fastmodel: Fix hierachical Iris component names.
Recent releases of Fast Models structure Iris resources in a hierarchy.
Use the parent resource ID if set to construct the hierachical name of
components when constructing the resource map.
Change-Id: Iafafa26d5aff560c3b2e93894f81f770c0e98079
---
M src/arch/arm/fastmodel/iris/thread_context.cc
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index a2cf2bf..f89180c 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2020 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
* Copyright 2019 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
@@ -205,8 +217,16 @@
call().resource_getList(_instId, resources);
ResourceMap resourceMap;
- for (auto &resource: resources)
- resourceMap[resource.name] = resource;
+ for (auto &resource: resources) {
+ std::string name = resource.name;
+ if (resource.parentRscId != iris::IRIS_UINT64_MAX) {
+ for (auto &parentResource: resources) {
+ if (parentResource.rscId == resource.parentRscId)
+ name = parentResource.name + "." + resource.name;
+ }
+ }
+ resourceMap[name] = resource;
+ }
initFromIrisInstance(resourceMap);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31076
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Iafafa26d5aff560c3b2e93894f81f770c0e98079
Gerrit-Change-Number: 31076
Gerrit-PatchSet: 1
Gerrit-Owner: Chris January <chris.janu...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
