merge blocks before and after remove-unused-brs

kripken · kripken · commit b3c97a9d6e9c · 2017-05-10T14:55:34.000-07:00
diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp
@@ -135,8 +135,9 @@ void PassRunner::addDefaultFunctionOptimizationPasses() {
   add("simplify-locals");
   add("vacuum"); // previous pass creates garbage
   add("reorder-locals");
+  add("merge-blocks"); // makes remove-unused-brs more effective
   add("remove-unused-brs"); // coalesce-locals opens opportunities for optimizations
-  add("merge-blocks");
+  add("merge-blocks"); // clean up remove-unused-brs new blocks
   add("optimize-instructions");
   add("precompute");
   if (options.shrinkLevel >= 2) {
diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
@@ -2741,69 +2741,71 @@
         (block
          (set_local $10
           (block $__rjto$0 i32
-           (block $__rjti$0
-            (br_if $__rjti$0
-             (i32.ge_u
-              (tee_local $11
-               (i32.add
-                (i32.load8_s
-                 (tee_local $6
-                  (i32.add
-                   (get_local $10)
-                   (i32.const 1)
+           (if
+            (i32.eqz
+             (i32.or
+              (i32.ge_u
+               (tee_local $11
+                (i32.add
+                 (i32.load8_s
+                  (tee_local $6
+                   (i32.add
+                    (get_local $10)
+                    (i32.const 1)
+                   )
                   )
                  )
+                 (i32.const -48)
                 )
-                (i32.const -48)
                )
+               (i32.const 10)
               )
-              (i32.const 10)
-             )
-            )
-            (br_if $__rjti$0
-             (i32.ne
-              (i32.load8_s offset=2
-               (get_local $10)
+              (i32.ne
+               (i32.load8_s offset=2
+                (get_local $10)
+               )
+               (i32.const 36)
               )
-              (i32.const 36)
              )
             )
-            (i32.store
-             (i32.add
-              (get_local $4)
-              (i32.shl
-               (get_local $11)
-               (i32.const 2)
+            (block
+             (i32.store
+              (i32.add
+               (get_local $4)
+               (i32.shl
+                (get_local $11)
+                (i32.const 2)
+               )
               )
+              (i32.const 10)
              )
-             (i32.const 10)
-            )
-            (set_local $6
-             (i32.add
-              (get_local $3)
-              (i32.shl
-               (i32.add
-                (i32.load8_s
-                 (get_local $6)
+             (set_local $6
+              (i32.add
+               (get_local $3)
+               (i32.shl
+                (i32.add
+                 (i32.load8_s
+                  (get_local $6)
+                 )
+                 (i32.const -48)
                 )
-                (i32.const -48)
+                (i32.const 3)
                )
-               (i32.const 3)
               )
              )
-            )
-            (set_local $8
-             (i32.const 1)
-            )
-            (set_local $14
-             (i32.load
-              (get_local $6)
+             (set_local $8
+              (i32.const 1)
              )
-            )
-            (br $__rjto$0
-             (i32.add
-              (get_local $10)
-              (i32.const 3)
+             (set_local $14
+              (i32.load
+               (get_local $6)
+              )
+             )
+             (br $__rjto$0
+              (i32.add
+               (get_local $10)
+               (i32.const 3)
+              )
              )
             )
            )
diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt
@@ -519,17 +519,19 @@
      )
      (br $shape$3$continue)
     )
+    (block
+     (call $print
+      (i32.const 2)
+     )
+     (drop
+      (call $check)
+     )
+     (set_local $0
+      (i32.const 6)
+     )
+     (br $shape$3$continue)
+    )
    )
-   (call $print
-    (i32.const 2)
-   )
-   (drop
-    (call $check)
-   )
-   (set_local $0
-    (i32.const 6)
-   )
-   (br $shape$3$continue)
   )
  )
 )
diff --git a/test/wasm-only.fromasm b/test/wasm-only.fromasm
@@ -363,7 +363,6 @@
      (get_local $1)
     )
     (block
-     (nop)
      (br_if $__rjto$0
       (get_local $2)
      )
diff --git a/test/wasm-only.fromasm.clamp b/test/wasm-only.fromasm.clamp
@@ -363,7 +363,6 @@
      (get_local $1)
     )
     (block
-     (nop)
      (br_if $__rjto$0
       (get_local $2)
      )
diff --git a/test/wasm-only.fromasm.imprecise b/test/wasm-only.fromasm.imprecise
@@ -278,7 +278,6 @@
      (get_local $1)
     )
     (block
-     (nop)
      (br_if $__rjto$0
       (get_local $2)
      )

Original file line number	Diff line number	Diff line change
`@@ -519,17 +519,19 @@`
`519`	`519`	`)`
`520`	`520`	`(br $shape$3$continue)`
`521`	`521`	`)`
	`522`	`+ (block`
	`523`	`+ (call $print`
	`524`	`+ (i32.const 2)`
	`525`	`+ )`
	`526`	`+ (drop`
	`527`	`+ (call $check)`
	`528`	`+ )`
	`529`	`+ (set_local $0`
	`530`	`+ (i32.const 6)`
	`531`	`+ )`
	`532`	`+ (br $shape$3$continue)`
	`533`	`+ )`
`522`	`534`	`)`
`523`		`- (call $print`
`524`		`- (i32.const 2)`
`525`		`- )`
`526`		`- (drop`
`527`		`- (call $check)`
`528`		`- )`
`529`		`- (set_local $0`
`530`		`- (i32.const 6)`
`531`		`- )`
`532`		`- (br $shape$3$continue)`
`533`	`535`	`)`
`534`	`536`	`)`
`535`	`537`	`)`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,6 @@`
`363`	`363`	`(get_local $1)`
`364`	`364`	`)`
`365`	`365`	`(block`
`366`		`- (nop)`
`367`	`366`	`(br_if $__rjto$0`
`368`	`367`	`(get_local $2)`
`369`	`368`	`)`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,6 @@`
`278`	`278`	`(get_local $1)`
`279`	`279`	`)`
`280`	`280`	`(block`
`281`		`- (nop)`
`282`	`281`	`(br_if $__rjto$0`
`283`	`282`	`(get_local $2)`
`284`	`283`	`)`