apply rse later

Author: MaxGraey

src/module.ts

@@ -1519,7 +1519,6 @@ export class Module {
 
       if (optimizeLevel >= 3 || shrinkLevel >= 1) {
         passes.push("simplify-locals-notee-nostructure");
-        passes.push("rse");
         passes.push("vacuum");
         passes.push("ssa-nomerge");
         passes.push("simplify-globals-optimizing");
@@ -1547,6 +1546,7 @@ export class Module {
       // }
       passes.push("optimize-instructions");
       if (optimizeLevel >= 3 || shrinkLevel >= 1) {
+        passes.push("rse");
         passes.push("dce");
       }
       passes.push("remove-unused-brs");

tests/compiler/comma.optimized.wat

@@ -10,13 +10,12 @@
  (start $~start)
  (func $start:comma
   (local $0 i32)
-  (local $1 i32)
   global.get $comma/a
-  local.tee $1
+  local.tee $0
   i32.const 1
   i32.add
   global.set $comma/a
-  local.get $1
+  local.get $0
   global.set $comma/b
   global.get $comma/a
   i32.const 1
@@ -80,6 +79,8 @@
   global.set $comma/b
   i32.const 2
   global.set $comma/a
+  i32.const 0
+  local.set $0
   loop $for-loop|0
    local.get $0
    global.get $comma/a

tests/compiler/do.optimized.wat

@@ -683,26 +683,26 @@
    i32.const 0
    i32.store
    loop $for-loop|0
-    local.get $0
+    local.get $2
     i32.const 23
     i32.lt_u
     if
-     local.get $0
+     local.get $2
      i32.const 2
      i32.shl
      i32.const 1216
      i32.add
      i32.const 0
      i32.store offset=4
      i32.const 0
-     local.set $2
+     local.set $0
      loop $for-loop|1
-      local.get $2
+      local.get $0
       i32.const 16
       i32.lt_u
       if
-       local.get $2
        local.get $0
+       local.get $2
        i32.const 4
        i32.shl
        i32.add
@@ -712,17 +712,17 @@
        i32.add
        i32.const 0
        i32.store offset=96
-       local.get $2
+       local.get $0
        i32.const 1
        i32.add
-       local.set $2
+       local.set $0
        br $for-loop|1
       end
      end
-     local.get $0
+     local.get $2
      i32.const 1
      i32.add
-     local.set $0
+     local.set $2
      br $for-loop|0
     end
    end
@@ -1028,22 +1028,23 @@
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
+  (local $3 i32)
   i32.const 0
   global.set $do/ran
   i32.const 10
-  local.set $0
+  local.set $1
   loop $do-continue|0
-   local.get $1
+   local.get $0
    i32.const 1
    i32.add
-   local.set $1
-   local.get $0
+   local.set $0
+   local.get $1
    i32.const 1
    i32.sub
-   local.tee $0
+   local.tee $1
    br_if $do-continue|0
   end
-  local.get $0
+  local.get $1
   if
    i32.const 0
    i32.const 1040
@@ -1052,7 +1053,7 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $1
+  local.get $0
   i32.const 10
   i32.ne
   if
@@ -1068,17 +1069,17 @@
   i32.const 0
   global.set $do/ran
   i32.const 10
-  local.set $1
+  local.set $0
   loop $do-continue|00
-   local.get $1
-   local.tee $0
+   local.get $0
+   local.tee $1
    i32.const 1
    i32.sub
-   local.set $1
-   local.get $0
+   local.set $0
+   local.get $1
    br_if $do-continue|00
   end
-  local.get $1
+  local.get $0
   i32.const -1
   i32.ne
   if
@@ -1108,14 +1109,14 @@
   global.set $do/ran
   i32.const 0
   local.set $0
-  loop $do-continue|01
+  loop $do-continue|001
    local.get $0
    i32.const 1
    i32.add
    local.tee $0
    i32.const 10
    i32.ne
-   br_if $do-continue|01
+   br_if $do-continue|001
   end
   local.get $0
   i32.const 10
@@ -1132,14 +1133,14 @@
   global.set $do/ran
   i32.const 0
   local.set $0
-  loop $do-continue|02
+  loop $do-continue|01
    local.get $0
    i32.const 1
    i32.add
    local.tee $0
    i32.const 10
    i32.ne
-   br_if $do-continue|02
+   br_if $do-continue|01
   end
   local.get $0
   i32.const 10
@@ -1168,14 +1169,14 @@
   global.set $do/ran
   i32.const 0
   local.set $0
-  loop $do-continue|03
+  loop $do-continue|02
    local.get $0
    i32.const 1
    i32.add
    local.tee $0
    i32.const 10
    i32.ne
-   br_if $do-continue|03
+   br_if $do-continue|02
   end
   local.get $0
   i32.const 10
@@ -1193,30 +1194,30 @@
   i32.const 0
   global.set $do/ran
   i32.const 0
-  local.set $1
-  i32.const 0
   local.set $0
-  loop $do-continue|04
-   local.get $1
+  i32.const 0
+  local.set $1
+  loop $do-continue|03
+   local.get $0
    i32.const 1
    i32.add
-   local.tee $1
+   local.tee $0
    i32.const 10
    i32.ne
    if
     loop $do-continue|1
-     local.get $0
+     local.get $1
      i32.const 1
      i32.add
-     local.tee $0
+     local.tee $1
      i32.const 10
      i32.rem_s
      br_if $do-continue|1
     end
-    br $do-continue|04
+    br $do-continue|03
    end
   end
-  local.get $1
+  local.get $0
   i32.const 10
   i32.ne
   if
@@ -1227,7 +1228,7 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $0
+  local.get $1
   i32.const 90
   i32.ne
   if
@@ -1247,8 +1248,8 @@
   i32.const 16
   i32.add
   call $~lib/rt/pure/__retain
-  local.set $1
-  loop $do-continue|05
+  local.set $0
+  loop $do-continue|04
    local.get $2
    i32.const 1
    i32.add
@@ -1257,10 +1258,10 @@
    i32.eq
    if
     i32.const 0
-    local.set $0
-    local.get $1
+    local.set $1
+    local.get $0
     if
-     local.get $1
+     local.get $0
      call $~lib/rt/pure/__release
     end
    else
@@ -1269,13 +1270,13 @@
     i32.const 16
     i32.add
     call $~lib/rt/pure/__retain
-    local.set $0
-    local.get $1
+    local.set $1
+    local.get $0
     call $~lib/rt/pure/__release
    end
-   local.get $0
-   local.tee $1
-   br_if $do-continue|05
+   local.get $1
+   local.tee $0
+   br_if $do-continue|04
   end
   local.get $2
   i32.const 10
@@ -1288,7 +1289,7 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $1
+  local.get $0
   if
    i32.const 0
    i32.const 1040
@@ -1299,7 +1300,7 @@
   end
   i32.const 1
   global.set $do/ran
-  local.get $1
+  local.get $0
   call $~lib/rt/pure/__release
   global.get $do/ran
   i32.eqz
@@ -1313,44 +1314,42 @@
   end
   i32.const 0
   global.set $do/ran
-  i32.const 0
-  local.set $2
   call $~lib/rt/tlsf/maybeInitialize
   call $~lib/rt/tlsf/allocateBlock
   i32.const 16
   i32.add
   call $~lib/rt/pure/__retain
-  local.set $1
-  loop $do-continue|06
+  local.set $0
+  loop $do-continue|05
    block $do-break|0
-    local.get $2
+    local.get $3
     i32.const 1
     i32.add
-    local.tee $2
+    local.tee $3
     i32.const 10
     i32.eq
     if
-     local.get $1
+     local.get $0
      if
-      local.get $1
+      local.get $0
       call $~lib/rt/pure/__release
      end
      i32.const 0
-     local.set $1
+     local.set $0
      br $do-break|0
     end
     call $~lib/rt/tlsf/maybeInitialize
     call $~lib/rt/tlsf/allocateBlock
     i32.const 16
     i32.add
     call $~lib/rt/pure/__retain
-    local.tee $0
+    local.tee $2
     call $~lib/rt/pure/__release
-    local.get $0
-    br_if $do-continue|06
+    local.get $2
+    br_if $do-continue|05
    end
   end
-  local.get $2
+  local.get $3
   i32.const 10
   i32.ne
   if
@@ -1361,7 +1360,7 @@
    call $~lib/builtins/abort
    unreachable
   end
-  local.get $1
+  local.get $0
   if
    i32.const 0
    i32.const 1040
@@ -1372,7 +1371,7 @@
   end
   i32.const 1
   global.set $do/ran
-  local.get $1
+  local.get $0
   call $~lib/rt/pure/__release
   global.get $do/ran
   i32.eqz