🌐 AI搜索 & 代理 主页
Skip to content

gh-106290: Fix edge cases around uops #106319

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.

Sign up for GitHub

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

Merged
gvanrossum merged 13 commits into from
Jul 3, 2023
Merged

gh-106290: Fix edge cases around uops #106319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a2216ce
Add commented-out prints about why an op is not viable
gvanrossum Jun 28, 2023
028b17d
Misc uops changes
gvanrossum Jun 28, 2023
4a75f35
There's no reason to forbid unbound_local_error
gvanrossum Jun 29, 2023
29a153f
Add a SET_IP uop at the top of a trace
gvanrossum Jun 29, 2023
7944a80
Fix gh-106290 (wrong line numbers in traceback)
gvanrossum Jul 1, 2023
c6ded69
Rename SET_IP to SAVE_IP
gvanrossum Jul 1, 2023
f6c9d52
Also fix prev_instr when deoptimizing
gvanrossum Jul 1, 2023
5b85a49
TEMPORARY -- turn on uops always
gvanrossum Jul 1, 2023
b2792db
Revert "TEMPORARY -- turn on uops always"
gvanrossum Jul 2, 2023
8a04a31
Streamline debug output in optimizer.c
gvanrossum Jul 3, 2023
118b324
Streamline debug output in ceval.c
gvanrossum Jul 3, 2023
f886d5b
Fix stray #undef
gvanrossum Jul 3, 2023
4816076
Merge branch 'python:main' into tweak-uops
gvanrossum Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename SET_IP to SAVE_IP 
To match faster-cpython/ideas#558.
  • Loading branch information
@gvanrossum
gvanrossum committed Jul 1, 2023
commit c6ded69b493d82f1e5264de3f392a221b63cc9ae
2 changes: 1 addition & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2828,7 +2828,7 @@ _PyUopExecute(_PyExecutorObject *executor, _PyInterpreterFrame *frame, PyObject
#define ENABLE_SPECIALIZATION 0
#include "executor_cases.c.h"

case SET_IP:
case SAVE_IP:
{
frame->prev_instr = ip_offset + oparg;
break;
Expand Down
4 changes: 2 additions & 2 deletions Python/opcode_metadata.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,15 @@ translate_bytecode_to_trace(
#endif

for (;;) {
ADD_TO_TRACE(SET_IP, (int)(instr - (_Py_CODEUNIT *)code->co_code_adaptive));
ADD_TO_TRACE(SAVE_IP, (int)(instr - (_Py_CODEUNIT *)code->co_code_adaptive));
int opcode = instr->op.code;
uint64_t operand = instr->op.arg;
switch (opcode) {
case LOAD_FAST_LOAD_FAST:
case STORE_FAST_LOAD_FAST:
case STORE_FAST_STORE_FAST:
{
// Reserve space for two uops (+ SET_IP + EXIT_TRACE)
// Reserve space for two uops (+ SAVE_IP + EXIT_TRACE)
if (trace_length + 4 > max_length) {
#ifdef LLTRACE
if (lltrace >= 1) {
Expand Down Expand Up @@ -384,7 +384,7 @@ translate_bytecode_to_trace(
{
const struct opcode_macro_expansion *expansion = &_PyOpcode_macro_expansion[opcode];
if (expansion->nuops > 0) {
// Reserve space for nuops (+ SET_IP + EXIT_TRACE)
// Reserve space for nuops (+ SAVE_IP + EXIT_TRACE)
int nuops = expansion->nuops;
if (trace_length + nuops + 2 > max_length) {
#ifdef LLTRACE
Expand Down Expand Up @@ -440,7 +440,7 @@ translate_bytecode_to_trace(
}

done:
// Skip short traces like SET_IP, LOAD_FAST, SET_IP, EXIT_TRACE
// Skip short traces like SAVE_IP, LOAD_FAST, SAVE_IP, EXIT_TRACE
if (trace_length > 3) {
ADD_TO_TRACE(EXIT_TRACE, 0);
#ifdef LLTRACE
Expand Down
2 changes: 1 addition & 1 deletion Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ def add(name: str) -> None:
self.out.emit(make_text(name, counter))
counter += 1
add("EXIT_TRACE")
add("SET_IP")
add("SAVE_IP")
for instr in self.instrs.values():
if instr.kind == "op" and instr.is_viable_uop():
add(instr.name)
Expand Down