Use --preserve-type-order in select tests (#6917)

These are the tests that would otherwise have the largest diffs when
changing the topological sort used to sort types.
signature-refining_gto.wat also cannot be automatically updated, so
there is extra benefit to making sure it has stable output.

1 files changed, 51 insertions, 65 deletions

diff --git a/test/lit/passes/unsubtyping.wast b/test/lit/passes/unsubtyping.wast
index 590cc5ae1..0d4e11e12 100644
--- a/test/lit/passes/unsubtyping.wast
+++ b/test/lit/passes/unsubtyping.wast
@@ -1,14 +1,14 @@
 ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
-;; RUN: foreach %s %t wasm-opt --closed-world --unsubtyping --remove-unused-types -all -S -o - | filecheck %s
+;; RUN: foreach %s %t wasm-opt -all --closed-world --preserve-type-order \
+;; RUN:     --unsubtyping --remove-unused-types -all -S -o - | filecheck %s
 
 (module
  ;; $sub1 and $sub2 should become parent types and $super should be removed.
  (type $super (sub (struct)))
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $sub2 (sub (struct (field f32))))
-
- ;; CHECK:       (type $sub1 (sub (struct (field i32))))
+ ;; CHECK-NEXT:  (type $sub1 (sub (struct (field i32))))
  (type $sub1 (sub $super (struct i32)))
+ ;; CHECK:       (type $sub2 (sub (struct (field f32))))
  (type $sub2 (sub $super (struct f32)))
 
  ;; CHECK:      (global $sub1 (ref $sub1) (struct.new_default $sub1))
@@ -21,10 +21,9 @@
  ;; Same result, but we start with $sub2 <: $sub1.
  (type $super (sub (struct)))
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $sub2 (sub (struct (field i32) (field i32))))
-
- ;; CHECK:       (type $sub1 (sub (struct (field i32))))
+ ;; CHECK-NEXT:  (type $sub1 (sub (struct (field i32))))
  (type $sub1 (sub $super (struct i32)))
+ ;; CHECK:       (type $sub2 (sub (struct (field i32) (field i32))))
  (type $sub2 (sub $sub1 (struct i32 i32)))
 
  ;; CHECK:      (global $sub1 (ref $sub1) (struct.new_default $sub1))
@@ -214,12 +213,11 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $opt (sub (struct (field i32))))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
+ ;; CHECK:       (type $opt (sub (struct (field i32))))
  (type $opt (sub $super (struct i32)))
 
  ;; CHECK:       (type $3 (func))
@@ -439,11 +437,11 @@
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
- ;; CHECK:       (type $2 (func (result (ref $sub))))
+ ;; CHECK:       (type $2 (func (result (ref $super))))
 
- ;; CHECK:       (type $3 (func (result (ref $super))))
+ ;; CHECK:       (type $3 (func (result (ref $sub))))
 
- ;; CHECK:      (func $return-call (type $3) (result (ref $super))
+ ;; CHECK:      (func $return-call (type $2) (result (ref $super))
  ;; CHECK-NEXT:  (return_call $callee)
  ;; CHECK-NEXT: )
  (func $return-call (result (ref $super))
@@ -451,7 +449,7 @@
   (return_call $callee)
  )
 
- ;; CHECK:      (func $callee (type $2) (result (ref $sub))
+ ;; CHECK:      (func $callee (type $3) (result (ref $sub))
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT: )
  (func $callee (result (ref $sub))
@@ -493,15 +491,15 @@
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
- ;; CHECK:       (type $2 (func (result (ref $sub))))
+ ;; CHECK:       (type $2 (func (result (ref $super))))
 
- ;; CHECK:       (type $3 (func (result (ref $super))))
+ ;; CHECK:       (type $3 (func (result (ref $sub))))
 
  ;; CHECK:      (table $t 1 1 funcref)
  (table $t 1 1 funcref)
 
- ;; CHECK:      (func $return-call-indirect (type $3) (result (ref $super))
- ;; CHECK-NEXT:  (return_call_indirect $t (type $2)
+ ;; CHECK:      (func $return-call-indirect (type $2) (result (ref $super))
+ ;; CHECK-NEXT:  (return_call_indirect $t (type $3)
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT: )
@@ -515,10 +513,9 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $sub (sub (func)))
-
- ;; CHECK:       (type $super (sub (func)))
+ ;; CHECK-NEXT:  (type $super (sub (func)))
  (type $super (sub (func)))
+ ;; CHECK:       (type $sub (sub (func)))
  (type $sub (sub $super (func)))
 
  ;; CHECK:      (table $t 1 1 (ref null $super))
@@ -620,10 +617,9 @@
  ;; CHECK:      (rec
  ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
- ;; CHECK:       (type $sub2 (sub $super (struct (field i32))))
-
  ;; CHECK:       (type $sub1 (sub $super (struct)))
  (type $sub1 (sub $super (struct)))
+ ;; CHECK:       (type $sub2 (sub $super (struct (field i32))))
  (type $sub2 (sub $super (struct i32)))
 
  ;; CHECK:       (type $3 (func))
@@ -673,10 +669,9 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $sub (sub (struct)))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
+ ;; CHECK:       (type $sub (sub (struct)))
  (type $sub (sub $super (struct)))
 
  ;; CHECK:       (type $2 (func))
@@ -697,15 +692,13 @@
 (module
  (rec
   ;; CHECK:      (rec
-  ;; CHECK-NEXT:  (type $super2 (sub (struct)))
-
-  ;; CHECK:       (type $sub2 (sub $super2 (struct)))
-
-  ;; CHECK:       (type $super1 (sub (struct)))
+  ;; CHECK-NEXT:  (type $super1 (sub (struct)))
   (type $super1 (sub (struct)))
+  ;; CHECK:       (type $super2 (sub (struct)))
   (type $super2 (sub (struct)))
   ;; CHECK:       (type $sub1 (sub $super1 (struct)))
   (type $sub1 (sub $super1 (struct)))
+  ;; CHECK:       (type $sub2 (sub $super2 (struct)))
   (type $sub2 (sub $super2 (struct)))
  )
 
@@ -788,20 +781,20 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $0 (func))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $2 (func))
+
  ;; CHECK:      (table $super 1 1 (ref null $super))
  (table $super 1 1 (ref null $super))
 
  ;; CHECK:      (table $sub 1 1 (ref null $sub))
  (table $sub 1 1 (ref null $sub))
 
- ;; CHECK:      (func $table-copy (type $0)
+ ;; CHECK:      (func $table-copy (type $2)
  ;; CHECK-NEXT:  (table.copy $super $sub
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (i32.const 0)
@@ -820,20 +813,20 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $0 (func))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $2 (func))
+
  ;; CHECK:      (table $super 1 1 (ref null $super))
  (table $super 1 1 (ref null $super))
 
  ;; CHECK:      (elem $sub (ref null $sub))
  (elem $sub (ref null $sub))
 
- ;; CHECK:      (func $table-copy (type $0)
+ ;; CHECK:      (func $table-copy (type $2)
  ;; CHECK-NEXT:  (table.init $super $sub
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (i32.const 0)
@@ -1134,13 +1127,12 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $struct (sub (struct (field (ref null $super)))))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $struct (sub (struct (field (ref null $super)))))
  (type $struct (sub (struct (ref null $super))))
 
  ;; CHECK:       (type $3 (func))
@@ -1181,13 +1173,12 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $struct (sub (struct (field (mut (ref null $super))))))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $struct (sub (struct (field (mut (ref null $super))))))
  (type $struct (sub (struct (mut (ref null $super)))))
 
  ;; CHECK:       (type $3 (func (param (ref null $struct))))
@@ -1237,13 +1228,12 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $array (sub (array (ref null $super))))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $array (sub (array (ref null $super))))
  (type $array (sub (array (ref null $super))))
 
  ;; CHECK:       (type $3 (func))
@@ -1298,21 +1288,20 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $array (sub (array (ref null $super))))
-
- ;; CHECK:       (type $1 (func))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $array (sub (array (ref null $super))))
  (type $array (sub (array (ref null $super))))
 
+ ;; CHECK:       (type $3 (func))
+
  ;; CHECK:      (elem $e (ref null $sub))
  (elem $e (ref null $sub))
 
- ;; CHECK:      (func $array-new-elem (type $1)
+ ;; CHECK:      (func $array-new-elem (type $3)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (array.new_elem $array $e
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1347,13 +1336,12 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $array (sub (array (ref null $super))))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $array (sub (array (ref null $super))))
  (type $array (sub (array (ref null $super))))
 
  ;; CHECK:       (type $3 (func))
@@ -1457,10 +1445,9 @@
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
- ;; CHECK:       (type $sub-array (sub (array (mut (ref null $sub)))))
-
  ;; CHECK:       (type $super-array (sub (array (mut (ref null $super)))))
  (type $super-array (sub (array (mut (ref null $super)))))
+ ;; CHECK:       (type $sub-array (sub (array (mut (ref null $sub)))))
  (type $sub-array (sub (array (mut (ref null $sub)))))
 
  ;; CHECK:       (type $4 (func))
@@ -1615,21 +1602,20 @@
 
 (module
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $array (sub (array (mut (ref null $super)))))
-
- ;; CHECK:       (type $1 (func))
-
- ;; CHECK:       (type $super (sub (struct)))
+ ;; CHECK-NEXT:  (type $super (sub (struct)))
  (type $super (sub (struct)))
  ;; CHECK:       (type $sub (sub $super (struct)))
  (type $sub (sub $super (struct)))
 
+ ;; CHECK:       (type $array (sub (array (mut (ref null $super)))))
  (type $array (sub (array (mut (ref null $super)))))
 
+ ;; CHECK:       (type $3 (func))
+
  ;; CHECK:      (elem $e (ref null $sub))
  (elem $e (ref null $sub))
 
- ;; CHECK:      (func $array-init-elem (type $1)
+ ;; CHECK:      (func $array-init-elem (type $3)
  ;; CHECK-NEXT:  (array.init_elem $array $e
  ;; CHECK-NEXT:   (array.new_fixed $array 0)
  ;; CHECK-NEXT:   (i32.const 0)