gh-106608: make uop trace variable length (#107531) · python/cpython@4e6fac7 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 4e6fac7

Browse filesBrowse the repository at this point in the historyBrowse files

rdrf2838

authored

gh-106608: make uop trace variable length (#107531)

Executors are now more like tuples.

1 parent 05a824f commit 4e6fac7
Copy full SHA for 4e6fac7

4 files changed

+7-15Lines changed: 7 additions & 15 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Include
  • cpython
    • optimizer.h
  • internal
    • pycore_uops.h
• Misc/NEWS.d/next/Core and Builtins
  • 2023-08-01-09-41-36.gh-issue-106608.OFZogw.rst
• Python
  • optimizer.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Include/cpython/optimizer.h‎

Copy file name to clipboardExpand all lines: Include/cpython/optimizer.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ typedef struct {
12	12	} _PyVMData;
13	13
14	14	typedef struct _PyExecutorObject {
15		- PyObject_HEAD
	15	+ PyObject_VAR_HEAD
16	16	/* WARNING: execute consumes a reference to self. This is necessary to allow executors to tail call into each other. */
17	17	struct _PyInterpreterFrame *(*execute)(struct _PyExecutorObject *self, struct _PyInterpreterFrame *frame, PyObject **stack_pointer);
18	18	_PyVMData vm_data; /* Used by the VM, but opaque to the optimizer */

Collapse file

‎Include/internal/pycore_uops.h‎

Copy file name to clipboardExpand all lines: Include/internal/pycore_uops.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ typedef struct {
18	18
19	19	typedef struct {
20	20	_PyExecutorObject base;
21		- _PyUOpInstruction trace[_Py_UOP_MAX_TRACE_LENGTH]; // TODO: variable length
	21	+ _PyUOpInstruction trace[1];
22	22	} _PyUOpExecutorObject;
23	23
24	24	_PyInterpreterFrame *_PyUopExecute(

Collapse file

‎Misc/NEWS.d/next/Core and Builtins/2023-08-01-09-41-36.gh-issue-106608.OFZogw.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Make ``_PyUOpExecutorObject`` variable length.

Collapse file

‎Python/optimizer.c‎

Copy file name to clipboardExpand all lines: Python/optimizer.c

+4-13Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
@@ -320,13 +320,7 @@ uop_name(int index) {
320	320	static Py_ssize_t
321	321	uop_len(_PyUOpExecutorObject *self)
322	322	{
323		- int count = 0;
324		- for (; count < _Py_UOP_MAX_TRACE_LENGTH; count++) {
325		- if (self->trace[count].opcode == 0) {
326		- break;
327		- }
328		- }
329		- return count;
	323	+ return Py_SIZE(self);
330	324	}
331	325
332	326	static PyObject *
@@ -368,8 +362,8 @@ PySequenceMethods uop_as_sequence = {
368	362	static PyTypeObject UOpExecutor_Type = {
369	363	PyVarObject_HEAD_INIT(&PyType_Type, 0)
370	364	.tp_name = "uop_executor",
371		- .tp_basicsize = sizeof(_PyUOpExecutorObject),
372		- .tp_itemsize = 0,
	365	+ .tp_basicsize = sizeof(_PyUOpExecutorObject) - sizeof(_PyUOpInstruction),
	366	+ .tp_itemsize = sizeof(_PyUOpInstruction),
373	367	.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
374	368	.tp_dealloc = (destructor)uop_dealloc,
375	369	.tp_as_sequence = &uop_as_sequence,
@@ -699,15 +693,12 @@ uop_optimize(
699	693	return trace_length;
700	694	}
701	695	OBJECT_STAT_INC(optimization_traces_created);
702		- _PyUOpExecutorObject *executor = PyObject_New(_PyUOpExecutorObject, &UOpExecutor_Type);
	696	+ _PyUOpExecutorObject *executor = PyObject_NewVar(_PyUOpExecutorObject, &UOpExecutor_Type, trace_length);
703	697	if (executor == NULL) {
704	698	return -1;
705	699	}
706	700	executor->base.execute = _PyUopExecute;
707	701	memcpy(executor->trace, trace, trace_length * sizeof(_PyUOpInstruction));
708		- if (trace_length < _Py_UOP_MAX_TRACE_LENGTH) {
709		- executor->trace[trace_length].opcode = 0; // Sentinel
710		- }
711	702	*exec_ptr = (_PyExecutorObject *)executor;
712	703	return 1;
713	704	}

0 commit comments

Comments

0 (0)