-
-
Notifications
You must be signed in to change notification settings - Fork 31.3k
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
Document how to add a bytecode specialization in Interpreter.md file #130831
base: main
Are you sure you want to change the base?
Document how to add a bytecode specialization in Interpreter.md file #130831
Conversation
…ecode-specialization-guide
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Look good mostly. Just a few minor edits.
@@ -505,6 +505,62 @@ After the last `DEOPT_IF` has passed, a hit should be recorded with | |||
`STAT_INC(BASE_INSTRUCTION, hit)`. | |||
After an optimization has been deferred in the adaptive instruction, | |||
that should be recorded with `STAT_INC(BASE_INSTRUCTION, deferred)`. | |||
## How to add a new bytecode specialization |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs a line spacing
## How to add a new bytecode specialization | |
## How to add a new bytecode specialization |
InternalDocs/interpreter.md
Outdated
|
||
3. Write the specializing function itself in [Python/specialize.c ](../Python/specialize.c). | ||
Refer to any other function in that file for the format. | ||
4. Remember to update operation stats by calling add_stat_dict in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
4. Remember to update operation stats by calling add_stat_dict in | |
4. Remember to update operation stats by calling `add_stat_dict` in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few tweak/suggestions
InternalDocs/interpreter.md
Outdated
- Add a uop that calls the specializing function `_SPECIALIZE_CONTAINS_OP`. | ||
For example. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Add a uop that calls the specializing function `_SPECIALIZE_CONTAINS_OP`. | |
For example. | |
- Add a uop that calls the specializing function: |
InternalDocs/interpreter.md
Outdated
- The original `CONTAINS_OP` is now a new macro consisting of | ||
`_SPECIALIZE_CONTAINS_OP` and `_CONTAINS_OP`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Create a macro for the original bytecode name:
macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP;
InternalDocs/interpreter.md
Outdated
3. Write the specializing function itself in [Python/specialize.c ](../Python/specialize.c). | ||
Refer to any other function in that file for the format. | ||
4. Remember to update operation stats by calling `add_stat_dict` in | ||
[Python/specialize.c ](../Python/specialize.c). | ||
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | ||
dis module will know how to represent it properly. | ||
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). | ||
7. Run ``make regen-all`` on `*nix` or `build.bat --regen` on Windows. | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3. Write the specializing function itself in [Python/specialize.c ](../Python/specialize.c). | |
Refer to any other function in that file for the format. | |
4. Remember to update operation stats by calling `add_stat_dict` in | |
[Python/specialize.c ](../Python/specialize.c). | |
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | |
dis module will know how to represent it properly. | |
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). | |
7. Run ``make regen-all`` on `*nix` or `build.bat --regen` on Windows. | |
3. Write the specializing function itself (_Py_Specialize_ContainsOp) in [Python/specialize.c ](../Python/specialize.c). | |
Refer to other functions in that file for the pattern. | |
4. Add a call to `add_stat_dict` in `_Py_GetSpecializationStats` which is in | |
[Python/specialize.c ](../Python/specialize.c). | |
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | |
`dis` module will know how to represent it properly. | |
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). | |
7. Run `make regen-all` on `*nix` or `build.bat --regen` on Windows. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This suggestion has some edits to the text as well, not just whitespace.
Let's give @brandtbucher a chance to review as well. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks correct. A couple of possible minor improvements, if we're aiming to be comprehensive here:
#if ENABLE_SPECIALIZATION | ||
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) { | ||
next_instr = this_instr; | ||
_Py_Specialize_ContainsOp(right, next_instr); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit, presumably this would use both operands:
_Py_Specialize_ContainsOp(right, next_instr); | |
_Py_Specialize_ContainsOp(left, right, next_instr); |
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). | ||
|
||
7. Run ``make regen-all`` on `*nix` or `build.bat --regen` on Windows. | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the only thing missing is adding an actual specialized variant. Maybe that's implied/obvious, but it wouldn't hurt to provide a dumb example of _Py_Specialize_ContainsOp
and _CONTAINS_OP_UNICODE_UNICODE
that just guards and calls PyUnicode_Contains
or something.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Several grammar nitpicks--English is hard!
Assuming you found an instruction that serves as a good specialization candidate. | ||
Let's use the example of [`CONTAINS_OP`](../Doc/library/dis.rst#contains_op): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sentence is a dependent clause, you either need a comma and then some more information, or remove the word "assuming." How about this?
Assuming you found an instruction that serves as a good specialization candidate. | |
Let's use the example of [`CONTAINS_OP`](../Doc/library/dis.rst#contains_op): | |
Let's say you found an instruction that serves as a good specialization candidate, such as [`CONTAINS_OP`](../Doc/library/dis.rst#contains_op): |
Assuming you found an instruction that serves as a good specialization candidate. | ||
Let's use the example of [`CONTAINS_OP`](../Doc/library/dis.rst#contains_op): | ||
|
||
1. Update below in [Python/bytecodes.c](../Python/bytecodes.c) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really like the phrase "Update below in," it's kind of wordy and an incomplete sentence. You could try something like this:
1. Update below in [Python/bytecodes.c](../Python/bytecodes.c) | |
1. Make necessary changes to the instruction in [Python/bytecodes.c](../Python/bytecodes.c) |
- Convert `CONTAINS_OP` to a micro-operation (uop) by renaming | ||
it to `_CONTAINS_OP` and changing the instruction definition | ||
from `inst` to `op`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CONTAINS_OP
is still an example here, we should try to be more general.- For clarity, we could explain why it's a "u."
- Reduce indentation.
- Convert `CONTAINS_OP` to a micro-operation (uop) by renaming | |
it to `_CONTAINS_OP` and changing the instruction definition | |
from `inst` to `op`. | |
- Convert the instruction (`CONTAINS_OP`, in our example) to a micro-operation (uop, formally μop) by renaming it to `_INSTRUCTION_NAME` (e.g., `_CONTAINS_OP`) and changing the instruction definition | |
from `inst` to `op`. |
} | ||
``` | ||
|
||
- Create a macro for the original bytecode name: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"intruction" reads better to me here.
- Create a macro for the original bytecode name: | |
- Create a macro for the original instruction name: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It also might be worth mentioning here what should go in that macro, but it also seems pretty clear based on the example.
2. Define the cache structure in [Include/internal/pycore_code.h](../Include/internal/pycore_code.h), | ||
at the very least, a 16-bit counter is needed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The clause after the first comma is independent, so it can't be used there. Let's just turn it into its own sentence.
2. Define the cache structure in [Include/internal/pycore_code.h](../Include/internal/pycore_code.h), | |
at the very least, a 16-bit counter is needed. | |
2. Define the cache structure in [Include/internal/pycore_code.h](../Include/internal/pycore_code.h). It needs to have at least a 16-bit counter field. |
} _PyContainsOpCache; | ||
``` | ||
|
||
3. Write the specializing function itself (`_Py_Specialize_ContainsOp`) in [Python/specialize.c ](../Python/specialize.c). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_Py_Specialize_ContainsOp
is an example.
3. Write the specializing function itself (`_Py_Specialize_ContainsOp`) in [Python/specialize.c ](../Python/specialize.c). | |
3. Write the specializing function itself (e.g., `_Py_Specialize_ContainsOp`) in [Python/specialize.c ](../Python/specialize.c). |
3. Write the specializing function itself (`_Py_Specialize_ContainsOp`) in [Python/specialize.c ](../Python/specialize.c). | ||
Refer to other functions in that file for the pattern. | ||
|
||
4. Add a call to `add_stat_dict` in `_Py_GetSpecializationStats` which is in [Python/specialize.c ](../Python/specialize.c). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra space.
4. Add a call to `add_stat_dict` in `_Py_GetSpecializationStats` which is in [Python/specialize.c ](../Python/specialize.c). | |
4. Add a call to `add_stat_dict` in `_Py_GetSpecializationStats` which is in [Python/specialize.c ](../Python/specialize.c). |
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | ||
`dis` module will know how to represent it properly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- "to," not "in."
- I think the context already implies that it's Python's
dis
module :)
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | |
`dis` module will know how to represent it properly. | |
5. Add the cache layout to [Lib/opcode.py](../Lib/opcode.py) so that the | |
`dis` module will know how to represent it properly. |
5. Add the cache layout in [Lib/opcode.py](../Lib/opcode.py) so that Python's | ||
`dis` module will know how to represent it properly. | ||
|
||
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra space.
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). | |
6. Bump magic number in [Include/core/pycore_magic_number.h](../Include/internal/pycore_magic_number.h). |
Solves: python/devguide#1286
Description
CONTAINS_OP
as an example.PS: Initial PR for reference: python/devguide#1522
📚 Documentation preview 📚: https://cpython-devguide--1522.org.readthedocs.build/