summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/lit/help/wasm-opt.test5
-rw-r--r--test/lit/help/wasm2js.test5
-rw-r--r--test/lit/passes/multi-memory-lowering.wast339
3 files changed, 349 insertions, 0 deletions
diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test
index a5c21af8b..22e3baaf1 100644
--- a/test/lit/help/wasm-opt.test
+++ b/test/lit/help/wasm-opt.test
@@ -282,6 +282,11 @@
;; CHECK-NEXT: --multi-memory-lowering combines multiple memories into
;; CHECK-NEXT: a single memory
;; CHECK-NEXT:
+;; CHECK-NEXT: --multi-memory-lowering-with-bounds-checks combines multiple memories into
+;; CHECK-NEXT: a single memory, trapping if the
+;; CHECK-NEXT: read or write is larger than the
+;; CHECK-NEXT: length of the memory's data
+;; CHECK-NEXT:
;; CHECK-NEXT: --name-types (re)name all heap types
;; CHECK-NEXT:
;; CHECK-NEXT: --nm name list
diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test
index 3073bf2f9..b901c253c 100644
--- a/test/lit/help/wasm2js.test
+++ b/test/lit/help/wasm2js.test
@@ -241,6 +241,11 @@
;; CHECK-NEXT: --multi-memory-lowering combines multiple memories into
;; CHECK-NEXT: a single memory
;; CHECK-NEXT:
+;; CHECK-NEXT: --multi-memory-lowering-with-bounds-checks combines multiple memories into
+;; CHECK-NEXT: a single memory, trapping if the
+;; CHECK-NEXT: read or write is larger than the
+;; CHECK-NEXT: length of the memory's data
+;; CHECK-NEXT:
;; CHECK-NEXT: --name-types (re)name all heap types
;; CHECK-NEXT:
;; CHECK-NEXT: --nm name list
diff --git a/test/lit/passes/multi-memory-lowering.wast b/test/lit/passes/multi-memory-lowering.wast
index fc402d877..d66db1b02 100644
--- a/test/lit/passes/multi-memory-lowering.wast
+++ b/test/lit/passes/multi-memory-lowering.wast
@@ -1,5 +1,6 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const -S -o - | filecheck %s
+;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering-with-bounds-checks --enable-bulk-memory --enable-extended-const -S -o - | filecheck %s --check-prefix BOUNDS
(module
(memory $memory1 1)
@@ -49,6 +50,105 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
+ ;; BOUNDS: (type $none_=>_i32 (func (result i32)))
+
+ ;; BOUNDS: (type $i32_=>_i32 (func (param i32) (result i32)))
+
+ ;; BOUNDS: (type $none_=>_none (func))
+
+ ;; BOUNDS: (global $memory2_byte_offset (mut i32) (i32.const 65536))
+
+ ;; BOUNDS: (global $memory3_byte_offset (mut i32) (i32.const 196608))
+
+ ;; BOUNDS: (memory $combined_memory 6)
+
+ ;; BOUNDS: (data (i32.const 0) "a")
+
+ ;; BOUNDS: (data (i32.add
+ ;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+ ;; BOUNDS-NEXT: (i32.const 1)
+ ;; BOUNDS-NEXT: ) "123")
+
+ ;; BOUNDS: (func $loads
+ ;; BOUNDS-NEXT: (local $0 i32)
+ ;; BOUNDS-NEXT: (local $1 i32)
+ ;; BOUNDS-NEXT: (local $2 i32)
+ ;; BOUNDS-NEXT: (drop
+ ;; BOUNDS-NEXT: (i32.load
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $0
+ ;; BOUNDS-NEXT: (i32.const 10)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $0)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory1_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (drop
+ ;; BOUNDS-NEXT: (i32.load
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $1
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+ ;; BOUNDS-NEXT: (i32.const 11)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $1)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory2_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $1)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (drop
+ ;; BOUNDS-NEXT: (i32.load
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $2
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+ ;; BOUNDS-NEXT: (i32.const 12)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $2)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory3_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $2)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
(func $loads
(drop
(i32.load $memory1
@@ -86,6 +186,83 @@
;; CHECK-NEXT: (i32.const 115)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
+ ;; BOUNDS: (func $stores
+ ;; BOUNDS-NEXT: (local $0 i32)
+ ;; BOUNDS-NEXT: (local $1 i32)
+ ;; BOUNDS-NEXT: (local $2 i32)
+ ;; BOUNDS-NEXT: (i32.store
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $0
+ ;; BOUNDS-NEXT: (i32.const 10)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $0)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory1_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 115)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.store
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $1
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+ ;; BOUNDS-NEXT: (i32.const 11)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $1)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory2_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $1)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 115)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.store
+ ;; BOUNDS-NEXT: (block (result i32)
+ ;; BOUNDS-NEXT: (local.set $2
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+ ;; BOUNDS-NEXT: (i32.const 12)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (if
+ ;; BOUNDS-NEXT: (i32.gt_u
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (i32.add
+ ;; BOUNDS-NEXT: (local.get $2)
+ ;; BOUNDS-NEXT: (i32.const 0)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 4)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (call $memory3_size)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (unreachable)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (local.get $2)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: (i32.const 115)
+ ;; BOUNDS-NEXT: )
+ ;; BOUNDS-NEXT: )
(func $stores
(i32.store $memory1
(i32.const 10)
@@ -263,3 +440,165 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $return_size)
;; CHECK-NEXT: )
+
+;; BOUNDS: (func $memory1_size (result i32)
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.div_u
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+
+;; BOUNDS: (func $memory2_size (result i32)
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.sub
+;; BOUNDS-NEXT: (i32.div_u
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (i32.div_u
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+
+;; BOUNDS: (func $memory3_size (result i32)
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.sub
+;; BOUNDS-NEXT: (memory.size)
+;; BOUNDS-NEXT: (i32.div_u
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+
+;; BOUNDS: (func $memory1_grow (param $page_delta i32) (result i32)
+;; BOUNDS-NEXT: (local $return_size i32)
+;; BOUNDS-NEXT: (local $memory_size i32)
+;; BOUNDS-NEXT: (local.set $return_size
+;; BOUNDS-NEXT: (call $memory1_size)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (local.set $memory_size
+;; BOUNDS-NEXT: (memory.size)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (if
+;; BOUNDS-NEXT: (i32.eq
+;; BOUNDS-NEXT: (memory.grow
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (memory.copy
+;; BOUNDS-NEXT: (i32.add
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: (i32.sub
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $memory_size)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.set $memory2_byte_offset
+;; BOUNDS-NEXT: (i32.add
+;; BOUNDS-NEXT: (global.get $memory2_byte_offset)
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.set $memory3_byte_offset
+;; BOUNDS-NEXT: (i32.add
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (local.get $return_size)
+;; BOUNDS-NEXT: )
+
+;; BOUNDS: (func $memory2_grow (param $page_delta i32) (result i32)
+;; BOUNDS-NEXT: (local $return_size i32)
+;; BOUNDS-NEXT: (local $memory_size i32)
+;; BOUNDS-NEXT: (local.set $return_size
+;; BOUNDS-NEXT: (call $memory2_size)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (local.set $memory_size
+;; BOUNDS-NEXT: (memory.size)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (if
+;; BOUNDS-NEXT: (i32.eq
+;; BOUNDS-NEXT: (memory.grow
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (memory.copy
+;; BOUNDS-NEXT: (i32.add
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.sub
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $memory_size)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (global.set $memory3_byte_offset
+;; BOUNDS-NEXT: (i32.add
+;; BOUNDS-NEXT: (global.get $memory3_byte_offset)
+;; BOUNDS-NEXT: (i32.mul
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: (i32.const 65536)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (local.get $return_size)
+;; BOUNDS-NEXT: )
+
+;; BOUNDS: (func $memory3_grow (param $page_delta i32) (result i32)
+;; BOUNDS-NEXT: (local $return_size i32)
+;; BOUNDS-NEXT: (local.set $return_size
+;; BOUNDS-NEXT: (call $memory3_size)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (if
+;; BOUNDS-NEXT: (i32.eq
+;; BOUNDS-NEXT: (memory.grow
+;; BOUNDS-NEXT: (local.get $page_delta)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (return
+;; BOUNDS-NEXT: (i32.const -1)
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: )
+;; BOUNDS-NEXT: (local.get $return_size)
+;; BOUNDS-NEXT: )