From a3b0be8fcb4d04de37cdaa57fa2f62aad39bad27 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Tue, 10 Oct 2023 18:02:31 +0200 Subject: [PATCH 01/12] Add phpseclib, Psalm, PHPStan nightly tests --- .cirrus.yml | 13 ++- .github/actions/test-linux/action.yml | 12 +++ .github/actions/test-macos/action.yml | 12 +++ .github/patch.php | 37 +++++++++ .github/scripts/windows/test_task.bat | 2 +- .github/workflows/nightly.yml | 111 ++++++++++++++++++++++++-- .travis.yml | 2 +- run-tests.php | 2 + 8 files changed, 181 insertions(+), 10 deletions(-) create mode 100644 .github/patch.php diff --git a/.cirrus.yml b/.cirrus.yml index 9ef70fb59191c..faa40ebb8a98b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -208,6 +208,7 @@ arm_task: -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M -d opcache.jit=function + -d opcache.file_update_protection=0 -P -q -x -j2 -g FAIL,BORK,LEAK,XLEAK --offline @@ -218,7 +219,17 @@ arm_task: sapi/cli/php run-tests.php -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M + -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_hot_loop=1 + -d opcache.jit_hot_func=1 + -d opcache.jit_hot_return=1 + -d opcache.jit_hot_side_exit=1 + -d opcache.file_update_protection=0 + -d opcache.jit_blacklist_root_trace=255 + -d opcache.jit_blacklist_side_trace=255 -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 7d66d2235208d..661fea9bec666 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -31,6 +31,18 @@ runs: export SKIP_IO_CAPTURE_TESTS=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -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 \ + -d opcache.jit_hot_loop=1 \ + -d opcache.jit_hot_func=1 \ + -d opcache.jit_hot_return=1 \ + -d opcache.jit_hot_side_exit=1 \ + -d opcache.jit_blacklist_root_trace=255 \ + -d opcache.jit_blacklist_side_trace=255 \ + -d opcache.file_update_protection=0 \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 6036ce1e5a9b6..2ba2182ffe1c6 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -16,6 +16,18 @@ runs: export CI_NO_IPV6=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -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 \ + -d opcache.jit_hot_loop=1 \ + -d opcache.jit_hot_func=1 \ + -d opcache.jit_hot_return=1 \ + -d opcache.jit_hot_side_exit=1 \ + -d opcache.jit_blacklist_root_trace=255 \ + -d opcache.jit_blacklist_side_trace=255 \ + -d opcache.file_update_protection=0 \ -j$(sysctl -n hw.ncpu) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/patch.php b/.github/patch.php new file mode 100644 index 0000000000000..3c76dd1a9649b --- /dev/null +++ b/.github/patch.php @@ -0,0 +1,37 @@ +> /etc/php.d/opcache.ini echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini + echo opcache.jit_max_root_traces=100000 >> /etc/php.d/opcache.ini + echo opcache.jit_max_side_traces=100000 >> /etc/php.d/opcache.ini + echo opcache.jit_max_exit_counters=100000 >> /etc/php.d/opcache.ini + echo opcache.jit_hot_loop=1 >> /etc/php.d/opcache.ini + echo opcache.jit_hot_func=1 >> /etc/php.d/opcache.ini + echo opcache.jit_hot_return=1 >> /etc/php.d/opcache.ini + echo opcache.jit_hot_side_exit=1 >> /etc/php.d/opcache.ini + echo opcache.jit_blacklist_root_trace=255 >> /etc/php.d/opcache.ini + echo opcache.jit_blacklist_side_trace=255 >> /etc/php.d/opcache.ini + echo opcache.file_update_protection=0 >> /etc/php.d/opcache.ini + echo opcache.memory_consumption=2G >> /etc/php.d/opcache.ini + echo opcache.interned_strings_buffer=64 >> /etc/php.d/opcache.ini + echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini + echo memory_limit=-1 >> /etc/php.d/opcache.ini + php -v + - name: Test Psalm + if: matrix.branch.ref != 'PHP-8.0' + run: | + git clone https://github.com/vimeo/psalm --branch=master + cd psalm + git checkout 7428e49b115a2a837aa29cf0fafd0ca902fe2457 + export ASAN_OPTIONS=exitcode=139 + # Needed to avoid overwriting JIT config + export PSALM_ALLOW_XDEBUG=1 + php /usr/bin/composer install --no-progress --ignore-platform-reqs + php $GITHUB_WORKSPACE/.github/patch.php ./psalm --no-cache || exit $? + - name: Test PHPStan + if: matrix.branch.ref != 'PHP-8.0' + run: | + git clone https://github.com/phpstan/phpstan-src + cd phpstan-src + git checkout d02cc99d4480a203a2dbe54a5ded2da016266b11 + sed 's/80399/89999/g' -i conf/parametersSchema.neon + php /usr/bin/composer install --no-progress --ignore-platform-reqs + export ASAN_OPTIONS=exitcode=139 + php $GITHUB_WORKSPACE/.github/patch.php bin/phpstan clear-result-cache + php $GITHUB_WORKSPACE/.github/patch.php bin/phpstan || exit $? + - name: Test AMPHP + if: matrix.branch.ref != 'PHP-8.0' + run: | + repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server" + X=0 + for repository in $repositories; do + printf "Testing amp/%s\n" "$repository" + git clone "https://github.com/amphp/$repository.git" "amphp-$repository" --depth 1 + cd "amphp-$repository" + git rev-parse HEAD + php /usr/bin/composer install --no-progress --ignore-platform-reqs + export ASAN_OPTIONS=exitcode=139 + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + if [ ${EXIT_CODE:-0} -gt 128 ]; then + X=1; + fi + cd .. + done + exit $X - name: Test Laravel if: matrix.branch.ref != 'PHP-8.0' run: | @@ -349,8 +405,39 @@ jobs: # Hack to disable a test that hangs php -r '$c = file_get_contents("tests/Filesystem/FilesystemTest.php"); $c = str_replace("*/\n public function testSharedGet()", "* @group skip\n */\n public function testSharedGet()", $c); file_put_contents("tests/Filesystem/FilesystemTest.php", $c);' export ASAN_OPTIONS=exitcode=139 - php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? - if [ $EXIT_CODE -gt 128 ]; then + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? + if [ ${EXIT_CODE:-0} -gt 128 ]; then + exit 1 + fi + - name: Test ReactPHP + if: matrix.branch.ref != 'PHP-8.0' + run: | + repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream" + X=0 + for repository in $repositories; do + printf "Testing reactphp/%s\n" "$repository" + git clone "https://github.com/reactphp/$repository.git" "reactphp-$repository" --depth 1 + cd "reactphp-$repository" + git rev-parse HEAD + php /usr/bin/composer install --no-progress --ignore-platform-reqs + export ASAN_OPTIONS=exitcode=139 + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + if [ $[EXIT_CODE:-0} -gt 128 ]; then + X=1; + fi + cd .. + done + exit $X + - name: Test Revolt PHP + if: matrix.branch.ref != 'PHP-8.0' + run: | + git clone https://github.com/revoltphp/event-loop.git --depth=1 + cd event-loop + git rev-parse HEAD + php /usr/bin/composer install --no-progress --ignore-platform-reqs + export ASAN_OPTIONS=exitcode=139 + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + if [ ${EXIT_CODE:-0} -gt 128 ]; then exit 1 fi - name: Test Symfony @@ -369,12 +456,22 @@ jobs: export SYMFONY_DEPRECATIONS_HELPER=max[total]=999 X=0 for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do - php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? - if [ $EXIT_CODE -gt 128 ]; then + php $GITHUB_WORKSPACE/.github/patch.php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? + if [ ${EXIT_CODE:-0} -gt 128 ]; then X=1; fi done exit $X + - name: Test PHPSeclib + if: always() + run: | + git clone https://github.com/phpseclib/phpseclib --branch=master + cd phpseclib + git checkout 259bd9f1e8af11726ed74acf527c2c046549061b + export ASAN_OPTIONS=exitcode=139 + export PHPSECLIB_ALLOW_JIT=1 + php /usr/bin/composer install --no-progress --ignore-platform-reqs + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner || exit $? - name: Test PHPUnit if: always() run: | @@ -383,8 +480,8 @@ jobs: git rev-parse HEAD export ASAN_OPTIONS=exitcode=139 php /usr/bin/composer install --no-progress --ignore-platform-reqs - php ./phpunit || EXIT_CODE=$? - if [ $EXIT_CODE -gt 128 ]; then + php $GITHUB_WORKSPACE/.github/patch.php ./phpunit || EXIT_CODE=$? + if [ ${EXIT_CODE:-0} -gt 128 ]; then exit 1 fi - name: 'Symfony Preloading' @@ -407,7 +504,7 @@ jobs: sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php sed -i 's/yourusernamehere/root/g' wp-tests-config.php sed -i 's/yourpasswordhere/root/g' wp-tests-config.php - php vendor/bin/phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? if [ $EXIT_CODE -gt 128 ]; then exit 1 fi diff --git a/.travis.yml b/.travis.yml index 9f764251afffc..6d37ec852c613 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ before_script: # Run PHPs run-tests.php script: - - ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing + - 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 -d opcache.jit_hot_loop=1 -d opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d opcache.jit_hot_side_exit=1 -d opcache.file_update_protection=0 -d opcache.jit_blacklist_root_trace=255 -d opcache.jit_blacklist_side_trace=255 - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/run-tests.php b/run-tests.php index 404fd3e457a6a..81315b40fe330 100755 --- a/run-tests.php +++ b/run-tests.php @@ -305,6 +305,8 @@ function main(): void 'opcache.jit_hot_func=1', 'opcache.jit_hot_return=1', 'opcache.jit_hot_side_exit=1', + 'opcache.jit_blacklist_root_trace=255', + 'opcache.jit_blacklist_side_trace=255', 'zend.assertions=1', 'zend.exception_ignore_args=0', 'zend.exception_string_param_max_len=15', From 37f4aabc8b8eeefc29a196ed19ce4d93316dba97 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Wed, 11 Oct 2023 10:20:06 +0200 Subject: [PATCH 02/12] Improve regex --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f65bda2a9ee54..70f9ef88a80ef 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -371,7 +371,7 @@ jobs: git clone https://github.com/phpstan/phpstan-src cd phpstan-src git checkout d02cc99d4480a203a2dbe54a5ded2da016266b11 - sed 's/80399/89999/g' -i conf/parametersSchema.neon + sed -E 's/phpVersion(.*)max[^)]+/phpVersion\1max(89999/g' conf/parametersSchema.neon -i php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 php $GITHUB_WORKSPACE/.github/patch.php bin/phpstan clear-result-cache From db8c94e5a13d77ded23f785a8295c352cbb4bd1c Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 12 Oct 2023 13:31:27 +0200 Subject: [PATCH 03/12] Update circleCI config --- .circleci/config.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2320d2baca9c2..2a7abdb9ea542 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,8 +181,18 @@ jobs: sapi/cli/php run-tests.php \ -d zend_extension=opcache.so \ -d opcache.enable_cli=1 \ - -d opcache.jit_buffer_size=16M \ + -d opcache.jit_buffer_size=64M \ -d opcache.jit=tracing \ + -d opcache.jit_max_root_traces=100000 \ + -d opcache.jit_max_side_traces=100000 \ + -d opcache.jit_max_exit_counters=100000 \ + -d opcache.jit_hot_loop=1 \ + -d opcache.jit_hot_func=1 \ + -d opcache.jit_hot_return=1 \ + -d opcache.jit_hot_side_exit=1 \ + -d opcache.jit_blacklist_root_trace=255 \ + -d opcache.jit_blacklist_side_trace=255 \ + -d opcache.file_update_protection=0 \ -P -q -x -j2 \ -g FAIL,BORK,LEAK,XLEAK \ --offline \ From cb1fb30e68abf1227cf07d8f41295c1bfd78e5c8 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 12 Oct 2023 14:39:42 +0200 Subject: [PATCH 04/12] Fixup --- .github/workflows/nightly.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 70f9ef88a80ef..022d11052e2c8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -337,7 +337,9 @@ jobs: run: | echo zend_extension=opcache.so > /etc/php.d/opcache.ini echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini + echo opcache.enable=1 >> /etc/php.d/opcache.ini echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini + echo opcache.jit=tracing >> /etc/php.d/opcache.ini echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini echo opcache.jit_max_root_traces=100000 >> /etc/php.d/opcache.ini echo opcache.jit_max_side_traces=100000 >> /etc/php.d/opcache.ini From daea65b7716cc01eb3bc93fd7d892dc3479b44b9 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 12 Oct 2023 16:40:48 +0200 Subject: [PATCH 05/12] Fixup --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 022d11052e2c8..fe2b7fd4d4fba 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -351,7 +351,7 @@ jobs: echo opcache.jit_blacklist_root_trace=255 >> /etc/php.d/opcache.ini echo opcache.jit_blacklist_side_trace=255 >> /etc/php.d/opcache.ini echo opcache.file_update_protection=0 >> /etc/php.d/opcache.ini - echo opcache.memory_consumption=2G >> /etc/php.d/opcache.ini + echo opcache.memory_consumption=256M >> /etc/php.d/opcache.ini echo opcache.interned_strings_buffer=64 >> /etc/php.d/opcache.ini echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini echo memory_limit=-1 >> /etc/php.d/opcache.ini From e958183fed2421b90d2ea5fa7ac0db2e8d78a2c9 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 13 Oct 2023 12:38:53 +0200 Subject: [PATCH 06/12] Improve config --- .circleci/config.yml | 11 ----------- .github/actions/test-linux/action.yml | 8 -------- .github/actions/test-macos/action.yml | 8 -------- .github/scripts/windows/test_task.bat | 2 +- .travis.yml | 2 +- run-tests.php | 5 +++++ 6 files changed, 7 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a7abdb9ea542..6ba02da4c399e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,18 +181,7 @@ jobs: sapi/cli/php run-tests.php \ -d zend_extension=opcache.so \ -d opcache.enable_cli=1 \ - -d opcache.jit_buffer_size=64M \ -d opcache.jit=tracing \ - -d opcache.jit_max_root_traces=100000 \ - -d opcache.jit_max_side_traces=100000 \ - -d opcache.jit_max_exit_counters=100000 \ - -d opcache.jit_hot_loop=1 \ - -d opcache.jit_hot_func=1 \ - -d opcache.jit_hot_return=1 \ - -d opcache.jit_hot_side_exit=1 \ - -d opcache.jit_blacklist_root_trace=255 \ - -d opcache.jit_blacklist_side_trace=255 \ - -d opcache.file_update_protection=0 \ -P -q -x -j2 \ -g FAIL,BORK,LEAK,XLEAK \ --offline \ diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index 3e2d7e09d6552..7d66d2235208d 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -31,14 +31,6 @@ runs: export SKIP_IO_CAPTURE_TESTS=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -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 \ - -d opcache.jit_blacklist_root_trace=255 \ - -d opcache.jit_blacklist_side_trace=255 \ - -d opcache.file_update_protection=0 \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 365fe98c1af3f..6036ce1e5a9b6 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -16,14 +16,6 @@ runs: export CI_NO_IPV6=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -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 \ - -d opcache.jit_blacklist_root_trace=255 \ - -d opcache.jit_blacklist_side_trace=255 \ - -d opcache.file_update_protection=0 \ -j$(sysctl -n hw.ncpu) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index af9c10de9d091..99ddb2459fd2b 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -71,7 +71,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_hot_loop=1 -d opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d opcache.jit_hot_side_exit=1 -d opcache.jit=tracing -d opcache.file_update_protection=0 -d opcache.jit_blacklist_root_trace=255 -d opcache.jit_blacklist_side_trace=255 +if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -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/.travis.yml b/.travis.yml index 6d37ec852c613..919ecfe0c72f4 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 -d opcache.jit_hot_loop=1 -d opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d opcache.jit_hot_side_exit=1 -d opcache.file_update_protection=0 -d opcache.jit_blacklist_root_trace=255 -d opcache.jit_blacklist_side_trace=255 + - travis_wait 60 ./travis/test.sh -d opcache.jit=tracing - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/run-tests.php b/run-tests.php index 81315b40fe330..c811bb041fd39 100755 --- a/run-tests.php +++ b/run-tests.php @@ -305,8 +305,13 @@ function main(): void 'opcache.jit_hot_func=1', 'opcache.jit_hot_return=1', 'opcache.jit_hot_side_exit=1', + 'opcache.jit_max_root_traces=100000', + 'opcache.jit_max_side_traces=100000', + 'opcache.jit_max_exit_counters=100000', 'opcache.jit_blacklist_root_trace=255', 'opcache.jit_blacklist_side_trace=255', + 'opcache.jit_buffer_size=64M', + 'opcache.protect_memory=1', 'zend.assertions=1', 'zend.exception_ignore_args=0', 'zend.exception_string_param_max_len=15', From 1048945802faadb0dc6efc23eafecc7795392276 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 13 Oct 2023 12:50:23 +0200 Subject: [PATCH 07/12] Fixup --- .circleci/config.yml | 1 + .github/actions/test-linux/action.yml | 1 + .github/actions/test-macos/action.yml | 1 + .github/scripts/windows/test_task.bat | 2 +- .travis.yml | 2 +- run-tests.php | 1 - 6 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ba02da4c399e..c1c0f23ea55cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,6 +181,7 @@ jobs: sapi/cli/php run-tests.php \ -d zend_extension=opcache.so \ -d opcache.enable_cli=1 \ + -d opcache.jit_buffer_size=64M \ -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 7d66d2235208d..68b967e752f57 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -31,6 +31,7 @@ runs: export SKIP_IO_CAPTURE_TESTS=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ + -d opcache.jit_buffer_size=64M \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 6036ce1e5a9b6..07a9fb515c244 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -16,6 +16,7 @@ runs: export CI_NO_IPV6=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ + -d opcache.jit_buffer_size=64M \ -j$(sysctl -n hw.ncpu) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index 99ddb2459fd2b..6cbb3cf1ae7b1 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -71,7 +71,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=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/.travis.yml b/.travis.yml index 919ecfe0c72f4..33d913cc320a2 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 + - travis_wait 60 ./travis/test.sh -d opcache.jit_buffer_size=64M -d opcache.jit=tracing - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/run-tests.php b/run-tests.php index c811bb041fd39..bb7f07e8ff420 100755 --- a/run-tests.php +++ b/run-tests.php @@ -310,7 +310,6 @@ function main(): void 'opcache.jit_max_exit_counters=100000', 'opcache.jit_blacklist_root_trace=255', 'opcache.jit_blacklist_side_trace=255', - 'opcache.jit_buffer_size=64M', 'opcache.protect_memory=1', 'zend.assertions=1', 'zend.exception_ignore_args=0', From 056c63fad6e3623d81a8e8613406adf0a07c231e Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 19 Oct 2023 21:42:12 +0200 Subject: [PATCH 08/12] Rename & cleanup --- .github/{patch.php => jit_check.php} | 7 ------- .github/workflows/nightly.yml | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 18 deletions(-) rename .github/{patch.php => jit_check.php} (85%) diff --git a/.github/patch.php b/.github/jit_check.php similarity index 85% rename from .github/patch.php rename to .github/jit_check.php index 3c76dd1a9649b..393e2ba12ba04 100644 --- a/.github/patch.php +++ b/.github/jit_check.php @@ -4,28 +4,21 @@ $status = opcache_get_status(false); var_dump($status); - $ok = true; if ($status["memory_usage"]["free_memory"] < 10*1024*1024) { echo "Not enough free opcache memory!".PHP_EOL; - $ok = false; } if ($status["interned_strings_usage"]["free_memory"] < 1*1024*1024) { echo "Not enough free interned strings memory!".PHP_EOL; - $ok = false; } if ($status["jit"]["buffer_free"] < 10*1024*1024) { echo "Not enough free JIT memory!".PHP_EOL; - $ok = false; } if (!$status["jit"]["on"]) { echo "JIT is not enabled!".PHP_EOL; - $ok = false; } unset($status); gc_collect_cycles(); - - if (!$ok) die(130); }); $argc--; diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 77f9aac4b3a8a..e5d907dcf5c80 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -360,7 +360,7 @@ jobs: # Needed to avoid overwriting JIT config export PSALM_ALLOW_XDEBUG=1 php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/patch.php ./psalm --no-cache || exit $? + php $GITHUB_WORKSPACE/.github/jit_check.php ./psalm --no-cache || exit $? - name: Test PHPStan if: matrix.branch.ref != 'PHP-8.0' run: | @@ -370,8 +370,8 @@ jobs: sed -E 's/phpVersion(.*)max[^)]+/phpVersion\1max(89999/g' conf/parametersSchema.neon -i php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/patch.php bin/phpstan clear-result-cache - php $GITHUB_WORKSPACE/.github/patch.php bin/phpstan || exit $? + php $GITHUB_WORKSPACE/.github/jit_check.php bin/phpstan clear-result-cache + php $GITHUB_WORKSPACE/.github/jit_check.php bin/phpstan || exit $? - name: Test AMPHP if: matrix.branch.ref != 'PHP-8.0' run: | @@ -384,7 +384,7 @@ jobs: git rev-parse HEAD php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? if [ ${EXIT_CODE:-0} -gt 128 ]; then X=1; fi @@ -401,7 +401,7 @@ jobs: # Hack to disable a test that hangs php -r '$c = file_get_contents("tests/Filesystem/FilesystemTest.php"); $c = str_replace("*/\n public function testSharedGet()", "* @group skip\n */\n public function testSharedGet()", $c); file_put_contents("tests/Filesystem/FilesystemTest.php", $c);' export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? if [ ${EXIT_CODE:-0} -gt 128 ]; then exit 1 fi @@ -417,7 +417,7 @@ jobs: git rev-parse HEAD php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? if [ $[EXIT_CODE:-0} -gt 128 ]; then X=1; fi @@ -432,7 +432,7 @@ jobs: git rev-parse HEAD php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? if [ ${EXIT_CODE:-0} -gt 128 ]; then exit 1 fi @@ -452,7 +452,7 @@ jobs: export SYMFONY_DEPRECATIONS_HELPER=max[total]=999 X=0 for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do - php $GITHUB_WORKSPACE/.github/patch.php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? if [ ${EXIT_CODE:-0} -gt 128 ]; then X=1; fi @@ -467,7 +467,7 @@ jobs: export ASAN_OPTIONS=exitcode=139 export PHPSECLIB_ALLOW_JIT=1 php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner || exit $? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner || exit $? - name: Test PHPUnit if: always() run: | @@ -476,7 +476,7 @@ jobs: git rev-parse HEAD export ASAN_OPTIONS=exitcode=139 php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/patch.php ./phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php ./phpunit || EXIT_CODE=$? if [ ${EXIT_CODE:-0} -gt 128 ]; then exit 1 fi @@ -500,7 +500,7 @@ jobs: sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php sed -i 's/yourusernamehere/root/g' wp-tests-config.php sed -i 's/yourpasswordhere/root/g' wp-tests-config.php - php $GITHUB_WORKSPACE/.github/patch.php vendor/bin/phpunit || EXIT_CODE=$? + php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? if [ $EXIT_CODE -gt 128 ]; then exit 1 fi From 745a34646f20f0f0fc77a9223bc5fc57a975a957 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 19 Oct 2023 21:53:39 +0200 Subject: [PATCH 09/12] Do not use fixed tag --- .github/workflows/nightly.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e5d907dcf5c80..d51902c3159ef 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -353,9 +353,9 @@ jobs: - name: Test Psalm if: matrix.branch.ref != 'PHP-8.0' run: | - git clone https://github.com/vimeo/psalm --branch=master + git clone https://github.com/vimeo/psalm --branch=master --depth 1 cd psalm - git checkout 7428e49b115a2a837aa29cf0fafd0ca902fe2457 + git rev-parse HEAD export ASAN_OPTIONS=exitcode=139 # Needed to avoid overwriting JIT config export PSALM_ALLOW_XDEBUG=1 @@ -364,9 +364,9 @@ jobs: - name: Test PHPStan if: matrix.branch.ref != 'PHP-8.0' run: | - git clone https://github.com/phpstan/phpstan-src + git clone https://github.com/phpstan/phpstan-src --depth 1 cd phpstan-src - git checkout d02cc99d4480a203a2dbe54a5ded2da016266b11 + git rev-parse HEAD sed -E 's/phpVersion(.*)max[^)]+/phpVersion\1max(89999/g' conf/parametersSchema.neon -i php /usr/bin/composer install --no-progress --ignore-platform-reqs export ASAN_OPTIONS=exitcode=139 @@ -461,9 +461,9 @@ jobs: - name: Test PHPSeclib if: always() run: | - git clone https://github.com/phpseclib/phpseclib --branch=master + git clone https://github.com/phpseclib/phpseclib --depth 1 cd phpseclib - git checkout 259bd9f1e8af11726ed74acf527c2c046549061b + git rev-parse HEAD export ASAN_OPTIONS=exitcode=139 export PHPSECLIB_ALLOW_JIT=1 php /usr/bin/composer install --no-progress --ignore-platform-reqs From 99d54c9eb887719c2fbc1cf7b27dbe4fb0f7baa7 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sun, 22 Oct 2023 13:45:52 +0200 Subject: [PATCH 10/12] Revert --- .github/jit_check.php | 30 --------- .github/workflows/nightly.yml | 113 +++------------------------------- 2 files changed, 7 insertions(+), 136 deletions(-) delete mode 100644 .github/jit_check.php diff --git a/.github/jit_check.php b/.github/jit_check.php deleted file mode 100644 index 393e2ba12ba04..0000000000000 --- a/.github/jit_check.php +++ /dev/null @@ -1,30 +0,0 @@ - /etc/php.d/opcache.ini echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini - echo opcache.enable=1 >> /etc/php.d/opcache.ini echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini - echo opcache.jit=tracing >> /etc/php.d/opcache.ini echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini - echo opcache.jit_max_root_traces=100000 >> /etc/php.d/opcache.ini - echo opcache.jit_max_side_traces=100000 >> /etc/php.d/opcache.ini - echo opcache.jit_max_exit_counters=100000 >> /etc/php.d/opcache.ini - echo opcache.jit_hot_loop=1 >> /etc/php.d/opcache.ini - echo opcache.jit_hot_func=1 >> /etc/php.d/opcache.ini - echo opcache.jit_hot_return=1 >> /etc/php.d/opcache.ini - echo opcache.jit_hot_side_exit=1 >> /etc/php.d/opcache.ini - echo opcache.jit_blacklist_root_trace=255 >> /etc/php.d/opcache.ini - echo opcache.jit_blacklist_side_trace=255 >> /etc/php.d/opcache.ini - echo opcache.file_update_protection=0 >> /etc/php.d/opcache.ini - echo opcache.memory_consumption=256M >> /etc/php.d/opcache.ini - echo opcache.interned_strings_buffer=64 >> /etc/php.d/opcache.ini - echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini - echo memory_limit=-1 >> /etc/php.d/opcache.ini - php -v - - name: Test Psalm - if: matrix.branch.ref != 'PHP-8.0' - run: | - git clone https://github.com/vimeo/psalm --branch=master --depth 1 - cd psalm - git rev-parse HEAD - export ASAN_OPTIONS=exitcode=139 - # Needed to avoid overwriting JIT config - export PSALM_ALLOW_XDEBUG=1 - php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/jit_check.php ./psalm --no-cache || exit $? - - name: Test PHPStan - if: matrix.branch.ref != 'PHP-8.0' - run: | - git clone https://github.com/phpstan/phpstan-src --depth 1 - cd phpstan-src - git rev-parse HEAD - sed -E 's/phpVersion(.*)max[^)]+/phpVersion\1max(89999/g' conf/parametersSchema.neon -i - php /usr/bin/composer install --no-progress --ignore-platform-reqs - export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/jit_check.php bin/phpstan clear-result-cache - php $GITHUB_WORKSPACE/.github/jit_check.php bin/phpstan || exit $? - - name: Test AMPHP - if: matrix.branch.ref != 'PHP-8.0' - run: | - repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server" - X=0 - for repository in $repositories; do - printf "Testing amp/%s\n" "$repository" - git clone "https://github.com/amphp/$repository.git" "amphp-$repository" --depth 1 - cd "amphp-$repository" - git rev-parse HEAD - php /usr/bin/composer install --no-progress --ignore-platform-reqs - export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? - if [ ${EXIT_CODE:-0} -gt 128 ]; then - X=1; - fi - cd .. - done - exit $X - name: Test Laravel if: matrix.branch.ref != 'PHP-8.0' run: | @@ -401,39 +343,8 @@ jobs: # Hack to disable a test that hangs php -r '$c = file_get_contents("tests/Filesystem/FilesystemTest.php"); $c = str_replace("*/\n public function testSharedGet()", "* @group skip\n */\n public function testSharedGet()", $c); file_put_contents("tests/Filesystem/FilesystemTest.php", $c);' export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? - if [ ${EXIT_CODE:-0} -gt 128 ]; then - exit 1 - fi - - name: Test ReactPHP - if: matrix.branch.ref != 'PHP-8.0' - run: | - repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream" - X=0 - for repository in $repositories; do - printf "Testing reactphp/%s\n" "$repository" - git clone "https://github.com/reactphp/$repository.git" "reactphp-$repository" --depth 1 - cd "reactphp-$repository" - git rev-parse HEAD - php /usr/bin/composer install --no-progress --ignore-platform-reqs - export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? - if [ $[EXIT_CODE:-0} -gt 128 ]; then - X=1; - fi - cd .. - done - exit $X - - name: Test Revolt PHP - if: matrix.branch.ref != 'PHP-8.0' - run: | - git clone https://github.com/revoltphp/event-loop.git --depth=1 - cd event-loop - git rev-parse HEAD - php /usr/bin/composer install --no-progress --ignore-platform-reqs - export ASAN_OPTIONS=exitcode=139 - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? - if [ ${EXIT_CODE:-0} -gt 128 ]; then + php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$? + if [ $EXIT_CODE -gt 128 ]; then exit 1 fi - name: Test Symfony @@ -452,22 +363,12 @@ jobs: export SYMFONY_DEPRECATIONS_HELPER=max[total]=999 X=0 for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do - php $GITHUB_WORKSPACE/.github/jit_check.php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? - if [ ${EXIT_CODE:-0} -gt 128 ]; then + php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$? + if [ $EXIT_CODE -gt 128 ]; then X=1; fi done exit $X - - name: Test PHPSeclib - if: always() - run: | - git clone https://github.com/phpseclib/phpseclib --depth 1 - cd phpseclib - git rev-parse HEAD - export ASAN_OPTIONS=exitcode=139 - export PHPSECLIB_ALLOW_JIT=1 - php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/paratest --verbose --configuration=tests/phpunit.xml --runner=WrapperRunner || exit $? - name: Test PHPUnit if: always() run: | @@ -476,8 +377,8 @@ jobs: git rev-parse HEAD export ASAN_OPTIONS=exitcode=139 php /usr/bin/composer install --no-progress --ignore-platform-reqs - php $GITHUB_WORKSPACE/.github/jit_check.php ./phpunit || EXIT_CODE=$? - if [ ${EXIT_CODE:-0} -gt 128 ]; then + php ./phpunit || EXIT_CODE=$? + if [ $EXIT_CODE -gt 128 ]; then exit 1 fi - name: 'Symfony Preloading' @@ -500,7 +401,7 @@ jobs: sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php sed -i 's/yourusernamehere/root/g' wp-tests-config.php sed -i 's/yourpasswordhere/root/g' wp-tests-config.php - php $GITHUB_WORKSPACE/.github/jit_check.php vendor/bin/phpunit || EXIT_CODE=$? + php vendor/bin/phpunit || EXIT_CODE=$? if [ $EXIT_CODE -gt 128 ]; then exit 1 fi From c1af7fe14c7e999ffcbee148777f6b66df6454f0 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sat, 11 Nov 2023 18:55:48 +0100 Subject: [PATCH 11/12] Use same JIT buffer size in all tests --- ext/opcache/tests/bug81272.phpt | 2 +- ext/opcache/tests/jit/add_001.phpt | 2 +- ext/opcache/tests/jit/add_002.phpt | 2 +- ext/opcache/tests/jit/add_003.phpt | 2 +- ext/opcache/tests/jit/add_004.phpt | 2 +- ext/opcache/tests/jit/add_005.phpt | 2 +- ext/opcache/tests/jit/add_006.phpt | 2 +- ext/opcache/tests/jit/add_007.phpt | 2 +- ext/opcache/tests/jit/add_008.phpt | 2 +- ext/opcache/tests/jit/add_009.phpt | 2 +- ext/opcache/tests/jit/add_010.phpt | 2 +- ext/opcache/tests/jit/add_011.phpt | 2 +- ext/opcache/tests/jit/add_012.phpt | 2 +- ext/opcache/tests/jit/add_013.phpt | 2 +- ext/opcache/tests/jit/add_014.phpt | 2 +- ext/opcache/tests/jit/and_001.phpt | 2 +- ext/opcache/tests/jit/and_002.phpt | 2 +- ext/opcache/tests/jit/array_elem_002.phpt | 2 +- ext/opcache/tests/jit/assign_001.phpt | 2 +- ext/opcache/tests/jit/assign_002.phpt | 2 +- ext/opcache/tests/jit/assign_003.phpt | 2 +- ext/opcache/tests/jit/assign_004.phpt | 2 +- ext/opcache/tests/jit/assign_005.phpt | 2 +- ext/opcache/tests/jit/assign_006.phpt | 2 +- ext/opcache/tests/jit/assign_007.phpt | 2 +- ext/opcache/tests/jit/assign_008.phpt | 2 +- ext/opcache/tests/jit/assign_009.phpt | 2 +- ext/opcache/tests/jit/assign_010.phpt | 2 +- ext/opcache/tests/jit/assign_011.phpt | 2 +- ext/opcache/tests/jit/assign_012.phpt | 2 +- ext/opcache/tests/jit/assign_013.phpt | 2 +- ext/opcache/tests/jit/assign_014.phpt | 2 +- ext/opcache/tests/jit/assign_015.phpt | 2 +- ext/opcache/tests/jit/assign_016.phpt | 2 +- ext/opcache/tests/jit/assign_017.phpt | 2 +- ext/opcache/tests/jit/assign_018.phpt | 2 +- ext/opcache/tests/jit/assign_019.phpt | 2 +- ext/opcache/tests/jit/assign_020.phpt | 2 +- ext/opcache/tests/jit/assign_021.phpt | 2 +- ext/opcache/tests/jit/assign_022.phpt | 2 +- ext/opcache/tests/jit/assign_023.phpt | 2 +- ext/opcache/tests/jit/assign_024.phpt | 2 +- ext/opcache/tests/jit/assign_025.phpt | 2 +- ext/opcache/tests/jit/assign_026.phpt | 2 +- ext/opcache/tests/jit/assign_027.phpt | 2 +- ext/opcache/tests/jit/assign_028.phpt | 2 +- ext/opcache/tests/jit/assign_029.phpt | 2 +- ext/opcache/tests/jit/assign_030.phpt | 2 +- ext/opcache/tests/jit/assign_031.phpt | 2 +- ext/opcache/tests/jit/assign_032.phpt | 2 +- ext/opcache/tests/jit/assign_033.phpt | 2 +- ext/opcache/tests/jit/assign_034.phpt | 2 +- ext/opcache/tests/jit/assign_035.phpt | 2 +- ext/opcache/tests/jit/assign_036.phpt | 2 +- ext/opcache/tests/jit/assign_037.phpt | 2 +- ext/opcache/tests/jit/assign_038.phpt | 2 +- ext/opcache/tests/jit/assign_039.phpt | 2 +- ext/opcache/tests/jit/assign_040.phpt | 2 +- ext/opcache/tests/jit/assign_041.phpt | 2 +- ext/opcache/tests/jit/assign_042.phpt | 2 +- ext/opcache/tests/jit/assign_043.phpt | 2 +- ext/opcache/tests/jit/assign_044.phpt | 2 +- ext/opcache/tests/jit/assign_045.phpt | 2 +- ext/opcache/tests/jit/assign_046.phpt | 2 +- ext/opcache/tests/jit/assign_047.phpt | 2 +- ext/opcache/tests/jit/assign_048.phpt | 2 +- ext/opcache/tests/jit/assign_049.phpt | 2 +- ext/opcache/tests/jit/assign_050.phpt | 2 +- ext/opcache/tests/jit/assign_051.phpt | 2 +- ext/opcache/tests/jit/assign_052.phpt | 2 +- ext/opcache/tests/jit/assign_053.phpt | 2 +- ext/opcache/tests/jit/assign_055.phpt | 2 +- ext/opcache/tests/jit/assign_056.phpt | 2 +- ext/opcache/tests/jit/assign_dim_002.phpt | 2 +- ext/opcache/tests/jit/assign_dim_003.phpt | 2 +- ext/opcache/tests/jit/assign_dim_004.phpt | 2 +- ext/opcache/tests/jit/assign_dim_005.phpt | 2 +- ext/opcache/tests/jit/assign_dim_006.phpt | 2 +- ext/opcache/tests/jit/assign_dim_007.phpt | 2 +- ext/opcache/tests/jit/assign_dim_008.phpt | 2 +- ext/opcache/tests/jit/assign_dim_009.phpt | 2 +- ext/opcache/tests/jit/assign_dim_010.phpt | 2 +- ext/opcache/tests/jit/assign_dim_011.phpt | 2 +- ext/opcache/tests/jit/assign_dim_012.phpt | 2 +- ext/opcache/tests/jit/assign_dim_013.phpt | 2 +- ext/opcache/tests/jit/assign_dim_014.phpt | 2 +- ext/opcache/tests/jit/assign_dim_015.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_001.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_002.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_003.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_004.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_005.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_006.phpt | 2 +- ext/opcache/tests/jit/assign_dim_op_007.phpt | 2 +- ext/opcache/tests/jit/assign_dim_undef_exception.phpt | 2 +- ext/opcache/tests/jit/assign_obj_001.phpt | 2 +- ext/opcache/tests/jit/assign_obj_002.phpt | 2 +- ext/opcache/tests/jit/assign_obj_003.phpt | 2 +- ext/opcache/tests/jit/assign_obj_on_null.phpt | 2 +- ext/opcache/tests/jit/assign_obj_op_001.phpt | 2 +- ext/opcache/tests/jit/assign_obj_op_002.phpt | 2 +- ext/opcache/tests/jit/assign_obj_op_003.phpt | 2 +- ext/opcache/tests/jit/assign_obj_ref_001.phpt | 2 +- ext/opcache/tests/jit/assign_op_001.phpt | 2 +- ext/opcache/tests/jit/assign_op_002.phpt | 2 +- ext/opcache/tests/jit/assign_op_003.phpt | 2 +- ext/opcache/tests/jit/assign_op_004.phpt | 2 +- ext/opcache/tests/jit/assign_op_005.phpt | 2 +- ext/opcache/tests/jit/assign_op_006.phpt | 2 +- ext/opcache/tests/jit/assign_op_007.phpt | 2 +- ext/opcache/tests/jit/assign_op_008.phpt | 2 +- ext/opcache/tests/jit/assign_op_009.phpt | 2 +- ext/opcache/tests/jit/assign_static_prop_001.phpt | 2 +- ext/opcache/tests/jit/bind_static.phpt | 2 +- ext/opcache/tests/jit/bool_not_001.phpt | 2 +- ext/opcache/tests/jit/bool_not_002.phpt | 2 +- ext/opcache/tests/jit/bug77857.phpt | 2 +- ext/opcache/tests/jit/bug79888.phpt | 2 +- ext/opcache/tests/jit/bug80426.phpt | 2 +- ext/opcache/tests/jit/bug80447.phpt | 2 +- ext/opcache/tests/jit/bug80634.phpt | 2 +- ext/opcache/tests/jit/bug80745.phpt | 2 +- ext/opcache/tests/jit/bug80782.phpt | 2 +- ext/opcache/tests/jit/bug80786.phpt | 2 +- ext/opcache/tests/jit/bug80802.phpt | 2 +- ext/opcache/tests/jit/bug80839.phpt | 2 +- ext/opcache/tests/jit/bug80861.phpt | 2 +- ext/opcache/tests/jit/bug80959.phpt | 2 +- ext/opcache/tests/jit/bug81051.phpt | 2 +- ext/opcache/tests/jit/bug81225.phpt | 2 +- ext/opcache/tests/jit/bug81225_2.phpt | 2 +- ext/opcache/tests/jit/bug81226.phpt | 2 +- ext/opcache/tests/jit/bug81249.phpt | 2 +- ext/opcache/tests/jit/bug81255.phpt | 2 +- ext/opcache/tests/jit/bug81256.phpt | 2 +- ext/opcache/tests/jit/bug81409.phpt | 2 +- ext/opcache/tests/jit/bug81512.phpt | 2 +- ext/opcache/tests/jit/bw_not_001.phpt | 2 +- ext/opcache/tests/jit/bw_not_002.phpt | 2 +- ext/opcache/tests/jit/call_chain_exit.phpt | 2 +- ext/opcache/tests/jit/cast_001.phpt | 2 +- ext/opcache/tests/jit/cast_002.phpt | 2 +- ext/opcache/tests/jit/cmp_001.phpt | 2 +- ext/opcache/tests/jit/cmp_002.phpt | 2 +- ext/opcache/tests/jit/cmp_003.phpt | 2 +- ext/opcache/tests/jit/cmp_004.phpt | 2 +- ext/opcache/tests/jit/cmp_005.phpt | 2 +- ext/opcache/tests/jit/cmp_006.phpt | 2 +- ext/opcache/tests/jit/cmp_007.phpt | 2 +- ext/opcache/tests/jit/cmp_008.phpt | 2 +- ext/opcache/tests/jit/concat_001.phpt | 2 +- ext/opcache/tests/jit/const_001.phpt | 2 +- ext/opcache/tests/jit/copy_tmp_001.phpt | 2 +- ext/opcache/tests/jit/copy_tmp_002.phpt | 2 +- ext/opcache/tests/jit/count_001.phpt | 2 +- ext/opcache/tests/jit/defined_001.phpt | 2 +- ext/opcache/tests/jit/fe_reset_001.phpt | 2 +- ext/opcache/tests/jit/fe_reset_undef.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_func_arg_002.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_func_args_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_002.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_003.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_004.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_005.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_006.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_007.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_008.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_009.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_010.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_011.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_012.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_013.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_014.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_rw_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_rw_002.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_rw_004.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_w_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_w_002.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_w_003.phpt | 2 +- ext/opcache/tests/jit/fetch_list_r_001.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_001.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_002.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_003.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_004.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_005.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_006.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_007.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_008.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_009.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_010.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_is_typed_prop.phpt | 2 +- ext/opcache/tests/jit/fetch_r_001.phpt | 2 +- ext/opcache/tests/jit/fetch_static_prop_001.phpt | 2 +- ext/opcache/tests/jit/gh10271.phpt | 2 +- ext/opcache/tests/jit/gh10635.phpt | 2 +- ext/opcache/tests/jit/gh12380.phpt | 2 +- ext/opcache/tests/jit/gh8030-001.phpt | 2 +- ext/opcache/tests/jit/gh8030-002.phpt | 2 +- ext/opcache/tests/jit/gh8461-001.phpt | 2 +- ext/opcache/tests/jit/gh8461-002.phpt | 2 +- ext/opcache/tests/jit/gh8461-003.phpt | 2 +- ext/opcache/tests/jit/gh8461-004.phpt | 2 +- ext/opcache/tests/jit/gh8461-005.phpt | 2 +- ext/opcache/tests/jit/gh8461-006.phpt | 2 +- ext/opcache/tests/jit/gh8461-007.phpt | 2 +- ext/opcache/tests/jit/gh8461-008.phpt | 2 +- ext/opcache/tests/jit/gh8591-001.phpt | 2 +- ext/opcache/tests/jit/gh8591-002.phpt | 2 +- ext/opcache/tests/jit/gh8591-003.phpt | 2 +- ext/opcache/tests/jit/gh8591-004.phpt | 2 +- ext/opcache/tests/jit/gh8591-005.phpt | 2 +- ext/opcache/tests/jit/gh8591-006.phpt | 2 +- ext/opcache/tests/jit/gh8847.phpt | 2 +- ext/opcache/tests/jit/gh8863.phpt | 2 +- ext/opcache/tests/jit/hot_func_001.phpt | 2 +- ext/opcache/tests/jit/hot_func_002.phpt | 2 +- ext/opcache/tests/jit/icall_001.phpt | 2 +- ext/opcache/tests/jit/identical_001.phpt | 2 +- ext/opcache/tests/jit/identical_002.phpt | 2 +- ext/opcache/tests/jit/identical_003.phpt | 2 +- ext/opcache/tests/jit/ignored_opcodes.phpt | 2 +- ext/opcache/tests/jit/inc_001.phpt | 2 +- ext/opcache/tests/jit/inc_002.phpt | 2 +- ext/opcache/tests/jit/inc_003.phpt | 2 +- ext/opcache/tests/jit/inc_004.phpt | 2 +- ext/opcache/tests/jit/inc_005.phpt | 2 +- ext/opcache/tests/jit/inc_006.phpt | 2 +- ext/opcache/tests/jit/inc_007.phpt | 2 +- ext/opcache/tests/jit/inc_008.phpt | 2 +- ext/opcache/tests/jit/inc_009.phpt | 2 +- ext/opcache/tests/jit/inc_010.phpt | 2 +- ext/opcache/tests/jit/inc_011.phpt | 2 +- ext/opcache/tests/jit/inc_012.phpt | 2 +- ext/opcache/tests/jit/inc_013.phpt | 2 +- ext/opcache/tests/jit/inc_014.phpt | 2 +- ext/opcache/tests/jit/inc_015.phpt | 2 +- ext/opcache/tests/jit/inc_016.phpt | 2 +- ext/opcache/tests/jit/inc_017.phpt | 2 +- ext/opcache/tests/jit/inc_018.phpt | 2 +- ext/opcache/tests/jit/inc_019.phpt | 2 +- ext/opcache/tests/jit/inc_020.phpt | 2 +- ext/opcache/tests/jit/inc_021.phpt | 2 +- ext/opcache/tests/jit/inc_022.phpt | 2 +- ext/opcache/tests/jit/inc_023.phpt | 2 +- ext/opcache/tests/jit/inc_024.phpt | 2 +- ext/opcache/tests/jit/inc_obj_001.phpt | 2 +- ext/opcache/tests/jit/inc_obj_002.phpt | 2 +- ext/opcache/tests/jit/inc_obj_003.phpt | 2 +- ext/opcache/tests/jit/inc_obj_004.phpt | 2 +- ext/opcache/tests/jit/inc_obj_005.phpt | 2 +- ext/opcache/tests/jit/init_fcall_001.phpt | 2 +- ext/opcache/tests/jit/init_fcall_002.phpt | 2 +- ext/opcache/tests/jit/init_fcall_003.phpt | 2 +- ext/opcache/tests/jit/isset_001.phpt | 2 +- ext/opcache/tests/jit/jmpz_001.phpt | 2 +- ext/opcache/tests/jit/jmpz_002.phpt | 2 +- ext/opcache/tests/jit/jmpz_ex_001.phpt | 2 +- ext/opcache/tests/jit/loop_001.phpt | 2 +- ext/opcache/tests/jit/loop_002.phpt | 2 +- ext/opcache/tests/jit/method_call_001.phpt | 2 +- ext/opcache/tests/jit/mod_001.phpt | 2 +- ext/opcache/tests/jit/mod_002.phpt | 2 +- ext/opcache/tests/jit/mod_003.phpt | 2 +- ext/opcache/tests/jit/mod_004.phpt | 2 +- ext/opcache/tests/jit/mod_005.phpt | 2 +- ext/opcache/tests/jit/mod_006.phpt | 2 +- ext/opcache/tests/jit/mod_007.phpt | 2 +- ext/opcache/tests/jit/mul_001.phpt | 2 +- ext/opcache/tests/jit/mul_002.phpt | 2 +- ext/opcache/tests/jit/mul_003.phpt | 2 +- ext/opcache/tests/jit/mul_004.phpt | 2 +- ext/opcache/tests/jit/mul_005.phpt | 2 +- ext/opcache/tests/jit/mul_006.phpt | 2 +- ext/opcache/tests/jit/mul_007.phpt | 2 +- ext/opcache/tests/jit/mul_008.phpt | 2 +- ext/opcache/tests/jit/mul_009.phpt | 2 +- ext/opcache/tests/jit/nan_001.phpt | 2 +- ext/opcache/tests/jit/nan_002.phpt | 2 +- ext/opcache/tests/jit/not_001.phpt | 2 +- ext/opcache/tests/jit/not_002.phpt | 2 +- ext/opcache/tests/jit/noval_001.phpt | 2 +- ext/opcache/tests/jit/qm_assign_001.phpt | 2 +- ext/opcache/tests/jit/qm_assign_002.phpt | 2 +- ext/opcache/tests/jit/qm_assign_003.phpt | 2 +- ext/opcache/tests/jit/qm_assign_undef_exception.phpt | 2 +- ext/opcache/tests/jit/readonly_001.phpt | 2 +- ext/opcache/tests/jit/readonly_002.phpt | 2 +- ext/opcache/tests/jit/readonly_003.phpt | 2 +- ext/opcache/tests/jit/readonly_004.phpt | 2 +- ext/opcache/tests/jit/readonly_005.phpt | 2 +- ext/opcache/tests/jit/readonly_006.phpt | 2 +- ext/opcache/tests/jit/readonly_007.phpt | 2 +- ext/opcache/tests/jit/readonly_008.phpt | 2 +- ext/opcache/tests/jit/recursive_wrong_args.phpt | 2 +- ext/opcache/tests/jit/recv_001.phpt | 2 +- ext/opcache/tests/jit/recv_002.phpt | 2 +- ext/opcache/tests/jit/recv_003.phpt | 2 +- ext/opcache/tests/jit/recv_004.phpt | 2 +- ext/opcache/tests/jit/recv_005.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_001.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_002.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_003.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_003_32bits.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_004.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_005.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_006.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_007.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_008.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_009.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_010.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_011.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_012.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_013.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_014.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_015.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_016.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_017.phpt | 2 +- ext/opcache/tests/jit/ret_001.phpt | 2 +- ext/opcache/tests/jit/ret_002.phpt | 2 +- ext/opcache/tests/jit/ret_003.phpt | 2 +- ext/opcache/tests/jit/ret_004.phpt | 2 +- ext/opcache/tests/jit/rope_001.phpt | 2 +- ext/opcache/tests/jit/rope_002.phpt | 2 +- ext/opcache/tests/jit/send_ref_001.phpt | 2 +- ext/opcache/tests/jit/send_val_001.phpt | 2 +- ext/opcache/tests/jit/send_val_002.phpt | 2 +- ext/opcache/tests/jit/send_var_ex_001.phpt | 2 +- ext/opcache/tests/jit/send_var_ex_002.phpt | 2 +- ext/opcache/tests/jit/shift_left_001.phpt | 2 +- ext/opcache/tests/jit/shift_left_002.phpt | 2 +- ext/opcache/tests/jit/shift_right_001.phpt | 2 +- ext/opcache/tests/jit/shift_right_002.phpt | 2 +- ext/opcache/tests/jit/shift_right_003.phpt | 2 +- ext/opcache/tests/jit/shift_right_004.phpt | 2 +- ext/opcache/tests/jit/sub_001.phpt | 2 +- ext/opcache/tests/jit/switch_jumptable.phpt | 2 +- ext/opcache/tests/jit/trampoline_001.phpt | 2 +- ext/opcache/tests/jit/trampoline_002.phpt | 2 +- ext/opcache/tests/jit/type_check_001.phpt | 2 +- ext/opcache/tests/jit/ucall_001.phpt | 2 +- ext/opcache/tests/jit/ucall_002.phpt | 2 +- ext/opcache/tests/jit/ucall_003.phpt | 2 +- ext/opcache/tests/jit/ucall_004.phpt | 2 +- ext/opcache/tests/jit/undef_to_typed_ref.phpt | 2 +- ext/opcache/tests/jit/unreachable_block.phpt | 2 +- ext/opcache/tests/jit/verify_return_undef.phpt | 2 +- ext/opcache/tests/jit/xor_001.phpt | 2 +- ext/opcache/tests/jit/xor_002.phpt | 2 +- ext/opcache/tests/jit/xor_003.phpt | 2 +- ext/phar/tests/024-opcache-win32.phpt | 2 +- 351 files changed, 351 insertions(+), 351 deletions(-) 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-- Date: Mon, 13 Nov 2023 15:13:09 +0100 Subject: [PATCH 12/12] Update --- run-tests.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/run-tests.php b/run-tests.php index 2899be5be5a0a..8cbaac8872cd5 100755 --- a/run-tests.php +++ b/run-tests.php @@ -311,8 +311,6 @@ function main(): void 'opcache.jit_max_root_traces=100000', 'opcache.jit_max_side_traces=100000', 'opcache.jit_max_exit_counters=100000', - 'opcache.jit_blacklist_root_trace=255', - 'opcache.jit_blacklist_side_trace=255', 'opcache.protect_memory=1', 'zend.assertions=1', 'zend.exception_ignore_args=0',