[pypy-svn] r13668 - pypy/dist/pypy/translator/goal

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Jun 21 22:31:11 2005
New Revision: 13668

Added:
   pypy/dist/pypy/translator/goal/richards.py
      - copied unchanged from r13667, user/pedronis/richards.py
   pypy/dist/pypy/translator/goal/targetrichards.py
      - copied, changed from r13665, pypy/dist/pypy/translator/goal/targetrpystonex.py
Log:
a target based on a (R)Python port of the classic richards benchmark



Copied: pypy/dist/pypy/translator/goal/targetrichards.py (from r13665, pypy/dist/pypy/translator/goal/targetrpystonex.py)
==============================================================================
--- pypy/dist/pypy/translator/goal/targetrpystonex.py	(original)
+++ pypy/dist/pypy/translator/goal/targetrichards.py	Tue Jun 21 22:31:11 2005
@@ -1,93 +1,17 @@
-from pypy.translator.test import rpystone
-from pypy.translator.c.symboltable import getsymboltable
+import richards
 
+entry_point = richards.entry_point
 
-def make_target_definition(LOOPS, version):
-    def entry_point(loops):
-        g = rpystone.g
-        g.IntGlob = 0
-        g.BoolGlob = 0
-        g.Char1Glob = '\0'
-        g.Char2Glob = '\0'
-        for i in range(51):
-            g.Array1Glob[i] = 0
-        for i in range(51):
-            for j in range(51):
-                g.Array2Glob[i][j] = 0
-        g.PtrGlb = None
-        g.PtrGlbNext = None        
-        return rpystone.pystones(loops), id(g)
+# _____ Define and setup target ___
 
-    def target():
-        return entry_point, [int]
-    
-    def run(c_entry_point):
-        res = c_entry_point(LOOPS)
-        (benchtime, stones), _ = res
-        print "translated rpystone.pystones/%s time for %d passes = %g" % \
-              (version, LOOPS, benchtime)
-        print "This machine benchmarks at %g translated rpystone/%s pystones/second" % (stones, version)
-        res = c_entry_point(50000)
-        _, g_addr = res        
-        print "CPython:"
-        benchtime, stones = rpystone.pystones(50000)
-        print "rpystone.pystones/%s time for %d passes = %g" % \
-              (version, 50000, benchtime)
-        print "This machine benchmarks at %g rpystone/%s pystones/second" % (stones, version)
-        symtable = getsymboltable(c_entry_point.__module__)
-        check_g_results(symtable, g_addr)
-
-    return entry_point, target, run
-
-
-def check_g_results(symtable, g_addr):
-    try:
-        g_ptr = symtable[g_addr]
-    except KeyError:
-        print "No low-level equivalent of structure 'g' found."
-    else:
-        assert g_ptr.inst_BoolGlob == rpystone.g.BoolGlob
-        assert g_ptr.inst_Char1Glob == rpystone.g.Char1Glob
-        assert g_ptr.inst_Char2Glob == rpystone.g.Char2Glob
-        compare_array(g_ptr.inst_Array1Glob, rpystone.g.Array1Glob)
-        compare_array_of_array(g_ptr.inst_Array2Glob, rpystone.g.Array2Glob)
-        compare_record(g_ptr.inst_PtrGlb, rpystone.g.PtrGlb)
-        compare_record(g_ptr.inst_PtrGlbNext, rpystone.g.PtrGlbNext)
-
-
-def compare_array_of_array(array, pylist):
-    assert len(array.items) == len(pylist)
-    for i in range(len(pylist)):
-        x1 = array.items[i]
-        x2 = pylist[i]
-        compare_array(x1, x2)
-
-def compare_array(array, pylist):
-    assert len(array.items) == len(pylist)
-    for i in range(len(pylist)):
-        x1 = array.items[i]
-        x2 = pylist[i]
-        assert x1 == x2
-
-def compare_record(struct, pyrecord):
-    if pyrecord is None:
-        assert not struct
-    else:
-        assert struct
-        compare_record(struct.inst_PtrComp, pyrecord.PtrComp)
-        assert struct.inst_Discr == pyrecord.Discr
-        assert struct.inst_EnumComp == pyrecord.EnumComp
-        assert struct.inst_IntComp == pyrecord.IntComp
-        compare_string(struct.inst_StringComp, pyrecord.StringComp)
+def target():
+    return entry_point, []
 
-def compare_string(str, pystr):
-    assert len(str.chars) == len(pystr)
-    for i in range(len(pystr)):
-        assert str.chars[i] == pystr[i]
+# _____ Run translated _____
+def run(c_entry_point):
+    print "Translated:"
+    richards.main(c_entry_point)
+    print "CPython:"
+    richards.main()
 
-#if __name__ == "__main__":
-#    # just run it without translation
-#    LOOPS = 50000
-#    target()
-#    run(entry_point)