Skip to content

Commit 7b35957

Browse files
kgkg
committed
Updated existing C# tests
1 parent edc7acf commit 7b35957

File tree

4 files changed

+152
-160
lines changed

4 files changed

+152
-160
lines changed

‎ml-proto/test/countUp.wasm

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
(module
44

55
(func $Program_countUp
6-
(param $outOffset i32) (param $count i32) (local $i i32) (local $num i32)
7-
6+
(param $outOffset i32) (param $count i32) (local $i i32)
87

98
(block
109

@@ -25,28 +24,27 @@
2524
)
2625

2726
;; for (...) {
28-
(block
29-
(stores.1.i32
30-
(mul.i32
31-
(add.i32
32-
(getlocal $outOffset)
33-
(getlocal $i)
34-
)
35-
(const.i32 4)
27+
(stores.1.i32
28+
(mul.i32
29+
(add.i32
30+
(getlocal $outOffset)
31+
(getlocal $i)
3632
)
37-
(getlocal $i)
33+
(const.i32 4)
3834
)
39-
(setlocal $num (getlocal $i))
40-
(setlocal $i (add.i32
41-
(getlocal $num)
42-
(const.i32 1)
43-
))
35+
(getlocal $i)
4436
)
37+
38+
;; for (...; ...; <!>)
39+
(setlocal $i (add.i32
40+
(getlocal $i)
41+
(const.i32 1)
42+
))
4543
)
4644
)
4745
)
48-
4946
)
47+
5048
(func $Program_readI32
5149
(param $base i32) (param $offset i32)
5250
(result i32)
@@ -61,13 +59,13 @@
6159
)
6260

6361
(export "countUp" $Program_countUp)
64-
6562
(export "readI32" $Program_readI32)
6663

6764
(memory 4096 4096)
6865

6966
)
7067

68+
7169
(invoke "countUp" (const.i32 0) (const.i32 32) )
7270
(invoke "countUp" (const.i32 16) (const.i32 4) )
7371
(asserteq (invoke "readI32" (const.i32 0) (const.i32 0) ) (const.i32 0) )

‎ml-proto/test/fannkuch.broken-wasm

Lines changed: 84 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44

55
(func $Program_fannkuch
66
(param $n i32) (local $sign i32) (local $maxflips i32) (local $sum i32)
7-
(local $j i32) (local $num i32) (local $q0 i32) (local $flag i32)
8-
(local $k i32) (local $flips i32) (local $qq i32) (local $flag2 i32)
9-
(local $flag3 i32) (local $l i32) (local $m i32) (local $t i32)
10-
(local $flag4 i32) (local $flag5 i32) (local $t3 i32) (local $i2 i32)
11-
(local $sx i32) (local $flag7 i32) (local $j2 i32)
7+
(local $j i32) (local $q0 i32) (local $k i32) (local $flips i32)
8+
(local $qq i32) (local $l i32) (local $m i32) (local $t i32)
9+
(local $t3 i32) (local $i2 i32) (local $sx i32) (local $j2 i32)
10+
1211
(local $currentLabel_0 i32)
1312

1413
(block
1514

16-
;; LabelGroup 0
15+
;; LabelGroup 0 (starting at $entry0)
1716
(setlocal $currentLabel_0 (const.i32 0))
1817

1918
(label $labelgroup_0 (loop (label $labelgroup_0_dispatch
@@ -72,12 +71,13 @@
7271
)
7372
(getlocal $j)
7473
)
75-
(setlocal $num (getlocal $j))
76-
(setlocal $j (add.i32
77-
(getlocal $num)
78-
(const.i32 1)
79-
))
8074
)
75+
76+
;; for (...; ...; <!>)
77+
(setlocal $j (add.i32
78+
(getlocal $j)
79+
(const.i32 1)
80+
))
8181
)
8282
)
8383

@@ -94,13 +94,12 @@
9494
;; while (...) {
9595
(block
9696
(setlocal $q0 (loads.1.i32 (const.i32 128) ))
97-
(setlocal $flag (gts.i32
98-
(getlocal $q0)
99-
(const.i32 0)
100-
))
10197

10298
(if
103-
(getlocal $flag)
99+
(neq.i32
100+
(getlocal $q0)
101+
(const.i32 0)
102+
)
104103
(block
105104

106105
;; for (var (@<var System.Int32 k> = 1); ...)
@@ -120,29 +119,28 @@
120119
)
121120

122121
;; for (...) {
123-
(block
124-
(stores.1.i32
125-
(mul.i32
122+
(stores.1.i32
123+
(mul.i32
124+
(add.i32
125+
(const.i32 64)
126+
(getlocal $k)
127+
)
128+
(const.i32 4)
129+
)
130+
(loads.1.i32 (mul.i32
126131
(add.i32
127-
(const.i32 64)
132+
(const.i32 32)
128133
(getlocal $k)
129134
)
130135
(const.i32 4)
131-
)
132-
(loads.1.i32 (mul.i32
133-
(add.i32
134-
(const.i32 32)
135-
(getlocal $k)
136-
)
137-
(const.i32 4)
138-
) )
139-
)
140-
(setlocal $num (getlocal $k))
141-
(setlocal $k (add.i32
142-
(getlocal $num)
143-
(const.i32 1)
144-
))
136+
) )
145137
)
138+
139+
;; for (...; ...; <!>)
140+
(setlocal $k (add.i32
141+
(getlocal $k)
142+
(const.i32 1)
143+
))
146144
)
147145
)
148146
(setlocal $flips (const.i32 1))
@@ -166,13 +164,12 @@
166164
)
167165
(const.i32 4)
168166
) ))
169-
(setlocal $flag2 (eq.i32
170-
(getlocal $qq)
171-
(const.i32 0)
172-
))
173167

174168
(if
175-
(getlocal $flag2)
169+
(eq.i32
170+
(getlocal $qq)
171+
(const.i32 0)
172+
)
176173
(break $loop_3)
177174
)
178175
(stores.1.i32
@@ -185,13 +182,12 @@
185182
)
186183
(getlocal $q0)
187184
)
188-
(setlocal $flag3 (ges.i32
189-
(getlocal $q0)
190-
(const.i32 3)
191-
))
192185

193186
(if
194-
(getlocal $flag3)
187+
(ges.i32
188+
(getlocal $q0)
189+
(const.i32 3)
190+
)
195191
(block
196192
(setlocal $l (const.i32 1))
197193
(setlocal $m (sub.i32
@@ -236,14 +232,12 @@
236232
)
237233
(getlocal $t)
238234
)
239-
(setlocal $num (getlocal $l))
240235
(setlocal $l (add.i32
241-
(getlocal $num)
236+
(getlocal $l)
242237
(const.i32 1)
243238
))
244-
(setlocal $num (getlocal $m))
245239
(setlocal $m (sub.i32
246-
(getlocal $num)
240+
(getlocal $m)
247241
(const.i32 1)
248242
))
249243
)
@@ -263,9 +257,8 @@
263257
)
264258
)
265259
(setlocal $q0 (getlocal $qq))
266-
(setlocal $num (getlocal $flips))
267260
(setlocal $flips (add.i32
268-
(getlocal $num)
261+
(getlocal $flips)
269262
(const.i32 1)
270263
))
271264
)
@@ -278,24 +271,22 @@
278271
(getlocal $flips)
279272
)
280273
))
281-
(setlocal $flag4 (gts.i32
282-
(getlocal $flips)
283-
(getlocal $maxflips)
284-
))
285274

286275
(if
287-
(getlocal $flag4)
276+
(gts.i32
277+
(getlocal $flips)
278+
(getlocal $maxflips)
279+
)
288280
(setlocal $maxflips (getlocal $flips))
289281
)
290282
)
291283
)
292-
(setlocal $flag5 (eq.i32
293-
(getlocal $sign)
294-
(const.i32 1)
295-
))
296284

297285
(if
298-
(getlocal $flag5)
286+
(eq.i32
287+
(getlocal $sign)
288+
(const.i32 1)
289+
)
299290
(block
300291
(stores.1.i32
301292
(const.i32 132)
@@ -346,7 +337,7 @@
346337
) ))
347338

348339
(if
349-
(gts.i32
340+
(neq.i32
350341
(getlocal $sx)
351342
(const.i32 0)
352343
)
@@ -367,16 +358,15 @@
367358
(break $loop_5)
368359
)
369360
)
370-
(setlocal $flag7 (eq.i32
361+
362+
(if
363+
(eq.i32
371364
(getlocal $i2)
372365
(sub.i32
373366
(getlocal $n)
374367
(const.i32 1)
375368
)
376-
))
377-
378-
(if
379-
(getlocal $flag7)
369+
)
380370
;; goto Block_8
381371
(block (setlocal $currentLabel_0 (const.i32 1)) (break $labelgroup_0_dispatch) )
382372
)
@@ -409,32 +399,31 @@
409399
)
410400

411401
;; for (...) {
412-
(block
413-
(stores.1.i32
414-
(mul.i32
402+
(stores.1.i32
403+
(mul.i32
404+
(add.i32
405+
(const.i32 32)
406+
(getlocal $j2)
407+
)
408+
(const.i32 4)
409+
)
410+
(loads.1.i32 (mul.i32
415411
(add.i32
416412
(const.i32 32)
417-
(getlocal $j2)
418-
)
419-
(const.i32 4)
420-
)
421-
(loads.1.i32 (mul.i32
422413
(add.i32
423-
(const.i32 32)
424-
(add.i32
425-
(getlocal $j2)
426-
(const.i32 1)
427-
)
414+
(getlocal $j2)
415+
(const.i32 1)
428416
)
429-
(const.i32 4)
430-
) )
431-
)
432-
(setlocal $num (getlocal $j2))
433-
(setlocal $j2 (add.i32
434-
(getlocal $num)
435-
(const.i32 1)
436-
))
417+
)
418+
(const.i32 4)
419+
) )
437420
)
421+
422+
;; for (...; ...; <!>)
423+
(setlocal $j2 (add.i32
424+
(getlocal $j2)
425+
(const.i32 1)
426+
))
438427
)
439428
)
440429
(stores.1.i32
@@ -450,12 +439,13 @@
450439
)
451440
(getlocal $t3)
452441
)
453-
(setlocal $num (getlocal $i2))
454-
(setlocal $i2 (add.i32
455-
(getlocal $num)
456-
(const.i32 1)
457-
))
458442
)
443+
444+
;; for (...; ...; <!>)
445+
(setlocal $i2 (add.i32
446+
(getlocal $i2)
447+
(const.i32 1)
448+
))
459449
)
460450
)
461451
)
@@ -489,8 +479,8 @@
489479
)
490480
))
491481
)
492-
493482
)
483+
494484
(func $Program_readI32
495485
(param $base i32) (param $offset i32)
496486
(result i32)
@@ -505,13 +495,13 @@
505495
)
506496

507497
(export "fannkuch" $Program_fannkuch)
508-
509498
(export "readI32" $Program_readI32)
510499

511500
(memory 4096 4096)
512501

513502
)
514503

504+
515505
(invoke "fannkuch" (const.i32 7) )
516506
(asserteq (invoke "readI32" (const.i32 0) (const.i32 0) ) (const.i32 228) )
517507
(asserteq (invoke "readI32" (const.i32 0) (const.i32 1) ) (const.i32 16) )

0 commit comments

Comments
 (0)