Skip to content

[wip] DFA based func call optimizations #13750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[wip] DFA based func call optimizations #13750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Zend/Optimizer/block_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "zend_API.h"
#include "zend_constants.h"
#include "zend_execute.h"
#include "zend_types.h"
#include "zend_vm.h"
#include "zend_bitset.h"
#include "zend_cfg.h"
Expand All @@ -36,6 +37,7 @@ bool zend_optimizer_get_persistent_constant(zend_string *name, zval *result, int
if (c) {
if ((ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT)
&& !(ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED)
&& (Z_TYPE(c->value) < IS_STRING || Z_TYPE(c->value) == IS_ARRAY || Z_TYPE(c->value) == IS_CONSTANT_AST)
&& (!(ZEND_CONSTANT_FLAGS(c) & CONST_NO_FILE_CACHE)
|| !(CG(compiler_options) & ZEND_COMPILE_WITH_FILE_CACHE))) {
ZVAL_COPY_VALUE(result, &c->value);
Expand Down
61 changes: 60 additions & 1 deletion Zend/Optimizer/dfa_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "Optimizer/zend_optimizer.h"
#include "Optimizer/zend_optimizer_internal.h"
#include "zend_API.h"
#include "zend_compile.h"
#include "zend_constants.h"
#include "zend_execute.h"
#include "zend_vm.h"
Expand All @@ -29,6 +30,7 @@
#include "zend_call_graph.h"
#include "zend_inference.h"
#include "zend_dump.h"
#include "zend_vm_opcodes.h"

#ifndef ZEND_DEBUG_DFA
# define ZEND_DEBUG_DFA ZEND_DEBUG
Expand All @@ -38,6 +40,10 @@
# include "ssa_integrity.c"
#endif

zend_result zend_dfa_optimize_func_calls(zend_arena **arena,
zend_op_array *op_array, const zend_script *script, zend_ssa *ssa,
zend_long optimization_level);

zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa)
{
uint32_t build_flags;
Expand Down Expand Up @@ -88,13 +94,19 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct
zend_dump_op_array(op_array, ZEND_DUMP_SSA, "dfa ssa", ssa);
}


zend_ssa_compute_use_def_chains(&ctx->arena, op_array, ssa);

zend_ssa_find_false_dependencies(op_array, ssa);

zend_ssa_find_sccs(op_array, ssa);

if (ZEND_OPTIMIZER_PASS_17 & ctx->optimization_level) {
if (zend_dfa_optimize_func_calls(&ctx->arena, op_array, ctx->script,
ssa, ctx->optimization_level) == FAILURE) {
return FAILURE;
}
}

if (zend_ssa_inference(&ctx->arena, op_array, ctx->script, ssa, ctx->optimization_level) == FAILURE) {
return FAILURE;
}
Expand Down Expand Up @@ -385,6 +397,53 @@ static bool variable_defined_or_used_in_range(zend_ssa *ssa, int var, int start,
return 0;
}

zend_result zend_dfa_optimize_func_calls(zend_arena **arena,
zend_op_array *op_array, const zend_script *script, zend_ssa *ssa,
zend_long optimization_level)
{
void *checkpoint = zend_arena_checkpoint(*arena);

zend_func_info *func_info = ZEND_FUNC_INFO(op_array);
ZEND_ASSERT(func_info);

/* Infer call_info->callee_func */
if (zend_ssa_callee_inference(arena, op_array, script, ssa,
optimization_level) == FAILURE) {
return FAILURE;
}

/* Remove call_infos without callee */
zend_call_info **call_info = &func_info->callee_info;
zend_call_info **map = func_info->call_map;
while ((*call_info)) {
(*call_info)->infer = false;
if (!(*call_info)->callee_func) {
map[(*call_info)->caller_init_opline - op_array->opcodes] = NULL;
if ((*call_info)->caller_call_opline) {
map[(*call_info)->caller_call_opline - op_array->opcodes] = NULL;
}
if (!(*call_info)->is_frameless) {
for (int i = 0; i < (*call_info)->num_args; i++) {
if ((*call_info)->arg_info[i].opline) {
map[(*call_info)->arg_info[i].opline - op_array->opcodes] = NULL;
}
}
}
*call_info = (*call_info)->next_callee;
} else {
call_info = &(*call_info)->next_callee;
}
}

zend_optimize_func_calls_ssa(arena, op_array, script, ssa,
optimization_level);

ssa->var_info = NULL;
zend_arena_release(arena, checkpoint);

return SUCCESS;
}

int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
{
zend_func_info *func_info = ZEND_FUNC_INFO(op_array);
Expand Down
70 changes: 63 additions & 7 deletions Zend/Optimizer/optimize_func_calls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@

#include "Optimizer/zend_optimizer.h"
#include "Optimizer/zend_optimizer_internal.h"
#include "Optimizer/zend_ssa.h"
#include "zend_API.h"
#include "zend_constants.h"
#include "zend_execute.h"
#include "zend_vm.h"
#include "zend_vm_opcodes.h"

typedef struct _optimizer_call_info {
zend_function *func;
Expand Down Expand Up @@ -147,7 +149,8 @@ static bool has_known_send_mode(const optimizer_call_info *info, uint32_t arg_nu
|| (info->func->common.fn_flags & ZEND_ACC_VARIADIC);
}

void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
void zend_optimize_func_calls_ssa(zend_arena **arena, zend_op_array *op_array,
const zend_script *script, zend_ssa *ssa, zend_long optimization_level)
{
zend_op *opline = op_array->opcodes;
zend_op *end = opline + op_array->last;
Expand All @@ -159,8 +162,8 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
return;
}

checkpoint = zend_arena_checkpoint(ctx->arena);
call_stack = zend_arena_calloc(&ctx->arena, op_array->last / 2, sizeof(optimizer_call_info));
checkpoint = zend_arena_checkpoint(*arena);
call_stack = zend_arena_calloc(arena, op_array->last / 2, sizeof(optimizer_call_info));
while (opline < end) {
switch (opline->opcode) {
case ZEND_INIT_FCALL_BY_NAME:
Expand All @@ -171,8 +174,9 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
case ZEND_NEW:
/* The argument passing optimizations are valid for prototypes as well,
* as inheritance cannot change between ref <-> non-ref arguments. */
call_stack[call].func = zend_optimizer_get_called_func(
ctx->script, op_array, opline, &call_stack[call].is_prototype);
call_stack[call].func = zend_optimizer_get_called_func_ssa(
script, op_array, opline,
&call_stack[call].is_prototype, ssa);
call_stack[call].try_inline =
!call_stack[call].is_prototype && opline->opcode != ZEND_NEW;
ZEND_FALLTHROUGH;
Expand Down Expand Up @@ -218,7 +222,7 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
ZEND_UNREACHABLE();
}

if ((ZEND_OPTIMIZER_PASS_16 & ctx->optimization_level)
if ((ZEND_OPTIMIZER_PASS_16 & optimization_level)
&& call_stack[call].try_inline
&& opline->opcode != ZEND_CALLABLE_CONVERT) {
zend_try_inline_call(op_array, fcall, opline, call_stack[call].func);
Expand Down Expand Up @@ -263,7 +267,23 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
} else {
opline->opcode = ZEND_FETCH_STATIC_PROP_R;
}
if (ssa) {
/* op1 is not defined anymore */
zend_ssa_op *op = &ssa->ops[opline - op_array->opcodes];
if (op->op1_def >= 0) {
ZEND_ASSERT(op->op1_use >= 0);
zend_ssa_rename_var_uses(ssa, op->op1_def,
op->op1_use, 0);
zend_ssa_remove_op1_def(ssa, op);
}
}
}
} else if (opline->opcode == ZEND_FETCH_DIM_FUNC_ARG
&& opline->op2_type == IS_UNUSED) {
/* FETCH_DIM_FUNC_ARG supports UNUSED op2, while FETCH_DIM_R does not.
* Performing the replacement would create an invalid opcode. */
call_stack[call - 1].try_inline = 0;
break;
}
break;
case ZEND_SEND_VAL_EX:
Expand All @@ -275,6 +295,16 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
if (has_known_send_mode(&call_stack[call - 1], opline->op2.num)) {
if (!ARG_MUST_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
opline->opcode = ZEND_SEND_VAL;
if (ssa) {
/* op1 is not defined anymore */
zend_ssa_op *op = &ssa->ops[opline - op_array->opcodes];
if (op->op1_def >= 0) {
ZEND_ASSERT(op->op1_use >= 0);
zend_ssa_rename_var_uses(ssa, op->op1_def,
op->op1_use, 0);
zend_ssa_remove_op1_def(ssa, op);
}
}
}
}
break;
Expand Down Expand Up @@ -313,6 +343,16 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
opline->opcode = ZEND_SEND_REF;
} else {
opline->opcode = ZEND_SEND_VAR;
if (ssa) {
/* op1 is not defined anymore */
zend_ssa_op *op = &ssa->ops[opline - op_array->opcodes];
if (op->op1_def >= 0) {
ZEND_ASSERT(op->op1_use >= 0);
zend_ssa_rename_var_uses(ssa, op->op1_def,
op->op1_use, 0);
zend_ssa_remove_op1_def(ssa, op);
}
}
}
}
break;
Expand All @@ -329,6 +369,16 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
opline->opcode = ZEND_SEND_VAL;
} else {
opline->opcode = ZEND_SEND_VAR;
if (ssa) {
/* op1 is not defined anymore */
zend_ssa_op *op = &ssa->ops[opline - op_array->opcodes];
if (op->op1_def >= 0) {
ZEND_ASSERT(op->op1_use >= 0);
zend_ssa_rename_var_uses(ssa, op->op1_def,
op->op1_use, 0);
zend_ssa_remove_op1_def(ssa, op);
}
}
}
}
break;
Expand All @@ -351,5 +401,11 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
opline++;
}

zend_arena_release(&ctx->arena, checkpoint);
zend_arena_release(arena, checkpoint);
}

void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
{
return zend_optimize_func_calls_ssa(&ctx->arena, op_array, ctx->script,
/* ssa */ NULL, ctx->optimization_level);
}
4 changes: 3 additions & 1 deletion Zend/Optimizer/pass1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,10 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
|| Z_TYPE(result) == IS_CONSTANT_AST) {
break;
}
} else {
} else if (Z_TYPE_P(c) < IS_STRING || Z_TYPE_P(c) == IS_ARRAY) {
ZVAL_COPY_OR_DUP(&result, c);
} else {
break;
}

replace_by_const_or_qm_assign(op_array, opline, &result);
Expand Down
2 changes: 1 addition & 1 deletion Zend/Optimizer/sccp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ typedef struct _sccp_ctx {
#define MAKE_TOP(zv) (Z_TYPE_INFO_P(zv) = TOP)
#define MAKE_BOT(zv) (Z_TYPE_INFO_P(zv) = BOT)

static void scp_dump_value(zval *zv) {
static void scp_dump_value(const zval *zv) {
if (IS_TOP(zv)) {
fprintf(stderr, " top");
} else if (IS_BOT(zv)) {
Expand Down
44 changes: 27 additions & 17 deletions Zend/Optimizer/zend_call_graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32
call_stack[call] = call_info;
func = zend_optimizer_get_called_func(
script, op_array, opline, &is_prototype);
if (func) {
if (func || ((build_flags & ZEND_INFERRED_CALLS)
&& opline->opcode == ZEND_INIT_METHOD_CALL)) {
call_info = zend_arena_calloc(arena, 1, sizeof(zend_call_info) + (sizeof(zend_send_arg_info) * ((int)opline->extended_value - 1)));
call_info->caller_op_array = op_array;
call_info->caller_init_opline = opline;
Expand All @@ -74,21 +75,8 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32
call_info->next_callee = func_info->callee_info;
call_info->is_prototype = is_prototype;
call_info->is_frameless = false;
call_info->infer = !func;
func_info->callee_info = call_info;

if (build_flags & ZEND_CALL_TREE) {
call_info->next_caller = NULL;
} else if (func->type == ZEND_INTERNAL_FUNCTION) {
call_info->next_caller = NULL;
} else {
zend_func_info *callee_func_info = ZEND_FUNC_INFO(&func->op_array);
if (callee_func_info) {
call_info->next_caller = callee_func_info->caller_info;
callee_func_info->caller_info = call_info;
} else {
call_info->next_caller = NULL;
}
}
} else {
call_info = NULL;
}
Expand Down Expand Up @@ -252,13 +240,35 @@ ZEND_API void zend_build_call_graph(zend_arena **arena, zend_script *script, zen
}
/* }}} */

ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph) /* {{{ */
ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script,
zend_call_graph *call_graph, uint32_t build_flags) /* {{{ */
{
int i;

for (i = 0; i < call_graph->op_arrays_count; i++) {
zend_analyze_calls(arena, script, 0, call_graph->op_arrays[i], call_graph->func_infos + i);
zend_analyze_calls(arena, script,
build_flags & (ZEND_INFERRED_CALLS|ZEND_CALL_TREE),
call_graph->op_arrays[i], call_graph->func_infos + i);
}

for (i = 0; i < call_graph->op_arrays_count; i++) {
zend_func_info *func_info = ZEND_FUNC_INFO(call_graph->op_arrays[i]);
for (
zend_call_info *call_info = func_info->callee_info;
call_info;
call_info = call_info->next_callee
) {
zend_function *func = call_info->callee_func;
if (func && func->type != ZEND_INTERNAL_FUNCTION) {
zend_func_info *callee_func_info = ZEND_FUNC_INFO(&func->op_array);
if (callee_func_info) {
call_info->next_caller = callee_func_info->caller_info;
callee_func_info->caller_info = call_info;
}
}
}
}

zend_analyze_recursion(call_graph);
zend_sort_op_arrays(call_graph);
}
Expand Down
3 changes: 2 additions & 1 deletion Zend/Optimizer/zend_call_graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ struct _zend_call_info {
bool named_args; /* Function has named arguments */
bool is_prototype; /* An overridden child method may be called */
bool is_frameless; /* A frameless function sends arguments through operands */
bool infer; /* callee_func to be inferred */
int num_args; /* Number of arguments, excluding named and variadic arguments */
zend_send_arg_info arg_info[1];
};
Expand All @@ -62,7 +63,7 @@ typedef struct _zend_call_graph {
BEGIN_EXTERN_C()

ZEND_API void zend_build_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph);
ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph);
ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph, uint32_t build_flags);
ZEND_API zend_call_info **zend_build_call_map(zend_arena **arena, zend_func_info *info, const zend_op_array *op_array);
ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_t build_flags, zend_op_array *op_array, zend_func_info *func_info);

Expand Down
1 change: 1 addition & 0 deletions Zend/Optimizer/zend_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ typedef struct _zend_cfg {
#define ZEND_CFG_RECV_ENTRY (1<<24)
#define ZEND_CALL_TREE (1<<23)
#define ZEND_SSA_USE_CV_RESULTS (1<<22)
#define ZEND_INFERRED_CALLS (1<<24)

#define CRT_CONSTANT_EX(op_array, opline, node) \
(((op_array)->fn_flags & ZEND_ACC_DONE_PASS_TWO) ? \
Expand Down
Loading