Move EG(vm_interrupt) checks at the end of the trace loops

diff --git a/ext/opcache/jit/zend_jit_internal.h b/ext/opcache/jit/zend_jit_internal.h
index d8062dc253271a1e0d3f80d80777c81fdb856ccb..9f6f16d62765fca28c959be823e416fccc6c76d6 100644 (file)
--- a/ext/opcache/jit/zend_jit_internal.h
+++ b/ext/opcache/jit/zend_jit_internal.h
@@ -353,6 +353,7 @@ typedef struct _zend_jit_trace_info {
        uint32_t                  code_size;     /* size of native code */
        uint32_t                  exit_counters; /* offset in exit counters array */
        uint32_t                  stack_map_size;
+       uint32_t                  loop_kind;     /* LOOP, RECURSIVE_CALL or RECURSIVE_RET */
        const zend_op            *opline;        /* first opline */
        const void               *code_start;    /* address of native code */
        zend_jit_trace_exit_info *exit_info;     /* info about side exits */

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 8d919dbf5d405c045800ae6cca61abccaa763f13..b40e71eb26f2bc2661976ba6c4851a109cf95de9 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -2456,6 +2456,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
        zend_uchar res_type = IS_UNKNOWN;
        const zend_op *opline, *orig_opline;
        const zend_ssa_op *ssa_op, *orig_ssa_op;
+       const void *timeout_exit_addr = NULL;
 
        JIT_G(current_trace) = trace_buffer;
 
@@ -2628,17 +2629,16 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                }
 
                if (trace_buffer->stop != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
-                       const void *exit_addr = NULL;
-
                        if (ra && zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T)) {
-                               uint32_t exit_point = zend_jit_trace_get_exit_point(NULL, NULL, NULL, 0);
+                               uint32_t exit_point = zend_jit_trace_get_exit_point(NULL, NULL, NULL, ZEND_JIT_EXIT_TO_VM);
 
-                               exit_addr = zend_jit_trace_get_exit_addr(exit_point);
-                               if (!exit_addr) {
+                               timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
+                               if (!timeout_exit_addr) {
                                        goto jit_failure;
                                }
+                       } else {
+                               timeout_exit_addr = dasm_labels[zend_lbinterrupt_handler];
                        }
-                       zend_jit_check_timeout(&dasm_state, opline, exit_addr);
                }
 
                if (ra && trace_buffer->stop != ZEND_JIT_TRACE_STOP_LOOP) {
@@ -3981,7 +3981,8 @@ done:
                        }
                }
                t->link = ZEND_JIT_TRACE_NUM;
-               zend_jit_jmp(&dasm_state, 0); /* jump back to start of the trace loop */
+               t->loop_kind = p->stop;
+               zend_jit_trace_end_loop(&dasm_state, 0, timeout_exit_addr); /* jump back to start of the trace loop */
        } else if (p->stop == ZEND_JIT_TRACE_STOP_LINK) {
                if (ra) {
                        /* Generate code for trace deoptimization */
@@ -4000,7 +4001,7 @@ done:
                        goto jit_failure;
                }
                t->link = zend_jit_find_trace(p->opline->handler);
-               zend_jit_trace_link_to_root(&dasm_state, p->opline->handler);
+               zend_jit_trace_link_to_root(&dasm_state, &zend_jit_traces[t->link]);
        } else if (p->stop == ZEND_JIT_TRACE_STOP_RETURN) {
                zend_jit_trace_return(&dasm_state, 0);
        } else {
@@ -4139,6 +4140,7 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
                t->exit_count = 0;
                t->child_count = 0;
                t->stack_map_size = 0;
+               t->loop_kind = 0;
                t->opline = ((zend_jit_trace_start_rec*)trace_buffer)->opline;
                t->exit_info = exit_info;
                t->stack_map = NULL;
@@ -4699,6 +4701,7 @@ static zend_jit_trace_stop zend_jit_compile_side_trace(zend_jit_trace_rec *trace
                t->exit_count = 0;
                t->child_count = 0;
                t->stack_map_size = 0;
+               t->loop_kind = 0;
                t->opline = NULL;
                t->exit_info = exit_info;
                t->stack_map = NULL;

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index e2a233f2713b2bb4148d6241998932eb376e1aae..d90f93861e0af8723a310c3693fb2a3b01e213d3 100644 (file)
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -2784,6 +2784,18 @@ static int zend_jit_check_timeout(dasm_State **Dst, const zend_op *opline, const
        return 1;
 }
 
+static int zend_jit_trace_end_loop(dasm_State **Dst, int loop_label, const void *timeout_exit_addr)
+{
+       if (timeout_exit_addr) {
+               |       MEM_OP2_1_ZTS cmp, byte, executor_globals, vm_interrupt, 0, r0
+               |       je =>loop_label
+               |       jmp &timeout_exit_addr
+       } else {
+               |       jmp =>loop_label
+       }
+       return 1;
+}
+
 static int zend_jit_check_exception(dasm_State **Dst)
 {
        |       MEM_OP2_1_ZTS cmp, aword, executor_globals, exception, 0, r0
@@ -2984,9 +2996,9 @@ static int zend_jit_link_side_trace(const void *code, size_t size, uint32_t exit
        return zend_jit_patch(code, size, zend_jit_trace_get_exit_addr(exit_num), addr);
 }
 
-static int zend_jit_trace_link_to_root(dasm_State **Dst, const void *code)
+static int zend_jit_trace_link_to_root(dasm_State **Dst, zend_jit_trace_info *t)
 {
-       const void *exit_addr;
+       const void *link_addr;
        size_t prologue_size;
 
        /* Skip prologue. */
@@ -3016,9 +3028,16 @@ static int zend_jit_trace_link_to_root(dasm_State **Dst, const void *code)
                prologue_size = 12;
 #endif
        }
-       exit_addr = (const void*)((const char*)code + prologue_size);
+       link_addr = (const void*)((const char*)t->code_start + prologue_size);
 
-       |       jmp &exit_addr
+       if (t->link == t->id && t->loop_kind != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
+               /* Check timeout for links to LOOP */
+               |       MEM_OP2_1_ZTS cmp, byte, executor_globals, vm_interrupt, 0, r0
+               |       je &link_addr
+               |       jmp ->interrupt_handler
+       } else {
+               |       jmp &link_addr
+       }
        return 1;
 }