mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix debug output for optimized executor (#116337)

Browse source 
This adjusts `length` rather than using `length+1`
all over the place.
This commit is contained in:
Guido van Rossum 2024-03-05 10:05:29 -08:00 • committed by GitHub
parent e7ba6e9dbe
commit d444dec09a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/optimizer.c
View file

@ -899,7 +899,8 @@ make_executor_from_uops(_PyUOpInstruction *buffer, const _PyBloomFilter *depende
uint32_t used[(UOP_MAX_TRACE_LENGTH + 31)/32] = { 0 }; uint32_t used[(UOP_MAX_TRACE_LENGTH + 31)/32] = { 0 };
int exit_count; int exit_count;
int length = compute_used(buffer, used, &exit_count); int length = compute_used(buffer, used, &exit_count);
_PyExecutorObject *executor = allocate_executor(exit_count, length+1); length += 1; // For _START_EXECUTOR
_PyExecutorObject *executor = allocate_executor(exit_count, length);
if (executor == NULL) { if (executor == NULL) {
return NULL; return NULL;
} }
@ -909,7 +910,7 @@ make_executor_from_uops(_PyUOpInstruction *buffer, const _PyBloomFilter *depende
executor->exits[i].temperature = 0; executor->exits[i].temperature = 0;
} }
int next_exit = exit_count-1; int next_exit = exit_count-1;
_PyUOpInstruction *dest = (_PyUOpInstruction *)&executor->trace[length]; _PyUOpInstruction *dest = (_PyUOpInstruction *)&executor->trace[length-1];
/* Scan backwards, so that we see the destinations of jumps before the jumps themselves. */ /* Scan backwards, so that we see the destinations of jumps before the jumps themselves. */
for (int i = UOP_MAX_TRACE_LENGTH-1; i >= 0; i--) { for (int i = UOP_MAX_TRACE_LENGTH-1; i >= 0; i--) {
if (!BIT_IS_SET(used, i)) { if (!BIT_IS_SET(used, i)) {
@ -957,7 +958,7 @@ make_executor_from_uops(_PyUOpInstruction *buffer, const _PyBloomFilter *depende
#ifdef _Py_JIT #ifdef _Py_JIT
executor->jit_code = NULL; executor->jit_code = NULL;
executor->jit_size = 0; executor->jit_size = 0;
if (_PyJIT_Compile(executor, executor->trace, length+1)) { if (_PyJIT_Compile(executor, executor->trace, length)) {
Py_DECREF(executor); Py_DECREF(executor);
return NULL; return NULL;
} }