Skip to content

Commit 01ed845

Browse files
dtcdtc
committed
Update the js-optimizer pointer masking test and re-enabled it.
1 parent f4bf8ba commit 01ed845

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎tests/optimizer/test-js-optimizer-pointerMask-output.js

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
function f() {
2-
HEAP8[x >> 0];
2+
HEAP8[(x & MASK0) >> 0];
33
HEAP8[(x & MASK0) + 1 >> 0];
44
HEAP8[(x & MASK0) + 2 >> 0];
5-
HEAP8[(x + 1 & MASK0) + 2 >> 0];
6-
HEAP8[(x + 2 & MASK0) + 2 >> 0];
7-
HEAP8[(x + 1 + y & MASK0) + 2 >> 0];
8-
HEAP8[(x + 2 + y & MASK0) + 2 >> 0];
5+
HEAP8[(x & MASK0) + 3 >> 0];
6+
HEAP8[(x & MASK0) + 4 >> 0];
7+
HEAP8[(x + y & MASK0) + 3 >> 0];
8+
HEAP8[(x + y & MASK0) + 4 >> 0];
99
x();
10-
HEAP16[x >> 1];
11-
HEAP16[x + 1 >> 1];
10+
HEAP16[(x & MASK1) >> 1];
11+
HEAP16[(x + 1 & MASK1) >> 1];
1212
HEAP16[(x & MASK1) + 2 >> 1];
1313
HEAP16[(x + 1 & MASK1) + 2 >> 1];
14-
HEAP16[(x + 2 & MASK1) + 2 >> 1];
14+
HEAP16[(x & MASK1) + 4 >> 1];
1515
HEAP16[(x + 1 + y & MASK1) + 2 >> 1];
16-
HEAP16[(x + 2 + y & MASK1) + 2 >> 1];
16+
HEAP16[(x + y & MASK1) + 4 >> 1];
1717
HEAP16[(x + 1 + y & MASK1) + 4 >> 1];
18-
HEAP16[(x + 2 + y & MASK1) + 4 >> 1];
18+
HEAP16[(x + y & MASK1) + 6 >> 1];
1919
HEAP16[(x + 1 + y & MASK1) + 4 >> 1];
20-
HEAP16[(x + 4 + y & MASK1) + 2 >> 1];
20+
HEAP16[(x + y & MASK1) + 6 >> 1];
2121
x();
22-
HEAP32[x >> 2];
23-
HEAP32[x + 1 >> 2];
24-
HEAP32[x + 2 >> 2];
25-
HEAP32[x + 3 >> 2];
22+
HEAP32[(x & MASK2) >> 2];
23+
HEAP32[(x + 1 & MASK2) >> 2];
24+
HEAP32[(x + 2 & MASK2) >> 2];
25+
HEAP32[(x + 3 & MASK2) >> 2];
2626
HEAP32[(x & MASK2) + 4 >> 2];
2727
HEAP32[(x + 1 & MASK2) + 4 >> 2];
28-
HEAP32[(x + 4 & MASK2) + 4 >> 2];
28+
HEAP32[(x & MASK2) + 8 >> 2];
2929
HEAP32[(x + 1 + y & MASK2) + 4 >> 2];
30-
HEAP32[(x + 4 + y & MASK2) + 4 >> 2];
30+
HEAP32[(x + y & MASK2) + 8 >> 2];
3131
HEAP32[(x + 1 + y & MASK2) + 8 >> 2];
32-
HEAP32[(x + 4 + y & MASK2) + 8 >> 2];
32+
HEAP32[(x + y & MASK2) + 12 >> 2];
3333
HEAP32[(x + 1 + y & MASK2) + 8 >> 2];
34-
HEAP32[(x + 8 + y & MASK2) + 4 >> 2];
34+
HEAP32[(x + y & MASK2) + 12 >> 2];
3535
x();
36-
HEAPU32[x >> 2];
37-
HEAPU32[x + 1 >> 2];
36+
HEAPU32[(x & MASK2) >> 2];
37+
HEAPU32[(x + 1 & MASK2) >> 2];
3838
HEAPU32[(x & MASK2) + 4 >> 2];
3939
HEAPU32[(x + 1 & MASK2) + 4 >> 2];
40-
HEAPU32[(x + 4 & MASK2) + 4 >> 2];
40+
HEAPU32[(x & MASK2) + 8 >> 2];
4141
HEAPU32[(x + 1 + y & MASK2) + 4 >> 2];
42-
HEAPU32[(x + 4 + y & MASK2) + 4 >> 2];
42+
HEAPU32[(x + y & MASK2) + 8 >> 2];
4343
HEAPU32[(x + 1 + y & MASK2) + 8 >> 2];
44-
HEAPU32[(x + 4 + y & MASK2) + 8 >> 2];
44+
HEAPU32[(x + y & MASK2) + 12 >> 2];
4545
HEAPU32[(x + 1 + y & MASK2) + 8 >> 2];
46-
HEAPU32[(x + 8 + y & MASK2) + 4 >> 2];
46+
HEAPU32[(x + y & MASK2) + 12 >> 2];
4747
x();
48-
HEAPF32[x >> 2];
49-
HEAPF32[x + 1 >> 2];
48+
HEAPF32[(x & MASK2) >> 2];
49+
HEAPF32[(x + 1 & MASK2) >> 2];
5050
HEAPF32[(x & MASK2) + 4 >> 2];
5151
HEAPF32[(x + 1 & MASK2) + 4 >> 2];
52-
HEAPF32[(x + 4 & MASK2) + 4 >> 2];
52+
HEAPF32[(x & MASK2) + 8 >> 2];
5353
HEAPF32[(x + 1 + y & MASK2) + 4 >> 2];
54-
HEAPF32[(x + 4 + y & MASK2) + 4 >> 2];
54+
HEAPF32[(x + y & MASK2) + 8 >> 2];
5555
HEAPF32[(x + 1 + y & MASK2) + 8 >> 2];
56-
HEAPF32[(x + 4 + y & MASK2) + 8 >> 2];
56+
HEAPF32[(x + y & MASK2) + 12 >> 2];
5757
HEAPF32[(x + 1 + y & MASK2) + 8 >> 2];
58-
HEAPF32[(x + 8 + y & MASK2) + 4 >> 2];
58+
HEAPF32[(x + y & MASK2) + 12 >> 2];
5959
x();
60-
HEAPF64[x >> 3];
61-
HEAPF64[x + 1 >> 3];
60+
HEAPF64[(x & MASK3) >> 3];
61+
HEAPF64[(x + 1 & MASK3) >> 3];
6262
HEAPF64[(x & MASK3) + 8 >> 3];
6363
HEAPF64[(x + 1 & MASK3) + 8 >> 3];
64-
HEAPF64[(x + 8 & MASK3) + 8 >> 3];
64+
HEAPF64[(x & MASK3) + 16 >> 3];
6565
HEAPF64[(x + 1 + y & MASK3) + 8 >> 3];
66-
HEAPF64[(x + 8 + y & MASK3) + 8 >> 3];
66+
HEAPF64[(x + y & MASK3) + 16 >> 3];
6767
HEAPF64[(x + 1 + y & MASK3) + 16 >> 3];
68-
HEAPF64[(x + 8 + y & MASK3) + 16 >> 3];
68+
HEAPF64[(x + y & MASK3) + 24 >> 3];
6969
HEAPF64[(x + 1 + y & MASK3) + 16 >> 3];
70-
HEAPF64[(x + 16 + y & MASK3) + 8 >> 3];
70+
HEAPF64[(x + y & MASK3) + 24 >> 3];
7171
}
7272

‎tests/test_other.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,8 +2006,8 @@ def test_js_optimizer(self):
20062006
['asm', 'minifyWhitespace', 'asmLastOpts', 'last']),
20072007
(path_from_root('tests', 'optimizer', 'test-js-optimizer-shiftsAggressive.js'), open(path_from_root('tests', 'optimizer', 'test-js-optimizer-shiftsAggressive-output.js')).read(),
20082008
['asm', 'aggressiveVariableElimination']),
2009-
#(path_from_root('tests', 'optimizer', 'test-js-optimizer-pointerMask.js'), open(path_from_root('tests', 'optimizer', 'test-js-optimizer-pointerMask-output.js')).read(),
2010-
# ['pointerMasking']),
2009+
(path_from_root('tests', 'optimizer', 'test-js-optimizer-pointerMask.js'), open(path_from_root('tests', 'optimizer', 'test-js-optimizer-pointerMask-output.js')).read(),
2010+
['pointerMasking']),
20112011
(path_from_root('tests', 'optimizer', 'test-js-optimizer-localCSE.js'), open(path_from_root('tests', 'optimizer', 'test-js-optimizer-localCSE-output.js')).read(),
20122012
['asm', 'localCSE']),
20132013
(path_from_root('tests', 'optimizer', 'test-js-optimizer-ensureLabelSet.js'), open(path_from_root('tests', 'optimizer', 'test-js-optimizer-ensureLabelSet-output.js')).read(),

0 commit comments

Comments
 (0)