Skip to content

gh-100239: more refined specialisation stats for BINARY_OP/SUBSCR #132068

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
merged 2 commits into from
Apr 4, 2025
Merged

gh-100239: more refined specialisation stats for BINARY_OP/SUBSCR #132068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebd800a
add stats
iritkatriel Apr 1, 2025
d7052e4
calculate max failure index
iritkatriel Apr 3, 2025
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/cpython/pystats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#define PYSTATS_MAX_UOP_ID 512

#define SPECIALIZATION_FAILURE_KINDS 37
#define SPECIALIZATION_FAILURE_KINDS 44

/* Stats for determining who is calling PyEval_EvalFrame */
#define EVAL_CALL_TOTAL 0
Expand Down
35 changes: 35 additions & 0 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,13 @@ _PyCode_Quicken(_Py_CODEUNIT *instructions, Py_ssize_t size, int enable_counters
#define SPEC_FAIL_BINARY_OP_SUBSCR_TUPLE_SLICE 35
#define SPEC_FAIL_BINARY_OP_SUBSCR_STRING_SLICE 36
#define SPEC_FAIL_BINARY_OP_SUBSCR_NOT_HEAP_TYPE 37
#define SPEC_FAIL_BINARY_OP_SUBSCR_OTHER_SLICE 38
#define SPEC_FAIL_BINARY_OP_SUBSCR_MAPPINGPROXY 39
#define SPEC_FAIL_BINARY_OP_SUBSCR_RE_MATCH 40
#define SPEC_FAIL_BINARY_OP_SUBSCR_ARRAY 41
#define SPEC_FAIL_BINARY_OP_SUBSCR_DEQUE 42
#define SPEC_FAIL_BINARY_OP_SUBSCR_ENUMDICT 43
#define SPEC_FAIL_BINARY_OP_SUBSCR_STACKSUMMARY 44

/* Calls */

Expand Down Expand Up @@ -2358,6 +2365,34 @@ binary_op_fail_kind(int oparg, PyObject *lhs, PyObject *rhs)
}
}
Py_XDECREF(descriptor);

if (PyObject_TypeCheck(lhs, &PyDictProxy_Type)) {
return SPEC_FAIL_BINARY_OP_SUBSCR_MAPPINGPROXY;
}

if (strcmp(container_type->tp_name, "array.array") == 0) {
return SPEC_FAIL_BINARY_OP_SUBSCR_ARRAY;
}

if (strcmp(container_type->tp_name, "re.Match") == 0) {
return SPEC_FAIL_BINARY_OP_SUBSCR_RE_MATCH;
}

if (strcmp(container_type->tp_name, "collections.deque") == 0) {
return SPEC_FAIL_BINARY_OP_SUBSCR_DEQUE;
}

if (strcmp(_PyType_Name(container_type), "EnumDict") != 0) {
return SPEC_FAIL_BINARY_OP_SUBSCR_ENUMDICT;
}

if (strcmp(container_type->tp_name, "StackSummary") != 0) {
return SPEC_FAIL_BINARY_OP_SUBSCR_STACKSUMMARY;
}

if (PySlice_Check(rhs)) {
return SPEC_FAIL_BINARY_OP_SUBSCR_OTHER_SLICE;
}
return SPEC_FAIL_BINARY_OP_SUBSCR;
}
Py_UNREACHABLE();
Expand Down
14 changes: 11 additions & 3 deletions Tools/scripts/summarize_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,20 @@ def kind_to_text(kind: int, opcode: str):
return "kind " + str(kind)

family_stats = self._get_stats_for_opcode(opcode)
failure_kinds = [0] * 40

def key_to_index(key):
return int(key[:-1].split("[")[1])

max_index = 0
for key in family_stats:
if key.startswith("specialization.failure_kind"):
max_index = max(max_index, key_to_index(key))

failure_kinds = [0] * (max_index + 1)
for key in family_stats:
if not key.startswith("specialization.failure_kind"):
continue
index = int(key[:-1].split("[")[1])
failure_kinds[index] = family_stats[key]
failure_kinds[key_to_index(key)] = family_stats[key]
return {
kind_to_text(index, opcode): value
for (index, value) in enumerate(failure_kinds)
Expand Down
Loading