traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate data dependency in predict macro. 

Added two predictions:
  GET_ITER --> FOR_ITER
  FOR_ITER --> STORE_FAST or UNPACK_SEQUENCE

Improves timings on pybench and timeit.py. Pystone results are neutral.
This commit is contained in:
Raymond Hettinger 2003-03-16 20:14:44 +00:00
parent ac2072920d
commit 7dc52212aa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Python/ceval.c
View File

@ -620,8 +620,8 @@ eval_frame(PyFrameObject *f)
#define PREDICT(op) if (*next_instr == op) goto PRED_##op #define PREDICT(op) if (*next_instr == op) goto PRED_##op
#define PREDICTED(op) PRED_##op: next_instr++ #define PREDICTED(op) PRED_##op: next_instr++
#define PREDICTED_WITH_ARG(op) PRED_##op: oparg = (next_instr += 3, \ #define PREDICTED_WITH_ARG(op) PRED_##op: oparg = (next_instr[2]<<8) + \
(next_instr[-1]<<8) + next_instr[-2]) next_instr[1]; next_instr += 3
/* Stack manipulation macros */ /* Stack manipulation macros */
@ -889,6 +889,7 @@ eval_frame(PyFrameObject *f)
PUSH(x); PUSH(x);
goto fast_next_opcode; goto fast_next_opcode;
PREDICTED_WITH_ARG(STORE_FAST);
case STORE_FAST: case STORE_FAST:
v = POP(); v = POP();
SETLOCAL(oparg, v); SETLOCAL(oparg, v);
@ -1675,6 +1676,7 @@ eval_frame(PyFrameObject *f)
NAME_ERROR_MSG ,w); NAME_ERROR_MSG ,w);
break; break;
PREDICTED_WITH_ARG(UNPACK_SEQUENCE);
case UNPACK_SEQUENCE: case UNPACK_SEQUENCE:
v = POP(); v = POP();
if (PyTuple_CheckExact(v)) { if (PyTuple_CheckExact(v)) {
@ -2051,17 +2053,21 @@ eval_frame(PyFrameObject *f)
Py_DECREF(v); Py_DECREF(v);
if (x != NULL) { if (x != NULL) {
SET_TOP(x); SET_TOP(x);
PREDICT(FOR_ITER);
continue; continue;
} }
STACKADJ(-1); STACKADJ(-1);
break; break;
PREDICTED_WITH_ARG(FOR_ITER);
case FOR_ITER: case FOR_ITER:
/* before: [iter]; after: [iter, iter()] *or* [] */ /* before: [iter]; after: [iter, iter()] *or* [] */
v = TOP(); v = TOP();
x = PyIter_Next(v); x = PyIter_Next(v);
if (x != NULL) { if (x != NULL) {
PUSH(x); PUSH(x);
PREDICT(STORE_FAST);
PREDICT(UNPACK_SEQUENCE);
continue; continue;
} }
if (!PyErr_Occurred()) { if (!PyErr_Occurred()) {