[pypy-svn] r34541 - pypy/dist/pypy/jit/timeshifter

pedronis at codespeak.net pedronis at codespeak.net
Sun Nov 12 23:29:05 CET 2006


Author: pedronis
Date: Sun Nov 12 23:29:04 2006
New Revision: 34541

Modified:
   pypy/dist/pypy/jit/timeshifter/transform.py
Log:
we are not really using the "at end of the loop" style of global-merge point hint. It should be a separate hint 
if really needed. Comment out the supporting code for now.



Modified: pypy/dist/pypy/jit/timeshifter/transform.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/transform.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/transform.py	Sun Nov 12 23:29:04 2006
@@ -80,17 +80,17 @@
                     if len(entrymap[prevblock]) > 1:
                         global_merge_blocks[prevblock] = True
                         cand += 1
-            op = block.operations[-1]
-            if (op.opname == 'hint' and
-                op.args[1].value == {'global_merge_point': True}):
-                hashint = True
-                for link in block.exits:
-                    if len(entrymap[link.target]) > 1:
-                        global_merge_blocks[link.target] = True
-                        cand += 1
+            #op = block.operations[-1]
+            #if (op.opname == 'hint' and
+            #    op.args[1].value == {'global_merge_point': True}):
+            #    hashint = True
+            #    for link in block.exits:
+            #        if len(entrymap[link.target]) > 1:
+            #            global_merge_blocks[link.target] = True
+            #            cand += 1
             assert not hashint or cand==1, (
                 "ambigous global merge point hint: %r" % block)
-            for op in block.operations[1:-1]:
+            for op in block.operations[1:]:
                 assert not (op.opname == 'hint' and
                     op.args[1].value == {'global_merge_point': True}), (
                     "stranded global merge point hint: %r" % block)



More information about the Pypy-commit mailing list