Skip to content

Commit 83d3059

Browse files
tlivelytlively
authored
[NFC] Reduce verbosity of test/lit/passes/global-effects.wast (#6471)
Since there was no difference between the WITHOUT and DISCARD check prefixes, we can just use WITHOUT for both and reduce the number of check lines by a third.
1 parent 2b197b9 commit 83d3059

File tree

1 file changed

+1
-107
lines changed

1 file changed

+1
-107
lines changed

‎test/lit/passes/global-effects.wast‎

Lines changed: 1 addition & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
;; RUN: foreach %s %t wasm-opt -all --vacuum -S -o - | filecheck %s --check-prefix WITHOUT
77
;; RUN: foreach %s %t wasm-opt -all --generate-global-effects --vacuum -S -o - | filecheck %s --check-prefix INCLUDE
8-
;; RUN: foreach %s %t wasm-opt -all --generate-global-effects --discard-global-effects --vacuum -S -o - | filecheck %s --check-prefix DISCARD
8+
;; RUN: foreach %s %t wasm-opt -all --generate-global-effects --discard-global-effects --vacuum -S -o - | filecheck %s --check-prefix WITHOUT
99

1010
(module
11-
1211
;; WITHOUT: (type $0 (func))
1312

1413
;; WITHOUT: (type $1 (func (result i32)))
@@ -23,18 +22,10 @@
2322
;; INCLUDE: (type $2 (func (param i32)))
2423

2524
;; INCLUDE: (import "a" "b" (func $import (type $0)))
26-
;; DISCARD: (type $0 (func))
27-
28-
;; DISCARD: (type $1 (func (result i32)))
29-
30-
;; DISCARD: (type $2 (func (param i32)))
31-
32-
;; DISCARD: (import "a" "b" (func $import (type $0)))
3325
(import "a" "b" (func $import))
3426

3527
;; WITHOUT: (tag $tag)
3628
;; INCLUDE: (tag $tag)
37-
;; DISCARD: (tag $tag)
3829
(tag $tag)
3930

4031
;; WITHOUT: (func $main (type $0)
@@ -54,17 +45,6 @@
5445
;; INCLUDE-NEXT: (call $throw)
5546
;; INCLUDE-NEXT: (call $throw-and-import)
5647
;; INCLUDE-NEXT: )
57-
;; DISCARD: (func $main (type $0)
58-
;; DISCARD-NEXT: (call $nop)
59-
;; DISCARD-NEXT: (call $unreachable)
60-
;; DISCARD-NEXT: (call $call-nop)
61-
;; DISCARD-NEXT: (call $call-unreachable)
62-
;; DISCARD-NEXT: (drop
63-
;; DISCARD-NEXT: (call $unimportant-effects)
64-
;; DISCARD-NEXT: )
65-
;; DISCARD-NEXT: (call $throw)
66-
;; DISCARD-NEXT: (call $throw-and-import)
67-
;; DISCARD-NEXT: )
6848
(func $main
6949
;; Calling a function with no effects can be optimized away in INCLUDE (but
7050
;; not WITHOUT or DISCARD, where the global effect info is not available).
@@ -93,9 +73,6 @@
9373
;; INCLUDE: (func $cycle (type $0)
9474
;; INCLUDE-NEXT: (call $cycle)
9575
;; INCLUDE-NEXT: )
96-
;; DISCARD: (func $cycle (type $0)
97-
;; DISCARD-NEXT: (call $cycle)
98-
;; DISCARD-NEXT: )
9976
(func $cycle
10077
;; Calling a function with no effects in a cycle cannot be optimized out -
10178
;; this must keep hanging forever.
@@ -108,9 +85,6 @@
10885
;; INCLUDE: (func $cycle-1 (type $0)
10986
;; INCLUDE-NEXT: (call $cycle-2)
11087
;; INCLUDE-NEXT: )
111-
;; DISCARD: (func $cycle-1 (type $0)
112-
;; DISCARD-NEXT: (call $cycle-2)
113-
;; DISCARD-NEXT: )
11488
(func $cycle-1
11589
;; $cycle-1 and -2 form a cycle together, in which no call can be removed.
11690
(call $cycle-2)
@@ -122,9 +96,6 @@
12296
;; INCLUDE: (func $cycle-2 (type $0)
12397
;; INCLUDE-NEXT: (call $cycle-1)
12498
;; INCLUDE-NEXT: )
125-
;; DISCARD: (func $cycle-2 (type $0)
126-
;; DISCARD-NEXT: (call $cycle-1)
127-
;; DISCARD-NEXT: )
12899
(func $cycle-2
129100
(call $cycle-1)
130101
)
@@ -135,9 +106,6 @@
135106
;; INCLUDE: (func $nop (type $0)
136107
;; INCLUDE-NEXT: (nop)
137108
;; INCLUDE-NEXT: )
138-
;; DISCARD: (func $nop (type $0)
139-
;; DISCARD-NEXT: (nop)
140-
;; DISCARD-NEXT: )
141109
(func $nop
142110
(nop)
143111
)
@@ -148,9 +116,6 @@
148116
;; INCLUDE: (func $unreachable (type $0)
149117
;; INCLUDE-NEXT: (unreachable)
150118
;; INCLUDE-NEXT: )
151-
;; DISCARD: (func $unreachable (type $0)
152-
;; DISCARD-NEXT: (unreachable)
153-
;; DISCARD-NEXT: )
154119
(func $unreachable
155120
(unreachable)
156121
)
@@ -161,9 +126,6 @@
161126
;; INCLUDE: (func $call-nop (type $0)
162127
;; INCLUDE-NEXT: (nop)
163128
;; INCLUDE-NEXT: )
164-
;; DISCARD: (func $call-nop (type $0)
165-
;; DISCARD-NEXT: (call $nop)
166-
;; DISCARD-NEXT: )
167129
(func $call-nop
168130
;; This call to a nop can be optimized out, as above, in INCLUDE.
169131
(call $nop)
@@ -175,9 +137,6 @@
175137
;; INCLUDE: (func $call-unreachable (type $0)
176138
;; INCLUDE-NEXT: (call $unreachable)
177139
;; INCLUDE-NEXT: )
178-
;; DISCARD: (func $call-unreachable (type $0)
179-
;; DISCARD-NEXT: (call $unreachable)
180-
;; DISCARD-NEXT: )
181140
(func $call-unreachable
182141
(call $unreachable)
183142
)
@@ -200,15 +159,6 @@
200159
;; INCLUDE-NEXT: (local.get $x)
201160
;; INCLUDE-NEXT: )
202161
;; INCLUDE-NEXT: )
203-
;; DISCARD: (func $unimportant-effects (type $1) (result i32)
204-
;; DISCARD-NEXT: (local $x i32)
205-
;; DISCARD-NEXT: (local.set $x
206-
;; DISCARD-NEXT: (i32.const 100)
207-
;; DISCARD-NEXT: )
208-
;; DISCARD-NEXT: (return
209-
;; DISCARD-NEXT: (local.get $x)
210-
;; DISCARD-NEXT: )
211-
;; DISCARD-NEXT: )
212162
(func $unimportant-effects (result i32)
213163
(local $x i32)
214164
;; Operations on locals should not prevent optimization, as when we return
@@ -250,24 +200,6 @@
250200
;; INCLUDE-NEXT: )
251201
;; INCLUDE-NEXT: )
252202
;; INCLUDE-NEXT: )
253-
;; DISCARD: (func $call-throw-and-catch (type $0)
254-
;; DISCARD-NEXT: (try $try
255-
;; DISCARD-NEXT: (do
256-
;; DISCARD-NEXT: (call $throw)
257-
;; DISCARD-NEXT: )
258-
;; DISCARD-NEXT: (catch_all
259-
;; DISCARD-NEXT: (nop)
260-
;; DISCARD-NEXT: )
261-
;; DISCARD-NEXT: )
262-
;; DISCARD-NEXT: (try $try0
263-
;; DISCARD-NEXT: (do
264-
;; DISCARD-NEXT: (call $throw-and-import)
265-
;; DISCARD-NEXT: )
266-
;; DISCARD-NEXT: (catch_all
267-
;; DISCARD-NEXT: (nop)
268-
;; DISCARD-NEXT: )
269-
;; DISCARD-NEXT: )
270-
;; DISCARD-NEXT: )
271203
(func $call-throw-and-catch
272204
(try
273205
(do
@@ -300,16 +232,6 @@
300232
;; INCLUDE: (func $call-unreachable-and-catch (type $0)
301233
;; INCLUDE-NEXT: (call $unreachable)
302234
;; INCLUDE-NEXT: )
303-
;; DISCARD: (func $call-unreachable-and-catch (type $0)
304-
;; DISCARD-NEXT: (try $try
305-
;; DISCARD-NEXT: (do
306-
;; DISCARD-NEXT: (call $unreachable)
307-
;; DISCARD-NEXT: )
308-
;; DISCARD-NEXT: (catch_all
309-
;; DISCARD-NEXT: (nop)
310-
;; DISCARD-NEXT: )
311-
;; DISCARD-NEXT: )
312-
;; DISCARD-NEXT: )
313235
(func $call-unreachable-and-catch
314236
(try
315237
(do
@@ -358,24 +280,6 @@
358280
;; INCLUDE-NEXT: )
359281
;; INCLUDE-NEXT: )
360282
;; INCLUDE-NEXT: )
361-
;; DISCARD: (func $call-throw-or-unreachable-and-catch (type $2) (param $x i32)
362-
;; DISCARD-NEXT: (try $try
363-
;; DISCARD-NEXT: (do
364-
;; DISCARD-NEXT: (if
365-
;; DISCARD-NEXT: (local.get $x)
366-
;; DISCARD-NEXT: (then
367-
;; DISCARD-NEXT: (call $throw)
368-
;; DISCARD-NEXT: )
369-
;; DISCARD-NEXT: (else
370-
;; DISCARD-NEXT: (call $unreachable)
371-
;; DISCARD-NEXT: )
372-
;; DISCARD-NEXT: )
373-
;; DISCARD-NEXT: )
374-
;; DISCARD-NEXT: (catch_all
375-
;; DISCARD-NEXT: (nop)
376-
;; DISCARD-NEXT: )
377-
;; DISCARD-NEXT: )
378-
;; DISCARD-NEXT: )
379283
(func $call-throw-or-unreachable-and-catch (param $x i32)
380284
;; This try-catch-all's body will either call a throw or an unreachable.
381285
;; Since we have both possible effects, we cannot optimize anything here.
@@ -401,9 +305,6 @@
401305
;; INCLUDE: (func $throw (type $0)
402306
;; INCLUDE-NEXT: (throw $tag)
403307
;; INCLUDE-NEXT: )
404-
;; DISCARD: (func $throw (type $0)
405-
;; DISCARD-NEXT: (throw $tag)
406-
;; DISCARD-NEXT: )
407308
(func $throw
408309
(throw $tag)
409310
)
@@ -414,9 +315,6 @@
414315
;; INCLUDE: (func $throw-and-import (type $0)
415316
;; INCLUDE-NEXT: (throw $tag)
416317
;; INCLUDE-NEXT: )
417-
;; DISCARD: (func $throw-and-import (type $0)
418-
;; DISCARD-NEXT: (throw $tag)
419-
;; DISCARD-NEXT: )
420318
(func $throw-and-import
421319
(if
422320
(i32.const 1)
@@ -437,10 +335,6 @@
437335
;; INCLUDE-NEXT: (call $cycle-with-unknown-call)
438336
;; INCLUDE-NEXT: (call $import)
439337
;; INCLUDE-NEXT: )
440-
;; DISCARD: (func $cycle-with-unknown-call (type $0)
441-
;; DISCARD-NEXT: (call $cycle-with-unknown-call)
442-
;; DISCARD-NEXT: (call $import)
443-
;; DISCARD-NEXT: )
444338
(func $cycle-with-unknown-call
445339
;; This function can not only call itself recursively, but also calls an
446340
;; import. We should not remove anything here, and not error during the

0 commit comments

Comments
 (0)