update relooper tests

9 files changed, 405 insertions, 394 deletions

diff --git a/src/relooper/test.txt b/src/relooper/test.txt
index 12d0ef39..b7c8794d 100644
--- a/src/relooper/test.txt
+++ b/src/relooper/test.txt
@@ -54,7 +54,7 @@ while(1) {
   // code 2
   if (!($2)) {
     var $x_1 = $x_0; 
-    label = 18;
+    label = 19;
     break;
   }
   // code 3
@@ -64,7 +64,7 @@ while(1) {
     var $i_0 = $7;var $x_0 = $5; 
   }
 }
-if (label == 18) {
+if (label == 19) {
   // code 7
 }
 // code 4
diff --git a/src/relooper/test2.txt b/src/relooper/test2.txt
index a847e806..c77ce491 100644
--- a/src/relooper/test2.txt
+++ b/src/relooper/test2.txt
@@ -1,11 +1,12 @@
 ep
-L1: 
-if (ep -> LBB1) {
-  LBB1
-  if (!(LBB1 -> LBB2)) {
-    break L1;
+do {
+  if (ep -> LBB1) {
+    LBB1
+    if (!(LBB1 -> LBB2)) {
+      break;
+    }
+    LBB2
   }
-  LBB2
-}
+} while(0);
 LBB3
 
diff --git a/src/relooper/test3.txt b/src/relooper/test3.txt
index 7d06f06a..696542ef 100644
--- a/src/relooper/test3.txt
+++ b/src/relooper/test3.txt
@@ -1,25 +1,27 @@
 ep
-L1: 
-if (ep -> LBB1) {
-  LBB1
-  if (!(LBB1 -> LBB2)) {
-    break L1;
+do {
+  if (ep -> LBB1) {
+    LBB1
+    if (!(LBB1 -> LBB2)) {
+      break;
+    }
+    LBB2
   }
-  LBB2
-}
+} while(0);
 LBB3
-L5: 
-if (LBB3 -> LBB4) {
-  LBB4
-  if (!(LBB4 -> LBB5)) {
-    break L5;
-  }
-  while(1) {
-    LBB5
-    if (LBB5 -> LBB6) {
-      break L5;
+L5: do {
+  if (LBB3 -> LBB4) {
+    LBB4
+    if (!(LBB4 -> LBB5)) {
+      break;
+    }
+    while(1) {
+      LBB5
+      if (LBB5 -> LBB6) {
+        break L5;
+      }
     }
   }
-}
+} while(0);
 LBB6
 
diff --git a/src/relooper/test4.txt b/src/relooper/test4.txt
index 2ab3265a..f0bfb972 100644
--- a/src/relooper/test4.txt
+++ b/src/relooper/test4.txt
@@ -1,16 +1,17 @@
 //19
-L1: 
-if ( 1 ) {
-  //20
-  if (!( 1 )) {
+do {
+  if ( 1 ) {
+    //20
+    if (!( 1 )) {
+      label = 4;
+      break;
+    }
+    //21
+    break;
+  } else {
     label = 4;
-    break L1;
   }
-  //21
-  break L1;
-} else {
-  label = 4;
-}
+} while(0);
 if (label == 4) {
   //22
 }
diff --git a/src/relooper/test6.txt b/src/relooper/test6.txt
index 0ec7e666..c5effd08 100644
--- a/src/relooper/test6.txt
+++ b/src/relooper/test6.txt
@@ -1,11 +1,12 @@
 //0
-L1: 
-if (check(0)) {
-  //1
-  if (!(check(1))) {
-    break L1;
+do {
+  if (check(0)) {
+    //1
+    if (!(check(1))) {
+      break;
+    }
+    //2
   }
-  //2
-}
+} while(0);
 //3
 
diff --git a/src/relooper/test_debug.txt b/src/relooper/test_debug.txt
index 02377fb7..1c7d0508 100644
--- a/src/relooper/test_debug.txt
+++ b/src/relooper/test_debug.txt
@@ -83,13 +83,14 @@ int main() {
 // === Optimizing shapes ===
 // Fusing Multiple to Simple
 ep
-L1: 
-if (ep -> LBB1) {
-  LBB1
-  if (!(LBB1 -> LBB2)) {
-    break L1;
+do {
+  if (ep -> LBB1) {
+    LBB1
+    if (!(LBB1 -> LBB2)) {
+      break;
+    }
+    LBB2
   }
-  LBB2
-}
+} while(0);
 LBB3
 
diff --git a/src/relooper/test_fuzz1.txt b/src/relooper/test_fuzz1.txt
index 09edb594..5122257e 100644
--- a/src/relooper/test_fuzz1.txt
+++ b/src/relooper/test_fuzz1.txt
@@ -3,12 +3,13 @@
 print('entry'); var label; var state; var decisions = [4, 1, 7, 2, 6, 6, 8]; var index = 0; function check() { if (index == decisions.length) throw 'HALT'; return decisions[index++] }
 print(5); state = check();
 print(6); state = check();
-L3: 
-if (state == 7) {
-  print(7); state = check();
-  label = 3;
-  break L3;
-}
+do {
+  if (state == 7) {
+    print(7); state = check();
+    label = 3;
+    break;
+  }
+} while(0);
 L5: while(1) {
   if (label == 3) {
     label = 0;
diff --git a/src/relooper/test_fuzz5.txt b/src/relooper/test_fuzz5.txt
index 7c795d53..9548205c 100644
--- a/src/relooper/test_fuzz5.txt
+++ b/src/relooper/test_fuzz5.txt
@@ -3,21 +3,22 @@
 print('entry'); var label; var state; var decisions = [133, 98, 134, 143, 162, 187, 130, 87, 91, 49, 102, 47, 9, 132, 179, 176, 157, 25, 64, 161, 57, 107, 16, 167, 185, 45, 191, 180, 23, 131]; var index = 0; function check() { if (index == decisions.length) throw 'HALT'; return decisions[index++] }
 L1: while(1) {
   print(7); state = check();
-  L3: 
-  if (state % 3 == 1) {
-    label = 3;
-  } else if (state % 3 == 0) {
-    print(8); state = check();
-    if (state % 2 == 0) {
-      label = 5;
-      break L3;
+  do {
+    if (state % 3 == 1) {
+      label = 3;
+    } else if (state % 3 == 0) {
+      print(8); state = check();
+      if (state % 2 == 0) {
+        label = 5;
+        break;
+      } else {
+        label = 7;
+        break;
+      }
     } else {
-      label = 7;
-      break L3;
+      break L1;
     }
-  } else {
-    break L1;
-  }
+  } while(0);
   while(1) {
     if (label == 3) {
       label = 0;
diff --git a/src/relooper/test_inf.txt b/src/relooper/test_inf.txt
index 3e292433..379d2083 100644
--- a/src/relooper/test_inf.txt
+++ b/src/relooper/test_inf.txt
@@ -5,34 +5,35 @@ if (uint(i4) >= uint(i5)) {
   code 1
 }
 code 3
-L5: 
-if (!(i2 == 0)) {
-  code 4
-  while(1) {
-    code 5
-    if (uint(i6) >= uint(i7)) {
-      code 7
-    } else {
-      code 6
-    }
-    code 8
-    if (uint(i6) >= uint(i7)) {
-      code 10
-    } else {
-      code 9
-    }
-    code 11
-    if (uint(i5) >= uint(i6)) {
-      code 13
-    } else {
-      code 12
-    }
-    code 14
-    if (!(i2 != 0)) {
-      break L5;
+L5: do {
+  if (!(i2 == 0)) {
+    code 4
+    while(1) {
+      code 5
+      if (uint(i6) >= uint(i7)) {
+        code 7
+      } else {
+        code 6
+      }
+      code 8
+      if (uint(i6) >= uint(i7)) {
+        code 10
+      } else {
+        code 9
+      }
+      code 11
+      if (uint(i5) >= uint(i6)) {
+        code 13
+      } else {
+        code 12
+      }
+      code 14
+      if (!(i2 != 0)) {
+        break L5;
+      }
     }
   }
-}
+} while(0);
 code 15
 if (uint(i4) >= uint(i5)) {
   code 17
@@ -40,178 +41,179 @@ if (uint(i4) >= uint(i5)) {
   code 16
 }
 code 18
-L26: 
-if (!(i2 == 0)) {
-  code 19
-  while(1) {
-    code 20
-    if (uint(i5) >= uint(i6)) {
-      code 22
-    } else {
-      code 21
-    }
-    code 23
-    if (uint(i5) >= uint(i6)) {
-      code 25
-    } else {
-      code 24
-    }
-    code 26
-    if (uint(i5) >= uint(i6)) {
-      code 28
-    } else {
-      code 27
-    }
-    code 29
-    if (uint(i5) >= uint(i6)) {
-      code 31
-    } else {
-      code 30
-    }
-    code 32
-    if (uint(i5) >= uint(i6)) {
-      code 34
-    } else {
-      code 33
-    }
-    code 35
-    if (uint(i5) >= uint(i6)) {
-      code 37
-    } else {
-      code 36
-    }
-    code 38
-    if (uint(i5) >= uint(i6)) {
-      code 40
-    } else {
-      code 39
-    }
-    code 41
-    if (uint(i5) >= uint(i6)) {
-      code 43
-    } else {
-      code 42
-    }
-    code 44
-    if (uint(i5) >= uint(i6)) {
-      code 46
-    } else {
-      code 45
-    }
-    code 47
-    if (uint(i5) >= uint(i6)) {
-      code 49
-    } else {
-      code 48
-    }
-    code 50
-    if (uint(i5) >= uint(i6)) {
-      code 52
-    } else {
-      code 51
-    }
-    code 53
-    if (uint(i5) >= uint(i6)) {
-      code 55
-    } else {
-      code 54
-    }
-    code 56
-    if (uint(i5) >= uint(i6)) {
-      code 58
-    } else {
-      code 57
-    }
-    code 59
-    if (uint(i5) >= uint(i6)) {
-      code 61
-    } else {
-      code 60
-    }
-    code 62
-    if (uint(i5) >= uint(i6)) {
-      code 64
-    } else {
-      code 63
-    }
-    code 65
-    if (uint(i5) >= uint(i6)) {
-      code 67
-    } else {
-      code 66
-    }
-    code 68
-    if (uint(i5) >= uint(i6)) {
-      code 70
-    } else {
-      code 69
-    }
-    code 71
-    if (uint(i5) >= uint(i6)) {
-      code 73
-    } else {
-      code 72
-    }
-    code 74
-    if (uint(i5) >= uint(i6)) {
-      code 76
-    } else {
-      code 75
-    }
-    code 77
-    if (uint(i5) >= uint(i6)) {
-      code 79
-    } else {
-      code 78
-    }
-    code 80
-    if (uint(i5) >= uint(i6)) {
-      code 82
-    } else {
-      code 81
-    }
-    code 83
-    if (uint(i5) >= uint(i6)) {
-      code 85
-    } else {
-      code 84
-    }
-    code 86
-    if (uint(i5) >= uint(i6)) {
-      code 88
-    } else {
-      code 87
-    }
-    code 89
-    if (uint(i5) >= uint(i6)) {
-      code 91
-    } else {
-      code 90
-    }
-    code 92
-    if (uint(i5) >= uint(i6)) {
-      code 94
-    } else {
-      code 93
-    }
-    code 95
-    if (uint(i5) >= uint(i6)) {
-      code 97
-    } else {
-      code 96
-    }
-    code 98
-    if (uint(i5) >= uint(i6)) {
-      code 100
-    } else {
-      code 99
-    }
-    code 101
-    if (!(i2 != 0)) {
-      break L26;
+L26: do {
+  if (!(i2 == 0)) {
+    code 19
+    while(1) {
+      code 20
+      if (uint(i5) >= uint(i6)) {
+        code 22
+      } else {
+        code 21
+      }
+      code 23
+      if (uint(i5) >= uint(i6)) {
+        code 25
+      } else {
+        code 24
+      }
+      code 26
+      if (uint(i5) >= uint(i6)) {
+        code 28
+      } else {
+        code 27
+      }
+      code 29
+      if (uint(i5) >= uint(i6)) {
+        code 31
+      } else {
+        code 30
+      }
+      code 32
+      if (uint(i5) >= uint(i6)) {
+        code 34
+      } else {
+        code 33
+      }
+      code 35
+      if (uint(i5) >= uint(i6)) {
+        code 37
+      } else {
+        code 36
+      }
+      code 38
+      if (uint(i5) >= uint(i6)) {
+        code 40
+      } else {
+        code 39
+      }
+      code 41
+      if (uint(i5) >= uint(i6)) {
+        code 43
+      } else {
+        code 42
+      }
+      code 44
+      if (uint(i5) >= uint(i6)) {
+        code 46
+      } else {
+        code 45
+      }
+      code 47
+      if (uint(i5) >= uint(i6)) {
+        code 49
+      } else {
+        code 48
+      }
+      code 50
+      if (uint(i5) >= uint(i6)) {
+        code 52
+      } else {
+        code 51
+      }
+      code 53
+      if (uint(i5) >= uint(i6)) {
+        code 55
+      } else {
+        code 54
+      }
+      code 56
+      if (uint(i5) >= uint(i6)) {
+        code 58
+      } else {
+        code 57
+      }
+      code 59
+      if (uint(i5) >= uint(i6)) {
+        code 61
+      } else {
+        code 60
+      }
+      code 62
+      if (uint(i5) >= uint(i6)) {
+        code 64
+      } else {
+        code 63
+      }
+      code 65
+      if (uint(i5) >= uint(i6)) {
+        code 67
+      } else {
+        code 66
+      }
+      code 68
+      if (uint(i5) >= uint(i6)) {
+        code 70
+      } else {
+        code 69
+      }
+      code 71
+      if (uint(i5) >= uint(i6)) {
+        code 73
+      } else {
+        code 72
+      }
+      code 74
+      if (uint(i5) >= uint(i6)) {
+        code 76
+      } else {
+        code 75
+      }
+      code 77
+      if (uint(i5) >= uint(i6)) {
+        code 79
+      } else {
+        code 78
+      }
+      code 80
+      if (uint(i5) >= uint(i6)) {
+        code 82
+      } else {
+        code 81
+      }
+      code 83
+      if (uint(i5) >= uint(i6)) {
+        code 85
+      } else {
+        code 84
+      }
+      code 86
+      if (uint(i5) >= uint(i6)) {
+        code 88
+      } else {
+        code 87
+      }
+      code 89
+      if (uint(i5) >= uint(i6)) {
+        code 91
+      } else {
+        code 90
+      }
+      code 92
+      if (uint(i5) >= uint(i6)) {
+        code 94
+      } else {
+        code 93
+      }
+      code 95
+      if (uint(i5) >= uint(i6)) {
+        code 97
+      } else {
+        code 96
+      }
+      code 98
+      if (uint(i5) >= uint(i6)) {
+        code 100
+      } else {
+        code 99
+      }
+      code 101
+      if (!(i2 != 0)) {
+        break L26;
+      }
     }
   }
-}
+} while(0);
 code 102
 if (uint(i4) >= uint(i5)) {
   code 104
@@ -219,136 +221,137 @@ if (uint(i4) >= uint(i5)) {
   code 103
 }
 code 105
-L143: 
-if (!(i2 == 0)) {
-  code 106
-  while(1) {
-    code 107
-    if (uint(i5) >= uint(i6)) {
-      code 109
-    } else {
-      code 108
-    }
-    code 110
-    if (uint(i5) >= uint(i6)) {
-      code 112
-    } else {
-      code 111
-    }
-    code 113
-    if (uint(i5) >= uint(i6)) {
-      code 115
-    } else {
-      code 114
-    }
-    code 116
-    if (uint(i5) >= uint(i6)) {
-      code 118
-    } else {
-      code 117
-    }
-    code 119
-    if (uint(i5) >= uint(i6)) {
-      code 121
-    } else {
-      code 120
-    }
-    code 122
-    if (uint(i5) >= uint(i6)) {
-      code 124
-    } else {
-      code 123
-    }
-    code 125
-    if (uint(i5) >= uint(i6)) {
-      code 127
-    } else {
-      code 126
-    }
-    code 128
-    if (uint(i5) >= uint(i6)) {
-      code 130
-    } else {
-      code 129
-    }
-    code 131
-    if (uint(i5) >= uint(i6)) {
-      code 133
-    } else {
-      code 132
-    }
-    code 134
-    if (uint(i5) >= uint(i6)) {
-      code 136
-    } else {
-      code 135
-    }
-    code 137
-    if (uint(i5) >= uint(i6)) {
-      code 139
-    } else {
-      code 138
-    }
-    code 140
-    if (uint(i5) >= uint(i6)) {
-      code 142
-    } else {
-      code 141
-    }
-    code 143
-    if (uint(i5) >= uint(i6)) {
-      code 145
-    } else {
-      code 144
-    }
-    code 146
-    if (uint(i5) >= uint(i6)) {
-      code 148
-    } else {
-      code 147
-    }
-    code 149
-    if (uint(i5) >= uint(i6)) {
-      code 151
-    } else {
-      code 150
-    }
-    code 152
-    if (uint(i5) >= uint(i6)) {
-      code 154
-    } else {
-      code 153
-    }
-    code 155
-    if (uint(i5) >= uint(i6)) {
-      code 157
-    } else {
-      code 156
-    }
-    code 158
-    if (uint(i5) >= uint(i6)) {
-      code 160
-    } else {
-      code 159
-    }
-    code 161
-    if (uint(i5) >= uint(i6)) {
-      code 163
-    } else {
-      code 162
-    }
-    code 164
-    if (uint(i5) >= uint(i6)) {
-      code 166
-    } else {
-      code 165
-    }
-    code 167
-    if (!(i2 != 0)) {
-      break L143;
+L143: do {
+  if (!(i2 == 0)) {
+    code 106
+    while(1) {
+      code 107
+      if (uint(i5) >= uint(i6)) {
+        code 109
+      } else {
+        code 108
+      }
+      code 110
+      if (uint(i5) >= uint(i6)) {
+        code 112
+      } else {
+        code 111
+      }
+      code 113
+      if (uint(i5) >= uint(i6)) {
+        code 115
+      } else {
+        code 114
+      }
+      code 116
+      if (uint(i5) >= uint(i6)) {
+        code 118
+      } else {
+        code 117
+      }
+      code 119
+      if (uint(i5) >= uint(i6)) {
+        code 121
+      } else {
+        code 120
+      }
+      code 122
+      if (uint(i5) >= uint(i6)) {
+        code 124
+      } else {
+        code 123
+      }
+      code 125
+      if (uint(i5) >= uint(i6)) {
+        code 127
+      } else {
+        code 126
+      }
+      code 128
+      if (uint(i5) >= uint(i6)) {
+        code 130
+      } else {
+        code 129
+      }
+      code 131
+      if (uint(i5) >= uint(i6)) {
+        code 133
+      } else {
+        code 132
+      }
+      code 134
+      if (uint(i5) >= uint(i6)) {
+        code 136
+      } else {
+        code 135
+      }
+      code 137
+      if (uint(i5) >= uint(i6)) {
+        code 139
+      } else {
+        code 138
+      }
+      code 140
+      if (uint(i5) >= uint(i6)) {
+        code 142
+      } else {
+        code 141
+      }
+      code 143
+      if (uint(i5) >= uint(i6)) {
+        code 145
+      } else {
+        code 144
+      }
+      code 146
+      if (uint(i5) >= uint(i6)) {
+        code 148
+      } else {
+        code 147
+      }
+      code 149
+      if (uint(i5) >= uint(i6)) {
+        code 151
+      } else {
+        code 150
+      }
+      code 152
+      if (uint(i5) >= uint(i6)) {
+        code 154
+      } else {
+        code 153
+      }
+      code 155
+      if (uint(i5) >= uint(i6)) {
+        code 157
+      } else {
+        code 156
+      }
+      code 158
+      if (uint(i5) >= uint(i6)) {
+        code 160
+      } else {
+        code 159
+      }
+      code 161
+      if (uint(i5) >= uint(i6)) {
+        code 163
+      } else {
+        code 162
+      }
+      code 164
+      if (uint(i5) >= uint(i6)) {
+        code 166
+      } else {
+        code 165
+      }
+      code 167
+      if (!(i2 != 0)) {
+        break L143;
+      }
     }
   }
-}
+} while(0);
 code 168
 if (uint(i4) >= uint(i5)) {
   code 170