Replace ZEND_JIT_TRACE_MAX_EXIT_COUNTERS constant by opcache.jit_max_exit_counters...

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 4e7929662a96646bc36fdaca8a9879ac810974a7..1968eff8d53f336200bdc5be4536337f8c20f355 100644 (file)
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -3953,6 +3953,9 @@ ZEND_EXT_API void zend_jit_shutdown(void)
                zend_jit_perf_jitdump_close();
        }
 #endif
+       if (JIT_G(exit_counters)) {
+               free(JIT_G(exit_counters));
+       }
 }
 
 static void zend_jit_reset_counters(void)

diff --git a/ext/opcache/jit/zend_jit.h b/ext/opcache/jit/zend_jit.h
index 99a0d76ae649f202d42fda224861b059c932ce53..7afcd613c07cddb9e2210ee32144850f1c8a5b3f 100644 (file)
--- a/ext/opcache/jit/zend_jit.h
+++ b/ext/opcache/jit/zend_jit.h
@@ -69,7 +69,6 @@
 
 #define ZEND_JIT_TRACE_MAX_LENGTH        1024 /* max length of single trace */
 #define ZEND_JIT_TRACE_MAX_EXITS          512 /* max number of side exits per trace */
-#define ZEND_JIT_TRACE_MAX_EXIT_COUNTERS 8192 /* max number of side exits for all trace */
 
 #define ZEND_JIT_TRACE_MAX_FUNCS           30 /* max number of different functions in a single trace */
 #define ZEND_JIT_TRACE_MAX_CALL_DEPTH      10 /* max depth of inlined calls */
@@ -96,6 +95,7 @@ typedef struct _zend_jit_globals {
        double      prof_threshold;
        zend_long   max_root_traces;       /* max number of root traces */
        zend_long   max_side_traces;       /* max number of side traces (per root trace) */
+       zend_long   max_exit_counters;     /* max total number of side exits for all traces */
        zend_long   hot_loop;
        zend_long   hot_func;
        zend_long   hot_return;
@@ -119,7 +119,7 @@ typedef struct _zend_jit_globals {
        uint8_t bad_root_cache_stop[ZEND_JIT_TRACE_BAD_ROOT_SLOTS];
        uint32_t bad_root_slot;
 
-       uint8_t  exit_counters[ZEND_JIT_TRACE_MAX_EXIT_COUNTERS];
+       uint8_t  *exit_counters;
 } zend_jit_globals;
 
 #ifdef ZTS

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index abedddec7c6d5417557a2999594593ce7d665b36..d1215b3734c9f02770de7c8a8ce8593d26811cb6 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -64,6 +64,11 @@ static int zend_jit_trace_startup(void)
        memset(&dummy_op_array, 0, sizeof(dummy_op_array));
        dummy_op_array.fn_flags = ZEND_ACC_DONE_PASS_TWO;
 
+       JIT_G(exit_counters) = calloc(JIT_G(max_exit_counters), 1);
+       if (JIT_G(exit_counters) == NULL) {
+               return FAILURE;
+       }
+
        return SUCCESS;
 }
 
@@ -4579,7 +4584,7 @@ done:
                ZEND_ASSERT(0 && p->stop);
        }
 
-       if (ZEND_JIT_EXIT_COUNTERS + t->exit_count >= ZEND_JIT_TRACE_MAX_EXIT_COUNTERS) {
+       if (ZEND_JIT_EXIT_COUNTERS + t->exit_count >= JIT_G(max_exit_counters)) {
                goto jit_failure;
        }
 
@@ -4788,7 +4793,7 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
 
                        ret = ZEND_JIT_TRACE_STOP_COMPILED;
                } else if (t->exit_count >= ZEND_JIT_TRACE_MAX_EXITS ||
-                          ZEND_JIT_EXIT_COUNTERS + t->exit_count >= ZEND_JIT_TRACE_MAX_EXIT_COUNTERS) {
+                          ZEND_JIT_EXIT_COUNTERS + t->exit_count >= JIT_G(max_exit_counters)) {
                    if (t->stack_map) {
                                efree(t->stack_map);
                                t->stack_map = NULL;
@@ -5388,7 +5393,7 @@ static zend_jit_trace_stop zend_jit_compile_side_trace(zend_jit_trace_rec *trace
 
                        ret = ZEND_JIT_TRACE_STOP_COMPILED;
                } else if (t->exit_count >= ZEND_JIT_TRACE_MAX_EXITS ||
-                          ZEND_JIT_EXIT_COUNTERS + t->exit_count >= ZEND_JIT_TRACE_MAX_EXIT_COUNTERS) {
+                          ZEND_JIT_EXIT_COUNTERS + t->exit_count >= JIT_G(max_exit_counters)) {
                    if (t->stack_map) {
                                efree(t->stack_map);
                                t->stack_map = NULL;
@@ -5766,7 +5771,9 @@ static void zend_jit_trace_init_caches(void)
        memset(JIT_G(bad_root_cache_stop), 0, sizeof(JIT_G(bad_root_cache_count)));
        JIT_G(bad_root_slot) = 0;
 
-       memset(JIT_G(exit_counters), 0, sizeof(JIT_G(exit_counters)));
+       if (JIT_G(exit_counters)) {
+               memset(JIT_G(exit_counters), 0, JIT_G(max_exit_counters));
+       }
 }
 
 static void zend_jit_trace_reset_caches(void)

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 2e0d5e441570e3d98342c93c24f843d6131b70e4..7b243931b28b5146b207ae3e7a99ec176af5e6b2 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -294,6 +294,7 @@ ZEND_INI_BEGIN()
        STD_PHP_INI_ENTRY("opcache.jit_prof_threshold"            , "0.005",                      PHP_INI_ALL,    OnUpdateReal,     prof_threshold,        zend_jit_globals, jit_globals)
        STD_PHP_INI_ENTRY("opcache.jit_max_root_traces"           , "1024",                       PHP_INI_SYSTEM, OnUpdateLong,     max_root_traces,       zend_jit_globals, jit_globals)
        STD_PHP_INI_ENTRY("opcache.jit_max_side_traces"           , "128",                        PHP_INI_SYSTEM, OnUpdateLong,     max_side_traces,       zend_jit_globals, jit_globals)
+       STD_PHP_INI_ENTRY("opcache.jit_max_exit_counters"         , "8192",                        PHP_INI_SYSTEM, OnUpdateLong,     max_exit_counters,     zend_jit_globals, jit_globals)
        STD_PHP_INI_ENTRY("opcache.jit_hot_loop"                  , "64",                         PHP_INI_SYSTEM, OnUpdateCounter,  hot_loop,              zend_jit_globals, jit_globals)
        STD_PHP_INI_ENTRY("opcache.jit_hot_func"                  , "127",                        PHP_INI_SYSTEM, OnUpdateCounter,  hot_func,              zend_jit_globals, jit_globals)
        STD_PHP_INI_ENTRY("opcache.jit_hot_return"                , "8",                          PHP_INI_SYSTEM, OnUpdateCounter,  hot_return,            zend_jit_globals, jit_globals)
@@ -783,6 +784,7 @@ ZEND_FUNCTION(opcache_get_configuration)
        add_assoc_long(&directives,   "opcache.jit_hot_loop", JIT_G(hot_loop));
        add_assoc_long(&directives,   "opcache.jit_hot_return", JIT_G(hot_return));
        add_assoc_long(&directives,   "opcache.jit_hot_side_exit", JIT_G(hot_side_exit));
+       add_assoc_long(&directives,   "opcache.jit_max_exit_counters", JIT_G(max_exit_counters));
        add_assoc_long(&directives,   "opcache.jit_max_loops_unroll", JIT_G(max_loops_unroll));
        add_assoc_long(&directives,   "opcache.jit_max_polymorphic_calls", JIT_G(max_polymorphic_calls));
        add_assoc_long(&directives,   "opcache.jit_max_recursive_calls", JIT_G(max_recursive_calls));