[Python-checkins]
python/nondist/sandbox/parrotbench README.txt, 1.4,
1.5 b0.py, 1.7, 1.8 b4.py, 1.2, 1.3 out0, 1.5, 1.6 out4, 1.3, 1.4
gvanrossum at users.sourceforge.net
gvanrossum at users.sourceforge.net
Wed Dec 31 16:53:15 EST 2003
Update of /cvsroot/python/python/nondist/sandbox/parrotbench
In directory sc8-pr-cvs1:/tmp/cvs-serv6302
Modified Files:
README.txt b0.py b4.py out0 out4
Log Message:
Attempt to fix the Mac OSX issue Dan found.
Index: README.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README.txt 31 Dec 2003 17:45:32 -0000 1.4
--- README.txt 31 Dec 2003 21:53:11 -0000 1.5
***************
*** 1,4 ****
! Parrot benchmark
! ================
This is a benchmark to be run in front of a live audience at OSCON
--- 1,7 ----
! Parrot benchmark 1.0.1
! ======================
!
! [This is version 1.0.1, with a hopeful bugfix for the Mac OSX issue
! Dan reported.]
This is a benchmark to be run in front of a live audience at OSCON
Index: b0.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b0.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** b0.py 31 Dec 2003 09:04:58 -0000 1.7
--- b0.py 31 Dec 2003 21:53:11 -0000 1.8
***************
*** 729,734 ****
output = OutputFile()
! def write(s):
! s = str(s).replace('<b0.', '<__main__.')
i = s.find(' at 0x')
while i > 0:
--- 729,734 ----
output = OutputFile()
! def cleanup(s):
! s = str(s).replace('<__main__.', '<').replace('<b0.', '<')
i = s.find(' at 0x')
while i > 0:
***************
*** 744,747 ****
--- 744,751 ----
s = s[:i+5] + s[j:]
i = s.find(' at 0x')
+ return s
+
+ def write(s):
+ s = cleanup(s)
if __debug__:
print s,
***************
*** 803,807 ****
argreprs = map(repr, args)
for i, s in enumerate(argreprs):
! s = s.replace('<b0.', '<__main__.')
if len(s) >= 45:
s = s[:20] + "..." + s[-20:]
--- 807,811 ----
argreprs = map(repr, args)
for i, s in enumerate(argreprs):
! s = cleanup(s)
if len(s) >= 45:
s = s[:20] + "..." + s[-20:]
***************
*** 884,888 ****
parser = Parser(scanner)
root = parser.parse()
! checkoutput(2037684980)
env = {}
eval(root, env, env)
--- 888,892 ----
parser = Parser(scanner)
root = parser.parse()
! checkoutput(3257889492)
env = {}
eval(root, env, env)
***************
*** 891,895 ****
for i in range(10):
digits.append(g.next())
! checkoutput(4201300315)
print "".join(map(str, digits))
--- 895,899 ----
for i in range(10):
digits.append(g.next())
! checkoutput(1177172576)
print "".join(map(str, digits))
Index: b4.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b4.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** b4.py 31 Dec 2003 09:04:58 -0000 1.2
--- b4.py 31 Dec 2003 21:53:11 -0000 1.3
***************
*** 82,86 ****
print sort
unInstrumentTree(Node)
! checkoutput(3255652498)
if __name__ == '__main__':
--- 82,86 ----
print sort
unInstrumentTree(Node)
! checkoutput(2403574442)
if __name__ == '__main__':
Index: out0
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out0,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** out0 31 Dec 2003 06:59:41 -0000 1.5
--- out0 31 Dec 2003 21:53:11 -0000 1.6
***************
*** 2705,2709 ****
return [Define(u'pi', [], ...), Define(u'strhash', [u's'], ...)]
3 1 4 1 5 9 2 6 5 3 5 8 9 7 9 3 2 3 8 4 6 2 6 4 3 3 8 3 2 7 9 5 0 2 8 8 4 1 9 7 1 6 9 3 9 9 3 7 5 1 0 5 8 2 0 9 7 4 9 4 4 5 9 2 3 0 7 8 1 6 4 0 6 2 8 6 2 0 8 9 9 8 6 2 8 0 3 4 8 2 5 3 4 2 1 1 7 0 6 7 9 8 2 1 4 8 0 8 6 5 1 3 2 8 2 3 0 6 6 4 7 0 9 3 8 4 4 6 0 9 5 5 0 5 8 2 2 3 1 7 2 5 3 5 9 4 0 8 1 2 8 4 8 1 1 1 7 4 5 0 2 8 4 1 0 2 7 0 1 9 3 8 5 2 1 1 0 5 5 5 9 6 4 4 6 2 2 9 4 8 9 5 4 9 3 0 3 8 1 9 6 4 4 2 8 8 1 0 9 7 5 6 6 5 9 3 3 4 4 6 1 2 8 4 7 5 6 4 8 2 3 3 7 8 6 7 8 3 1 6 5 2 7 1 2 0 1 9 0 9 1 4 5 6 4 8 5 6 6 9 2 3 4 6 0 3 4 8 6 1 0 4 5 4 3 2 6 6 4 8 2 1 3 3 9 3 6 0 7 2 6 0 2 4 9 1 4 1 2 7 3 7 2 4 5 8 7 0 0 6 6 0 6 3 1 5 5 8 8 1 7 4 8 8 1 5 2 0 9 2 0 9 6 2 8 2 9 2 5 4 0 9 1 7 1 5 3 6 4 3 6 7 8 9 2 5 9 0 3 6 0 0 1 1 3 3 0 5 3 0 5 4 8 8 2 0 4 6 6 5 2 1 3 8 4 1 4 6 9 5 1 9 4 1 5 1 1 6 0 9 4 3 3 0 5 7 2 7 0 3 6 5 7 5 9 5 9 1 9 5 3 0 9 2 1 8 6 1 1 7 3 8 1 9 3 2 6 1 1 7 9 3 1 0 5 1 1 8 5 4 8 0 7 4 4 6 2 3 7 9 9 6 2 7 4 9 5 6 7 3 5 1 8 8 5 7 5 2 7 2 4 8 9 1 2 2 7 9 3 8 1 8 3 0 1 1 9 4 9 1 2 9 8 3 3 6 7 3 3 6 2 4 4 0 6 5 6 6 4 3 0 8 6 0 2 1 3 9 4 9 4 6 3 9 5 2 2 4 7 3 7 1 9 0 7 0 2 1 7 9 8 6 0 9 4 3 7 0 2 7 7 0 5 3 9 2 1 7 1 7 6 2 9 3 1 7 6 7 5 2 3 8 4 6 7 4 8 1 8 4 6 7 6 6 9 4 0 5 1 3 2 0 0 0 5 6 8 1 2 7 1 4 5 2 6 3 5 6 0 8 2 7 7 8 5 7 7 1 3 4 2 7 5 7 7 8 9 6 0 9 1 7 3 6 3 7 1 7 8 7 2 1 4 6 8 4 4 0 9 0 1 2 2 4 9 5 3 4 3 0 1 4 6 5 4 9 5 8 5 3 7 1 0 5 0 7 9 2 2 7 9 6 8 9 2 5 8 9 2 3 5 4 2 0 1 9 9 5 6 1 1 2 1 2 9 0 2 1 9 6 0 8 6 4 0 3 4 4 1 8 1 5 9 8 1 3 6 2 9 7 7 4 7 7 1 3 0 9 9 6 0 5 1 8 7 0 7 2 1 1 3 4 9 9 9 9 9 9 8 3 7 2 9 7 8 0 4 9 9 5 1 0 5 9 7 3 1 7 3 2 8 1 6 0 9 6 3 1 8 5 9 5 0 2 4 4 5 9 4 5 5 3 4 6 9 0 8 3 0 2 6 4 2 5 2 2 3 0 8 2 5 3 3 4 4 6 8 5 0 3 5 2 6 1 9 3 1 1 8 8 1 7 1 0 1 0 0 0 3 1 3 7 8 3 8 7 5 2 8 8 6 5 8 7 5 3 3 2 0 8 3 8 1 4 2 0 6 1 7 1 7 7 6 6 9 1 4 7 3 0 3 5 9 8 2 5 3 4 9 0 4 2 8 7 5 5 4 6 8 7 3 1 1 5 9 5 6 2 8 6 3 8 8 2 3 5 3 7 8 7 5 9 3 7 5 1 9 5 7 7 8 1 8 5 7 7 8 0 5 3 2 1 7 1 2 2 6 8 0 6 6 1 3 0 0 1 9 2 7 8 7 6 6 1 1 1 9 5 9 0 9 2 1 6 4 2 0 1 9 8
! Parser.__init__('<__main__.Clone object at 0>')
Parser.nexttoken('')
return (NAME, u'def')
--- 2705,2709 ----
return [Define(u'pi', [], ...), Define(u'strhash', [u's'], ...)]
3 1 4 1 5 9 2 6 5 3 5 8 9 7 9 3 2 3 8 4 6 2 6 4 3 3 8 3 2 7 9 5 0 2 8 8 4 1 9 7 1 6 9 3 9 9 3 7 5 1 0 5 8 2 0 9 7 4 9 4 4 5 9 2 3 0 7 8 1 6 4 0 6 2 8 6 2 0 8 9 9 8 6 2 8 0 3 4 8 2 5 3 4 2 1 1 7 0 6 7 9 8 2 1 4 8 0 8 6 5 1 3 2 8 2 3 0 6 6 4 7 0 9 3 8 4 4 6 0 9 5 5 0 5 8 2 2 3 1 7 2 5 3 5 9 4 0 8 1 2 8 4 8 1 1 1 7 4 5 0 2 8 4 1 0 2 7 0 1 9 3 8 5 2 1 1 0 5 5 5 9 6 4 4 6 2 2 9 4 8 9 5 4 9 3 0 3 8 1 9 6 4 4 2 8 8 1 0 9 7 5 6 6 5 9 3 3 4 4 6 1 2 8 4 7 5 6 4 8 2 3 3 7 8 6 7 8 3 1 6 5 2 7 1 2 0 1 9 0 9 1 4 5 6 4 8 5 6 6 9 2 3 4 6 0 3 4 8 6 1 0 4 5 4 3 2 6 6 4 8 2 1 3 3 9 3 6 0 7 2 6 0 2 4 9 1 4 1 2 7 3 7 2 4 5 8 7 0 0 6 6 0 6 3 1 5 5 8 8 1 7 4 8 8 1 5 2 0 9 2 0 9 6 2 8 2 9 2 5 4 0 9 1 7 1 5 3 6 4 3 6 7 8 9 2 5 9 0 3 6 0 0 1 1 3 3 0 5 3 0 5 4 8 8 2 0 4 6 6 5 2 1 3 8 4 1 4 6 9 5 1 9 4 1 5 1 1 6 0 9 4 3 3 0 5 7 2 7 0 3 6 5 7 5 9 5 9 1 9 5 3 0 9 2 1 8 6 1 1 7 3 8 1 9 3 2 6 1 1 7 9 3 1 0 5 1 1 8 5 4 8 0 7 4 4 6 2 3 7 9 9 6 2 7 4 9 5 6 7 3 5 1 8 8 5 7 5 2 7 2 4 8 9 1 2 2 7 9 3 8 1 8 3 0 1 1 9 4 9 1 2 9 8 3 3 6 7 3 3 6 2 4 4 0 6 5 6 6 4 3 0 8 6 0 2 1 3 9 4 9 4 6 3 9 5 2 2 4 7 3 7 1 9 0 7 0 2 1 7 9 8 6 0 9 4 3 7 0 2 7 7 0 5 3 9 2 1 7 1 7 6 2 9 3 1 7 6 7 5 2 3 8 4 6 7 4 8 1 8 4 6 7 6 6 9 4 0 5 1 3 2 0 0 0 5 6 8 1 2 7 1 4 5 2 6 3 5 6 0 8 2 7 7 8 5 7 7 1 3 4 2 7 5 7 7 8 9 6 0 9 1 7 3 6 3 7 1 7 8 7 2 1 4 6 8 4 4 0 9 0 1 2 2 4 9 5 3 4 3 0 1 4 6 5 4 9 5 8 5 3 7 1 0 5 0 7 9 2 2 7 9 6 8 9 2 5 8 9 2 3 5 4 2 0 1 9 9 5 6 1 1 2 1 2 9 0 2 1 9 6 0 8 6 4 0 3 4 4 1 8 1 5 9 8 1 3 6 2 9 7 7 4 7 7 1 3 0 9 9 6 0 5 1 8 7 0 7 2 1 1 3 4 9 9 9 9 9 9 8 3 7 2 9 7 8 0 4 9 9 5 1 0 5 9 7 3 1 7 3 2 8 1 6 0 9 6 3 1 8 5 9 5 0 2 4 4 5 9 4 5 5 3 4 6 9 0 8 3 0 2 6 4 2 5 2 2 3 0 8 2 5 3 3 4 4 6 8 5 0 3 5 2 6 1 9 3 1 1 8 8 1 7 1 0 1 0 0 0 3 1 3 7 8 3 8 7 5 2 8 8 6 5 8 7 5 3 3 2 0 8 3 8 1 4 2 0 6 1 7 1 7 7 6 6 9 1 4 7 3 0 3 5 9 8 2 5 3 4 9 0 4 2 8 7 5 5 4 6 8 7 3 1 1 5 9 5 6 2 8 6 3 8 8 2 3 5 3 7 8 7 5 9 3 7 5 1 9 5 7 7 8 1 8 5 7 7 8 0 5 3 2 1 7 1 2 2 6 8 0 6 6 1 3 0 0 1 9 2 7 8 7 6 6 1 1 1 9 5 9 0 9 2 1 6 4 2 0 1 9 8
! Parser.__init__('<Clone object at 0>')
Parser.nexttoken('')
[...4327 lines suppressed...]
! Exprs.assign("(3L, 3L), {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
! Name.assign("3L, {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return
! Name.assign("3L, {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return
return
return
! While.geneval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return <generator object at 0>
! Binop.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return 3L
! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return 3L
return True
! Yield.geneval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return <generator object at 0>
! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}")
return 3L
3141592653
Index: out4
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** out4 31 Dec 2003 02:05:08 -0000 1.3
--- out4 31 Dec 2003 21:53:12 -0000 1.4
***************
*** 5,9 ****
return False
return
! Define.eval("{'heappush': <__main...ject at 0>}, {'heappush': <__main...ject at 0>}")
Node.isgenerator('')
return False
--- 5,9 ----
return False
return
! Define.eval("{'heappush': <Function object at 0>}, {'heappush': <Function object at 0>}")
Node.isgenerator('')
[...7278 lines suppressed...]
return <built-in method pop of list object at 0>
return 9
! Name.assign("9, {'heappop': <Functio...nction object at 0>}, {'heap': []}")
return
return
! If.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}")
! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}")
return []
! Assign.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}")
! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}")
return 9
! Name.assign("9, {'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}")
return
return
return
! Return.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'returnitem': 9, 'heap': []}")
! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'returnitem': 9, 'heap': []}")
return 9
! raise <DoReturn instance at 0>
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
More information about the Python-checkins
mailing list