diff --git a/UPGRADING b/UPGRADING index 1c75894512f9..379c389547c8 100644 --- a/UPGRADING +++ b/UPGRADING @@ -519,6 +519,8 @@ PHP 8.6 UPGRADE NOTES . Improved performance of array_map() with multiple arrays passed. . Improved performance of array_sum() and array_product() for integer-only arrays. + . Improved performance of min() and max() for integer-only and float-only + arrays. . Improved performance of array_unshift(). . Improved performance of array_walk(). . Improved performance of intval('+0b...', 2) and intval('0b...', 2). diff --git a/ext/standard/array.c b/ext/standard/array.c index a233e6c4dcb5..832958f86dd0 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1109,6 +1109,80 @@ static zval *php_array_data_minmax(HashTable *array, bool max) /* {{{ */ } /* }}} */ +static zend_always_inline bool php_array_minmax(HashTable *array, zval *return_value, bool max) /* {{{ */ +{ + zval *entry, *result = NULL; + zend_long result_lval = 0; + double result_dval = 0.0; + /* IS_LONG or IS_DOUBLE while every value scanned so far has that exact type, + * IS_UNDEF once a value forces the generic zend_compare() fallback. */ + uint8_t fast_type = IS_UNDEF; + + ZEND_HASH_FOREACH_VAL(array, entry) { + zval *value = entry; + + ZVAL_DEREF(value); + + if (fast_type == IS_LONG && EXPECTED(Z_TYPE_P(value) == IS_LONG)) { + zend_long value_lval = Z_LVAL_P(value); + if (max ? result_lval < value_lval : result_lval > value_lval) { + result = value; + result_lval = value_lval; + } + continue; + } + + if (fast_type == IS_DOUBLE && EXPECTED(Z_TYPE_P(value) == IS_DOUBLE)) { + double value_dval = Z_DVAL_P(value); + /* NaN ordering differs from zend_compare(); hand it to the fallback. */ + if (EXPECTED(!zend_isnan(value_dval))) { + if (max ? result_dval < value_dval : result_dval > value_dval) { + result = value; + result_dval = value_dval; + } + continue; + } + } + + if (!result) { + if (Z_TYPE_P(value) == IS_LONG) { + result = value; + result_lval = Z_LVAL_P(value); + fast_type = IS_LONG; + continue; + } + if (Z_TYPE_P(value) == IS_DOUBLE && !zend_isnan(Z_DVAL_P(value))) { + result = value; + result_dval = Z_DVAL_P(value); + fast_type = IS_DOUBLE; + continue; + } + return false; + } + + fast_type = IS_UNDEF; + + int cmp = zend_compare(result, value); + if (max ? cmp < 0 : cmp > 0) { + result = value; + } + } ZEND_HASH_FOREACH_END(); + + if (!result) { + return false; + } + + if (fast_type == IS_LONG) { + ZVAL_LONG(return_value, result_lval); + } else if (fast_type == IS_DOUBLE) { + ZVAL_DOUBLE(return_value, result_dval); + } else { + ZVAL_COPY_DEREF(return_value, result); + } + return true; +} +/* }}} */ + /* {{{ * proto mixed min(array values) * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) @@ -1128,7 +1202,12 @@ PHP_FUNCTION(min) zend_wrong_parameter_type_error(1, Z_EXPECTED_ARRAY, &args[0]); RETURN_THROWS(); } else { - zval *result = php_array_data_minmax(Z_ARRVAL(args[0]), false); + HashTable *array = Z_ARRVAL(args[0]); + if (php_array_minmax(array, return_value, false)) { + return; + } + + zval *result = php_array_data_minmax(array, false); if (result) { RETURN_COPY_DEREF(result); } else { @@ -1256,7 +1335,12 @@ PHP_FUNCTION(max) zend_wrong_parameter_type_error(1, Z_EXPECTED_ARRAY, &args[0]); RETURN_THROWS(); } else { - zval *result = php_array_data_minmax(Z_ARRVAL(args[0]), true); + HashTable *array = Z_ARRVAL(args[0]); + if (php_array_minmax(array, return_value, true)) { + return; + } + + zval *result = php_array_data_minmax(array, true); if (result) { RETURN_COPY_DEREF(result); } else { diff --git a/ext/standard/tests/array/min_max_array_fast_path.phpt b/ext/standard/tests/array/min_max_array_fast_path.phpt new file mode 100644 index 000000000000..c9b613911c55 --- /dev/null +++ b/ext/standard/tests/array/min_max_array_fast_path.phpt @@ -0,0 +1,107 @@ +--TEST-- +min() and max() array long/double fast path preserves comparison behavior +--FILE-- + $values) { + echo "-- $name --\n"; + var_dump(min($values)); + var_dump(max($values)); +} + +?> +--EXPECT-- +-- packed long -- +int(-3) +int(7) +-- sparse long -- +int(-2) +int(7) +-- long refs -- +int(3) +int(9) +-- packed double -- +float(-3.5) +float(7.5) +-- sparse double -- +float(-2.5) +float(7.5) +-- double refs -- +float(3.5) +float(9.5) +-- double equal -- +float(2.5) +float(2.5) +-- nan first -- +float(1) +float(NAN) +-- nan middle -- +float(1) +float(3) +-- nan last -- +float(NAN) +float(3) +-- inf -- +float(-INF) +float(INF) +-- single long -- +int(7) +int(7) +-- single double -- +float(7.5) +float(7.5) +-- first non-long -- +int(3) +string(1) "5" +-- fallback after longs -- +int(2) +int(5) +-- fallback after doubles -- +float(2.5) +float(5.5) +-- long then double -- +float(2.5) +int(9) +-- double then long -- +int(2) +int(9)