JIT-long-compiled-inline-function

Author: wxue1

ext/opcache/jit/zend_jit.h

@@ -116,6 +116,7 @@ typedef struct _zend_jit_globals {
 	zend_long   max_recursive_calls;   /* max number of recursive inlined call unrolls */
 	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   jit_trace_inline_func_limit; /* max length of inlined function in a trace */
 
 	zend_sym_node *symbols;            /* symbols for disassembler */
 

ext/opcache/jit/zend_jit_internal.h

@@ -340,6 +340,7 @@ zend_constant* ZEND_FASTCALL zend_jit_check_constant(const zval *key);
 	_(LOOP,              "loop") \
 	_(RECURSIVE_CALL,    "recursive call") \
 	_(RECURSIVE_RET,     "recursive return") \
+	_(BACKTRACK_INLINE,	 "backtrace inline func") \
 	_(RETURN,            "return") \
 	_(INTERPRETER,       "exit to VM interpreter") \
 	_(LINK,              "link to another trace") \

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -562,10 +562,16 @@ 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;
+	bool link_to_inline_func_flag = false;
 	int loop_unroll_limit = 0;
 	int last_loop = -1;
 	int last_loop_level = -1;
@@ -908,6 +914,23 @@ 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 */
+					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)) {
+						link_to_inline_func_flag = true;
+						break;
+					} else {
+						/* the inline function is not too long */
+						backtrack_link_to_inline_func = backtrack_link_to_inline_func_next;
+						link_to_inline_func_opline = opline;
+						backtrack_link_to_inline_func_next = -1;
+					}
 				}
 
 				unrolled_calls[ret_level + level] = &EX(func)->op_array;
@@ -925,6 +948,9 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 						if (ret_level > ZEND_JIT_TRACE_MAX_RET_DEPTH) {
 							stop = ZEND_JIT_TRACE_STOP_TOO_DEEP_RET;
 							break;
+						} else if (idx - backtrack_link_to_inline_func > JIT_G(jit_trace_inline_func_limit)) {
+							link_to_inline_func_flag = true;
+							break;
 						}
 						TRACE_RECORD(ZEND_JIT_TRACE_BACK, 0, op_array);
 						count = zend_jit_trace_recursive_ret_count(&EX(func)->op_array, unrolled_calls, ret_level);
@@ -975,6 +1001,10 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 					if (level < last_loop_level) {
 						last_loop_opline = NULL;
 					}
+					if (idx - backtrack_link_to_inline_func > JIT_G(jit_trace_inline_func_limit)) {
+						link_to_inline_func_flag = true;
+						break;
+					}
 					TRACE_RECORD(ZEND_JIT_TRACE_BACK, 0, op_array);
 				}
 			}
@@ -1142,6 +1172,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 && link_to_inline_func_flag == true) {
+			/* Reset the index and stop flag to link to the long inline function. */
+			idx = backtrack_link_to_inline_func;
+			stop = ZEND_JIT_TRACE_STOP_BACKTRACK_INLINE;
+			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) ==

ext/opcache/zend_accelerator_module.c

@@ -302,6 +302,7 @@ ZEND_INI_BEGIN()
 	STD_PHP_INI_ENTRY("opcache.jit_max_recursive_calls"       , "2",                          PHP_INI_ALL,    OnUpdateUnrollC,  max_recursive_calls,   zend_jit_globals, jit_globals)
 	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_trace_inline_func_limit"   , "6",                       PHP_INI_ALL,    OnUpdateLong,     jit_trace_inline_func_limit, zend_jit_globals, jit_globals)
 #endif
 ZEND_INI_END()
 
@@ -792,6 +793,7 @@ ZEND_FUNCTION(opcache_get_configuration)
 	add_assoc_long(&directives,   "opcache.jit_max_root_traces", JIT_G(max_root_traces));
 	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_trace_inline_func_limit", JIT_G(jit_trace_inline_func_limit));
 #endif
 
 	add_assoc_zval(return_value, "directives", &directives);