Skip to content

Commit cdec865

Browse files
dcodeIOdcodeIO
committed
Update Binaryen to latest nightly
1 parent c835b5f commit cdec865

20 files changed

+1910
-1937
lines changed

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@protobufjs/utf8": "^1.1.0",
15-
"binaryen": "71.0.0-nightly.20190305",
15+
"binaryen": "72.0.0-nightly.20190308",
1616
"glob": "^7.1.3",
1717
"long": "^4.0.0",
1818
"opencollective-postinstall": "^2.0.0",

‎tests/compiler.js

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ if (args.help) {
5252
const features = process.env.ASC_FEATURES ? process.env.ASC_FEATURES.split(",") : [];
5353
const featuresConfig = require("./features.json");
5454

55-
var successes = 0;
5655
var failedTests = [];
57-
var failedInstantiates = new Map();
56+
var failedMessages = new Map();
57+
var skippedTests = [];
58+
var skippedMessages = new Map();
5859

5960
const basedir = path.join(__dirname, "compiler");
6061

@@ -123,6 +124,8 @@ tests.forEach(filename => {
123124
});
124125
if (missing_features.length) {
125126
console.log("- " + colorsUtil.yellow("feature SKIPPED") + " (" + missing_features.join(", ") + ")\n");
127+
skippedTests.push(basename);
128+
skippedMessages.set(basename, "feature not enabled");
126129
return;
127130
}
128131
}
@@ -167,7 +170,6 @@ tests.forEach(filename => {
167170
}
168171
}
169172
console.log("- " + colorsUtil.green("error check OK"));
170-
++successes;
171173
console.log();
172174
return;
173175
}
@@ -300,23 +302,33 @@ tests.forEach(filename => {
300302
} catch (e) {
301303
console.log("- " + colorsUtil.red("instantiate ERROR: ") + e.stack);
302304
failed = true;
303-
failedInstantiates.set(basename, e.message);
305+
failedMessages.set(basename, e.message);
304306
}
305307

306308
if (failed) failedTests.push(basename);
307-
else ++successes;
308309
console.log();
309310
});
310311
});
311312
if (v8_no_flags) v8.setFlagsFromString(v8_no_flags);
312313
});
313314

315+
if (skippedTests.length) {
316+
console.log(colorsUtil.yellow("WARNING: ") + colorsUtil.white(skippedTests.length + " compiler tests have been skipped:\n"));
317+
skippedTests.forEach(name => {
318+
var message = skippedMessages.has(name) ? colorsUtil.gray("[" + skippedMessages.get(name) + "]") : "";
319+
console.log(" " + name + " " + message);
320+
});
321+
console.log();
322+
}
314323
if (failedTests.length) {
315324
process.exitCode = 1;
316-
console.log(colorsUtil.red("ERROR: ") + colorsUtil.white(failedTests.length + " compiler tests failed:"));
325+
console.log(colorsUtil.red("ERROR: ") + colorsUtil.white(failedTests.length + " compiler tests had failures:\n"));
317326
failedTests.forEach(name => {
318-
var message = failedInstantiates.has(name) ? colorsUtil.gray("[" + failedInstantiates.get(name) + "]") : "";
327+
var message = failedMessages.has(name) ? colorsUtil.gray("[" + failedMessages.get(name) + "]") : "";
319328
console.log(" " + name + " " + message);
320329
});
321-
} else
322-
console.log("[ " + colorsUtil.white("SUCCESS") + " ]");
330+
console.log();
331+
}
332+
if (!process.exitCode) {
333+
console.log("[ " + colorsUtil.white("OK") + " ]");
334+
}

‎tests/compiler/mandelbrot.optimized.wat

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@
190190
(local $1 f64)
191191
(local $2 i32)
192192
(local $3 i32)
193-
(local $4 i32)
194-
(local $5 i64)
195-
(local $6 f64)
193+
(local $4 f64)
194+
(local $5 i32)
195+
(local $6 i64)
196196
(local $7 f64)
197197
(local $8 f64)
198198
local.get $0
199199
i64.reinterpret_f64
200-
local.tee $5
200+
local.tee $6
201201
i64.const 32
202202
i64.shr_u
203203
i32.wrap_i64
@@ -214,7 +214,7 @@
214214
end
215215
local.get $3
216216
if
217-
local.get $5
217+
local.get $6
218218
i64.const 1
219219
i64.shl
220220
i64.const 0
@@ -239,12 +239,12 @@
239239
return
240240
end
241241
i32.const -54
242-
local.set $4
242+
local.set $5
243243
local.get $0
244244
f64.const 18014398509481984
245245
f64.mul
246246
i64.reinterpret_f64
247-
local.tee $5
247+
local.tee $6
248248
i64.const 32
249249
i64.shr_u
250250
i32.wrap_i64
@@ -262,7 +262,7 @@
262262
i32.eq
263263
local.tee $3
264264
if
265-
local.get $5
265+
local.get $6
266266
i64.const 32
267267
i64.shl
268268
i64.const 0
@@ -284,10 +284,10 @@
284284
i32.shr_u
285285
i32.const 1023
286286
i32.sub
287-
local.get $4
288-
i32.add
289-
local.set $4
290287
local.get $5
288+
i32.add
289+
local.set $5
290+
local.get $6
291291
i64.const 4294967295
292292
i64.and
293293
local.get $2
@@ -307,8 +307,8 @@
307307
local.get $1
308308
f64.add
309309
f64.div
310-
local.tee $6
311-
local.get $6
310+
local.tee $4
311+
local.get $4
312312
f64.mul
313313
local.tee $7
314314
local.get $7
@@ -331,7 +331,7 @@
331331
f64.sub
332332
local.get $1
333333
f64.sub
334-
local.get $6
334+
local.get $4
335335
local.get $1
336336
local.get $7
337337
f64.const 0.6666666666666735
@@ -363,26 +363,25 @@
363363
f64.add
364364
f64.mul
365365
f64.add
366-
local.tee $0
366+
local.set $4
367+
local.get $5
368+
f64.convert_i32_s
369+
local.tee $7
367370
local.get $8
368-
f64.add
369-
f64.const 1.6751713164886512e-10
370-
f64.mul
371-
local.get $0
372371
f64.const 1.4426950407214463
373372
f64.mul
373+
local.tee $1
374374
f64.add
375-
local.set $6
375+
local.set $0
376376
local.get $4
377-
f64.convert_i32_s
378-
local.tee $7
379377
local.get $8
378+
f64.add
379+
f64.const 1.6751713164886512e-10
380+
f64.mul
381+
local.get $4
380382
f64.const 1.4426950407214463
381383
f64.mul
382-
local.tee $1
383384
f64.add
384-
local.set $0
385-
local.get $6
386385
local.get $7
387386
local.get $0
388387
f64.sub
@@ -413,14 +412,14 @@
413412
f64.const 4
414413
local.get $2
415414
f64.convert_i32_u
416-
local.tee $4
415+
local.tee $6
417416
f64.mul
418417
f64.min
419418
f64.div
420419
local.set $9
421420
local.get $0
422421
f64.convert_i32_u
423-
local.get $4
422+
local.get $6
424423
f64.const 0.5
425424
f64.mul
426425
f64.sub
@@ -448,7 +447,7 @@
448447
f64.const 8
449448
local.get $6
450449
f64.min
451-
local.set $8
450+
local.set $14
452451
loop $repeat|0
453452
local.get $7
454453
local.get $1
@@ -471,7 +470,7 @@
471470
local.get $4
472471
local.get $4
473472
f64.mul
474-
local.tee $14
473+
local.tee $8
475474
local.get $5
476475
local.get $5
477476
f64.mul
@@ -489,7 +488,7 @@
489488
local.get $10
490489
f64.add
491490
local.set $5
492-
local.get $14
491+
local.get $8
493492
local.get $6
494493
f64.sub
495494
local.get $11
@@ -510,7 +509,7 @@
510509
loop $continue|2
511510
local.get $2
512511
f64.convert_i32_u
513-
local.get $8
512+
local.get $14
514513
f64.lt
515514
if
516515
local.get $4

0 commit comments

Comments
 (0)