Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-96793: Specialize FOR_ITER for generators. #98772

Merged
merged 7 commits into from
Nov 7, 2022

Conversation

markshannon
Copy link
Member

@markshannon markshannon commented Oct 27, 2022

Performance results seem to be just noise. I suspect there aren't enough uses of generators in the benchmark suite for this to make a difference.

@markshannon
Copy link
Member Author

There is a bug in this. It doesn't set the gi_exc_state stack.

@markshannon
Copy link
Member Author

https://github.com/python/cpython/compare/main...faster-cpython:cpython:specialize-for-iter-gen-handle-exc-stack?expand=1
fixes the gi_exc_state issue, but is messy. I think this would benefit from merging #96319 first

@@ -110,6 +111,7 @@ _PyFrame_InitializeSpecials(
frame->frame_obj = NULL;
frame->prev_instr = _PyCode_CODE(code) - 1;
frame->is_entry = false;
frame->yield_offset = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this called "yield_offset", is it not the relative offset to jump by when the generator is exhausted? (the same as the arg to FOR_ITER?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kumaraditya303
Copy link
Contributor

I suspect there aren't enough uses of generators in the benchmark suite for this to make a difference.

You can run https://github.com/python/pyperformance/blob/main/pyperformance/data-files/benchmarks/bm_generators/run_benchmark.py, it is specifically designed to benchmark generators (microbenchmark).

@markshannon
Copy link
Member Author

markshannon commented Nov 1, 2022

I'll run that benchmark if pyperformance ever does another release.

@markshannon
Copy link
Member Author

markshannon commented Nov 7, 2022

I'm seeing a 35% speedup on this benchmark:

Tree iterator
import timeit

class Tree:
    def __init__(self, left, value, right):
        self.left = left
        self.value = value
        self.right = right


    def __iter__(self):
        if self.left:
            for item in self.left:
                yield item
        yield self.value
        if self.right:
            for item in self.right:
                yield item

def tree(input: range) -> Tree | None:
    n = len(input)
    if n == 0:
        return None
    i = n // 2
    return Tree(tree(input[:i]), input[i], tree(input[i + 1:]))

def setup():
    global iterable
    assert list(tree(range(10))) == list(range(10))
    iterable = tree(range(100000))
    
print(timeit.timeit("for _ in iterable: pass", "setup()", globals=globals(), number=10))

Note that this uses yield not yield from. yield from compiles to the SEND instruction which is for another PR.


And a 36% speedup on this one:

Flat iterator
import timeit

class RangeWrapper:
    def __init__(self, n):
        self.r = range(n)

    def __iter__(self):
        for item in self.r:
            yield item

def setup():
    global iterable
    iterable = RangeWrapper(1000000)

print(timeit.timeit("for _ in iterable: pass", "setup()", globals=globals(), number=10))

Comparing the fastest of 6 runs for main and this PR.

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants