Skip to content

Commit f07067d

Browse files
sbc100sbc100
authored
Avoid extra wrappers library_math.js. NFC (#21675)
Its possible that passing these function directly to Wasm is easier to optimize in the engine.
1 parent 77be1bf commit f07067d

File tree

2 files changed

+62
-63
lines changed

2 files changed

+62
-63
lines changed

‎src/library_math.js

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
addToLibrary({
2-
emscripten_math_cbrt: (x) => Math.cbrt(x),
3-
emscripten_math_pow: (x, y) => Math.pow(x, y),
4-
emscripten_math_random: () => Math.random(),
5-
emscripten_math_sign: (x) => Math.sign(x),
6-
emscripten_math_sqrt: (x) => Math.sqrt(x),
7-
emscripten_math_exp: (x) => Math.exp(x),
8-
emscripten_math_expm1: (x) => Math.expm1(x),
2+
emscripten_math_cbrt: 'Math.cbrt',
3+
emscripten_math_pow: 'Math.pow',
4+
emscripten_math_random: 'Math.random',
5+
emscripten_math_sign: 'Math.sign',
6+
emscripten_math_sqrt: 'Math.sqrt',
7+
emscripten_math_exp: 'Math.exp',
8+
emscripten_math_expm1: 'Math.expm1',
99
emscripten_math_fmod: (x, y) => x % y,
10-
emscripten_math_log: (x) => Math.log(x),
11-
emscripten_math_log1p: (x) => Math.log1p(x),
12-
emscripten_math_log10: (x) => Math.log10(x),
13-
emscripten_math_log2: (x) => Math.log2(x),
14-
emscripten_math_round: (x) => Math.round(x),
15-
emscripten_math_acos: (x) => Math.acos(x),
16-
emscripten_math_acosh: (x) => Math.acosh(x),
17-
emscripten_math_asin: (x) => Math.asin(x),
18-
emscripten_math_asinh: (x) => Math.asinh(x),
19-
emscripten_math_atan: (x) => Math.atan(x),
20-
emscripten_math_atanh: (x) => Math.atanh(x),
21-
emscripten_math_atan2: (y, x) => Math.atan2(y, x),
22-
emscripten_math_cos: (x) => Math.cos(x),
23-
emscripten_math_cosh: (x) => Math.cosh(x),
10+
emscripten_math_log: 'Math.log',
11+
emscripten_math_log1p: 'Math.log1p',
12+
emscripten_math_log10: 'Math.log10',
13+
emscripten_math_log2: 'Math.log2',
14+
emscripten_math_round: 'Math.round',
15+
emscripten_math_acos: 'Math.acos',
16+
emscripten_math_acosh: 'Math.acosh',
17+
emscripten_math_asin: 'Math.asin',
18+
emscripten_math_asinh: 'Math.asinh',
19+
emscripten_math_atan: 'Math.atan',
20+
emscripten_math_atanh: 'Math.atanh',
21+
emscripten_math_atan2: 'Math.atan2',
22+
emscripten_math_cos: 'Math.cos',
23+
emscripten_math_cosh: 'Math.cosh',
2424
emscripten_math_hypot: (count, varargs) => {
2525
var args = [];
2626
for (var i = 0; i < count; ++i) {
2727
args.push({{{ makeGetValue('varargs', `i * ${getNativeTypeSize('double')}`, 'double') }}});
2828
}
2929
return Math.hypot(...args);
3030
},
31-
emscripten_math_sin: (x) => Math.sin(x),
32-
emscripten_math_sinh: (x) => Math.sinh(x),
33-
emscripten_math_tan: (x) => Math.tan(x),
34-
emscripten_math_tanh: (x) => Math.tanh(x)
31+
emscripten_math_sin: 'Math.sin',
32+
emscripten_math_sinh: 'Math.sinh',
33+
emscripten_math_tan: 'Math.tan',
34+
emscripten_math_tanh: 'Math.tanh',
3535
});

‎test/core/test_emscripten_math.c

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
#include <stdio.h>
22
#include <emscripten/em_math.h>
33

4-
int main()
5-
{
6-
printf("%f\n", emscripten_math_acos(0.5));
7-
printf("%f\n", emscripten_math_acosh(42.0));
8-
printf("%f\n", emscripten_math_asin(0.5));
9-
printf("%f\n", emscripten_math_asinh(42.0));
10-
printf("%f\n", emscripten_math_atan(42.0));
11-
printf("%f\n", emscripten_math_atan2(42.0, 13.0));
12-
printf("%f\n", emscripten_math_atanh(0.9));
13-
printf("%f\n", emscripten_math_cbrt(8.0));
14-
printf("%f\n", emscripten_math_cos(42.0));
15-
printf("%f\n", emscripten_math_cosh(0.6));
16-
printf("%f\n", emscripten_math_exp(2.0));
17-
printf("%f\n", emscripten_math_expm1(2.0));
18-
printf("%f\n", emscripten_math_fmod(2.0, 0.75));
19-
printf("%f\n", emscripten_math_hypot(3, 3.0, 4.0, 5.0));
20-
printf("%f\n", emscripten_math_log(42.0));
21-
printf("%f\n", emscripten_math_log10(42.0));
22-
printf("%f\n", emscripten_math_log1p(42.0));
23-
printf("%f\n", emscripten_math_log2(42.0));
24-
printf("%f\n", emscripten_math_pow(2.0, 4.0));
25-
printf("%d\n", (int)(emscripten_math_random() >= 0 && emscripten_math_random() <= 1));
26-
printf("%f\n", emscripten_math_round(42.5));
27-
printf("%f\n", emscripten_math_sign(-42.0));
28-
printf("%f\n", emscripten_math_sin(42.0));
29-
printf("%f\n", emscripten_math_sinh(0.6));
30-
printf("%f\n", emscripten_math_sqrt(10000.0));
31-
printf("%f\n", emscripten_math_tan(42.0));
32-
printf("%f\n", emscripten_math_tanh(42.0));
33-
printf("-\n");
34-
printf("%f\n", EM_MATH_E);
35-
printf("%f\n", EM_MATH_LN2);
36-
printf("%f\n", EM_MATH_LN10);
37-
printf("%f\n", EM_MATH_LOG2E);
38-
printf("%f\n", EM_MATH_LOG10E);
39-
printf("%f\n", EM_MATH_PI);
40-
printf("%f\n", EM_MATH_SQRT1_2);
41-
printf("%f\n", EM_MATH_SQRT2);
4+
int main() {
5+
printf("%f\n", emscripten_math_acos(0.5));
6+
printf("%f\n", emscripten_math_acosh(42.0));
7+
printf("%f\n", emscripten_math_asin(0.5));
8+
printf("%f\n", emscripten_math_asinh(42.0));
9+
printf("%f\n", emscripten_math_atan(42.0));
10+
printf("%f\n", emscripten_math_atan2(42.0, 13.0));
11+
printf("%f\n", emscripten_math_atanh(0.9));
12+
printf("%f\n", emscripten_math_cbrt(8.0));
13+
printf("%f\n", emscripten_math_cos(42.0));
14+
printf("%f\n", emscripten_math_cosh(0.6));
15+
printf("%f\n", emscripten_math_exp(2.0));
16+
printf("%f\n", emscripten_math_expm1(2.0));
17+
printf("%f\n", emscripten_math_fmod(2.0, 0.75));
18+
printf("%f\n", emscripten_math_hypot(3, 3.0, 4.0, 5.0));
19+
printf("%f\n", emscripten_math_log(42.0));
20+
printf("%f\n", emscripten_math_log10(42.0));
21+
printf("%f\n", emscripten_math_log1p(42.0));
22+
printf("%f\n", emscripten_math_log2(42.0));
23+
printf("%f\n", emscripten_math_pow(2.0, 4.0));
24+
printf("%d\n", (int)(emscripten_math_random() >= 0 && emscripten_math_random() <= 1));
25+
printf("%f\n", emscripten_math_round(42.5));
26+
printf("%f\n", emscripten_math_sign(-42.0));
27+
printf("%f\n", emscripten_math_sin(42.0));
28+
printf("%f\n", emscripten_math_sinh(0.6));
29+
printf("%f\n", emscripten_math_sqrt(10000.0));
30+
printf("%f\n", emscripten_math_tan(42.0));
31+
printf("%f\n", emscripten_math_tanh(42.0));
32+
printf("-\n");
33+
printf("%f\n", EM_MATH_E);
34+
printf("%f\n", EM_MATH_LN2);
35+
printf("%f\n", EM_MATH_LN10);
36+
printf("%f\n", EM_MATH_LOG2E);
37+
printf("%f\n", EM_MATH_LOG10E);
38+
printf("%f\n", EM_MATH_PI);
39+
printf("%f\n", EM_MATH_SQRT1_2);
40+
printf("%f\n", EM_MATH_SQRT2);
4241
}

0 commit comments

Comments
 (0)