recurse in optimizeBoolean (WebAssembly#809)

kripken · web-flow · commit aa06410ccd11 · 2016-10-27T11:28:35.000-07:00
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
@@ -371,7 +371,17 @@ struct OptimizeInstructions : public WalkerPass<PostWalker<OptimizeInstructions,
           }
         }
       }
+    } else if (auto* block = boolean->dynCast<Block>()) {
+      if (block->type == i32 && block->list.size() > 0) {
+        block->list.back() = optimizeBoolean(block->list.back());
+      }
+    } else if (auto* iff = boolean->dynCast<If>()) {
+      if (iff->type == i32) {
+        iff->ifTrue = optimizeBoolean(iff->ifTrue);
+        iff->ifFalse = optimizeBoolean(iff->ifFalse);
+      }
     }
+    // TODO: recurse into br values?
     return boolean;
   }
 
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm
@@ -9600,12 +9600,9 @@
               (i32.const 12)
             )
           )
-          (i32.ne
-            (call $___syscall54
-              (i32.const 54)
-              (get_local $3)
-            )
-            (i32.const 0)
+          (call $___syscall54
+            (i32.const 54)
+            (get_local $3)
           )
         )
       )
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise
@@ -9598,12 +9598,9 @@
               (i32.const 12)
             )
           )
-          (i32.ne
-            (call $___syscall54
-              (i32.const 54)
-              (get_local $3)
-            )
-            (i32.const 0)
+          (call $___syscall54
+            (i32.const 54)
+            (get_local $3)
           )
         )
       )
diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt
@@ -375,4 +375,21 @@
     )
     (i32.const 1)
   )
+  (func $recurse-bool (type $1)
+    (if
+      (if i32
+        (i32.const 1)
+        (call $ne0)
+        (call $ne0)
+      )
+      (nop)
+    )
+    (if
+      (block $block i32
+        (nop)
+        (call $ne0)
+      )
+      (nop)
+    )
+  )
 )
diff --git a/test/passes/optimize-instructions.wast b/test/passes/optimize-instructions.wast
@@ -296,4 +296,21 @@
     )
     (i32.const 1)
   )
+  (func $recurse-bool
+    (if
+      (if i32
+        (i32.const 1)
+        (i32.ne (call $ne0) (i32.const 0))
+        (i32.ne (call $ne0) (i32.const 0))
+      )
+      (nop)
+    )
+    (if
+      (block i32
+        (nop)
+        (i32.ne (call $ne0) (i32.const 0))
+      )
+      (nop)
+    )
+  )
 )

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,17 @@ struct OptimizeInstructions : public WalkerPass<PostWalker<OptimizeInstructions,`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`	`}`
	`374`	`+ } else if (auto* block = boolean->dynCast<Block>()) {`
	`375`	`+ if (block->type == i32 && block->list.size() > 0) {`
	`376`	`+ block->list.back() = optimizeBoolean(block->list.back());`
	`377`	`+ }`
	`378`	`+ } else if (auto* iff = boolean->dynCast<If>()) {`
	`379`	`+ if (iff->type == i32) {`
	`380`	`+ iff->ifTrue = optimizeBoolean(iff->ifTrue);`
	`381`	`+ iff->ifFalse = optimizeBoolean(iff->ifFalse);`
	`382`	`+ }`
`374`	`383`	`}`
	`384`	`+ // TODO: recurse into br values?`
`375`	`385`	`return boolean;`
`376`	`386`	`}`
`377`	`387`
Original file line number	Diff line number	Diff line change
`@@ -9600,12 +9600,9 @@`
`9600`	`9600`	`(i32.const 12)`
`9601`	`9601`	`)`
`9602`	`9602`	`)`
`9603`		`- (i32.ne`
`9604`		`- (call $___syscall54`
`9605`		`- (i32.const 54)`
`9606`		`- (get_local $3)`
`9607`		`- )`
`9608`		`- (i32.const 0)`
	`9603`	`+ (call $___syscall54`
	`9604`	`+ (i32.const 54)`
	`9605`	`+ (get_local $3)`
`9609`	`9606`	`)`
`9610`	`9607`	`)`
`9611`	`9608`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9598,12 +9598,9 @@`
`9598`	`9598`	`(i32.const 12)`
`9599`	`9599`	`)`
`9600`	`9600`	`)`
`9601`		`- (i32.ne`
`9602`		`- (call $___syscall54`
`9603`		`- (i32.const 54)`
`9604`		`- (get_local $3)`
`9605`		`- )`
`9606`		`- (i32.const 0)`
	`9601`	`+ (call $___syscall54`
	`9602`	`+ (i32.const 54)`
	`9603`	`+ (get_local $3)`
`9607`	`9604`	`)`
`9608`	`9605`	`)`
`9609`	`9606`	`)`