Skip to content

Update Binaryen to latest / allowInliningFunctionsWithLoops bindings #1449

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 12 commits into from
Sep 11, 2020
Merged

Update Binaryen to latest / allowInliningFunctionsWithLoops bindings #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23c5093
Update Binaryen to latest / allowHeavyweight bindings
dcodeIO Aug 28, 2020
3d545d3
update to latest Binaryen nightly
dcodeIO Aug 29, 2020
44f512f
switch on
dcodeIO Aug 29, 2020
233b7e5
mirror Binaryen's allowHeavyweight levels
dcodeIO Aug 29, 2020
a423c17
rerun ci
dcodeIO Aug 29, 2020
7b344aa
Update src/module.ts
dcodeIO Sep 6, 2020
fc374c3
Update src/glue/binaryen.d.ts
dcodeIO Sep 6, 2020
d1c32f1
Update src/module.ts
dcodeIO Sep 6, 2020
e80a791
Update src/module.ts
dcodeIO Sep 6, 2020
e211b04
binaryen++
dcodeIO Sep 6, 2020
7b2e295
binaryen#
dcodeIO Sep 11, 2020
bc2c762
Merge branch 'master' into allowHeavyweight
dcodeIO Sep 11, 2020
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"url": "https://github.com/AssemblyScript/assemblyscript/issues"
},
"dependencies": {
"binaryen": "95.0.0-nightly.20200813",
"binaryen": "96.0.0-nightly.20200911",
"long": "^4.0.0",
"source-map-support": "^0.5.19",
"ts-node": "^6.2.0"
Expand Down
2 changes: 2 additions & 0 deletions src/glue/binaryen.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,3 +986,5 @@ export declare function _BinaryenGetFlexibleInlineMaxSize(): BinaryenIndex;
export declare function _BinaryenSetFlexibleInlineMaxSize(size: BinaryenIndex): void;
export declare function _BinaryenGetOneCallerInlineMaxSize(): BinaryenIndex;
export declare function _BinaryenSetOneCallerInlineMaxSize(size: BinaryenIndex): void;
export declare function _BinaryenGetAllowInliningFunctionsWithLoops(): bool;
export declare function _BinaryenSetAllowInliningFunctionsWithLoops(enabled: bool): void;
33 changes: 22 additions & 11 deletions src/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,14 @@ export class Module {
binaryen._BinaryenSetOneCallerInlineMaxSize(size);
}

getAllowInliningFunctionsWithLoops(): bool {
return binaryen._BinaryenGetAllowInliningFunctionsWithLoops();
}

setAllowInliningFunctionsWithLoops(enabled: bool): void {
binaryen._BinaryenSetAllowInliningFunctionsWithLoops(enabled);
}

// meta (module)

getFeatures(): FeatureFlags {
Expand Down Expand Up @@ -1474,23 +1482,26 @@ export class Module {
// Implicitly run costly non-LLVM optimizations on -O3 or -Oz
if (optimizeLevel >= 3 || shrinkLevel >= 2) optimizeLevel = 4;

binaryen._BinaryenSetOptimizeLevel(optimizeLevel);
binaryen._BinaryenSetShrinkLevel(shrinkLevel);
binaryen._BinaryenSetDebugInfo(debugInfo);
this.setOptimizeLevel(optimizeLevel);
this.setShrinkLevel(shrinkLevel);
this.setDebugInfo(debugInfo);
this.clearPassArguments();

// Tweak inlining limits based on optimization levels
if (optimizeLevel >= 2 && shrinkLevel === 0) {
binaryen._BinaryenSetAlwaysInlineMaxSize(12);
binaryen._BinaryenSetFlexibleInlineMaxSize(70);
binaryen._BinaryenSetOneCallerInlineMaxSize(200);
if (optimizeLevel >= 2 && shrinkLevel == 0) {
this.setAlwaysInlineMaxSize(12);
this.setFlexibleInlineMaxSize(70);
this.setOneCallerInlineMaxSize(200);
this.setAllowInliningFunctionsWithLoops(optimizeLevel >= 3);
} else {
binaryen._BinaryenSetAlwaysInlineMaxSize(
this.setAlwaysInlineMaxSize(
optimizeLevel == 0 && shrinkLevel >= 0
? 2
: 4
);
binaryen._BinaryenSetFlexibleInlineMaxSize(65);
binaryen._BinaryenSetOneCallerInlineMaxSize(80);
this.setFlexibleInlineMaxSize(65);
this.setOneCallerInlineMaxSize(80);
this.setAllowInliningFunctionsWithLoops(false);
}

// Pass order here differs substantially from Binaryen's defaults
Expand Down Expand Up @@ -1596,7 +1607,7 @@ export class Module {
if (optimizeLevel >= 2 || shrinkLevel >= 2) {
passes.push("inlining-optimizing");
}
if (binaryen._BinaryenGetLowMemoryUnused()) {
if (this.getLowMemoryUnused()) {
if (optimizeLevel >= 3 || shrinkLevel >= 1) {
passes.push("optimize-added-constants-propagate");
} else {
Expand Down