Improve jit tests

Closes GH-12425
php · Nov 14, 2023 · 2ca142e · 2ca142e
1 parent 82dcfd1
commit 2ca142e
Show file tree

Hide file tree

Showing 358 changed files with 357 additions and 363 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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--
 <?php

diff --git a/ext/opcache/tests/jit/add_001.phpt b/ext/opcache/tests/jit/add_001.phpt
@@ -4,7 +4,7 @@ JIT ADD: 001
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_002.phpt b/ext/opcache/tests/jit/add_002.phpt
@@ -4,7 +4,7 @@ JIT ADD: 002
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_003.phpt b/ext/opcache/tests/jit/add_003.phpt
@@ -4,7 +4,7 @@ JIT ADD: 003
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_004.phpt b/ext/opcache/tests/jit/add_004.phpt
@@ -4,7 +4,7 @@ JIT ADD: 004
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_005.phpt b/ext/opcache/tests/jit/add_005.phpt
@@ -4,7 +4,7 @@ JIT ADD: 005
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_006.phpt b/ext/opcache/tests/jit/add_006.phpt
@@ -4,7 +4,7 @@ JIT ADD: 006
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=32M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_007.phpt b/ext/opcache/tests/jit/add_007.phpt
@@ -4,7 +4,7 @@ JIT ADD: 007 Addition with immediate values
 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
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/add_008.phpt b/ext/opcache/tests/jit/add_008.phpt
@@ -4,7 +4,7 @@ JIT ADD: 008 Addition with reference IS_VAR
 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
 opcache.jit=tracing
 --EXTENSIONS--

diff --git a/ext/opcache/tests/jit/add_009.phpt b/ext/opcache/tests/jit/add_009.phpt
@@ -4,7 +4,7 @@ JIT ADD: 009 two array references
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 --FILE--
 <?php
 $a = []; 

diff --git a/ext/opcache/tests/jit/add_010.phpt b/ext/opcache/tests/jit/add_010.phpt
@@ -4,7 +4,7 @@ JIT ADD: 010 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--
 <?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
 --FILE--

diff --git 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--
 <?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
 --FILE--

diff --git 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--
 <?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
 --FILE--

diff --git 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--
 <?php
 function y(){

diff --git a/ext/opcache/tests/jit/add_014.phpt b/ext/opcache/tests/jit/add_014.phpt
@@ -4,7 +4,7 @@ JIT ADD: 014 incorrect guard elimination
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 --FILE--
 <?php
 function test() {

diff --git a/ext/opcache/tests/jit/and_001.phpt b/ext/opcache/tests/jit/and_001.phpt
@@ -4,7 +4,7 @@ JIT BW_AND: 001 (empty string)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 --FILE--
 <?php
 $a = [];

diff --git a/ext/opcache/tests/jit/and_002.phpt b/ext/opcache/tests/jit/and_002.phpt
@@ -4,7 +4,7 @@ JIT BW_AND: 002 (memory leak)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 --FILE--
 <?php
 function t($a) {

diff --git a/ext/opcache/tests/jit/array_elem_002.phpt b/ext/opcache/tests/jit/array_elem_002.phpt
@@ -4,7 +4,7 @@ Occupied next element
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 --FILE--
 <?php
 $float = 100000000000000000000000000000000000000;

diff --git a/ext/opcache/tests/jit/assign_001.phpt b/ext/opcache/tests/jit/assign_001.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 001
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_002.phpt b/ext/opcache/tests/jit/assign_002.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 002
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=1
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_003.phpt b/ext/opcache/tests/jit/assign_003.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 003
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_004.phpt b/ext/opcache/tests/jit/assign_004.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 004
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_005.phpt b/ext/opcache/tests/jit/assign_005.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 005
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_006.phpt b/ext/opcache/tests/jit/assign_006.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 006
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_007.phpt b/ext/opcache/tests/jit/assign_007.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 007
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_008.phpt b/ext/opcache/tests/jit/assign_008.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 008
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_009.phpt b/ext/opcache/tests/jit/assign_009.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 009
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_010.phpt b/ext/opcache/tests/jit/assign_010.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 010
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_011.phpt b/ext/opcache/tests/jit/assign_011.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 011
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_012.phpt b/ext/opcache/tests/jit/assign_012.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 012
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_013.phpt b/ext/opcache/tests/jit/assign_013.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 013
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_014.phpt b/ext/opcache/tests/jit/assign_014.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 014
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_015.phpt b/ext/opcache/tests/jit/assign_015.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 015
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_016.phpt b/ext/opcache/tests/jit/assign_016.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 016
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_017.phpt b/ext/opcache/tests/jit/assign_017.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 017
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_018.phpt b/ext/opcache/tests/jit/assign_018.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 018
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_019.phpt b/ext/opcache/tests/jit/assign_019.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 019
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache

diff --git a/ext/opcache/tests/jit/assign_020.phpt b/ext/opcache/tests/jit/assign_020.phpt
@@ -4,7 +4,7 @@ JIT ASSIGN: 020
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
-opcache.jit_buffer_size=1M
+opcache.jit_buffer_size=64M
 ;opcache.jit_debug=257
 --EXTENSIONS--
 opcache