Skip to content

Link to the compiled function to improve performance #12182

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −0
Open

Link to the compiled function to improve performance #12182

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
1 change: 1 addition & 0 deletions ext/opcache/jit/zend_jit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ typedef struct _zend_jit_globals {
zend_long max_recursive_returns; /* max number of recursive inlined return unrolls */
zend_long max_polymorphic_calls; /* max number of inlined polymorphic calls */
zend_long max_trace_length; /* max length of a single trace */
zend_long jit_trace_inline_func_limit; /* max length of inlined function in a trace */

zend_sym_node *symbols; /* symbols for disassembler */

Expand Down
29 changes: 29 additions & 0 deletions ext/opcache/jit/zend_jit_vm_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,15 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
uint8_t trace_flags, op1_type, op2_type, op3_type;
zend_class_entry *ce1, *ce2;
const zend_op *link_to_enter_opline = NULL;
/* Remember the first opline of inline function*/
const zend_op *link_to_inline_func_opline = NULL;
int backtrack_link_to_enter = -1;
int backtrack_recursion = -1;
int backtrack_ret_recursion = -1;
int backtrack_ret_recursion_level = 0;
/* Remember the index of inline function opline in the trace buffer */
int backtrack_link_to_inline_func = -1;
int backtrack_link_to_inline_func_next = -1;
int loop_unroll_limit = 0;
int last_loop = -1;
int last_loop_level = -1;
Expand Down Expand Up @@ -922,6 +927,25 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
} else if (count >= JIT_G(max_recursive_calls)) {
stop = ZEND_JIT_TRACE_STOP_DEEP_RECURSION;
break;
} else if (backtrack_link_to_inline_func < 0 && backtrack_link_to_inline_func_next < 0 && ZEND_OP_TRACE_INFO(opline, offset)->trace_flags & ZEND_JIT_TRACE_JITED) {
/* enter a compiled inline function, remember the idx to backtrack */
backtrack_link_to_inline_func = idx;
link_to_inline_func_opline = opline;
} else if (backtrack_link_to_inline_func > 0 && backtrack_link_to_inline_func_next < 0) {
/* enter a function the second time */
backtrack_link_to_inline_func_next = idx;
if (idx - backtrack_link_to_inline_func > JIT_G(jit_trace_inline_func_limit)) {
break;
} else if (ZEND_OP_TRACE_INFO(opline, offset)->trace_flags & ZEND_JIT_TRACE_JITED) {
/* the second function is a compiled inline function too */
backtrack_link_to_inline_func = backtrack_link_to_inline_func_next;
link_to_inline_func_opline = opline;
backtrack_link_to_inline_func_next = -1;
} else {
/* the compiled inline function is not too long */
backtrack_link_to_inline_func = -1;
link_to_inline_func_opline = NULL;
}
}

unrolled_calls[ret_level + level] = &EX(func)->op_array;
Expand Down Expand Up @@ -1156,6 +1180,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
ret_level = backtrack_ret_recursion_level;
stop = ZEND_JIT_TRACE_STOP_RECURSIVE_RET;
end_opline = orig_opline;
} else if (backtrack_link_to_inline_func > 0) {
/* Reset the index and stop flag to link to the compiled inline function. */
idx = backtrack_link_to_inline_func;
stop = ZEND_JIT_TRACE_STOP_LINK;
end_opline = link_to_inline_func_opline;
} else if (backtrack_link_to_enter > 0) {
if (stop == ZEND_JIT_TRACE_STOP_DEEP_RECURSION
&& zend_jit_trace_bad_stop_event(orig_opline, JIT_G(blacklist_root_trace) / 2) ==
Expand Down
2 changes: 2 additions & 0 deletions ext/opcache/zend_accelerator_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ ZEND_INI_BEGIN()
STD_PHP_INI_ENTRY("opcache.jit_max_recursive_returns" , "2", PHP_INI_ALL, OnUpdateUnrollR, max_recursive_returns, zend_jit_globals, jit_globals)
STD_PHP_INI_ENTRY("opcache.jit_max_polymorphic_calls" , "2", PHP_INI_ALL, OnUpdateLong, max_polymorphic_calls, zend_jit_globals, jit_globals)
STD_PHP_INI_ENTRY("opcache.jit_max_trace_length" , "1024", PHP_INI_ALL, OnUpdateMaxTraceLength, max_trace_length, zend_jit_globals, jit_globals)
STD_PHP_INI_ENTRY("opcache.jit_trace_inline_func_limit" , "6", PHP_INI_ALL, OnUpdateLong, jit_trace_inline_func_limit, zend_jit_globals, jit_globals)
#endif
ZEND_INI_END()

Expand Down Expand Up @@ -851,6 +852,7 @@ ZEND_FUNCTION(opcache_get_configuration)
add_assoc_long(&directives, "opcache.jit_max_side_traces", JIT_G(max_side_traces));
add_assoc_long(&directives, "opcache.jit_prof_threshold", JIT_G(prof_threshold));
add_assoc_long(&directives, "opcache.jit_max_trace_length", JIT_G(max_trace_length));
add_assoc_long(&directives, "opcache.jit_trace_inline_func_limit", JIT_G(jit_trace_inline_func_limit));
#endif

add_assoc_zval(return_value, "directives", &directives);
Expand Down