From 249897d1a63ae52e256dfb1fc91f64f948a9d2ea Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Sun, 18 Dec 2022 02:52:10 +0000 Subject: [PATCH 1/8] Maintain memory exports --- src/passes/MultiMemoryLowering.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 38a5ded93ae..2ed8b40ca0c 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -385,6 +385,7 @@ struct MultiMemoryLowering : public Pass { createMemoryGrowFunctions(); removeExistingMemories(); addCombinedMemory(); + updateMemoryExports(); Replacer(*this, *wasm).run(getPassRunner(), wasm); } @@ -656,6 +657,14 @@ struct MultiMemoryLowering : public Pass { memory->max = totalMaxPages; wasm->addMemory(std::move(memory)); } + + void updateMemoryExports() { + for (auto& exp : wasm->exports) { + if (exp->kind == ExternalKind::Memory) { + exp->value = combinedMemory; + } + } + } }; Pass* createMultiMemoryLoweringPass() { return new MultiMemoryLowering(false); } From 3764f5b7070e68c4a966fe0cb4d70679c753a662 Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Sat, 31 Dec 2022 04:18:58 +0000 Subject: [PATCH 2/8] Handling of import/export of first memory --- src/passes/MultiMemoryLowering.cpp | 41 ++++++++++++++++++- .../multi-memory-lowering-export-error.wast | 9 ++++ .../multi-memory-lowering-export.wast | 9 ++++ .../multi-memory-lowering-import-error.wast | 8 ++++ .../multi-memory-lowering-import.wast | 8 ++++ 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 test/lit/wasm-split/multi-memory-lowering-export-error.wast create mode 100644 test/lit/wasm-split/multi-memory-lowering-export.wast create mode 100644 test/lit/wasm-split/multi-memory-lowering-import-error.wast create mode 100644 test/lit/wasm-split/multi-memory-lowering-import.wast diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 2ed8b40ca0c..5a4014d2203 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -59,6 +59,14 @@ struct MultiMemoryLowering : public Pass { Builder::MemoryInfo memoryInfo; // If the combined memory is shared bool isShared; + // If the combined memory is imported + bool isImported; + // If the combined memory is exported + bool isExported; + // If the combined memory should be imported or exported, the following two + // properties will be set + Name module; + Name base; // The initial page size of the combined memory Address totalInitialPages; // The max page size of the combined memory @@ -385,7 +393,9 @@ struct MultiMemoryLowering : public Pass { createMemoryGrowFunctions(); removeExistingMemories(); addCombinedMemory(); - updateMemoryExports(); + if (isExported) { + updateMemoryExports(); + } Replacer(*this, *wasm).run(getPassRunner(), wasm); } @@ -413,6 +423,29 @@ struct MultiMemoryLowering : public Pass { memoryInfo = pointerType == Type::i32 ? Builder::MemoryInfo::Memory32 : Builder::MemoryInfo::Memory64; isShared = wasm->memories[0]->shared; + isImported = wasm->memories[0]->imported(); + for (Index i = 1; i < wasm->memories.size(); i++) { + auto& memory = wasm->memories[i]; + if (memory->imported()) { + Fatal() << "MultiMemoryLowering: only the first memory can be imported"; + } + + } + if (isImported) { + module = wasm->memories[0]->module; + base = wasm->memories[0]->base; + } else { + for (auto& exp : wasm->exports) { + if (exp->kind == ExternalKind::Memory) { + if (exp->value == wasm->memories[0]->name) { + isExported = true; + } else { + Fatal() << "MultiMemoryLowering: only the first memory can be exported"; + } + } + } + } + for (auto& memory : wasm->memories) { // We are assuming that each memory is configured the same as the first // and assert if any of the memories does not match this configuration @@ -655,12 +688,18 @@ struct MultiMemoryLowering : public Pass { memory->indexType = pointerType; memory->initial = totalInitialPages; memory->max = totalMaxPages; + if (isImported) { + memory->base = base; + memory->module = module; + } wasm->addMemory(std::move(memory)); } void updateMemoryExports() { for (auto& exp : wasm->exports) { if (exp->kind == ExternalKind::Memory) { + // We checked in prepForCombinedMemory that any memory exports are for + // the first memory exp->value = combinedMemory; } } diff --git a/test/lit/wasm-split/multi-memory-lowering-export-error.wast b/test/lit/wasm-split/multi-memory-lowering-export-error.wast new file mode 100644 index 00000000000..5f8dd85cdd7 --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-export-error.wast @@ -0,0 +1,9 @@ +;; RUN: not wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads 2>&1 | filecheck %s + +(module + (memory $memory1 1) + (memory $memory2 1 1) + (export "mem" (memory $memory2)) +) + +;; CHECK: MultiMemoryLowering: only the first memory can be exported diff --git a/test/lit/wasm-split/multi-memory-lowering-export.wast b/test/lit/wasm-split/multi-memory-lowering-export.wast new file mode 100644 index 00000000000..1116330b579 --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-export.wast @@ -0,0 +1,9 @@ +;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s + +(module + (memory $memory1 1) + (memory $memory2 1 1) + (export "mem" (memory $memory1)) +) + +;; CHECK: (export "mem" (memory $combined_memory)) diff --git a/test/lit/wasm-split/multi-memory-lowering-import-error.wast b/test/lit/wasm-split/multi-memory-lowering-import-error.wast new file mode 100644 index 00000000000..37355c40d2a --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-import-error.wast @@ -0,0 +1,8 @@ +;; RUN: not wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads 2>&1 | filecheck %s + +(module + (memory $memory1 1) + (import "env" "mem" (memory $memory2 1 1)) +) + +;; CHECK: MultiMemoryLowering: only the first memory can be imported diff --git a/test/lit/wasm-split/multi-memory-lowering-import.wast b/test/lit/wasm-split/multi-memory-lowering-import.wast new file mode 100644 index 00000000000..4368470991d --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-import.wast @@ -0,0 +1,8 @@ +;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s + +(module + (import "env" "mem" (memory $memory1 1 1)) + (memory $memory2 1 1) +) + +;; CHECK: (import "env" "mem" (memory $combined_memory 2 2)) From 5ec1c7187b6aea2cbdd9bc2160110fc4d0c1e41b Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Sat, 31 Dec 2022 04:33:28 +0000 Subject: [PATCH 3/8] clang-format --- src/passes/MultiMemoryLowering.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 5a4014d2203..8f596874124 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -429,7 +429,6 @@ struct MultiMemoryLowering : public Pass { if (memory->imported()) { Fatal() << "MultiMemoryLowering: only the first memory can be imported"; } - } if (isImported) { module = wasm->memories[0]->module; @@ -440,7 +439,8 @@ struct MultiMemoryLowering : public Pass { if (exp->value == wasm->memories[0]->name) { isExported = true; } else { - Fatal() << "MultiMemoryLowering: only the first memory can be exported"; + Fatal() + << "MultiMemoryLowering: only the first memory can be exported"; } } } From cfa108cb9f069f3cd43628c0a5288d818ef3a6df Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Sat, 31 Dec 2022 05:40:11 +0000 Subject: [PATCH 4/8] default value --- src/passes/MultiMemoryLowering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 8f596874124..0c9fc7d8d47 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -62,7 +62,7 @@ struct MultiMemoryLowering : public Pass { // If the combined memory is imported bool isImported; // If the combined memory is exported - bool isExported; + bool isExported = false; // If the combined memory should be imported or exported, the following two // properties will be set Name module; From 09efe5b1905787380216adaf20fa36894f02218d Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Mon, 2 Jan 2023 23:53:40 +0000 Subject: [PATCH 5/8] cleanup --- src/passes/MultiMemoryLowering.cpp | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 0c9fc7d8d47..cc998d1cf1c 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -63,7 +63,7 @@ struct MultiMemoryLowering : public Pass { bool isImported; // If the combined memory is exported bool isExported = false; - // If the combined memory should be imported or exported, the following two + // If the combined memory should be imported, the following two // properties will be set Name module; Name base; @@ -418,40 +418,25 @@ struct MultiMemoryLowering : public Pass { // offsetGlobalNames bool isLastMemory(Index idx) { return idx == offsetGlobalNames.size(); } + Memory getFirstMemory() { return *wasm->memories[0]; } + void prepCombinedMemory() { - pointerType = wasm->memories[0]->indexType; + pointerType = getFirstMemory().indexType; memoryInfo = pointerType == Type::i32 ? Builder::MemoryInfo::Memory32 : Builder::MemoryInfo::Memory64; - isShared = wasm->memories[0]->shared; - isImported = wasm->memories[0]->imported(); - for (Index i = 1; i < wasm->memories.size(); i++) { - auto& memory = wasm->memories[i]; - if (memory->imported()) { - Fatal() << "MultiMemoryLowering: only the first memory can be imported"; - } - } - if (isImported) { - module = wasm->memories[0]->module; - base = wasm->memories[0]->base; - } else { - for (auto& exp : wasm->exports) { - if (exp->kind == ExternalKind::Memory) { - if (exp->value == wasm->memories[0]->name) { - isExported = true; - } else { - Fatal() - << "MultiMemoryLowering: only the first memory can be exported"; - } - } - } - } - + isShared = getFirstMemory().shared; + isImported = getFirstMemory().imported(); for (auto& memory : wasm->memories) { // We are assuming that each memory is configured the same as the first // and assert if any of the memories does not match this configuration assert(memory->shared == isShared); assert(memory->indexType == pointerType); + // TODO: handle memory import for memories other than the first + if (memory->name != getFirstMemory().name && memory->imported()) { + Fatal() << "MultiMemoryLowering: only the first memory can be imported"; + } + // Calculating the total initial and max page size for the combined memory // by totaling the initial and max page sizes for the memories in the // module @@ -471,6 +456,20 @@ struct MultiMemoryLowering : public Pass { totalInitialPages = totalMaxPages; } + // Save the module and base to set on the combinedMemory + if (isImported) { + module = getFirstMemory().module; + base = getFirstMemory().base; + } + // Ensuring only the first memory is an exported memory + for (auto& exp : wasm->exports) { + if (exp->kind == ExternalKind::Memory && exp->value == getFirstMemory().name) { + isExported = true; + } else if (exp->kind == ExternalKind::Memory) { + Fatal() + << "MultiMemoryLowering: only the first memory can be exported"; + } + } // Creating the combined memory name so we can reference the combined memory // in subsequent instructions before it is added to the module combinedMemory = Names::getValidMemoryName(*wasm, "combined_memory"); @@ -698,8 +697,9 @@ struct MultiMemoryLowering : public Pass { void updateMemoryExports() { for (auto& exp : wasm->exports) { if (exp->kind == ExternalKind::Memory) { - // We checked in prepForCombinedMemory that any memory exports are for - // the first memory + // We checked in prepCombinedMemory that any memory exports are for + // the first memory, so setting the exports to the combinedMemory means + // calling JS will not have to worry about offsets exp->value = combinedMemory; } } From c2f34a3ff9eebcbd690917b688b2b3aca20ec8c8 Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Tue, 3 Jan 2023 00:05:23 +0000 Subject: [PATCH 6/8] clang-format --- src/passes/MultiMemoryLowering.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index cc998d1cf1c..0c7849ff106 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -463,11 +463,11 @@ struct MultiMemoryLowering : public Pass { } // Ensuring only the first memory is an exported memory for (auto& exp : wasm->exports) { - if (exp->kind == ExternalKind::Memory && exp->value == getFirstMemory().name) { - isExported = true; + if (exp->kind == ExternalKind::Memory && + exp->value == getFirstMemory().name) { + isExported = true; } else if (exp->kind == ExternalKind::Memory) { - Fatal() - << "MultiMemoryLowering: only the first memory can be exported"; + Fatal() << "MultiMemoryLowering: only the first memory can be exported"; } } // Creating the combined memory name so we can reference the combined memory From 2baee5f34c9855944c17fcd1187e63c811683480 Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Tue, 3 Jan 2023 20:06:08 +0000 Subject: [PATCH 7/8] comment updates --- src/passes/MultiMemoryLowering.cpp | 2 +- test/lit/wasm-split/multi-memory-lowering-export-error.wast | 2 +- test/lit/wasm-split/multi-memory-lowering-export.wast | 4 +++- test/lit/wasm-split/multi-memory-lowering-import-error.wast | 2 +- test/lit/wasm-split/multi-memory-lowering-import.wast | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index 0c7849ff106..b125f9b728e 100644 --- a/src/passes/MultiMemoryLowering.cpp +++ b/src/passes/MultiMemoryLowering.cpp @@ -418,7 +418,7 @@ struct MultiMemoryLowering : public Pass { // offsetGlobalNames bool isLastMemory(Index idx) { return idx == offsetGlobalNames.size(); } - Memory getFirstMemory() { return *wasm->memories[0]; } + Memory& getFirstMemory() { return *wasm->memories[0]; } void prepCombinedMemory() { pointerType = getFirstMemory().indexType; diff --git a/test/lit/wasm-split/multi-memory-lowering-export-error.wast b/test/lit/wasm-split/multi-memory-lowering-export-error.wast index 5f8dd85cdd7..c631e48b139 100644 --- a/test/lit/wasm-split/multi-memory-lowering-export-error.wast +++ b/test/lit/wasm-split/multi-memory-lowering-export-error.wast @@ -1,4 +1,4 @@ -;; RUN: not wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads 2>&1 | filecheck %s +;; RUN: not wasm-opt %s --multi-memory-lowering -all 2>&1 | filecheck %s (module (memory $memory1 1) diff --git a/test/lit/wasm-split/multi-memory-lowering-export.wast b/test/lit/wasm-split/multi-memory-lowering-export.wast index 1116330b579..b228cec4182 100644 --- a/test/lit/wasm-split/multi-memory-lowering-export.wast +++ b/test/lit/wasm-split/multi-memory-lowering-export.wast @@ -1,4 +1,6 @@ -;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s +;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. + +;; RUN: wasm-opt %s --multi-memory-lowering -all -S -o - | filecheck %s (module (memory $memory1 1) diff --git a/test/lit/wasm-split/multi-memory-lowering-import-error.wast b/test/lit/wasm-split/multi-memory-lowering-import-error.wast index 37355c40d2a..f697db40b67 100644 --- a/test/lit/wasm-split/multi-memory-lowering-import-error.wast +++ b/test/lit/wasm-split/multi-memory-lowering-import-error.wast @@ -1,4 +1,4 @@ -;; RUN: not wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads 2>&1 | filecheck %s +;; RUN: not wasm-opt %s --multi-memory-lowering -all 2>&1 | filecheck %s (module (memory $memory1 1) diff --git a/test/lit/wasm-split/multi-memory-lowering-import.wast b/test/lit/wasm-split/multi-memory-lowering-import.wast index 4368470991d..a9d6483b718 100644 --- a/test/lit/wasm-split/multi-memory-lowering-import.wast +++ b/test/lit/wasm-split/multi-memory-lowering-import.wast @@ -1,4 +1,6 @@ -;; RUN: wasm-opt %s --enable-multi-memories --multi-memory-lowering --enable-bulk-memory --enable-extended-const --enable-simd --enable-threads -S -o - | filecheck %s +;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited. + +;; RUN: wasm-opt %s --multi-memory-lowering -all -S -o - | filecheck %s (module (import "env" "mem" (memory $memory1 1 1)) From e3d8ef90d60bbd71614b48821cfb73f01a400e85 Mon Sep 17 00:00:00 2001 From: Ashley Nelson Date: Tue, 3 Jan 2023 20:09:18 +0000 Subject: [PATCH 8/8] auto-update --- .../multi-memory-lowering-export.wast | 98 ++++++++++++++++++- .../multi-memory-lowering-import.wast | 96 +++++++++++++++++- 2 files changed, 192 insertions(+), 2 deletions(-) diff --git a/test/lit/wasm-split/multi-memory-lowering-export.wast b/test/lit/wasm-split/multi-memory-lowering-export.wast index b228cec4182..e4572d2b4b5 100644 --- a/test/lit/wasm-split/multi-memory-lowering-export.wast +++ b/test/lit/wasm-split/multi-memory-lowering-export.wast @@ -5,7 +5,103 @@ (module (memory $memory1 1) (memory $memory2 1 1) + ;; CHECK: (type $none_=>_i32 (func (result i32))) + + ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; CHECK: (global $memory2_byte_offset (mut i32) (i32.const 65536)) + + ;; CHECK: (memory $combined_memory 1 1) + + ;; CHECK: (export "mem" (memory $combined_memory)) (export "mem" (memory $memory1)) ) -;; CHECK: (export "mem" (memory $combined_memory)) +;; CHECK: (func $memory1_size (type $none_=>_i32) (result i32) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.div_u +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory2_size (type $none_=>_i32) (result i32) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.sub +;; CHECK-NEXT: (memory.size) +;; CHECK-NEXT: (i32.div_u +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory1_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK-NEXT: (local $return_size i32) +;; CHECK-NEXT: (local $memory_size i32) +;; CHECK-NEXT: (local.set $return_size +;; CHECK-NEXT: (call $memory1_size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.set $memory_size +;; CHECK-NEXT: (memory.size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (if +;; CHECK-NEXT: (i32.eq +;; CHECK-NEXT: (memory.grow +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (memory.copy +;; CHECK-NEXT: (i32.add +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.sub +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $memory_size) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.set $memory2_byte_offset +;; CHECK-NEXT: (i32.add +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.get $return_size) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory2_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK-NEXT: (local $return_size i32) +;; CHECK-NEXT: (local.set $return_size +;; CHECK-NEXT: (call $memory2_size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (if +;; CHECK-NEXT: (i32.eq +;; CHECK-NEXT: (memory.grow +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.get $return_size) +;; CHECK-NEXT: ) diff --git a/test/lit/wasm-split/multi-memory-lowering-import.wast b/test/lit/wasm-split/multi-memory-lowering-import.wast index a9d6483b718..53940506451 100644 --- a/test/lit/wasm-split/multi-memory-lowering-import.wast +++ b/test/lit/wasm-split/multi-memory-lowering-import.wast @@ -3,8 +3,102 @@ ;; RUN: wasm-opt %s --multi-memory-lowering -all -S -o - | filecheck %s (module + ;; CHECK: (type $none_=>_i32 (func (result i32))) + + ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32))) + + ;; CHECK: (import "env" "mem" (memory $combined_memory 2 2)) (import "env" "mem" (memory $memory1 1 1)) (memory $memory2 1 1) ) -;; CHECK: (import "env" "mem" (memory $combined_memory 2 2)) +;; CHECK: (global $memory2_byte_offset (mut i32) (i32.const 65536)) + +;; CHECK: (func $memory1_size (type $none_=>_i32) (result i32) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.div_u +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory2_size (type $none_=>_i32) (result i32) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.sub +;; CHECK-NEXT: (memory.size) +;; CHECK-NEXT: (i32.div_u +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory1_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK-NEXT: (local $return_size i32) +;; CHECK-NEXT: (local $memory_size i32) +;; CHECK-NEXT: (local.set $return_size +;; CHECK-NEXT: (call $memory1_size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.set $memory_size +;; CHECK-NEXT: (memory.size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (if +;; CHECK-NEXT: (i32.eq +;; CHECK-NEXT: (memory.grow +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (memory.copy +;; CHECK-NEXT: (i32.add +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.sub +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $memory_size) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (global.set $memory2_byte_offset +;; CHECK-NEXT: (i32.add +;; CHECK-NEXT: (global.get $memory2_byte_offset) +;; CHECK-NEXT: (i32.mul +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: (i32.const 65536) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.get $return_size) +;; CHECK-NEXT: ) + +;; CHECK: (func $memory2_grow (type $i32_=>_i32) (param $page_delta i32) (result i32) +;; CHECK-NEXT: (local $return_size i32) +;; CHECK-NEXT: (local.set $return_size +;; CHECK-NEXT: (call $memory2_size) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (if +;; CHECK-NEXT: (i32.eq +;; CHECK-NEXT: (memory.grow +;; CHECK-NEXT: (local.get $page_delta) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (return +;; CHECK-NEXT: (i32.const -1) +;; CHECK-NEXT: ) +;; CHECK-NEXT: ) +;; CHECK-NEXT: (local.get $return_size) +;; CHECK-NEXT: )