For my keynotes at PyCon Argentina and Brasil I'm going to be talking about Python 3.3 and trying to sell it to Python 2.7 users. That means selling the performance numbers of Python 3.3 as acceptable for Python 2.7 users. Since that means using the benchmark suite I might as well start work on merging https://bitbucket.org/pypy/benchmarks/ and http://hg.python.org/benchmarks so we can host the canonical benchmarks at hg.python.org like we have discussed previously (along with coming up with a way to run the benchmarks against Python 2.7 and 3.3 for comparison and making more tests work in Python 3).

So, to start, I want to remove the divergence of the Unladen benchmarks (after that we can look at adding in any tests that are unique to PyPy). Am I right in thinking that all forked tests that came from Unladen ended up in PyPy's own directory under the same name (e.g. bm_mako.py)?