Skip to content

Commit 2ca142e

Browse files
danogiluuu1994
danog
authored and
iluuu1994
committed
Improve jit tests
Closes phpGH-12425
1 parent 82dcfd1 commit 2ca142e

File tree

358 files changed

+357
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+357
-363
lines changed

Diff for: ‎.circleci/config.yml

-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ jobs:
182182
-d zend_extension=opcache.so \
183183
-d opcache.enable_cli=1 \
184184
-d opcache.jit_buffer_size=64M \
185-
-d opcache.jit_max_root_traces=100000 \
186-
-d opcache.jit_max_side_traces=100000 \
187-
-d opcache.jit_max_exit_counters=100000 \
188185
-d opcache.jit=tracing \
189186
-P -q -x -j2 \
190187
-g FAIL,BORK,LEAK,XLEAK \

Diff for: ‎.github/actions/test-linux/action.yml

-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ runs:
4646
-d opcache.jit=${{ inputs.jitType }} \
4747
-d opcache.protect_memory=1 \
4848
-d opcache.jit_buffer_size=64M \
49-
-d opcache.jit_max_root_traces=100000 \
50-
-d opcache.jit_max_side_traces=100000 \
51-
-d opcache.jit_max_exit_counters=100000 \
5249
-j$(/usr/bin/nproc) \
5350
-g FAIL,BORK,LEAK,XLEAK \
5451
--no-progress \

Diff for: ‎.github/actions/test-macos/action.yml

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ runs:
2323
-d opcache.jit=${{ inputs.jitType }} \
2424
-d opcache.protect_memory=1 \
2525
-d opcache.jit_buffer_size=64M \
26-
-d opcache.jit_max_root_traces=100000 \
27-
-d opcache.jit_max_side_traces=100000 \
28-
-d opcache.jit_max_exit_counters=100000 \
2926
-j$(sysctl -n hw.ncpu) \
3027
-g FAIL,BORK,LEAK,XLEAK \
3128
--no-progress \

Diff for: ‎.github/scripts/windows/test_task.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ set OPENSSL_CONF=
8383
rem set SSLEAY_CONF=
8484

8585
rem prepare for OPcache
86-
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
86+
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
8787
rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508)
8888
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli
8989

Diff for: ‎.github/workflows/nightly.yml

-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ jobs:
382382
echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini
383383
echo memory_limit=-1 >> /etc/php.d/opcache.ini
384384
php -v
385-
386385
- name: Test AMPHP
387386
if: matrix.branch.ref != 'PHP-8.0'
388387
run: |

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ before_script:
8585

8686
# Run PHPs run-tests.php
8787
script:
88-
- 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
88+
- travis_wait 60 ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M
8989
- sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
9090

9191
after_success:

Diff for: ‎ext/opcache/tests/bug81272.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ opcache
55
--INI--
66
opcache.enable=1
77
opcache.enable_cli=1
8-
opcache.jit_buffer_size=16M
8+
opcache.jit_buffer_size=64M
99
opcache.jit=function
1010
--FILE--
1111
<?php

Diff for: ‎ext/opcache/tests/jit/add_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 001
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 002
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 003
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_004.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 004
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_005.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 005
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_006.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 006
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=32M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_007.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 007 Addition with immediate values
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
opcache.protect_memory=1
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/add_008.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 008 Addition with reference IS_VAR
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
opcache.protect_memory=1
99
opcache.jit=tracing
1010
--EXTENSIONS--

Diff for: ‎ext/opcache/tests/jit/add_009.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 009 two array references
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
$a = [];

Diff for: ‎ext/opcache/tests/jit/add_010.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 010 overflow handling
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--SKIPIF--
99
<?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
1010
--FILE--

Diff for: ‎ext/opcache/tests/jit/add_011.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 011 overflow handling
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--SKIPIF--
99
<?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
1010
--FILE--

Diff for: ‎ext/opcache/tests/jit/add_012.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 012 register allocation for 64-bit constant
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--SKIPIF--
99
<?php if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
1010
--FILE--

Diff for: ‎ext/opcache/tests/jit/add_013.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 013 register allocation (incorrect hinting)
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
function y(){

Diff for: ‎ext/opcache/tests/jit/add_014.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ADD: 014 incorrect guard elimination
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
function test() {

Diff for: ‎ext/opcache/tests/jit/and_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT BW_AND: 001 (empty string)
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
$a = [];

Diff for: ‎ext/opcache/tests/jit/and_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT BW_AND: 002 (memory leak)
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
function t($a) {

Diff for: ‎ext/opcache/tests/jit/array_elem_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Occupied next element
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
--FILE--
99
<?php
1010
$float = 100000000000000000000000000000000000000;

Diff for: ‎ext/opcache/tests/jit/assign_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 001
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 002
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=1
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 003
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_004.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 004
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_005.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 005
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_006.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 006
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_007.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 007
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_008.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 008
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_009.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 009
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_010.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 010
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_011.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 011
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_012.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 012
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_013.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 013
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_014.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 014
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_015.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 015
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_016.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 016
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_017.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 017
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_018.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 018
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_019.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 019
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

Diff for: ‎ext/opcache/tests/jit/assign_020.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ JIT ASSIGN: 020
44
opcache.enable=1
55
opcache.enable_cli=1
66
opcache.file_update_protection=0
7-
opcache.jit_buffer_size=1M
7+
opcache.jit_buffer_size=64M
88
;opcache.jit_debug=257
99
--EXTENSIONS--
1010
opcache

0 commit comments

Comments
 (0)