[Python-checkins] python/nondist/sandbox/parrotbench Makefile, 1.3,
1.4 README.txt, 1.6, 1.7 b0.py, 1.9, 1.10 b4.py, 1.4, 1.5 out0,
1.7, 1.8 out4, 1.5, 1.6
gvanrossum at users.sourceforge.net
gvanrossum at users.sourceforge.net
Thu Jan 1 11:48:14 EST 2004
- Previous message: [Python-checkins] python/nondist/sandbox/msi README.txt, 1.1.1.1,
1.2 msi.py, 1.2, 1.3 exclamic.bin, 1.1.1.1, NONE info.bin,
1.1.1.1, NONE
- Next message: [Python-checkins] python/nondist/sandbox/parrotbench Makefile, 1.4,
1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/nondist/sandbox/parrotbench
In directory sc8-pr-cvs1:/tmp/cvs-serv29473
Modified Files:
Makefile README.txt b0.py b4.py out0 out4
Log Message:
Version 1.0.3 adds one more Dict usage.
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 31 Dec 2003 16:25:28 -0000 1.3
--- Makefile 1 Jan 2004 16:48:11 -0000 1.4
***************
*** 1,16 ****
time:
! time python -O b.py >@out
! cmp @out out
cmp:
! python -O b.py >@out
! cmp @out out
diff:
! python -O b.py >@out
! diff @out out
dist:
! tar czf parrotbench.tgz README.txt Makefile b.py b?.py out out[0-9]
clean:
--- 1,22 ----
+ PYTHON=python2.3
+ DIFF=diff
+ CMP=cmp
+
+ FILES=README.txt Makefile b.py b[0-9].py t.py out out[0-9]
+
time:
! time $(PYTHON) -O b.py >@out
! $(CMP) @out out
cmp:
! $(PYTHON) -O b.py >@out
! $(CMP) @out out
diff:
! $(PYTHON) -O b.py >@out
! $(DIFF) @out out
dist:
! tar czf parrotbench.tgz $(FILES)
clean:
***************
*** 20,25 ****
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! time python b$$i.py >@out$$i; \
! cmp @out$$i out$$i; \
done
--- 26,31 ----
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! time $(PYTHON) b$$i.py >@out$$i; \
! $(CMP) @out$$i out$$i; \
done
***************
*** 27,32 ****
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! python b$$i.py >@out$$i; \
! cmp @out$$i out$$i; \
done
--- 33,38 ----
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! $(PYTHON) b$$i.py >@out$$i; \
! $(CMP) @out$$i out$$i; \
done
***************
*** 34,39 ****
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! python b$$i.py >@out$$i; \
! diff @out$$i out$$i; \
done
--- 40,45 ----
for i in 0 1 2 3 4 5 6; do \
echo b$$i.py; \
! $(PYTHON) b$$i.py >@out$$i; \
! $(DIFF) @out$$i out$$i; \
done
***************
*** 41,64 ****
out: b.py b?.py
! python -O b.py >out
out0: b0.py
! python b0.py >out0
out1: b1.py
! python b1.py >out1
out2: b2.py
! python b2.py >out2
out3: b3.py
! python b3.py >out3
! out4: b4.py
! python b4.py >out4
out5: b5.py
! python b5.py >out5
out6: b6.py
! python b6.py >out6
--- 47,70 ----
out: b.py b?.py
! $(PYTHON) -O b.py >out
out0: b0.py
! $(PYTHON) b0.py >out0
out1: b1.py
! $(PYTHON) b1.py >out1
out2: b2.py
! $(PYTHON) b2.py >out2
out3: b3.py
! $(PYTHON) b3.py >out3
! out4: b4.py b0.py
! $(PYTHON) b4.py >out4
out5: b5.py
! $(PYTHON) b5.py >out5
out6: b6.py
! $(PYTHON) b6.py >out6
Index: README.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README.txt 1 Jan 2004 05:35:19 -0000 1.6
--- README.txt 1 Jan 2004 16:48:11 -0000 1.7
***************
*** 1,8 ****
! Parrot benchmark 1.0.2
======================
! [This is version 1.0.2, with a bugfix for the Mac OSX issue that Dan
! reported, and a further bugfix for the dict ordering problem noted by
! Samuele Pedroni.]
This is a benchmark to be run in front of a live audience at OSCON
--- 1,8 ----
! Parrot benchmark 1.0.3
======================
! [This is version 1.0.3, with a bugfix for the Mac OSX issue that Dan
! reported, and two further bugfixes for the dict ordering problem noted
! by Samuele Pedroni.]
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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** b0.py 1 Jan 2004 05:35:19 -0000 1.9
--- b0.py 1 Jan 2004 16:48:11 -0000 1.10
***************
*** 251,256 ****
return False
class Function(object):
! makeLocals = dict
def __init__(self, name, args, body, globals):
self.name = name
--- 251,266 ----
return False
+ class Dict(dict):
+
+ def __repr__(self):
+ keys = self.keys()
+ keys.sort()
+ L = []
+ for key in keys:
+ L.append(repr(key) + ": " + repr(self[key]))
+ return "{" + ", ".join(L) + "}"
+
class Function(object):
! makeLocals = Dict
def __init__(self, name, args, body, globals):
self.name = name
***************
*** 836,849 ****
unInstrumentTree(cls)
- class Dict(dict):
-
- def __repr__(self):
- keys = self.keys()
- keys.sort()
- L = []
- for key in keys:
- L.append(repr(key) + ": " + repr(self[key]))
- return "{" + ", ".join(L) + "}"
-
def main():
output.reset()
--- 846,849 ----
***************
*** 905,909 ****
for i in range(10):
digits.append(g.next())
! checkoutput(2832206487)
print "".join(map(str, digits))
--- 905,909 ----
for i in range(10):
digits.append(g.next())
! checkoutput(3259608361)
print "".join(map(str, digits))
***************
*** 933,937 ****
digits.append(g.next())
checkoutput(902386495)
! Function.makeLocals = dict
if __name__ == '__main__':
--- 933,937 ----
digits.append(g.next())
checkoutput(902386495)
! Function.makeLocals = Dict
if __name__ == '__main__':
Index: b4.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b4.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** b4.py 1 Jan 2004 05:35:19 -0000 1.4
--- b4.py 1 Jan 2004 16:48:11 -0000 1.5
***************
*** 82,86 ****
print sort
unInstrumentTree(Node)
! checkoutput(2713552348)
if __name__ == '__main__':
--- 82,86 ----
print sort
unInstrumentTree(Node)
! checkoutput(2055134175)
if __name__ == '__main__':
Index: out0
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out0,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** out0 1 Jan 2004 05:35:19 -0000 1.7
--- out0 1 Jan 2004 16:48:11 -0000 1.8
***************
*** 7033,9175 ****
Name.assign("1, {u'pi': <Generator o...nction object at 0>}, {u'a': 4, u'k': 2}")
return
! Name.assign("12, {u'pi': <Generator o...nction object at 0>}, {u'a': 4, u'k': 2, u'b': 1}")
return
! Name.assign("4, {u'pi': <Generator o...nction object at 0>}, {u'a': 4, u'a1': 12, u'k': 2, u'b': 1}")
return
return
return
! While.geneval("{u'pi': <Generator o...nction object at 0>}, {u'a': 4, u'a1': 12,..., u'b': 1, u'b1': 4}")
return <generator object at 0>
[...4257 lines suppressed...]
! Exprs.assign("(3L, 3L), {u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
! Name.assign("3L, {u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return
! Name.assign("3L, {u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return
return
return
! While.geneval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return <generator object at 0>
! Binop.eval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
! Name.eval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return 3L
! Name.eval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return 3L
return True
! Yield.geneval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return <generator object at 0>
! Name.eval("{u'pi': <Generator o...nction object at 0>}, {u'a': 9576126383040...u'p': 196, u'q': 29}")
return 3L
3141592653
Index: out4
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** out4 1 Jan 2004 05:35:19 -0000 1.5
--- out4 1 Jan 2004 16:48:11 -0000 1.6
***************
*** 87,1168 ****
return False
return
! Call.eval("{'_siftdown': <Funct...nction object at 0>}, {'item': 1, 'heap': []}")
! Attribute.eval("{'_siftdown': <Funct...nction object at 0>}, {'item': 1, 'heap': []}")
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'item': 1, 'heap': []}")
return []
return <built-in method append of list object at 0>
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'item': 1, 'heap': []}")
return 1
return
[...7077 lines suppressed...]
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'lastelt': 9, 'returnitem': 9, 'heap': []}")
return 9
raise <DoReturn instance at 0>
--- 3693,3708 ----
return
return
! If.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9}")
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9}")
return []
! Assign.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9}")
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9}")
return 9
! Name.assign("9, {'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9}")
return
return
return
! Return.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9, 'returnitem': 9}")
! Name.eval("{'_siftdown': <Funct...nction object at 0>}, {'heap': [], 'lastelt': 9, 'returnitem': 9}")
return 9
raise <DoReturn instance at 0>
- Previous message: [Python-checkins] python/nondist/sandbox/msi README.txt, 1.1.1.1,
1.2 msi.py, 1.2, 1.3 exclamic.bin, 1.1.1.1, NONE info.bin,
1.1.1.1, NONE
- Next message: [Python-checkins] python/nondist/sandbox/parrotbench Makefile, 1.4,
1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Python-checkins
mailing list