diff options
Diffstat (limited to 'test/lit/wasm-split')
-rw-r--r-- | test/lit/wasm-split/basic.wast | 18 | ||||
-rw-r--r-- | test/lit/wasm-split/jspi-secondary-export.wast | 12 | ||||
-rw-r--r-- | test/lit/wasm-split/jspi.wast | 12 | ||||
-rw-r--r-- | test/lit/wasm-split/minimized-exports.wast | 4 | ||||
-rw-r--r-- | test/lit/wasm-split/multi-memory-lowering-export.wast | 12 | ||||
-rw-r--r-- | test/lit/wasm-split/multi-memory-lowering-import.wast | 12 |
6 files changed, 35 insertions, 35 deletions
diff --git a/test/lit/wasm-split/basic.wast b/test/lit/wasm-split/basic.wast index 7dcb7933b..2291916a0 100644 --- a/test/lit/wasm-split/basic.wast +++ b/test/lit/wasm-split/basic.wast @@ -63,7 +63,7 @@ ;; KEEP-NONE: warning: not keeping any functions in the primary module ;; KEEP-NONE-PRIMARY: (module -;; KEEP-NONE-PRIMARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-NONE-PRIMARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-NONE-PRIMARY-NEXT: (import "placeholder" "0" (func $placeholder_0 (param i32) (result i32))) ;; KEEP-NONE-PRIMARY-NEXT: (table $table 1 1 funcref) ;; KEEP-NONE-PRIMARY-NEXT: (elem $0 (i32.const 0) $placeholder_0) @@ -71,7 +71,7 @@ ;; KEEP-NONE-PRIMARY-NEXT: ) ;; KEEP-NONE-SECONDARY: (module -;; KEEP-NONE-SECONDARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-NONE-SECONDARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-NONE-SECONDARY-NEXT: (import "primary" "%table" (table $table 1 1 funcref)) ;; KEEP-NONE-SECONDARY-NEXT: (elem $0 (i32.const 0) $foo) ;; KEEP-NONE-SECONDARY-NEXT: (func $bar (param $0 i32) (result i32) @@ -90,14 +90,14 @@ ;; KEEP-FOO-NEXT: Splitting out functions: bar{{$}} ;; KEEP-FOO-PRIMARY: (module -;; KEEP-FOO-PRIMARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-FOO-PRIMARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-FOO-PRIMARY-NEXT: (import "placeholder" "1" (func $placeholder_1 (param i32) (result i32))) ;; KEEP-FOO-PRIMARY-NEXT: (table $table 2 2 funcref) ;; KEEP-FOO-PRIMARY-NEXT: (elem $0 (i32.const 0) $foo $placeholder_1) ;; KEEP-FOO-PRIMARY-NEXT: (export "%foo" (func $foo)) ;; KEEP-FOO-PRIMARY-NEXT: (export "%table" (table $table)) ;; KEEP-FOO-PRIMARY-NEXT: (func $foo (param $0 i32) (result i32) -;; KEEP-FOO-PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) +;; KEEP-FOO-PRIMARY-NEXT: (call_indirect (type $0) ;; KEEP-FOO-PRIMARY-NEXT: (i32.const 0) ;; KEEP-FOO-PRIMARY-NEXT: (i32.const 1) ;; KEEP-FOO-PRIMARY-NEXT: ) @@ -105,7 +105,7 @@ ;; KEEP-FOO-PRIMARY-NEXT: ) ;; KEEP-FOO-SECONDARY: (module -;; KEEP-FOO-SECONDARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-FOO-SECONDARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-FOO-SECONDARY-NEXT: (import "primary" "%table" (table $table 2 2 funcref)) ;; KEEP-FOO-SECONDARY-NEXT: (import "primary" "%foo" (func $foo (param i32) (result i32))) ;; KEEP-FOO-SECONDARY-NEXT: (elem $0 (i32.const 1) $bar) @@ -120,14 +120,14 @@ ;; KEEP-BAR-NEXT: Splitting out functions: foo{{$}} ;; KEEP-BAR-PRIMARY: (module -;; KEEP-BAR-PRIMARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-BAR-PRIMARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-BAR-PRIMARY-NEXT: (import "placeholder" "0" (func $placeholder_0 (param i32) (result i32))) ;; KEEP-BAR-PRIMARY-NEXT: (table $table 1 1 funcref) ;; KEEP-BAR-PRIMARY-NEXT: (elem $0 (i32.const 0) $placeholder_0) ;; KEEP-BAR-PRIMARY-NEXT: (export "%bar" (func $bar)) ;; KEEP-BAR-PRIMARY-NEXT: (export "%table" (table $table)) ;; KEEP-BAR-PRIMARY-NEXT: (func $bar (param $0 i32) (result i32) -;; KEEP-BAR-PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) +;; KEEP-BAR-PRIMARY-NEXT: (call_indirect (type $0) ;; KEEP-BAR-PRIMARY-NEXT: (i32.const 1) ;; KEEP-BAR-PRIMARY-NEXT: (i32.const 0) ;; KEEP-BAR-PRIMARY-NEXT: ) @@ -135,7 +135,7 @@ ;; KEEP-BAR-PRIMARY-NEXT: ) ;; KEEP-BAR-SECONDARY: (module -;; KEEP-BAR-SECONDARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-BAR-SECONDARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-BAR-SECONDARY-NEXT: (import "primary" "%table" (table $table 1 1 funcref)) ;; KEEP-BAR-SECONDARY-NEXT: (import "primary" "%bar" (func $bar (param i32) (result i32))) ;; KEEP-BAR-SECONDARY-NEXT: (elem $0 (i32.const 0) $foo) @@ -151,7 +151,7 @@ ;; KEEP-BOTH-NEXT: Splitting out functions: {{$}} ;; KEEP-BOTH-PRIMARY: (module -;; KEEP-BOTH-PRIMARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) +;; KEEP-BOTH-PRIMARY-NEXT: (type $0 (func (param i32) (result i32))) ;; KEEP-BOTH-PRIMARY-NEXT: (table $table 1 1 funcref) ;; KEEP-BOTH-PRIMARY-NEXT: (elem $0 (i32.const 0) $foo) ;; KEEP-BOTH-PRIMARY-NEXT: (export "%table" (table $table)) diff --git a/test/lit/wasm-split/jspi-secondary-export.wast b/test/lit/wasm-split/jspi-secondary-export.wast index bcfeb1ecb..6bb388fec 100644 --- a/test/lit/wasm-split/jspi-secondary-export.wast +++ b/test/lit/wasm-split/jspi-secondary-export.wast @@ -8,13 +8,13 @@ ;; enabled. (module - ;; PRIMARY: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; PRIMARY: (type $0 (func (param i32) (result i32))) - ;; PRIMARY: (type $externref_=>_none (func (param externref))) + ;; PRIMARY: (type $3 (func (param externref))) - ;; PRIMARY: (type $externref_i32_=>_i32 (func (param externref i32) (result i32))) + ;; PRIMARY: (type $1 (func (param externref i32) (result i32))) - ;; PRIMARY: (type $none_=>_none (func)) + ;; PRIMARY: (type $2 (func)) ;; PRIMARY: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) @@ -30,7 +30,7 @@ ;; PRIMARY: (export "foo" (func $export$foo)) (export "foo" (func $foo)) - ;; SECONDARY: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; SECONDARY: (type $0 (func (param i32) (result i32))) ;; SECONDARY: (import "primary" "%table" (table $timport$0 1 funcref)) @@ -63,7 +63,7 @@ ;; PRIMARY-NEXT: ) ;; PRIMARY-NEXT: (call $__load_secondary_module) ;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) +;; PRIMARY-NEXT: (call_indirect (type $0) ;; PRIMARY-NEXT: (local.get $0) ;; PRIMARY-NEXT: (i32.const 0) ;; PRIMARY-NEXT: ) diff --git a/test/lit/wasm-split/jspi.wast b/test/lit/wasm-split/jspi.wast index e323660a8..b1f1b56f3 100644 --- a/test/lit/wasm-split/jspi.wast +++ b/test/lit/wasm-split/jspi.wast @@ -8,13 +8,13 @@ ;; that bar is moved to the secondary module. (module - ;; PRIMARY: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; PRIMARY: (type $0 (func (param i32) (result i32))) - ;; PRIMARY: (type $externref_=>_none (func (param externref))) + ;; PRIMARY: (type $3 (func (param externref))) - ;; PRIMARY: (type $externref_i32_=>_i32 (func (param externref i32) (result i32))) + ;; PRIMARY: (type $1 (func (param externref i32) (result i32))) - ;; PRIMARY: (type $none_=>_none (func)) + ;; PRIMARY: (type $2 (func)) ;; PRIMARY: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) @@ -45,7 +45,7 @@ ;; PRIMARY-NEXT: ) ;; PRIMARY-NEXT: (call $__load_secondary_module) ;; PRIMARY-NEXT: ) - ;; PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) + ;; PRIMARY-NEXT: (call_indirect (type $0) ;; PRIMARY-NEXT: (i32.const 0) ;; PRIMARY-NEXT: (i32.const 0) ;; PRIMARY-NEXT: ) @@ -53,7 +53,7 @@ (func $foo (param i32) (result i32) (call $bar (i32.const 0)) ) - ;; SECONDARY: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; SECONDARY: (type $0 (func (param i32) (result i32))) ;; SECONDARY: (import "primary" "%table" (table $timport$0 1 funcref)) diff --git a/test/lit/wasm-split/minimized-exports.wast b/test/lit/wasm-split/minimized-exports.wast index a7c225550..4ee73a35b 100644 --- a/test/lit/wasm-split/minimized-exports.wast +++ b/test/lit/wasm-split/minimized-exports.wast @@ -3,7 +3,7 @@ ;; RUN: wasm-dis %t.2.wasm | filecheck %s --check-prefix SECONDARY ;; PRIMARY: (module -;; PRIMARY-NEXT: (type $none_=>_none (func)) +;; PRIMARY-NEXT: (type $0 (func)) ;; PRIMARY-NEXT: (export "%a" (func $1)) ;; PRIMARY-NEXT: (export "%b" (func $0)) ;; PRIMARY-NEXT: (func $0 @@ -15,7 +15,7 @@ ;; PRIMARY-NEXT: ) ;; SECONDARY: (module -;; SECONDARY-NEXT: (type $none_=>_none (func)) +;; SECONDARY-NEXT: (type $0 (func)) ;; SECONDARY-NEXT: (import "primary" "%a" (func $fimport$0)) ;; SECONDARY-NEXT: (import "primary" "%b" (func $fimport$1)) ;; SECONDARY-NEXT: (func $0 diff --git a/test/lit/wasm-split/multi-memory-lowering-export.wast b/test/lit/wasm-split/multi-memory-lowering-export.wast index e4572d2b4..156ac2efe 100644 --- a/test/lit/wasm-split/multi-memory-lowering-export.wast +++ b/test/lit/wasm-split/multi-memory-lowering-export.wast @@ -5,9 +5,9 @@ (module (memory $memory1 1) (memory $memory2 1 1) - ;; CHECK: (type $none_=>_i32 (func (result i32))) + ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; CHECK: (type $1 (func (param i32) (result i32))) ;; CHECK: (global $memory2_byte_offset (mut i32) (i32.const 65536)) @@ -17,7 +17,7 @@ (export "mem" (memory $memory1)) ) -;; CHECK: (func $memory1_size (type $none_=>_i32) (result i32) +;; CHECK: (func $memory1_size (type $0) (result i32) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (i32.div_u ;; CHECK-NEXT: (global.get $memory2_byte_offset) @@ -26,7 +26,7 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) -;; CHECK: (func $memory2_size (type $none_=>_i32) (result i32) +;; CHECK: (func $memory2_size (type $0) (result i32) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (i32.sub ;; CHECK-NEXT: (memory.size) @@ -38,7 +38,7 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) -;; CHECK: (func $memory1_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK: (func $memory1_grow (type $1) (param $page_delta i32) (result i32) ;; CHECK-NEXT: (local $return_size i32) ;; CHECK-NEXT: (local $memory_size i32) ;; CHECK-NEXT: (local.set $return_size @@ -87,7 +87,7 @@ ;; CHECK-NEXT: (local.get $return_size) ;; CHECK-NEXT: ) -;; CHECK: (func $memory2_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK: (func $memory2_grow (type $1) (param $page_delta i32) (result i32) ;; CHECK-NEXT: (local $return_size i32) ;; CHECK-NEXT: (local.set $return_size ;; CHECK-NEXT: (call $memory2_size) diff --git a/test/lit/wasm-split/multi-memory-lowering-import.wast b/test/lit/wasm-split/multi-memory-lowering-import.wast index 539405064..e00c13799 100644 --- a/test/lit/wasm-split/multi-memory-lowering-import.wast +++ b/test/lit/wasm-split/multi-memory-lowering-import.wast @@ -3,9 +3,9 @@ ;; RUN: wasm-opt %s --multi-memory-lowering -all -S -o - | filecheck %s (module - ;; CHECK: (type $none_=>_i32 (func (result i32))) + ;; CHECK: (type $0 (func (result i32))) - ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32))) + ;; CHECK: (type $1 (func (param i32) (result i32))) ;; CHECK: (import "env" "mem" (memory $combined_memory 2 2)) (import "env" "mem" (memory $memory1 1 1)) @@ -14,7 +14,7 @@ ;; CHECK: (global $memory2_byte_offset (mut i32) (i32.const 65536)) -;; CHECK: (func $memory1_size (type $none_=>_i32) (result i32) +;; CHECK: (func $memory1_size (type $0) (result i32) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (i32.div_u ;; CHECK-NEXT: (global.get $memory2_byte_offset) @@ -23,7 +23,7 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) -;; CHECK: (func $memory2_size (type $none_=>_i32) (result i32) +;; CHECK: (func $memory2_size (type $0) (result i32) ;; CHECK-NEXT: (return ;; CHECK-NEXT: (i32.sub ;; CHECK-NEXT: (memory.size) @@ -35,7 +35,7 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) -;; CHECK: (func $memory1_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK: (func $memory1_grow (type $1) (param $page_delta i32) (result i32) ;; CHECK-NEXT: (local $return_size i32) ;; CHECK-NEXT: (local $memory_size i32) ;; CHECK-NEXT: (local.set $return_size @@ -84,7 +84,7 @@ ;; CHECK-NEXT: (local.get $return_size) ;; CHECK-NEXT: ) -;; CHECK: (func $memory2_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK: (func $memory2_grow (type $1) (param $page_delta i32) (result i32) ;; CHECK-NEXT: (local $return_size i32) ;; CHECK-NEXT: (local.set $return_size ;; CHECK-NEXT: (call $memory2_size) |