Skip to content

refactor: Reorder list construction in the function php_intpow10 #11683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2023
Merged

refactor: Reorder list construction in the function php_intpow10 #11683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16169e8
Reorder array construction in the function
jorgsowa Jul 11, 2023
962bfe7
Optimize function php_intlog10abs
jorgsowa Jul 11, 2023
70daa36
Merge branch 'php:master' into optimize_function_php_intpow10
jorgsowa Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions ext/standard/math.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,32 @@

#include "php.h"
#include "php_math.h"
#include "zend_multiply.h"
#include "zend_bitset.h"
#include "zend_exceptions.h"
#include "zend_multiply.h"
#include "zend_portability.h"
#include "zend_bitset.h"

#include <math.h>
#include <float.h>
#include <math.h>
#include <stdlib.h>

#include "basic_functions.h"

/* {{{ php_intlog10abs
Returns floor(log10(fabs(val))), uses fast binary search */
static inline int php_intlog10abs(double value) {
int result;
value = fabs(value);

if (value < 1e-8 || value > 1e22) {
result = (int)floor(log10(value));
return (int)floor(log10(value));
} else {
static const double values[] = {
1e-8, 1e-7, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1,
1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7,
1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15,
1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22};
/* Do a binary search with 5 steps */
result = 15;
int result = 15;
static const double values[] = {
1e-8, 1e-7, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1, 1e0, 1e1, 1e2,
1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13,
1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22};

if (value < values[result]) {
result -= 8;
} else {
Expand All @@ -70,23 +69,23 @@ static inline int php_intlog10abs(double value) {
result -= 1;
}
result -= 8;
return result;
}
return result;
}
/* }}} */

/* {{{ php_intpow10
Returns pow(10.0, (double)power), uses fast lookup table for exact powers */
static inline double php_intpow10(int power) {
static const double powers[] = {
1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7,
1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15,
1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22};

/* Not in lookup table */
if (power < 0 || power > 22) {
return pow(10.0, (double)power);
}

static const double powers[] = {
1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11,
1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22};

return powers[power];
}
/* }}} */
Expand Down Expand Up @@ -1023,7 +1022,7 @@ PHPAPI zend_string *_php_math_number_format_ex(double d, int dec, const char *de
size_t integral;
size_t reslen = 0;
int count = 0;
int is_negative=0;
int is_negative = 0;

if (d < 0) {
is_negative = 1;
Expand Down