Nikos Nikoleris has submitted this change and it was merged. (
https://gem5-review.googlesource.com/2901 )
Change subject: python: Fix unproxing of VectorParams
......................................................................
python: Fix unproxing of VectorParams
Previously proxy vector parameters would resolve correctly only for
Parent.all. Any other proxy such as Parent.any, or exact ones such as
Parent.addr_range would resolve to a *vector* of the right value
resulting into a vector of a vector. For example if we set:
DirectoryController0.addr_range = [0x100000-0x1fffff, 0x200000-0x2fffff]
DirectoryMemory0.addr_range = Parent.addr_range
where DirectoryController0 is the parent SimObject of DirectoryMemory0
after unproxying the Parent.addr_range VectorParam we would get
DirectoryMemory0.addr_range = [[0x100000-0x1fffff, 0x200000-0x2fffff]]
This change unifies handling of all three proxies to the same correct
unproxy mechanism.
Change-Id: Ie5107f69f58eb700b3e1b92c55210e0d53e6788d
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/2901
Maintainer: Andreas Sandberg <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
---
M src/python/m5/params.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 7a1eec8..776fbe2 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -245,10 +245,12 @@
return [ v.getValue() for v in self ]
def unproxy(self, base):
- if len(self) == 1 and isinstance(self[0], proxy.AllProxy):
+ if len(self) == 1 and isinstance(self[0], proxy.BaseProxy):
+ # The value is a proxy (e.g. Parent.any, Parent.all or
+ # Parent.x) therefore try resolve it
return self[0].unproxy(base)
else:
- return [v.unproxy(base) for v in self]
+ return [v.unproxy(base) for v in self]
class SimObjectVector(VectorParamValue):
# support clone operation
--
To view, visit https://gem5-review.googlesource.com/2901
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5107f69f58eb700b3e1b92c55210e0d53e6788d
Gerrit-Change-Number: 2901
Gerrit-PatchSet: 4
Gerrit-Owner: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nathan Binkert <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
