diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-04-20 17:41:07 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2016-04-20 17:48:13 -0700 |
| commit | 6b7963ca2c79836a984a4c74121a55e523f797f0 (patch) | |
| tree | b64b235ca71f56455a2a4041dd87b445ae5fb27b | |
| parent | a6112412ce60546f9d9523476edddc0a891ad11e (diff) | |
| download | binaryen-6b7963ca2c79836a984a4c74121a55e523f797f0.tar.gz binaryen-6b7963ca2c79836a984a4c74121a55e523f797f0.tar.bz2 binaryen-6b7963ca2c79836a984a4c74121a55e523f797f0.zip | |
run merge-blocks later, so it can optiize simplify-locals output
| -rw-r--r-- | src/pass.cpp | 2 | ||||
| -rw-r--r-- | test/unit.fromasm | 18 | ||||
| -rw-r--r-- | test/unit.fromasm.imprecise | 18 |
3 files changed, 17 insertions, 21 deletions
diff --git a/src/pass.cpp b/src/pass.cpp index 1a8aaabc9..7095da71d 100644 --- a/src/pass.cpp +++ b/src/pass.cpp @@ -60,9 +60,9 @@ std::string PassRegistry::getPassDescription(std::string name) { void PassRunner::addDefaultOptimizationPasses() { add("remove-unused-brs"); add("remove-unused-names"); - add("merge-blocks"); add("optimize-instructions"); add("simplify-locals"); + add("merge-blocks"); add("reorder-locals"); add("vacuum"); } diff --git a/test/unit.fromasm b/test/unit.fromasm index 9a142a142..0a4b39d25 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -311,19 +311,17 @@ ) (func $abs (local $asm2wasm_i32_temp i32) - (block - (select - (i32.sub + (select + (i32.sub + (i32.const 0) + (set_local $asm2wasm_i32_temp (i32.const 0) - (set_local $asm2wasm_i32_temp - (i32.const 0) - ) ) + ) + (get_local $asm2wasm_i32_temp) + (i32.lt_s (get_local $asm2wasm_i32_temp) - (i32.lt_s - (get_local $asm2wasm_i32_temp) - (i32.const 0) - ) + (i32.const 0) ) ) (f64.abs diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index e829c7f3c..e146f60c4 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -305,19 +305,17 @@ ) (func $abs (local $asm2wasm_i32_temp i32) - (block - (select - (i32.sub + (select + (i32.sub + (i32.const 0) + (set_local $asm2wasm_i32_temp (i32.const 0) - (set_local $asm2wasm_i32_temp - (i32.const 0) - ) ) + ) + (get_local $asm2wasm_i32_temp) + (i32.lt_s (get_local $asm2wasm_i32_temp) - (i32.lt_s - (get_local $asm2wasm_i32_temp) - (i32.const 0) - ) + (i32.const 0) ) ) (f64.abs |