derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Switch from the print statement to the print function.

Browse Source 
Starting with version 3, scons imposes using the print function instead
of the print statement in code it processes. To get things building
again, this change moves all python code within gem5 to use the
function version. Another change by another author separately made this
same change to the site_tools and site_init.py files.

Change-Id: I2de7dc3b1be756baad6f60574c47c8b7e80ea3b0
Reviewed-on: https://gem5-review.googlesource.com/8761
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-03-05 22:05:47 -08:00
parent 10e5646dbb
commit 0bb50e6745
33 changed files with 386 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/python/m5/util/__init__.py
View File

@@ -39,6 +39,8 @@
#
# Authors: Nathan Binkert
from __future__ import print_function
import os
import re
import sys
@@ -57,26 +59,26 @@ from sorteddict import SortedDict
# ever happen regardless of what the user does (i.e., an acutal m5
# bug).
def panic(fmt, *args):
print >>sys.stderr, 'panic:', fmt % args
print('panic:', fmt % args, file=sys.stderr)
sys.exit(1)
# fatal() should be called when the simulation cannot continue due to
# some condition that is the user's fault (bad configuration, invalid
# arguments, etc.) and not a simulator bug.
def fatal(fmt, *args):
print >>sys.stderr, 'fatal:', fmt % args
print('fatal:', fmt % args, file=sys.stderr)
sys.exit(1)
# warn() should be called when the user should be warned about some condition
# that may or may not be the user's fault, but that they should be made aware
# of as it may affect the simulation or results.
def warn(fmt, *args):
print >>sys.stderr, 'warn:', fmt % args
print('warn:', fmt % args, file=sys.stderr)
# inform() should be called when the user should be informed about some
# condition that they may be interested in.
def inform(fmt, *args):
print >>sys.stdout, 'info:', fmt % args
print('info:', fmt % args, file=sys.stdout)
class Singleton(type):
def __call__(cls, *args, **kwargs):
@@ -166,14 +168,14 @@ def printList(items, indent=4):
line = ' ' * indent
for i,item in enumerate(items):
if len(line) + len(item) > 76:
print line
print(line)
line = ' ' * indent
if i < len(items) - 1:
line += '%s, ' % item
else:
line += item
print line
print(line)
def readCommand(cmd, **kwargs):
"""run the command cmd, read the results and return them

26
src/python/m5/util/attrdict.py
View File

@@ -26,6 +26,8 @@
#
# Authors: Nathan Binkert
from __future__ import print_function
__all__ = [ 'attrdict', 'multiattrdict', 'optiondict' ]
class attrdict(dict):
@@ -77,24 +79,24 @@ if __name__ == '__main__':
x = attrdict()
x.y = 1
x['z'] = 2
print x['y'], x.y
print x['z'], x.z
print dir(x)
print x
print(x['y'], x.y)
print(x['z'], x.z)
print(dir(x))
print(x)
print
print()
del x['y']
del x.z
print dir(x)
print(dir(x))
print(x)
print
print "multiattrdict"
print()
print("multiattrdict")
x = multiattrdict()
x.x.x.x = 9
x.y.z = 9
print x
print x.y
print x.y.z
print x.z.z
print(x)
print(x.y)
print(x.y.z)
print(x.z.z)

4
src/python/m5/util/code_formatter.py
View File

@@ -24,6 +24,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
import __builtin__
import inspect
import os
@@ -312,4 +314,4 @@ if __name__ == '__main__':
}
''', 1, 9)
print f,
print(f, end=' ')

30
src/python/m5/util/jobfile.py
View File

@@ -26,6 +26,8 @@
#
# Authors: Nathan Binkert
from __future__ import print_function
import sys
class Data(object):
@@ -69,12 +71,12 @@ class Data(object):
def printinfo(self):
if self.name:
print 'name: %s' % self.name
print('name: %s' % self.name)
if self.desc:
print 'desc: %s' % self.desc
print('desc: %s' % self.desc)
try:
if self.system:
print 'system: %s' % self.system
print('system: %s' % self.system)
except AttributeError:
pass
@@ -84,8 +86,8 @@ class Data(object):
if isinstance(val, dict):
import pprint
val = pprint.pformat(val)
print '%-20s = %s' % (key, val)
print
print('%-20s = %s' % (key, val))
print()
def __contains__(self, attr):
if attr.startswith('_'):
@@ -186,10 +188,10 @@ class Job(Data):
def printinfo(self):
super(Job, self).printinfo()
if self._checkpoint:
print 'checkpoint: %s' % self._checkpoint.name
print 'config: %s' % self._config.name
print 'groups: %s' % [ g.name for g in self._groups ]
print 'options: %s' % [ o.name for o in self._options ]
print('checkpoint: %s' % self._checkpoint.name)
print('config: %s' % self._config.name)
print('groups: %s' % [ g.name for g in self._groups ])
print('options: %s' % [ o.name for o in self._options ])
super(Job, self).printverbose()
class SubOption(Data):
@@ -253,7 +255,7 @@ class Option(Data):
def printinfo(self):
super(Option, self).printinfo()
print 'config: %s' % self._config.name
print('config: %s' % self._config.name)
super(Option, self).printverbose()
class Group(Data):
@@ -283,8 +285,8 @@ class Group(Data):
def printinfo(self):
super(Group, self).printinfo()
print 'config: %s' % self._config.name
print 'options: %s' % [ o.name for o in self._options ]
print('config: %s' % self._config.name)
print('options: %s' % [ o.name for o in self._options ])
super(Group, self).printverbose()
class Configuration(Data):
@@ -397,7 +399,7 @@ class Configuration(Data):
def printinfo(self):
super(Configuration, self).printinfo()
print 'groups: %s' % [ g.name for g in self._groups ]
print('groups: %s' % [ g.name for g in self._groups ])
super(Configuration, self).printverbose()
def JobFile(jobfile):
@@ -466,7 +468,7 @@ def main(conf=None):
cpt = ''
if job._checkpoint:
cpt = job._checkpoint.name
print job.name, cpt
print(job.name, cpt)
if __name__ == '__main__':
main()

44
src/python/m5/util/multidict.py
View File

@@ -26,6 +26,8 @@
#
# Authors: Nathan Binkert
from __future__ import print_function
__all__ = [ 'multidict' ]
class multidict(object):
@@ -116,10 +118,10 @@ class multidict(object):
return default
def _dump(self):
print 'multidict dump'
print('multidict dump')
node = self
while isinstance(node, multidict):
print ' ', node.local
print(' ', node.local)
node = node.parent
def _dumpkey(self, key):
@@ -129,7 +131,7 @@ class multidict(object):
if key in node.local:
values.append(node.local[key])
node = node.parent
print key, values
print(key, values)
if __name__ == '__main__':
test1 = multidict()
@@ -150,33 +152,33 @@ if __name__ == '__main__':
test2.setdefault('f', multidict)
print 'test1>', test1.items()
print 'test2>', test2.items()
#print test1['a']
print test1['b']
print test1['c']
print test1['d']
print test1['e']
print('test1>', test1.items())
print('test2>', test2.items())
#print(test1['a'])
print(test1['b'])
print(test1['c'])
print(test1['d'])
print(test1['e'])
print test2['a']
#print test2['b']
print test2['c']
print test2['d']
print test2['e']
print(test2['a'])
#print(test2['b'])
print(test2['c'])
print(test2['d'])
print(test2['e'])
for key in test2.iterkeys():
print key
print(key)
test2.get('g', 'foo')
#test2.get('b')
test2.get('b', 'bar')
test2.setdefault('b', 'blah')
print test1
print test2
print `test2`
print(test1)
print(test2)
print(`test2`)
print len(test2)
print(len(test2))
test3['a'] = [ 0, 1, 2, 3 ]
print test4
print(test4)

26
src/python/m5/util/sorteddict.py
View File

@@ -24,6 +24,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from bisect import bisect_left, bisect_right
class SortedDict(dict):
@@ -181,21 +183,21 @@ class SortedDict(dict):
if __name__ == '__main__':
def display(d):
print d
print d.keys()
print list(d.iterkeys())
print d.values()
print list(d.itervalues())
print d.items()
print list(d.iteritems())
print(d)
print(d.keys())
print(list(d.iterkeys()))
print(d.values())
print(list(d.itervalues()))
print(d.items())
print(list(d.iteritems()))
d = SortedDict(x=24,e=5,j=4,b=2,z=26,d=4)
display(d)
print 'popitem', d.popitem()
print('popitem', d.popitem())
display(d)
print 'pop j'
print('pop j')
d.pop('j')
display(d)
@@ -212,9 +214,9 @@ if __name__ == '__main__':
d['y'] = 26
display(d)
print `d`
print(`d`)
print d.copy()
print(d.copy())
for k,v in d.itemrange('d', 'z', inclusive=True):
print k,v
print(k, v)

18
src/python/m5/util/terminal.py
View File

@@ -26,6 +26,8 @@
#
# Author: Steve Reinhardt
from __future__ import print_function
import sys
# Intended usage example:
@@ -36,7 +38,7 @@ import sys
# from m5.util.terminal import no_termcap as termcap
# else:
# from m5.util.terminal import tty_termcap as termcap
# print termcap.Blue + "This could be blue!" + termcap.Normal
# print(termcap.Blue + "This could be blue!" + termcap.Normal)
# ANSI color names in index order
color_names = "Black Red Green Yellow Blue Magenta Cyan".split()
@@ -105,18 +107,18 @@ def get_termcap(use_colors = None):
def test_termcap(obj):
for c_name in color_names:
c_str = getattr(obj, c_name)
print c_str + c_name + obj.Normal
print(c_str + c_name + obj.Normal)
for attr_name in capability_names:
if attr_name == 'Normal':
continue
attr_str = getattr(obj, attr_name)
print attr_str + c_str + attr_name + " " + c_name + obj.Normal
print obj.Bold + obj.Underline + \
c_name + "Bold Underline " + c + obj.Normal
print(attr_str + c_str + attr_name + " " + c_name + obj.Normal)
print(obj.Bold + obj.Underline +
c_name + "Bold Underline " + c + obj.Normal)
if __name__ == '__main__':
print "=== termcap enabled ==="
print("=== termcap enabled ===")
test_termcap(termcap)
print termcap.Normal
print "=== termcap disabled ==="
print(termcap.Normal)
print("=== termcap disabled ===")
test_termcap(no_termcap)