diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/lit/help/wasm-split.test | 8 | ||||
-rw-r--r-- | test/lit/passes/jspi-split-module.wast | 30 | ||||
-rw-r--r-- | test/lit/wasm-split/asyncify.wast | 174 | ||||
-rw-r--r-- | test/lit/wasm-split/jspi-secondary-export.wast | 83 | ||||
-rw-r--r-- | test/lit/wasm-split/jspi.wast | 98 |
5 files changed, 215 insertions, 178 deletions
diff --git a/test/lit/help/wasm-split.test b/test/lit/help/wasm-split.test index 118117d62..e0cdf3ca4 100644 --- a/test/lit/help/wasm-split.test +++ b/test/lit/help/wasm-split.test @@ -66,10 +66,10 @@ ;; CHECK-NEXT: import placeholder functions into the ;; CHECK-NEXT: primary module. ;; CHECK-NEXT: -;; CHECK-NEXT: --asyncify [split] Transform the module to support -;; CHECK-NEXT: unwinding the stack from placeholder -;; CHECK-NEXT: functions and rewinding it once the -;; CHECK-NEXT: secondary module has been loaded. +;; CHECK-NEXT: --jspi [split] Transform the module to support +;; CHECK-NEXT: asynchronously loading the secondary +;; CHECK-NEXT: module before any placeholder functions +;; CHECK-NEXT: have been called. ;; CHECK-NEXT: ;; CHECK-NEXT: --export-prefix [split] An identifying prefix to prepend ;; CHECK-NEXT: to new export names created by module diff --git a/test/lit/passes/jspi-split-module.wast b/test/lit/passes/jspi-split-module.wast new file mode 100644 index 000000000..d3484bacf --- /dev/null +++ b/test/lit/passes/jspi-split-module.wast @@ -0,0 +1,30 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. +;; RUN: wasm-opt %s --jspi --pass-arg=jspi-split-module -all -S -o - | filecheck %s + +;; The following should be generated besides the usual JSPI wasm: +;; - function import +;; - JSPI'ed version of the import +;; - export of the above +(module) +;; CHECK: (type $none_=>_none (func)) + +;; CHECK: (type $externref_=>_none (func (param externref))) + +;; CHECK: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) + +;; CHECK: (global $suspender (mut externref) (ref.null noextern)) + +;; CHECK: (export "__load_secondary_module" (func $__load_secondary_module)) + +;; CHECK: (func $__load_secondary_module (type $none_=>_none) +;; CHECK-NEXT: (local $0 externref) +;; CHECK-NEXT: (local.set $0 +;; CHECK-NEXT: (global.get $suspender) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (call $import$__load_secondary_module +;; CHECK-NEXT: (global.get $suspender) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.set $suspender +;; CHECK-NEXT: (local.get $0) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) diff --git a/test/lit/wasm-split/asyncify.wast b/test/lit/wasm-split/asyncify.wast deleted file mode 100644 index 4894f58a7..000000000 --- a/test/lit/wasm-split/asyncify.wast +++ /dev/null @@ -1,174 +0,0 @@ -;; RUN: wasm-split %s --export-prefix='%' -g -o1 %t.1.wasm -o2 %t.2.wasm --keep-funcs=foo --asyncify -;; RUN: wasm-dis %t.1.wasm | filecheck %s --check-prefix PRIMARY -;; RUN: wasm-dis %t.2.wasm | filecheck %s --check-prefix SECONDARY - -;; Check that the --asyncify option instruments the primary module but not the -;; secondary module. - -(module - (func $foo (param i32) (result i32) - (call $bar (i32.const 0)) - ) - (func $bar (param i32) (result i32) - (call $foo (i32.const 1)) - ) -) - -;; PRIMARY: (module -;; PRIMARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) -;; PRIMARY-NEXT: (type $i32_=>_none (func (param i32))) -;; PRIMARY-NEXT: (type $none_=>_none (func)) -;; PRIMARY-NEXT: (type $none_=>_i32 (func (result i32))) -;; PRIMARY-NEXT: (import "placeholder" "0" (func $placeholder_0 (param i32) (result i32))) -;; PRIMARY-NEXT: (global $global$0 (mut i32) (i32.const 0)) -;; PRIMARY-NEXT: (global $global$1 (mut i32) (i32.const 0)) -;; PRIMARY-NEXT: (memory $0 1 1) -;; PRIMARY-NEXT: (table $0 1 funcref) -;; PRIMARY-NEXT: (elem (i32.const 0) $placeholder_0) -;; PRIMARY-NEXT: (export "%foo" (func $foo)) -;; PRIMARY-NEXT: (export "%table" (table $0)) -;; PRIMARY-NEXT: (export "asyncify_start_unwind" (func $asyncify_start_unwind)) -;; PRIMARY-NEXT: (export "asyncify_stop_unwind" (func $asyncify_stop_unwind)) -;; PRIMARY-NEXT: (export "asyncify_start_rewind" (func $asyncify_start_rewind)) -;; PRIMARY-NEXT: (export "asyncify_stop_rewind" (func $asyncify_stop_rewind)) -;; PRIMARY-NEXT: (export "asyncify_get_state" (func $asyncify_get_state)) -;; PRIMARY-NEXT: (func $foo (param $0 i32) (result i32) -;; PRIMARY-NEXT: (local $1 i32) -;; PRIMARY-NEXT: (if -;; PRIMARY-NEXT: (i32.eq -;; PRIMARY-NEXT: (global.get $global$0) -;; PRIMARY-NEXT: (i32.const 2) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (block -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: (i32.sub -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 4) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.set $0 -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.set $1 -;; PRIMARY-NEXT: (block $label$2 (result i32) -;; PRIMARY-NEXT: (if -;; PRIMARY-NEXT: (i32.eqz -;; PRIMARY-NEXT: (select -;; PRIMARY-NEXT: (if (result i32) -;; PRIMARY-NEXT: (i32.eq -;; PRIMARY-NEXT: (global.get $global$0) -;; PRIMARY-NEXT: (i32.const 2) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (block (result i32) -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: (i32.sub -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 4) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.get $1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 0) -;; PRIMARY-NEXT: (global.get $global$0) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (block -;; PRIMARY-NEXT: (local.set $1 -;; PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) -;; PRIMARY-NEXT: (i32.const 0) -;; PRIMARY-NEXT: (i32.const 0) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (drop -;; PRIMARY-NEXT: (br_if $label$2 -;; PRIMARY-NEXT: (i32.const 0) -;; PRIMARY-NEXT: (i32.eq -;; PRIMARY-NEXT: (global.get $global$0) -;; PRIMARY-NEXT: (i32.const 1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.set $0 -;; PRIMARY-NEXT: (local.get $1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (if -;; PRIMARY-NEXT: (i32.eqz -;; PRIMARY-NEXT: (global.get $global$0) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (return -;; PRIMARY-NEXT: (local.get $0) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (unreachable) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.get $1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: (i32.add -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 4) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (local.get $0) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.store -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: (i32.add -;; PRIMARY-NEXT: (i32.load -;; PRIMARY-NEXT: (global.get $global$1) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 4) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: ) -;; PRIMARY-NEXT: (i32.const 0) -;; PRIMARY-NEXT: ) -;; PRIMARY: (func $asyncify_start_unwind (param $0 i32) -;; PRIMARY: (func $asyncify_stop_unwind -;; PRIMARY: (func $asyncify_start_rewind (param $0 i32) -;; PRIMARY: (func $asyncify_stop_rewind -;; PRIMARY: (func $asyncify_get_state (result i32) -;; PRIMARY: ) - -;; SECONDARY: (module -;; SECONDARY-NEXT: (type $i32_=>_i32 (func (param i32) (result i32))) -;; SECONDARY-NEXT: (import "primary" "%table" (table $timport$0 1 funcref)) -;; SECONDARY-NEXT: (import "primary" "%foo" (func $foo (param i32) (result i32))) -;; SECONDARY-NEXT: (elem (i32.const 0) $bar) -;; SECONDARY-NEXT: (func $bar (param $0 i32) (result i32) -;; SECONDARY-NEXT: (call $foo -;; SECONDARY-NEXT: (i32.const 1) -;; SECONDARY-NEXT: ) -;; SECONDARY-NEXT: ) -;; SECONDARY-NEXT: ) diff --git a/test/lit/wasm-split/jspi-secondary-export.wast b/test/lit/wasm-split/jspi-secondary-export.wast new file mode 100644 index 000000000..6d6e54e15 --- /dev/null +++ b/test/lit/wasm-split/jspi-secondary-export.wast @@ -0,0 +1,83 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. +;; RUN: wasm-opt %s --jspi --pass-arg=jspi-exports@foo --pass-arg=jspi-split-module -all -S -o %t.jspi.wast +;; RUN: wasm-split %t.jspi.wast --export-prefix='%' -g -o1 %t.1.wasm -o2 %t.2.wasm --jspi --enable-reference-types +;; RUN: wasm-dis %t.1.wasm | filecheck %s --check-prefix PRIMARY +;; RUN: wasm-dis %t.2.wasm | filecheck %s --check-prefix SECONDARY + +;; Ensure exported functions are not moved to secondary module when JSPI is +;; enabled. + +(module + ;; PRIMARY: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; PRIMARY: (type $externref_=>_none (func (param externref))) + + ;; PRIMARY: (type $externref_i32_=>_i32 (func (param externref i32) (result i32))) + + ;; PRIMARY: (type $none_=>_none (func)) + + ;; PRIMARY: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) + + ;; PRIMARY: (import "placeholder" "0" (func $placeholder_0 (param i32) (result i32))) + + ;; PRIMARY: (global $suspender (mut externref) (ref.null noextern)) + + ;; PRIMARY: (global $global$1 (mut i32) (i32.const 0)) + + ;; PRIMARY: (table $0 1 funcref) + + ;; PRIMARY: (elem (i32.const 0) $placeholder_0) + + ;; PRIMARY: (export "foo" (func $export$foo)) + (export "foo" (func $foo)) + ;; SECONDARY: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; SECONDARY: (import "primary" "%table" (table $timport$0 1 funcref)) + + ;; SECONDARY: (import "primary" "%global" (global $suspender (mut externref))) + + ;; SECONDARY: (import "primary" "load_secondary_module_status" (global $gimport$1 (mut i32))) + + ;; SECONDARY: (elem (i32.const 0) $foo) + + ;; SECONDARY: (func $foo (param $0 i32) (result i32) + ;; SECONDARY-NEXT: (i32.const 0) + ;; SECONDARY-NEXT: ) + (func $foo (param i32) (result i32) + (i32.const 0) + ) +) +;; PRIMARY: (export "load_secondary_module_status" (global $global$1)) + +;; PRIMARY: (export "%table" (table $0)) + +;; PRIMARY: (export "%global" (global $suspender)) + +;; PRIMARY: (func $export$foo (param $susp externref) (param $0 i32) (result i32) +;; PRIMARY-NEXT: (global.set $suspender +;; PRIMARY-NEXT: (local.get $susp) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (if +;; PRIMARY-NEXT: (i32.eqz +;; PRIMARY-NEXT: (global.get $global$1) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (call $__load_secondary_module) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) +;; PRIMARY-NEXT: (local.get $0) +;; PRIMARY-NEXT: (i32.const 0) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: ) + +;; PRIMARY: (func $__load_secondary_module +;; PRIMARY-NEXT: (local $0 externref) +;; PRIMARY-NEXT: (local.set $0 +;; PRIMARY-NEXT: (global.get $suspender) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (call $import$__load_secondary_module +;; PRIMARY-NEXT: (global.get $suspender) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (global.set $suspender +;; PRIMARY-NEXT: (local.get $0) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: ) diff --git a/test/lit/wasm-split/jspi.wast b/test/lit/wasm-split/jspi.wast new file mode 100644 index 000000000..c202b9cb1 --- /dev/null +++ b/test/lit/wasm-split/jspi.wast @@ -0,0 +1,98 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. +;; RUN: wasm-opt %s --jspi --pass-arg=jspi-exports@foo --pass-arg=jspi-split-module -all -S -o %t.jspi.wast +;; RUN: wasm-split %t.jspi.wast --export-prefix='%' -g -o1 %t.1.wasm -o2 %t.2.wasm --keep-funcs=foo --jspi --enable-reference-types +;; RUN: wasm-dis %t.1.wasm | filecheck %s --check-prefix PRIMARY +;; RUN: wasm-dis %t.2.wasm | filecheck %s --check-prefix SECONDARY + +;; Check that the call to bar first checks if the secondary module is loaded and +;; that bar is moved to the secondary module. + +(module + ;; PRIMARY: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; PRIMARY: (type $externref_=>_none (func (param externref))) + + ;; PRIMARY: (type $externref_i32_=>_i32 (func (param externref i32) (result i32))) + + ;; PRIMARY: (type $none_=>_none (func)) + + ;; PRIMARY: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) + + ;; PRIMARY: (import "placeholder" "0" (func $placeholder_0 (param i32) (result i32))) + + ;; PRIMARY: (global $suspender (mut externref) (ref.null noextern)) + + ;; PRIMARY: (global $global$1 (mut i32) (i32.const 0)) + + ;; PRIMARY: (table $0 1 funcref) + + ;; PRIMARY: (elem (i32.const 0) $placeholder_0) + + ;; PRIMARY: (export "foo" (func $export$foo)) + (export "foo" (func $foo)) + ;; PRIMARY: (export "load_secondary_module_status" (global $global$1)) + + ;; PRIMARY: (export "%foo" (func $foo)) + + ;; PRIMARY: (export "%table" (table $0)) + + ;; PRIMARY: (export "%global" (global $suspender)) + + ;; PRIMARY: (func $foo (param $0 i32) (result i32) + ;; PRIMARY-NEXT: (if + ;; PRIMARY-NEXT: (i32.eqz + ;; PRIMARY-NEXT: (global.get $global$1) + ;; PRIMARY-NEXT: ) + ;; PRIMARY-NEXT: (call $__load_secondary_module) + ;; PRIMARY-NEXT: ) + ;; PRIMARY-NEXT: (call_indirect (type $i32_=>_i32) + ;; PRIMARY-NEXT: (i32.const 0) + ;; PRIMARY-NEXT: (i32.const 0) + ;; PRIMARY-NEXT: ) + ;; PRIMARY-NEXT: ) + (func $foo (param i32) (result i32) + (call $bar (i32.const 0)) + ) + ;; SECONDARY: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; SECONDARY: (import "primary" "%table" (table $timport$0 1 funcref)) + + ;; SECONDARY: (import "primary" "%global" (global $suspender (mut externref))) + + ;; SECONDARY: (import "primary" "load_secondary_module_status" (global $gimport$1 (mut i32))) + + ;; SECONDARY: (import "primary" "%foo" (func $foo (param i32) (result i32))) + + ;; SECONDARY: (elem (i32.const 0) $bar) + + ;; SECONDARY: (func $bar (param $0 i32) (result i32) + ;; SECONDARY-NEXT: (call $foo + ;; SECONDARY-NEXT: (i32.const 1) + ;; SECONDARY-NEXT: ) + ;; SECONDARY-NEXT: ) + (func $bar (param i32) (result i32) + (call $foo (i32.const 1)) + ) +) + +;; PRIMARY: (func $export$foo (param $susp externref) (param $0 i32) (result i32) +;; PRIMARY-NEXT: (global.set $suspender +;; PRIMARY-NEXT: (local.get $susp) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (call $foo +;; PRIMARY-NEXT: (local.get $0) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: ) + +;; PRIMARY: (func $__load_secondary_module +;; PRIMARY-NEXT: (local $0 externref) +;; PRIMARY-NEXT: (local.set $0 +;; PRIMARY-NEXT: (global.get $suspender) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (call $import$__load_secondary_module +;; PRIMARY-NEXT: (global.get $suspender) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: (global.set $suspender +;; PRIMARY-NEXT: (local.get $0) +;; PRIMARY-NEXT: ) +;; PRIMARY-NEXT: ) |