mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
ext/standard/array.c: Optimize min/max functions for int/float (#11194)
Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
This commit is contained in:
George Peter Banyard
committed by
GitHub
GitHub
parent
82e761eaac
commit
15402454a6
@@ -1233,15 +1233,58 @@ PHP_FUNCTION(min)
|
||||
}
|
||||
} else {
|
||||
/* mixed min ( mixed $value1 , mixed $value2 [, mixed $value3... ] ) */
|
||||
zval *min, result;
|
||||
zval *min;
|
||||
uint32_t i;
|
||||
|
||||
min = &args[0];
|
||||
zend_long min_lval;
|
||||
double min_dval;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
is_smaller_function(&result, &args[i], min);
|
||||
if (Z_TYPE(result) == IS_TRUE) {
|
||||
min = &args[i];
|
||||
if (Z_TYPE_P(min) == IS_LONG) {
|
||||
min_lval = Z_LVAL_P(min);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (EXPECTED(Z_TYPE(args[i]) == IS_LONG)) {
|
||||
if (min_lval > Z_LVAL(args[i])) {
|
||||
min_lval = Z_LVAL(args[i]);
|
||||
min = &args[i];
|
||||
}
|
||||
} else if (Z_TYPE(args[i]) == IS_DOUBLE && (zend_dval_to_lval((double) min_lval) == min_lval)) {
|
||||
/* if min_lval can be exactly represented as a double, go to double dedicated code */
|
||||
min_dval = (double) min_lval;
|
||||
goto double_compare;
|
||||
} else {
|
||||
goto generic_compare;
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_LONG(min_lval);
|
||||
} else if (Z_TYPE_P(min) == IS_DOUBLE) {
|
||||
min_dval = Z_DVAL_P(min);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (EXPECTED(Z_TYPE(args[i]) == IS_DOUBLE)) {
|
||||
double_compare:
|
||||
if (min_dval > Z_DVAL(args[i])) {
|
||||
min_dval = Z_DVAL(args[i]);
|
||||
min = &args[i];
|
||||
}
|
||||
} else if (Z_TYPE(args[i]) == IS_LONG && (zend_dval_to_lval((double) Z_LVAL(args[i])) == Z_LVAL(args[i]))) {
|
||||
/* if the value can be exactly represented as a double, use double dedicated code otherwise generic */
|
||||
if (min_dval > (double)Z_LVAL(args[i])) {
|
||||
min_dval = (double)Z_LVAL(args[i]);
|
||||
min = &args[i];
|
||||
}
|
||||
} else {
|
||||
goto generic_compare;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = 1; i < argc; i++) {
|
||||
generic_compare:
|
||||
if (zend_compare(&args[i], min) < 0) {
|
||||
min = &args[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1279,15 +1322,58 @@ PHP_FUNCTION(max)
|
||||
}
|
||||
} else {
|
||||
/* mixed max ( mixed $value1 , mixed $value2 [, mixed $value3... ] ) */
|
||||
zval *max, result;
|
||||
zval *max;
|
||||
uint32_t i;
|
||||
|
||||
max = &args[0];
|
||||
zend_long max_lval;
|
||||
double max_dval;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
is_smaller_or_equal_function(&result, &args[i], max);
|
||||
if (Z_TYPE(result) == IS_FALSE) {
|
||||
max = &args[i];
|
||||
if (Z_TYPE_P(max) == IS_LONG) {
|
||||
max_lval = Z_LVAL_P(max);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (EXPECTED(Z_TYPE(args[i]) == IS_LONG)) {
|
||||
if (max_lval < Z_LVAL(args[i])) {
|
||||
max_lval = Z_LVAL(args[i]);
|
||||
max = &args[i];
|
||||
}
|
||||
} else if (Z_TYPE(args[i]) == IS_DOUBLE && (zend_dval_to_lval((double) max_lval) == max_lval)) {
|
||||
/* if max_lval can be exactly represented as a double, go to double dedicated code */
|
||||
max_dval = (double) max_lval;
|
||||
goto double_compare;
|
||||
} else {
|
||||
goto generic_compare;
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_LONG(max_lval);
|
||||
} else if (Z_TYPE_P(max) == IS_DOUBLE) {
|
||||
max_dval = Z_DVAL_P(max);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (EXPECTED(Z_TYPE(args[i]) == IS_DOUBLE)) {
|
||||
double_compare:
|
||||
if (max_dval < Z_DVAL(args[i])) {
|
||||
max_dval = Z_DVAL(args[i]);
|
||||
max = &args[i];
|
||||
}
|
||||
} else if (Z_TYPE(args[i]) == IS_LONG && (zend_dval_to_lval((double) Z_LVAL(args[i])) == Z_LVAL(args[i]))) {
|
||||
/* if the value can be exactly represented as a double, use double dedicated code otherwise generic */
|
||||
if (max_dval < (double)Z_LVAL(args[i])) {
|
||||
max_dval = (double)Z_LVAL(args[i]);
|
||||
max = &args[i];
|
||||
}
|
||||
} else {
|
||||
goto generic_compare;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = 1; i < argc; i++) {
|
||||
generic_compare:
|
||||
if (zend_compare(&args[i], max) > 0) {
|
||||
max = &args[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
61
ext/standard/tests/array/max_int_float_optimisation.phpt
Normal file
61
ext/standard/tests/array/max_int_float_optimisation.phpt
Normal file
@@ -0,0 +1,61 @@
|
||||
--TEST--
|
||||
Check max() optimisation for int and float types
|
||||
--SKIPIF--
|
||||
<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
echo "Start as int optimisation:\n";
|
||||
var_dump(max(10, 5, 3, 2));
|
||||
var_dump(max(2, 3, 5, 10));
|
||||
var_dump(max(10, 5, 3.5, 2));
|
||||
var_dump(max(2, 3.5, 5, 10));
|
||||
var_dump(max(10, 5, "3", 2));
|
||||
var_dump(max(2, "3", 5, 10));
|
||||
var_dump(max(2, 3, "15", 10));
|
||||
echo "Check that int not representable as float works:\n";
|
||||
var_dump(max(PHP_INT_MIN+1, PHP_INT_MIN, PHP_INT_MIN*2));
|
||||
var_dump(max(PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX*2));
|
||||
// Has INF
|
||||
var_dump(max(PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX**20));
|
||||
|
||||
echo "Start as float optimisation:\n";
|
||||
var_dump(max(10.5, 5.5, 3.5, 2.5));
|
||||
var_dump(max(2.5, 3.5, 5.5, 10.5));
|
||||
var_dump(max(10.5, 5.5, 3, 2.5));
|
||||
var_dump(max(2.5, 3, 5.5, 10.5));
|
||||
var_dump(max(10.5, 5.5, "3.5", 2.5));
|
||||
var_dump(max(2.5, "3.5", 5.5, 10.5));
|
||||
var_dump(max(2.5, 3.5, "15.5", 10.5));
|
||||
echo "Check that int not representable as float works:\n";
|
||||
var_dump(max(PHP_INT_MIN*2, PHP_INT_MIN, PHP_INT_MIN+1));
|
||||
var_dump(max(PHP_INT_MAX*2, PHP_INT_MAX, PHP_INT_MAX-1));
|
||||
// Has INF
|
||||
var_dump(max(PHP_INT_MAX**20, PHP_INT_MAX, PHP_INT_MAX-1));
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
Start as int optimisation:
|
||||
int(10)
|
||||
int(10)
|
||||
int(10)
|
||||
int(10)
|
||||
int(10)
|
||||
int(10)
|
||||
string(2) "15"
|
||||
Check that int not representable as float works:
|
||||
int(-9223372036854775807)
|
||||
float(1.8446744073709552E+19)
|
||||
float(INF)
|
||||
Start as float optimisation:
|
||||
float(10.5)
|
||||
float(10.5)
|
||||
float(10.5)
|
||||
float(10.5)
|
||||
float(10.5)
|
||||
float(10.5)
|
||||
string(4) "15.5"
|
||||
Check that int not representable as float works:
|
||||
int(-9223372036854775807)
|
||||
float(1.8446744073709552E+19)
|
||||
float(INF)
|
||||
61
ext/standard/tests/array/min_int_float_optimisation.phpt
Normal file
61
ext/standard/tests/array/min_int_float_optimisation.phpt
Normal file
@@ -0,0 +1,61 @@
|
||||
--TEST--
|
||||
Check min() optimisation for int and float types
|
||||
--SKIPIF--
|
||||
<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
echo "Start as int optimisation:\n";
|
||||
var_dump(min(10, 5, 3, 2));
|
||||
var_dump(min(2, 3, 5, 10));
|
||||
var_dump(min(10, 5, 3.5, 2));
|
||||
var_dump(min(2, 3.5, 5, 10));
|
||||
var_dump(min(10, 5, "3", 2));
|
||||
var_dump(min(2, "3", 5, 10));
|
||||
var_dump(min(2, 3, "1", 10));
|
||||
echo "Check that int not representable as float works:\n";
|
||||
var_dump(min(PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX*2));
|
||||
var_dump(min(PHP_INT_MIN+1, PHP_INT_MIN, PHP_INT_MIN*2));
|
||||
// Has INF
|
||||
var_dump(min(PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX**20));
|
||||
|
||||
echo "Start as float optimisation:\n";
|
||||
var_dump(min(10.5, 5.5, 3.5, 2.5));
|
||||
var_dump(min(2.5, 3.5, 5.5, 10.5));
|
||||
var_dump(min(10.5, 5.5, 3, 2.5));
|
||||
var_dump(min(2.5, 3, 5.5, 10.5));
|
||||
var_dump(min(10.5, 5.5, "3.5", 2.5));
|
||||
var_dump(min(2.5, "3.5", 5.5, 10.5));
|
||||
var_dump(min(2.5, 3.5, "1.5", 10.5));
|
||||
echo "Check that int not representable as float works:\n";
|
||||
var_dump(min(PHP_INT_MAX*2, PHP_INT_MAX, PHP_INT_MAX-1));
|
||||
var_dump(min(PHP_INT_MIN*2, PHP_INT_MIN, PHP_INT_MIN+1));
|
||||
// Has INF
|
||||
var_dump(min(PHP_INT_MAX**20, PHP_INT_MAX, PHP_INT_MAX-1));
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
Start as int optimisation:
|
||||
int(2)
|
||||
int(2)
|
||||
int(2)
|
||||
int(2)
|
||||
int(2)
|
||||
int(2)
|
||||
string(1) "1"
|
||||
Check that int not representable as float works:
|
||||
int(9223372036854775806)
|
||||
float(-1.8446744073709552E+19)
|
||||
int(9223372036854775806)
|
||||
Start as float optimisation:
|
||||
float(2.5)
|
||||
float(2.5)
|
||||
float(2.5)
|
||||
float(2.5)
|
||||
float(2.5)
|
||||
float(2.5)
|
||||
string(3) "1.5"
|
||||
Check that int not representable as float works:
|
||||
int(9223372036854775806)
|
||||
float(-1.8446744073709552E+19)
|
||||
int(9223372036854775806)
|
||||
Reference in New Issue
Block a user