diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-02 12:23:28 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-02 12:25:21 +0100 |
| commit | 0571f09424162603f416ca35d4339745f57dfcd8 (patch) | |
| tree | d8a4dcae9b6338824afdfa8563bbad130397f45e | |
| parent | 6fc2cab254c4331e70790c21114a6519493662f9 (diff) | |
| download | php-git-0571f09424162603f416ca35d4339745f57dfcd8.tar.gz | |
Rename opcache.jit_max_loops_unroll to opcache.jit_max_loop_unrolls
| -rw-r--r-- | ext/opcache/jit/zend_jit.h | 2 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_vm_helpers.c | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/opcache/jit/zend_jit.h b/ext/opcache/jit/zend_jit.h index 7ffc80ef36..ed0dc29a6c 100644 --- a/ext/opcache/jit/zend_jit.h +++ b/ext/opcache/jit/zend_jit.h @@ -101,7 +101,7 @@ typedef struct _zend_jit_globals { zend_long hot_side_exit; /* number of exits before taking side trace */ zend_long blacklist_root_trace; /* number of attempts to JIT a root trace before blacklist it */ zend_long blacklist_side_trace; /* number of attempts to JIT a side trace before blacklist it */ - zend_long max_loops_unroll; /* max number of unrolled loops */ + zend_long max_loop_unrolls; /* max number of unrolled loops */ 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 */ diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c index 48df7ff108..6296532fdb 100644 --- a/ext/opcache/jit/zend_jit_vm_helpers.c +++ b/ext/opcache/jit/zend_jit_vm_helpers.c @@ -1022,7 +1022,7 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex, stop = ZEND_JIT_TRACE_STOP_LOOP; ret_level = 0; break; - } else if (loop_unroll_limit < JIT_G(max_loops_unroll)) { + } else if (loop_unroll_limit < JIT_G(max_loop_unrolls)) { last_loop = idx; last_loop_opline = opline; last_loop_level = level; diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 4258ddd686..d68ab9531a 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -301,7 +301,7 @@ ZEND_INI_BEGIN() STD_PHP_INI_ENTRY("opcache.jit_hot_side_exit" , "8", PHP_INI_ALL, OnUpdateCounter, hot_side_exit, zend_jit_globals, jit_globals) STD_PHP_INI_ENTRY("opcache.jit_blacklist_root_trace" , "16", PHP_INI_ALL, OnUpdateCounter, blacklist_root_trace, zend_jit_globals, jit_globals) STD_PHP_INI_ENTRY("opcache.jit_blacklist_side_trace" , "8", PHP_INI_ALL, OnUpdateCounter, blacklist_side_trace, zend_jit_globals, jit_globals) - STD_PHP_INI_ENTRY("opcache.jit_max_loops_unroll" , "8", PHP_INI_ALL, OnUpdateUnrollL, max_loops_unroll, zend_jit_globals, jit_globals) + STD_PHP_INI_ENTRY("opcache.jit_max_loop_unrolls" , "8", PHP_INI_ALL, OnUpdateUnrollL, max_loop_unrolls, zend_jit_globals, jit_globals) 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) @@ -785,7 +785,7 @@ ZEND_FUNCTION(opcache_get_configuration) 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_loop_unrolls", JIT_G(max_loop_unrolls)); 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)); add_assoc_long(&directives, "opcache.jit_max_recursive_returns", JIT_G(max_recursive_returns)); |