diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-26 09:19:22 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-22 10:47:36 +0000 |
| commit | 7d71f6641fcb660de0f003e2c028b464d7116ca1 (patch) | |
| tree | eab821617b26ce34b0dc834f2e0f11cfee67c2a0 /src/mem/ruby | |
| parent | 8e5d168332c4ac3851aee4f815cff0b62b37cc40 (diff) | |
| download | gem5-7d71f6641fcb660de0f003e2c028b464d7116ca1.tar.xz | |
python: Make iterator handling Python 3 compatible
Many functions that used to return lists (e.g., dict.items()) now
return iterators and their iterator counterparts (e.g.,
dict.iteritems()) have been removed. Switch calls to the Python 2.7
iterator methods to use the Python 3 equivalent and add explicit list
conversions where necessary.
Change-Id: I0c18114955af8f4932d81fb689a0adb939dafaba
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15992
Reviewed-by: Juha Jäykkä <juha.jaykka@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/mem/ruby')
| -rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.py b/src/mem/ruby/network/simple/SimpleNetwork.py index e7a79492b..1f86f9939 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.py +++ b/src/mem/ruby/network/simple/SimpleNetwork.py @@ -49,7 +49,7 @@ class SimpleNetwork(RubyNetwork): for link in self.int_links: # The network needs number_of_virtual_networks buffers per # int_link port - for i in xrange(self.number_of_virtual_networks): + for i in range(int(self.number_of_virtual_networks)): network_buffers.append(MessageBuffer(ordered = True)) network_buffers.append(MessageBuffer(ordered = True)) self.int_link_buffers = network_buffers @@ -61,14 +61,14 @@ class SimpleNetwork(RubyNetwork): # unidirectional internal link for link in self.int_links: if link.dst_node == router: - for i in xrange(self.number_of_virtual_networks): + for i in range(int(self.number_of_virtual_networks)): router_buffers.append(MessageBuffer(ordered = True)) # Add message buffers to routers for each external link connection for link in self.ext_links: # Routers can only be int_nodes on ext_links if link.int_node in self.routers: - for i in xrange(self.number_of_virtual_networks): + for i in range(int(self.number_of_virtual_networks)): router_buffers.append(MessageBuffer(ordered = True)) router.port_buffers = router_buffers |