Skip to content

Commit b81d379

Browse files
nielsdosnielsdos
committed
Implementation using NO_VAL
Fixup DFG check condition Re-enable other benches Tweak Fix regression
1 parent 085a404 commit b81d379

File tree

10 files changed

+90
-59
lines changed

10 files changed

+90
-59
lines changed

‎Zend/Optimizer/dfa_pass.c

Lines changed: 27 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,10 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
466466
int var_num = ssa_op->op1_use;
467467
zend_ssa_var *var = ssa->vars + var_num;
468468

469-
ZEND_ASSERT(ssa_op->op1_def < 0);
469+
if (ssa_op->op1_def >= 0) {
470+
zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
471+
}
472+
470473
zend_ssa_unlink_use_chain(ssa, op_num, ssa_op->op1_use);
471474
ssa_op->op1_use = -1;
472475
ssa_op->op1_use_chain = -1;
@@ -1066,46 +1069,35 @@ static bool zend_dfa_try_to_replace_result(zend_op_array *op_array, zend_ssa *ss
10661069
return 0;
10671070
}
10681071

1069-
static bool op_dominates(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *a, const zend_op *b)
1070-
{
1071-
uint32_t a_block = ssa->cfg.map[a - op_array->opcodes];
1072-
uint32_t b_block = ssa->cfg.map[b - op_array->opcodes];
1073-
if (a_block == b_block) {
1074-
return a < b;
1075-
} else {
1076-
return dominates(ssa->cfg.blocks, a_block, b_block);
1077-
}
1078-
}
1079-
1080-
static bool op_dominates_all_uses(const zend_op_array *op_array, const zend_ssa *ssa, int start) {
1081-
int use;
1082-
FOREACH_USE(ssa->vars + ssa->ops[start].op1_def, use) {
1083-
if (!op_dominates(op_array, ssa, op_array->opcodes + start, op_array->opcodes + use)) {
1084-
return false;
1085-
}
1086-
} FOREACH_USE_END();
1087-
return true;
1088-
}
1089-
10901072
/* Sets a flag on SEND ops when a copy can be a avoided. */
1091-
static void zend_dfa_optimize_send_copies(zend_op_array *op_array, const zend_ssa *ssa)
1073+
static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa)
10921074
{
1093-
/* func_get_args() etc could make the optimization observable */
1075+
/* func_get_args(), indirect accesses and exceptions could make the optimization observable.
1076+
* The latter two cases are already tested before applying the DFA pass. */
10941077
if (ssa->cfg.flags & ZEND_FUNC_VARARG) {
10951078
return;
10961079
}
10971080

10981081
for (uint32_t i = 0; i < op_array->last; i++) {
1099-
const zend_op *opline = &op_array->opcodes[i];
1082+
zend_op *opline = op_array->opcodes + i;
11001083
if ((opline->opcode != ZEND_SEND_VAR && opline->opcode != ZEND_SEND_VAR_EX) || opline->op2_type != IS_UNUSED || opline->op1_type != IS_CV) {
11011084
continue;
11021085
}
11031086

1104-
/* NULL must not be visible in backtraces */
1105-
int ssa_cv = ssa->ops[i].op1_use;
1087+
zend_ssa_op *ssa_op = ssa->ops + i;
1088+
int op1_def = ssa_op->op1_def;
1089+
if (op1_def == -1) {
1090+
continue;
1091+
}
1092+
1093+
int ssa_cv = ssa_op->op1_use;
1094+
1095+
#if 0
1096+
/* Argument move must not be observable in backtraces */
11061097
if (ssa->vars[ssa_cv].var < op_array->num_args) {
11071098
continue;
11081099
}
1100+
#endif
11091101

11101102
/* Unsetting a CV is always fine if it gets overwritten afterwards.
11111103
* Since type inference often infers very wide types, we are very loose in matching types. */
@@ -1114,25 +1106,11 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, const zend_ss
11141106
continue;
11151107
}
11161108

1117-
if (opline->opcode == ZEND_SEND_VAR) {
1118-
/* Check if the call dominates the assignment and the assignment dominates all the future uses of this SSA variable */
1119-
int next_use = ssa->ops[i].op1_use_chain;
1120-
if (next_use >= 0
1121-
&& op_array->opcodes[next_use].opcode == ZEND_ASSIGN
1122-
&& ssa->ops[next_use].op1_use == ssa_cv
1123-
&& ssa->ops[next_use].op2_use >= 0
1124-
&& op_dominates(op_array, ssa, opline, op_array->opcodes + next_use)) {
1125-
if (op_dominates_all_uses(op_array, ssa, next_use)) {
1126-
op_array->opcodes[i].extended_value = 1;
1127-
//fprintf(stderr, "yes optimize 1\n");
1128-
}
1129-
}
1130-
} else /* ZEND_SEND_VAR_EX */ {
1131-
ZEND_ASSERT(ssa->ops[i].op1_def != -1);
1132-
if (ssa->vars[ssa->ops[i].op1_def].no_val) {
1133-
op_array->opcodes[i].extended_value = 1;
1134-
//fprintf(stderr, "yes optimize 2\n");
1135-
}
1109+
zend_ssa_var *ssa_var = ssa->vars + op1_def;
1110+
1111+
if (ssa_var->no_val && !ssa_var->alias) {
1112+
/* Flag will be used by VM type spec handler */
1113+
opline->extended_value = 1;
11361114
}
11371115
}
11381116
}
@@ -1198,6 +1176,9 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
11981176
/* Optimization should not be done on main because of globals. */
11991177
if (op_array->function_name) {
12001178
zend_dfa_optimize_send_copies(op_array, ssa);
1179+
#if ZEND_DEBUG_DFA
1180+
ssa_verify_integrity(op_array, ssa, "after optimize send copies");
1181+
#endif
12011182
}
12021183

12031184
for (v = op_array->last_var; v < ssa->vars_count; v++) {

‎Zend/Optimizer/sccp.c

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ typedef struct _sccp_ctx {
9898
#define MAKE_TOP(zv) (Z_TYPE_INFO_P(zv) = TOP)
9999
#define MAKE_BOT(zv) (Z_TYPE_INFO_P(zv) = BOT)
100100

101-
static void scp_dump_value(zval *zv) {
101+
static void scp_dump_value(const zval *zv) {
102102
if (IS_TOP(zv)) {
103103
fprintf(stderr, " top");
104104
} else if (IS_BOT(zv)) {
@@ -1050,6 +1050,12 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
10501050
case ZEND_SEND_VAL:
10511051
case ZEND_SEND_VAR:
10521052
{
1053+
SKIP_IF_TOP(op1);
1054+
1055+
if (opline->opcode == ZEND_SEND_VAR) {
1056+
SET_RESULT(op1, op1);
1057+
}
1058+
10531059
/* If the value of a SEND for an ICALL changes, we need to reconsider the
10541060
* ICALL result value. Otherwise we can ignore the opcode. */
10551061
zend_call_info *call;
@@ -1058,7 +1064,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
10581064
}
10591065

10601066
call = ctx->call_map[opline - ctx->scdf.op_array->opcodes];
1061-
if (IS_TOP(op1) || !call || !call->caller_call_opline
1067+
if (!call || !call->caller_call_opline
10621068
|| call->caller_call_opline->opcode != ZEND_DO_ICALL) {
10631069
return;
10641070
}
@@ -2034,8 +2040,14 @@ static int remove_call(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op)
20342040
&ssa->ops[call->caller_init_opline - op_array->opcodes]);
20352041

20362042
for (i = 0; i < call->num_args; i++) {
2037-
zend_ssa_remove_instr(ssa, call->arg_info[i].opline,
2038-
&ssa->ops[call->arg_info[i].opline - op_array->opcodes]);
2043+
zend_op *op = call->arg_info[i].opline;
2044+
zend_ssa_op *this_ssa_op = &ssa->ops[op - op_array->opcodes];
2045+
2046+
if (op->opcode == ZEND_SEND_VAR && this_ssa_op->op1_def >= 0) {
2047+
zend_ssa_replace_op1_def_op1_use(ssa, this_ssa_op);
2048+
}
2049+
2050+
zend_ssa_remove_instr(ssa, op, this_ssa_op);
20392051
}
20402052

20412053
// TODO: remove call_info completely???
@@ -2188,6 +2200,10 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
21882200
return 0;
21892201
}
21902202

2203+
if (opline->opcode == ZEND_SEND_VAR) {
2204+
return 0;
2205+
}
2206+
21912207
/* Compound assign or incdec -> convert to direct ASSIGN */
21922208

21932209
if (!value) {
@@ -2330,6 +2346,9 @@ static int replace_constant_operands(sccp_ctx *ctx) {
23302346
FOREACH_USE(var, use) {
23312347
zend_op *opline = &op_array->opcodes[use];
23322348
zend_ssa_op *ssa_op = &ssa->ops[use];
2349+
if (opline->opcode == ZEND_SEND_VAR && ssa_op->op1_use == i && ssa_op->op1_def >= 0) {
2350+
zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
2351+
}
23332352
if (try_replace_op1(ctx, opline, ssa_op, i, value)) {
23342353
if (opline->opcode == ZEND_NOP) {
23352354
removed_ops++;

‎Zend/Optimizer/zend_cfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ ZEND_API void zend_cfg_compute_dominators_tree(const zend_op_array *op_array, ze
761761
}
762762
/* }}} */
763763

764-
bool dominates(const zend_basic_block *blocks, int a, int b) /* {{{ */
764+
static bool dominates(zend_basic_block *blocks, int a, int b) /* {{{ */
765765
{
766766
while (blocks[b].level > blocks[a].level) {
767767
b = blocks[b].idom;

‎Zend/Optimizer/zend_cfg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void zend_cfg_remark_reachable_blocks(const zend_op_array *op_array, zend_cfg *c
120120
ZEND_API void zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg);
121121
ZEND_API void zend_cfg_compute_dominators_tree(const zend_op_array *op_array, zend_cfg *cfg);
122122
ZEND_API void zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg);
123-
bool dominates(const zend_basic_block *blocks, int a, int b);
124123

125124
END_EXTERN_C()
126125

‎Zend/Optimizer/zend_dfg.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ static zend_always_inline void _zend_dfg_add_use_def_op(const zend_op_array *op_
174174
}
175175
break;
176176
case ZEND_SEND_VAR:
177+
if (opline->op1_type == IS_CV && ((build_flags & ZEND_SSA_RC_INFERENCE) || opline->op2_type == IS_UNUSED)) {
178+
goto add_op1_def;
179+
}
180+
break;
177181
case ZEND_CAST:
178182
case ZEND_QM_ASSIGN:
179183
case ZEND_JMP_SET:

‎Zend/Optimizer/zend_inference.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2950,6 +2950,9 @@ static zend_always_inline zend_result _zend_update_type_info(
29502950
if (t1 & (MAY_BE_RC1|MAY_BE_REF)) {
29512951
tmp |= MAY_BE_RCN;
29522952
}
2953+
if ((t1 & (MAY_BE_ARRAY|MAY_BE_STRING)) && (t1 & MAY_BE_RC1) && !(t1 & (MAY_BE_UNDEF|MAY_BE_REF)) && ssa_vars[ssa_op->op1_def].no_val && !ssa_vars[ssa_op->op1_def].alias) {
2954+
tmp |= MAY_BE_UNDEF;
2955+
}
29532956
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
29542957
COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);
29552958
}
@@ -2991,6 +2994,9 @@ static zend_always_inline zend_result _zend_update_type_info(
29912994
case ZEND_SEND_FUNC_ARG:
29922995
if (ssa_op->op1_def >= 0) {
29932996
tmp = (t1 & MAY_BE_UNDEF)|MAY_BE_REF|MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ANY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF;
2997+
if (opline->opcode == ZEND_SEND_VAR_EX && (t1 & (MAY_BE_ARRAY|MAY_BE_STRING)) && (t1 & MAY_BE_RC1) && !(t1 & (MAY_BE_UNDEF|MAY_BE_REF)) && ssa_vars[ssa_op->op1_def].no_val && !ssa_vars[ssa_op->op1_def].alias) {
2998+
tmp |= MAY_BE_UNDEF;
2999+
}
29943000
UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
29953001
}
29963002
break;

‎Zend/Optimizer/zend_ssa.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@
1818
*/
1919

2020
#include "zend_compile.h"
21-
#include "zend_cfg.h"
2221
#include "zend_dfg.h"
2322
#include "zend_ssa.h"
2423
#include "zend_dump.h"
2524
#include "zend_inference.h"
2625
#include "Optimizer/zend_optimizer_internal.h"
2726

27+
static bool dominates(const zend_basic_block *blocks, int a, int b) {
28+
while (blocks[b].level > blocks[a].level) {
29+
b = blocks[b].idom;
30+
}
31+
return a == b;
32+
}
33+
2834
static bool will_rejoin(
2935
const zend_cfg *cfg, const zend_dfg *dfg, const zend_basic_block *block,
3036
int other_successor, int exclude, int var) {
@@ -697,6 +703,10 @@ static zend_always_inline int _zend_ssa_rename_op(const zend_op_array *op_array,
697703
}
698704
break;
699705
case ZEND_SEND_VAR:
706+
if (opline->op1_type == IS_CV && ((build_flags & ZEND_SSA_RC_INFERENCE) || opline->op2_type == IS_UNUSED)) {
707+
goto add_op1_def;
708+
}
709+
break;
700710
case ZEND_CAST:
701711
case ZEND_QM_ASSIGN:
702712
case ZEND_JMP_SET:
@@ -1674,3 +1684,13 @@ void zend_ssa_rename_var_uses(zend_ssa *ssa, int old, int new, bool update_types
16741684
old_var->phi_use_chain = NULL;
16751685
}
16761686
/* }}} */
1687+
1688+
void zend_ssa_replace_op1_def_op1_use(zend_ssa *ssa, zend_ssa_op *ssa_op)
1689+
{
1690+
int op1_new = ssa_op->op1_use;
1691+
ZEND_ASSERT(op1_new >= 0);
1692+
ZEND_ASSERT(ssa_op->op1_def >= 0);
1693+
/* zend_ssa_rename_var_uses() clear use_chain & phi_use_chain for us */
1694+
zend_ssa_rename_var_uses(ssa, ssa_op->op1_def, op1_new, true);
1695+
zend_ssa_remove_op1_def(ssa, ssa_op);
1696+
}

‎Zend/Optimizer/zend_ssa.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ void zend_ssa_remove_uses_of_var(zend_ssa *ssa, int var_num);
159159
void zend_ssa_remove_block(zend_op_array *op_array, zend_ssa *ssa, int b);
160160
void zend_ssa_rename_var_uses(zend_ssa *ssa, int old_var, int new_var, bool update_types);
161161
void zend_ssa_remove_block_from_cfg(zend_ssa *ssa, int b);
162+
void zend_ssa_replace_op1_def_op1_use(zend_ssa *ssa, zend_ssa_op *ssa_op);
162163

163164
static zend_always_inline void _zend_ssa_remove_def(zend_ssa_var *var)
164165
{

‎benchmark/benchmark.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ function main() {
1313
global $storeResult;
1414

1515
$data = [];
16-
$data['Zend/bench.php'] = runBench(false);
16+
/* $data['Zend/bench.php'] = runBench(false);
1717
$data['Zend/bench.php JIT'] = runBench(true);
1818
$data['Symfony Demo 2.2.3'] = runSymfonyDemo(false);
19-
$data['Symfony Demo 2.2.3 JIT'] = runSymfonyDemo(true);
19+
$data['Symfony Demo 2.2.3 JIT'] = runSymfonyDemo(true);*/
2020
$data['Wordpress 6.2'] = runWordpress(false);
21-
$data['Wordpress 6.2 JIT'] = runWordpress(true);
21+
// $data['Wordpress 6.2 JIT'] = runWordpress(true);
2222
$result = json_encode($data, JSON_PRETTY_PRINT) . "\n";
2323

2424
fwrite(STDOUT, $result);
@@ -78,7 +78,7 @@ function runWordpress(bool $jit): array {
7878

7979
// Warmup
8080
runPhpCommand([$dir . '/index.php'], $dir);
81-
return runValgrindPhpCgiCommand([$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
81+
return runValgrindPhpCgiCommand([$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 2, repeat: 2);
8282
}
8383

8484
function runPhpCommand(array $args, ?string $cwd = null): ProcessResult {
@@ -97,11 +97,12 @@ function runValgrindPhpCgiCommand(
9797
'valgrind',
9898
'--tool=callgrind',
9999
'--dump-instr=yes',
100-
'--callgrind-out-file=/dev/null',
100+
//'--callgrind-out-file=/dev/null',
101101
'--',
102102
$phpCgi,
103103
'-T' . ($warmup ? $warmup . ',' : '') . $repeat,
104104
'-d max_execution_time=0',
105+
'-c', '/run/media/niels/MoreData/php-src',
105106
'-d opcache.enable=1',
106107
'-d opcache.jit_buffer_size=' . ($jit ? '128M' : '0'),
107108
'-d opcache.validate_timestamps=0',

‎ext/opcache/jit/zend_jit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static int zend_jit_assign_to_variable(dasm_State **Dst,
156156
zend_jit_addr res_addr,
157157
bool check_exception);
158158

159-
bool dominates(const zend_basic_block *blocks, int a, int b) {
159+
static bool dominates(const zend_basic_block *blocks, int a, int b) {
160160
while (blocks[b].level > blocks[a].level) {
161161
b = blocks[b].idom;
162162
}

0 commit comments

Comments
 (0)