diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/lit/help/optimization-opts.test | 3 | ||||
-rw-r--r-- | test/lit/passes/local-subtyping-nn.wast | 37 | ||||
-rw-r--r-- | test/lit/passes/local-subtyping.wast | 205 | ||||
-rw-r--r-- | test/passes/Oz_fuzz-exec_all-features.txt | 6 |
4 files changed, 248 insertions, 3 deletions
diff --git a/test/lit/help/optimization-opts.test b/test/lit/help/optimization-opts.test index 3350015a1..0d4ed48a8 100644 --- a/test/lit/help/optimization-opts.test +++ b/test/lit/help/optimization-opts.test @@ -292,6 +292,9 @@ ;; CHECK-NEXT: --local-cse common subexpression elimination ;; CHECK-NEXT: inside basic blocks ;; CHECK-NEXT: +;; CHECK-NEXT: --local-subtyping apply more specific subtypes to +;; CHECK-NEXT: locals where possible +;; CHECK-NEXT: ;; CHECK-NEXT: --log-execution instrument the build with ;; CHECK-NEXT: logging of where execution goes ;; CHECK-NEXT: diff --git a/test/lit/passes/local-subtyping-nn.wast b/test/lit/passes/local-subtyping-nn.wast new file mode 100644 index 000000000..7eca6558a --- /dev/null +++ b/test/lit/passes/local-subtyping-nn.wast @@ -0,0 +1,37 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. +;; RUN: wasm-opt %s --local-subtyping -all --enable-gc-nn-locals -S -o - \ +;; RUN: | filecheck %s + +(module + ;; CHECK: (type $struct (struct )) + (type $struct (struct)) + + ;; CHECK: (import "out" "i32" (func $i32 (result i32))) + (import "out" "i32" (func $i32 (result i32))) + + ;; CHECK: (func $non-nullable + ;; CHECK-NEXT: (local $x (ref $struct)) + ;; CHECK-NEXT: (local $y (ref $none_=>_i32)) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.as_non_null + ;; CHECK-NEXT: (ref.null $struct) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $non-nullable + (local $x (ref null $struct)) + (local $y anyref) + ;; x is assigned a value that is non-nullable. + (local.set $x + (ref.as_non_null (ref.null $struct)) + ) + ;; x is assigned a value that is non-nullable, and also allows a more + ;; specific heap type. + (local.set $y + (ref.func $i32) + ) + ) +) diff --git a/test/lit/passes/local-subtyping.wast b/test/lit/passes/local-subtyping.wast new file mode 100644 index 000000000..59f93ce43 --- /dev/null +++ b/test/lit/passes/local-subtyping.wast @@ -0,0 +1,205 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. +;; RUN: wasm-opt %s --local-subtyping -all -S -o - \ +;; RUN: | filecheck %s + +(module + ;; CHECK: (import "out" "i32" (func $i32 (result i32))) + (import "out" "i32" (func $i32 (result i32))) + ;; CHECK: (import "out" "i64" (func $i64 (result i64))) + (import "out" "i64" (func $i64 (result i64))) + + ;; Refinalization can find a more specific type, where the declared type was + ;; not the optimal LUB. + ;; CHECK: (func $refinalize (param $x i32) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (if (result (ref func)) + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (block $block (result (ref func)) + ;; CHECK-NEXT: (br $block + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $refinalize (param $x i32) + (drop + (if (result anyref) + (local.get $x) + (ref.func $i32) + (ref.func $i64) + ) + ) + (drop + (block $block (result anyref) + (br $block + (ref.func $i32) + ) + (ref.func $i64) + ) + ) + ) + + ;; A simple case where a local has a single assignment that we can use as a + ;; more specific type. A similar thing with a parameter, however, is not a + ;; thing we can optimize. Also, ignore a local with zero assignments. + ;; CHECK: (func $simple-local-but-not-param (param $x anyref) + ;; CHECK-NEXT: (local $y (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local $unused anyref) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $simple-local-but-not-param (param $x anyref) + (local $y anyref) + (local $unused anyref) + (local.set $x + (ref.func $i32) + ) + (local.set $y + (ref.func $i32) + ) + ) + + ;; CHECK: (func $locals-with-multiple-assignments + ;; CHECK-NEXT: (local $x funcref) + ;; CHECK-NEXT: (local $y (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local $z (ref null $none_=>_i64)) + ;; CHECK-NEXT: (local $w funcref) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $z + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $z + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $w + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $w + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $locals-with-multiple-assignments + (local $x anyref) + (local $y anyref) + (local $z anyref) + (local $w funcref) + ;; x is assigned two different types with a new LUB possible + (local.set $x + (ref.func $i32) + ) + (local.set $x + (ref.func $i64) + ) + ;; y and z are assigned the same more specific type twice + (local.set $y + (ref.func $i32) + ) + (local.set $y + (ref.func $i32) + ) + (local.set $z + (ref.func $i64) + ) + (local.set $z + (ref.func $i64) + ) + ;; w is assigned two different types *without* a new LUB possible, as it + ;; already had the optimal LUB + (local.set $w + (ref.func $i32) + ) + (local.set $w + (ref.func $i64) + ) + ) + + ;; In some cases multiple iterations are necessary, as one inferred new type + ;; applies to a get which then allows another inference. + ;; CHECK: (func $multiple-iterations + ;; CHECK-NEXT: (local $x (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local $y (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local $z (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $z + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $multiple-iterations + (local $x anyref) + (local $y anyref) + (local $z anyref) + (local.set $x + (ref.func $i32) + ) + (local.set $y + (local.get $x) + ) + (local.set $z + (local.get $y) + ) + ) + + ;; Sometimes a refinalize is necessary in between the iterations. + ;; CHECK: (func $multiple-iterations-refinalize (param $i i32) + ;; CHECK-NEXT: (local $x (ref null $none_=>_i32)) + ;; CHECK-NEXT: (local $y (ref null $none_=>_i64)) + ;; CHECK-NEXT: (local $z funcref) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $i32) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $y + ;; CHECK-NEXT: (ref.func $i64) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $z + ;; CHECK-NEXT: (select (result funcref) + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: (local.get $i) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $multiple-iterations-refinalize (param $i i32) + (local $x anyref) + (local $y anyref) + (local $z anyref) + (local.set $x + (ref.func $i32) + ) + (local.set $y + (ref.func $i64) + ) + (local.set $z + (select + (local.get $x) + (local.get $y) + (local.get $i) + ) + ) + ) +) diff --git a/test/passes/Oz_fuzz-exec_all-features.txt b/test/passes/Oz_fuzz-exec_all-features.txt index 6d342196e..b0f4c6448 100644 --- a/test/passes/Oz_fuzz-exec_all-features.txt +++ b/test/passes/Oz_fuzz-exec_all-features.txt @@ -153,7 +153,7 @@ ) ) (func $2 (; has Stack IR ;) - (local $0 anyref) + (local $0 (ref null $extendedstruct)) (call $log (i32.const 1) ) @@ -247,7 +247,7 @@ (unreachable) ) (func $4 (; has Stack IR ;) - (local $0 anyref) + (local $0 (ref null $struct)) (local.set $0 (struct.new_default_with_rtt $struct (rtt.canon $struct) @@ -272,7 +272,7 @@ ) ) (func $5 (; has Stack IR ;) - (local $0 anyref) + (local $0 (ref null $extendedstruct)) (local.set $0 (struct.new_default_with_rtt $extendedstruct (rtt.canon $extendedstruct) |