Skip to content

Commit d898344

Browse files
dstogovdstogov
committed
Inline simple constant functions
1 parent e247e93 commit d898344

5 files changed

Lines changed: 110 additions & 5 deletions

File tree

‎ext/opcache/Optimizer/optimize_func_calls.c‎

Lines changed: 93 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,91 @@ typedef struct _optimizer_call_info {
4141
zend_op *opline;
4242
} optimizer_call_info;
4343

44+
static void zend_delete_call_instructions(zend_op *opline)
45+
{
46+
int call = 0;
47+
48+
while (1) {
49+
switch (opline->opcode) {
50+
case ZEND_INIT_FCALL_BY_NAME:
51+
case ZEND_INIT_NS_FCALL_BY_NAME:
52+
case ZEND_INIT_STATIC_METHOD_CALL:
53+
case ZEND_INIT_METHOD_CALL:
54+
case ZEND_INIT_FCALL:
55+
if (call == 0) {
56+
MAKE_NOP(opline);
57+
return;
58+
}
59+
/* break missing intentionally */
60+
case ZEND_NEW:
61+
case ZEND_INIT_DYNAMIC_CALL:
62+
case ZEND_INIT_USER_CALL:
63+
call--;
64+
break;
65+
case ZEND_DO_FCALL:
66+
case ZEND_DO_ICALL:
67+
case ZEND_DO_UCALL:
68+
case ZEND_DO_FCALL_BY_NAME:
69+
call++;
70+
break;
71+
case ZEND_SEND_VAL:
72+
case ZEND_SEND_VAR:
73+
case ZEND_SEND_VAR_NO_REF:
74+
case ZEND_SEND_REF:
75+
if (call == 0) {
76+
if (opline->op1_type & (IS_CONST|IS_CV)) {
77+
MAKE_NOP(opline);
78+
} else {
79+
opline->opcode = ZEND_FREE;
80+
opline->extended_value = 0;
81+
opline->result.var = 0;
82+
}
83+
}
84+
break;
85+
}
86+
opline--;
87+
}
88+
}
89+
90+
static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_op *opline, zend_function *func)
91+
{
92+
if (func->type == ZEND_USER_FUNCTION
93+
&& !(func->op_array.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_HAS_TYPE_HINTS))
94+
&& fcall->extended_value >= func->op_array.required_num_args
95+
&& func->op_array.opcodes[func->op_array.num_args].opcode == ZEND_RETURN) {
96+
97+
zend_op *ret_opline = func->op_array.opcodes + func->op_array.num_args;
98+
99+
if (ret_opline->op1_type == IS_CONST) {
100+
101+
if (fcall->extended_value < func->op_array.num_args) {
102+
/* don't inline funcions with named constants in default arguments */
103+
uint32_t n = fcall->extended_value;
104+
105+
do {
106+
if (Z_CONSTANT_P(RT_CONSTANT_EX(&func->op_array, func->op_array.opcodes[n].op2))) {
107+
return;
108+
}
109+
n++;
110+
} while (n < func->op_array.num_args);
111+
}
112+
if (RETURN_VALUE_USED(opline)) {
113+
zval zv;
114+
115+
ZVAL_DUP(&zv, RT_CONSTANT_EX(&func->op_array, ret_opline->op1));
116+
opline->opcode = ZEND_QM_ASSIGN;
117+
opline->op1_type = IS_CONST;
118+
opline->op1.constant = zend_optimizer_add_literal(op_array, &zv);
119+
SET_UNUSED(opline->op2);
120+
} else {
121+
MAKE_NOP(opline);
122+
}
123+
124+
zend_delete_call_instructions(opline-1);
125+
}
126+
}
127+
}
128+
44129
void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
45130
{
46131
zend_op *opline = op_array->opcodes;
@@ -61,12 +146,12 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
61146
case ZEND_INIT_NS_FCALL_BY_NAME:
62147
case ZEND_INIT_STATIC_METHOD_CALL:
63148
case ZEND_INIT_METHOD_CALL:
149+
case ZEND_INIT_FCALL:
64150
call_stack[call].func = zend_optimizer_get_called_func(
65151
ctx->script, op_array, opline, 0);
66152
/* break missing intentionally */
67153
case ZEND_NEW:
68154
case ZEND_INIT_DYNAMIC_CALL:
69-
case ZEND_INIT_FCALL:
70155
case ZEND_INIT_USER_CALL:
71156
call_stack[call].opline = opline;
72157
call++;
@@ -79,7 +164,9 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
79164
if (call_stack[call].func && call_stack[call].opline) {
80165
zend_op *fcall = call_stack[call].opline;
81166

82-
if (fcall->opcode == ZEND_INIT_FCALL_BY_NAME) {
167+
if (fcall->opcode == ZEND_INIT_FCALL) {
168+
/* nothing to do */
169+
} else if (fcall->opcode == ZEND_INIT_FCALL_BY_NAME) {
83170
fcall->opcode = ZEND_INIT_FCALL;
84171
fcall->op1.num = zend_vm_calc_used_stack(fcall->extended_value, call_stack[call].func);
85172
Z_CACHE_SLOT(op_array->literals[fcall->op2.constant + 1]) = Z_CACHE_SLOT(op_array->literals[fcall->op2.constant]);
@@ -100,6 +187,10 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
100187
} else {
101188
ZEND_ASSERT(0);
102189
}
190+
191+
if (ZEND_OPTIMIZER_PASS_16 & ctx->optimization_level) {
192+
zend_try_inline_call(op_array, fcall, opline, call_stack[call].func);
193+
}
103194
}
104195
call_stack[call].func = NULL;
105196
call_stack[call].opline = NULL;

‎ext/opcache/Optimizer/zend_inference.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3186,7 +3186,6 @@ static void zend_update_type_info(const zend_op_array *op_array,
31863186
}
31873187
}
31883188
}
3189-
ZEND_ASSERT(!ssa_vars[ssa_ops[i].result_def].phi_use_chain);
31903189
j = ssa_vars[ssa_ops[i].result_def].use_chain;
31913190
while (j >= 0) {
31923191
switch (op_array->opcodes[j].opcode) {

‎ext/opcache/Optimizer/zend_optimizer.c‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,18 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
191191
opline->op1.constant = zend_optimizer_add_literal(op_array, val);
192192
alloc_cache_slots_op1(op_array, opline, 2);
193193
break;
194+
case ZEND_SEND_VAR:
195+
opline->opcode = ZEND_SEND_VAL;
196+
opline->op1.constant = zend_optimizer_add_literal(op_array, val);
197+
break;
198+
case ZEND_SEND_VAR_NO_REF_EX:
199+
opline->opcode = ZEND_SEND_VAL_EX;
200+
opline->op1.constant = zend_optimizer_add_literal(op_array, val);
201+
break;
202+
case ZEND_SEPARATE:
203+
case ZEND_SEND_VAR_NO_REF:
204+
zval_ptr_dtor(val);
205+
return 0;
194206
case ZEND_CONCAT:
195207
case ZEND_FAST_CONCAT:
196208
case ZEND_FETCH_R:
@@ -659,7 +671,7 @@ static void zend_optimize(zend_op_array *op_array,
659671
if (ZEND_OPTIMIZER_PASS_3 & ctx->optimization_level) {
660672
zend_optimizer_pass3(op_array);
661673
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_3) {
662-
zend_dump_op_array(op_array, 0, "after pass 1", NULL);
674+
zend_dump_op_array(op_array, 0, "after pass 3", NULL);
663675
}
664676
}
665677

@@ -669,7 +681,7 @@ static void zend_optimize(zend_op_array *op_array,
669681
if (ZEND_OPTIMIZER_PASS_4 & ctx->optimization_level) {
670682
zend_optimize_func_calls(op_array, ctx);
671683
if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_4) {
672-
zend_dump_op_array(op_array, 0, "after pass 1", NULL);
684+
zend_dump_op_array(op_array, 0, "after pass 4", NULL);
673685
}
674686
}
675687

‎ext/opcache/Optimizer/zend_optimizer.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#define ZEND_OPTIMIZER_PASS_13 (1<<12)
4141
#define ZEND_OPTIMIZER_PASS_14 (1<<13)
4242
#define ZEND_OPTIMIZER_PASS_15 (1<<14) /* Collect constants */
43+
#define ZEND_OPTIMIZER_PASS_16 (1<<15) /* Inline functions */
4344

4445
#define ZEND_OPTIMIZER_ALL_PASSES 0x7FFFFFFF
4546

‎sapi/phpdbg/tests/finish_leave_001.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
test finish and leave commands
3+
--INI--
4+
opcache.optimization_level=0
35
--PHPDBG--
46
b bar
57
b 5

0 commit comments

Comments
 (0)