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.

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

Jump to bottom

gh-106529: Cleanups split off gh-112134 #112214

Merged
merged 6 commits into from
Nov 17, 2023
Merged

gh-106529: Cleanups split off gh-112134 #112214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36ceecb
Add executor_cases.c.h dependency for ceval.o
gvanrossum Nov 15, 2023
aef042a
Clean up flags.py
gvanrossum Nov 15, 2023
83c0c68
Clean up parsing.py
gvanrossum Nov 15, 2023
8400020
Add back printing optimized uops
gvanrossum Nov 15, 2023
354910e
_SPECIALIZE_UNPACK_SEQUENCE is TIER_ONE_ONLY
gvanrossum Nov 16, 2023
31d815f
Double max trace length to 256
gvanrossum Nov 16, 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
2 changes: 1 addition & 1 deletion Include/internal/pycore_uops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern "C" {

#include "pycore_frame.h" // _PyInterpreterFrame

#define _Py_UOP_MAX_TRACE_LENGTH 128
#define _Py_UOP_MAX_TRACE_LENGTH 256

typedef struct {
uint16_t opcode;
Expand Down
1 change: 1 addition & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ Python/ceval.o: \
$(srcdir)/Python/ceval_macros.h \
$(srcdir)/Python/condvar.h \
$(srcdir)/Python/generated_cases.c.h \
$(srcdir)/Python/executor_cases.c.h \
$(srcdir)/Python/opcode_targets.h

Python/flowgraph.o: \
Expand Down
1 change: 1 addition & 0 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,7 @@ dummy_func(
};

specializing op(_SPECIALIZE_UNPACK_SEQUENCE, (counter/1, seq -- seq)) {
TIER_ONE_ONLY
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr = this_instr;
Expand Down
1 change: 1 addition & 0 deletions Python/generated_cases.c.h
View file
Open in desktop

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

21 changes: 20 additions & 1 deletion Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ uop_dealloc(_PyUOpExecutorObject *self) {
}

static const char *
uop_name(int index) {
uop_name(int index)
{
if (index <= MAX_REAL_OPCODE) {
return _PyOpcode_OpName[index];
}
Expand Down Expand Up @@ -832,6 +833,24 @@ make_executor_from_uops(_PyUOpInstruction *buffer, _PyBloomFilter *dependencies)
assert(dest == -1);
executor->base.execute = _PyUopExecute;
_Py_ExecutorInit((_PyExecutorObject *)executor, dependencies);
#ifdef Py_DEBUG
char *python_lltrace = Py_GETENV("PYTHON_LLTRACE");
int lltrace = 0;
if (python_lltrace != NULL && *python_lltrace >= '0') {
lltrace = *python_lltrace - '0'; // TODO: Parse an int and all that
}
if (lltrace >= 2) {
printf("Optimized executor (length %d):\n", length);
for (int i = 0; i < length; i++) {
printf("%4d %s(%d, %d, %" PRIu64 ")\n",
i,
uop_name(executor->trace[i].opcode),
executor->trace[i].oparg,
executor->trace[i].target,
executor->trace[i].operand);
}
}
#endif
return (_PyExecutorObject *)executor;
}

Expand Down
7 changes: 3 additions & 4 deletions Tools/cases_generator/flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

def makes_escaping_api_call(instr: parsing.InstDef) -> bool:
if "CALL_INTRINSIC" in instr.name:
return True;
return True
tkns = iter(instr.tokens)
for tkn in tkns:
if tkn.kind != lx.IDENTIFIER:
Expand All @@ -79,6 +79,7 @@ def makes_escaping_api_call(instr: parsing.InstDef) -> bool:
return True
return False


@dataclasses.dataclass
class InstructionFlags:
"""Construct and manipulate instruction flags"""
Expand Down Expand Up @@ -124,9 +125,7 @@ def fromInstruction(instr: parsing.InstDef) -> "InstructionFlags":
or variable_used(instr, "exception_unwind")
or variable_used(instr, "resume_with_error")
),
HAS_ESCAPES_FLAG=(
makes_escaping_api_call(instr)
),
HAS_ESCAPES_FLAG=makes_escaping_api_call(instr),
)

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions Tools/cases_generator/parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class OpName(Node):

@dataclass
class InstHeader(Node):
annotations : list[str]
annotations: list[str]
kind: Literal["inst", "op"]
name: str
inputs: list[InputEffect]
Expand All @@ -114,7 +114,7 @@ class InstHeader(Node):

@dataclass
class InstDef(Node):
annotations : list[str]
annotations: list[str]
kind: Literal["inst", "op"]
name: str
inputs: list[InputEffect]
Expand Down
Loading