archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added few more jump threading optimisation patterns

Browse source
This commit is contained in:
Dmitry Stogov 2017-08-16 09:17:32 +03:00
parent 05e75d6aaa
commit db2807e4d2
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ext/opcache/Optimizer/pass3.c
View file

@ -33,9 +33,6 @@
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_vm.h" #include "zend_vm.h"
/* compares opcodes with allowing oc1 be _EX of oc2 */
#define SAME_OPCODE_EX(oc1, oc2) ((oc1 == oc2) || (oc1 == ZEND_JMPZ_EX && oc2 == ZEND_JMPZ) || (oc1 == ZEND_JMPNZ_EX && oc2 == ZEND_JMPNZ))
/* we use "jmp_hitlist" to avoid infinity loops during jmp optimization */ /* we use "jmp_hitlist" to avoid infinity loops during jmp optimization */
#define CHECK_JMP(target, label) \ #define CHECK_JMP(target, label) \
for (i=0; i<jmp_hitlist_count; i++) { \ for (i=0; i<jmp_hitlist_count; i++) { \
@ -270,13 +267,17 @@ void zend_optimizer_pass3(zend_op_array *op_array)
while (ZEND_OP2_JMP_ADDR(opline) < end) { while (ZEND_OP2_JMP_ADDR(opline) < end) {
zend_op *target = ZEND_OP2_JMP_ADDR(opline); zend_op *target = ZEND_OP2_JMP_ADDR(opline);
if (SAME_OPCODE_EX(opline->opcode, target->opcode) && if (target->opcode == opline->opcode-3 &&
SAME_VAR(target->op1, T)) { SAME_VAR(target->op1, T)) {
/* Check for JMPZ_EX to JMPZ[_EX] with the same condition, either with _EX or not */ /* convert T=JMPZ_EX(X,L1), L1: JMPZ(T,L2) to
if (target->opcode == opline->opcode) { JMPZ_EX(X,L2) */
/* change T only if we have _EX opcode there */ CHECK_JMP2(target, continue_jmp_ex_optimization);
COPY_NODE(T, target->result); ZEND_SET_OP_JMP_ADDR(opline, opline->op2, ZEND_OP2_JMP_ADDR(target));
} } else if (target->opcode == opline->opcode &&
SAME_VAR(target->op1, T) &&
SAME_VAR(target->result, T)) {
/* convert T=JMPZ_EX(X,L1), L1: T=JMPZ_EX(T,L2) to
JMPZ_EX(X,L2) */
CHECK_JMP2(target, continue_jmp_ex_optimization); CHECK_JMP2(target, continue_jmp_ex_optimization);
ZEND_SET_OP_JMP_ADDR(opline, opline->op2, ZEND_OP2_JMP_ADDR(target)); ZEND_SET_OP_JMP_ADDR(opline, opline->op2, ZEND_OP2_JMP_ADDR(target));
} else if (target->opcode == ZEND_JMPZNZ && } else if (target->opcode == ZEND_JMPZNZ &&
@ -299,6 +300,19 @@ void zend_optimizer_pass3(zend_op_array *op_array)
JMPZ_EX(X,L1+1) */ JMPZ_EX(X,L1+1) */
ZEND_SET_OP_JMP_ADDR(opline, opline->op2, target + 1); ZEND_SET_OP_JMP_ADDR(opline, opline->op2, target + 1);
break; break;
} else if (target->opcode == INV_EX_COND(opline->opcode) &&
SAME_VAR(target->op1, T)) {
/* convert T=JMPZ_EX(X,L1), L1: JMPNZ(T,L2) to
JMPZ_EX(X,L1+1) */
ZEND_SET_OP_JMP_ADDR(opline, opline->op2, target + 1);
break;
} else if (target->opcode == INV_EX_COND_EX(opline->opcode) &&
SAME_VAR(target->op1, T) &&
SAME_VAR(target->result, T)) {
/* convert T=JMPZ_EX(X,L1), L1: T=JMPNZ_EX(T,L2) to
JMPZ_EX(X,L1+1) */
ZEND_SET_OP_JMP_ADDR(opline, opline->op2, target + 1);
break;
} else if (target->opcode == ZEND_BOOL && } else if (target->opcode == ZEND_BOOL &&
SAME_VAR(opline->result, target->op1)) { SAME_VAR(opline->result, target->op1)) {
/* convert Y = JMPZ_EX(X,L1), L1: Z = BOOL(Y) to /* convert Y = JMPZ_EX(X,L1), L1: Z = BOOL(Y) to