diff options
5 files changed, 278 insertions, 2 deletions
diff --git a/src/passes/MultiMemoryLowering.cpp b/src/passes/MultiMemoryLowering.cpp index ab0a1376b..5414f2f99 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 = false; + // If the combined memory should be imported, 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,6 +393,9 @@ struct MultiMemoryLowering : public Pass { createMemoryGrowFunctions(); removeExistingMemories(); addCombinedMemory(); + if (isExported) { + updateMemoryExports(); + } Replacer(*this, *wasm).run(getPassRunner(), wasm); } @@ -407,17 +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; + 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 @@ -437,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"); @@ -657,8 +690,23 @@ 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 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; + } + } + } }; Pass* createMultiMemoryLoweringPass() { return new MultiMemoryLowering(false); } 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 000000000..c631e48b1 --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-export-error.wast @@ -0,0 +1,9 @@ +;; RUN: not wasm-opt %s --multi-memory-lowering -all 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 000000000..e4572d2b4 --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-export.wast @@ -0,0 +1,107 @@ +;; 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) + (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: (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-error.wast b/test/lit/wasm-split/multi-memory-lowering-import-error.wast new file mode 100644 index 000000000..f697db40b --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-import-error.wast @@ -0,0 +1,8 @@ +;; RUN: not wasm-opt %s --multi-memory-lowering -all 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 000000000..539405064 --- /dev/null +++ b/test/lit/wasm-split/multi-memory-lowering-import.wast @@ -0,0 +1,104 @@ +;; 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 + ;; 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: (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: ) |