diff options
author | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2019-06-07 13:31:09 +0100 |
---|---|---|
committer | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2019-06-10 17:36:55 +0000 |
commit | 007d71a95da5532efeb2bfcd325bac0472be5922 (patch) | |
tree | 9a14b9a208ec33830b79c4fb635e4a4fea96b415 | |
parent | 1ba2ae76235806c8f3b4381582cba4266fd6d409 (diff) | |
download | gem5-007d71a95da5532efeb2bfcd325bac0472be5922.tar.xz |
configs: Fix read_config to work with new AddrRange serialization
Change-Id: I122c77c34c2f8c75f8b32682be858f651112ce89
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19151
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
-rw-r--r-- | configs/example/read_config.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/configs/example/read_config.py b/configs/example/read_config.py index b1e820c62..167815c70 100644 --- a/configs/example/read_config.py +++ b/configs/example/read_config.py @@ -89,12 +89,17 @@ def tick_parser(cast=lambda i: i): def addr_range_parser(cls, flags, param): sys.stdout.flush() - (low, high, intlv_high_bit, xor_high_bit, - intlv_bits, intlv_match) = param.split(':') - return m5.objects.AddrRange( - start=long(low), end=long(high), - intlvHighBit=long(intlv_high_bit), xorHighBit=long(xor_high_bit), - intlvBits=long(intlv_bits), intlvMatch=long(intlv_match)) + _param = param.split(':') + (start, end) = _param[0:2] + if len(_param) == 2: + return m5.objects.AddrRange(start=long(start), end=long(end)) + else: + assert len(_param) > 2 + intlv_match = _param[2] + masks = [ long(m) for m in _param[3:] ] + return m5.objects.AddrRange(start=long(start), end=long(end), + masks=masks, intlvMatch=long(intlv_match)) + def memory_bandwidth_parser(cls, flags, param): # The string will be in tick/byte |