diff --git a/.circleci/config.yml b/.circleci/config.yml index a11ad56f74c66..f78d04fb730d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -182,9 +182,6 @@ jobs: -d zend_extension=opcache.so \ -d opcache.enable_cli=1 \ -d opcache.jit_buffer_size=64M \ - -d opcache.jit_max_root_traces=100000 \ - -d opcache.jit_max_side_traces=100000 \ - -d opcache.jit_max_exit_counters=100000 \ -d opcache.jit=tracing \ -P -q -x -j2 \ -g FAIL,BORK,LEAK,XLEAK \ diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index 00600554a635f..dd53d4db3f295 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -46,9 +46,6 @@ runs: -d opcache.jit=${{ inputs.jitType }} \ -d opcache.protect_memory=1 \ -d opcache.jit_buffer_size=64M \ - -d opcache.jit_max_root_traces=100000 \ - -d opcache.jit_max_side_traces=100000 \ - -d opcache.jit_max_exit_counters=100000 \ -j$(/usr/bin/nproc) \ -g FAIL,BORK,LEAK,XLEAK \ --no-progress \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 4997c81d2ef61..606ecebb5ce9c 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -23,9 +23,6 @@ runs: -d opcache.jit=${{ inputs.jitType }} \ -d opcache.protect_memory=1 \ -d opcache.jit_buffer_size=64M \ - -d opcache.jit_max_root_traces=100000 \ - -d opcache.jit_max_side_traces=100000 \ - -d opcache.jit_max_exit_counters=100000 \ -j$(sysctl -n hw.ncpu) \ -g FAIL,BORK,LEAK,XLEAK \ --no-progress \ diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index 08be50d4d07d4..d7f76bfc483e0 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -83,7 +83,7 @@ set OPENSSL_CONF= rem set SSLEAY_CONF= rem prepare for OPcache -if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000 -d opcache.jit=tracing +if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508) if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2d86c36de92d7..54c5871cb8da5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -382,7 +382,6 @@ jobs: echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini echo memory_limit=-1 >> /etc/php.d/opcache.ini php -v - - name: Test AMPHP if: matrix.branch.ref != 'PHP-8.0' run: | diff --git a/.travis.yml b/.travis.yml index b29b9b565101d..ac64fd48aae19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ before_script: # Run PHPs run-tests.php script: - - travis_wait 60 ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M -d opcache.jit_max_root_traces=100000 -d opcache.jit_max_side_traces=100000 -d opcache.jit_max_exit_counters=100000 + - travis_wait 60 ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/ext/opcache/tests/bug81272.phpt b/ext/opcache/tests/bug81272.phpt index 3c7e9cd247218..7e31002975763 100644 --- a/ext/opcache/tests/bug81272.phpt +++ b/ext/opcache/tests/bug81272.phpt @@ -5,7 +5,7 @@ opcache --INI-- opcache.enable=1 opcache.enable_cli=1 -opcache.jit_buffer_size=16M +opcache.jit_buffer_size=64M opcache.jit=function --FILE-- --FILE-- diff --git a/ext/opcache/tests/jit/add_011.phpt b/ext/opcache/tests/jit/add_011.phpt index cd078629b30b0..0a8d15fbb916a 100644 --- a/ext/opcache/tests/jit/add_011.phpt +++ b/ext/opcache/tests/jit/add_011.phpt @@ -4,7 +4,7 @@ JIT ADD: 011 overflow handling opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M --SKIPIF-- --FILE-- diff --git a/ext/opcache/tests/jit/add_012.phpt b/ext/opcache/tests/jit/add_012.phpt index 645f8f4bdd9b5..e891a5e1d36a3 100644 --- a/ext/opcache/tests/jit/add_012.phpt +++ b/ext/opcache/tests/jit/add_012.phpt @@ -4,7 +4,7 @@ JIT ADD: 012 register allocation for 64-bit constant opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M --SKIPIF-- --FILE-- diff --git a/ext/opcache/tests/jit/add_013.phpt b/ext/opcache/tests/jit/add_013.phpt index e2baa69566af3..7ec0a794c1470 100644 --- a/ext/opcache/tests/jit/add_013.phpt +++ b/ext/opcache/tests/jit/add_013.phpt @@ -4,7 +4,7 @@ JIT ADD: 013 register allocation (incorrect hinting) opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M --FILE-- 0]; diff --git a/ext/opcache/tests/jit/assign_op_006.phpt b/ext/opcache/tests/jit/assign_op_006.phpt index 8d4caa97094e5..9f870b4505b79 100644 --- a/ext/opcache/tests/jit/assign_op_006.phpt +++ b/ext/opcache/tests/jit/assign_op_006.phpt @@ -4,7 +4,7 @@ JIT ASSIGN_OP: 006 concationation with itself opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M --FILE-- diff --git a/ext/opcache/tests/jit/bug81225_2.phpt b/ext/opcache/tests/jit/bug81225_2.phpt index 4a1cd1123c334..b3411e53b9c15 100644 --- a/ext/opcache/tests/jit/bug81225_2.phpt +++ b/ext/opcache/tests/jit/bug81225_2.phpt @@ -5,7 +5,7 @@ opcache --INI-- opcache.enable=1 opcache.enable_cli=1 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.jit=function --SKIPIF-- diff --git a/ext/opcache/tests/jit/bug81226.phpt b/ext/opcache/tests/jit/bug81226.phpt index b3c0b9ec6ed3e..dfa9f31875941 100644 --- a/ext/opcache/tests/jit/bug81226.phpt +++ b/ext/opcache/tests/jit/bug81226.phpt @@ -5,7 +5,7 @@ opcache --INI-- opcache.enable=1 opcache.enable_cli=1 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.jit=tracing --SKIPIF-- diff --git a/ext/opcache/tests/jit/bug81249.phpt b/ext/opcache/tests/jit/bug81249.phpt index a30798d74e213..5a188d5806ab0 100644 --- a/ext/opcache/tests/jit/bug81249.phpt +++ b/ext/opcache/tests/jit/bug81249.phpt @@ -5,7 +5,7 @@ opcache --INI-- opcache.enable=1 opcache.enable_cli=1 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.jit=tracing --SKIPIF-- diff --git a/ext/opcache/tests/jit/bug81255.phpt b/ext/opcache/tests/jit/bug81255.phpt index 551bcf4365229..3fa12183d0ad4 100644 --- a/ext/opcache/tests/jit/bug81255.phpt +++ b/ext/opcache/tests/jit/bug81255.phpt @@ -5,7 +5,7 @@ opcache --INI-- opcache.enable=1 opcache.enable_cli=1 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.jit=function --FILE-- diff --git a/ext/opcache/tests/jit/inc_obj_001.phpt b/ext/opcache/tests/jit/inc_obj_001.phpt index 736204ab62f6a..9378721e5fe22 100644 --- a/ext/opcache/tests/jit/inc_obj_001.phpt +++ b/ext/opcache/tests/jit/inc_obj_001.phpt @@ -4,7 +4,7 @@ PRE_INC_OBJ: 001 opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.protect_memory=1 --FILE-- diff --git a/ext/opcache/tests/jit/mul_009.phpt b/ext/opcache/tests/jit/mul_009.phpt index 51789527115f2..840473fe736e8 100644 --- a/ext/opcache/tests/jit/mul_009.phpt +++ b/ext/opcache/tests/jit/mul_009.phpt @@ -4,7 +4,7 @@ JIT MUL: 009 memory leak opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 -opcache.jit_buffer_size=1M +opcache.jit_buffer_size=64M opcache.protect_memory=1 --FILE--