diff options
| -rw-r--r-- | llvm/include/llvm/IR/IntrinsicsWebAssembly.td | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td | 22 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr32.ll | 22 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr64.ll | 22 |
4 files changed, 18 insertions, 51 deletions
diff --git a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td index 04edae5294f..2a9e406aa8b 100644 --- a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td +++ b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td @@ -14,8 +14,7 @@ let TargetPrefix = "wasm" in { // All intrinsics start with "llvm.wasm.". -def int_wasm_page_size : Intrinsic<[llvm_anyint_ty], [], [IntrNoMem]>; def int_wasm_memory_size : Intrinsic<[llvm_anyint_ty], [], [IntrNoMem]>; -def int_wasm_resize_memory : Intrinsic<[], [llvm_anyint_ty], []>; +def int_wasm_grow_memory : Intrinsic<[], [llvm_anyint_ty], []>; } diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td b/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td index cdc72b69122..75c0fe2a19a 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td @@ -84,14 +84,6 @@ def STORE16_I64 : I<(outs), (ins I32:$addr, I64:$val), def STORE32_I64 : I<(outs), (ins I32:$addr, I64:$val), [(truncstorei32 I64:$val, I32:$addr)]>; -// Page size. -def page_size_I32 : I<(outs I32:$dst), (ins), - [(set I32:$dst, (int_wasm_page_size))]>, - Requires<[HasAddr32]>; -def page_size_I64 : I<(outs I64:$dst), (ins), - [(set I64:$dst, (int_wasm_page_size))]>, - Requires<[HasAddr64]>; - // Memory size. def memory_size_I32 : I<(outs I32:$dst), (ins), [(set I32:$dst, (int_wasm_memory_size))]>, @@ -100,10 +92,10 @@ def memory_size_I64 : I<(outs I64:$dst), (ins), [(set I64:$dst, (int_wasm_memory_size))]>, Requires<[HasAddr64]>; -// Resize memory. -def resize_memory_I32 : I<(outs), (ins I32:$delta), - [(int_wasm_resize_memory I32:$delta)]>, - Requires<[HasAddr32]>; -def resize_memory_I64 : I<(outs), (ins I64:$delta), - [(int_wasm_resize_memory I64:$delta)]>, - Requires<[HasAddr64]>; +// Grow memory. +def grow_memory_I32 : I<(outs), (ins I32:$delta), + [(int_wasm_grow_memory I32:$delta)]>, + Requires<[HasAddr32]>; +def grow_memory_I64 : I<(outs), (ins I64:$delta), + [(int_wasm_grow_memory I64:$delta)]>, + Requires<[HasAddr64]>; diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll b/llvm/test/CodeGen/WebAssembly/memory-addr32.ll index 3cb27ffe662..194fd64cce8 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll +++ b/llvm/test/CodeGen/WebAssembly/memory-addr32.ll @@ -5,20 +5,8 @@ target datalayout = "e-p:32:32-i64:64-n32:64-S128" target triple = "wasm32-unknown-unknown" -declare i32 @llvm.wasm.page.size.i32() nounwind readnone declare i32 @llvm.wasm.memory.size.i32() nounwind readnone -declare void @llvm.wasm.resize.memory.i32(i32) nounwind - -; CHECK-LABEL: page_size: -; CHECK-NEXT: .result i32{{$}} -; CHECK-NEXT: .local i32{{$}} -; CHECK-NEXT: page_size -; CHECK-NEXT: set_local 0, pop{{$}} -; CHECK-NEXT: return (get_local 0){{$}} -define i32 @page_size() { - %a = call i32 @llvm.wasm.page.size.i32() - ret i32 %a -} +declare void @llvm.wasm.grow.memory.i32(i32) nounwind ; CHECK-LABEL: memory_size: ; CHECK-NEXT: .result i32{{$}} @@ -31,12 +19,12 @@ define i32 @memory_size() { ret i32 %a } -; CHECK-LABEL: resize_memory: +; CHECK-LABEL: grow_memory: ; CHECK-NEXT: .param i32 ; CHECK-NEXT: .local i32{{$}} -; CHECK: resize_memory (get_local 1) +; CHECK: grow_memory (get_local 1) ; CHECK-NEXT: return -define void @resize_memory(i32 %n) { - call void @llvm.wasm.resize.memory.i32(i32 %n) +define void @grow_memory(i32 %n) { + call void @llvm.wasm.grow.memory.i32(i32 %n) ret void } diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll b/llvm/test/CodeGen/WebAssembly/memory-addr64.ll index a9d3c7bf1eb..54e1c4aa9e4 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll +++ b/llvm/test/CodeGen/WebAssembly/memory-addr64.ll @@ -5,20 +5,8 @@ target datalayout = "e-p:64:64-i64:64-n32:64-S128" target triple = "wasm64-unknown-unknown" -declare i64 @llvm.wasm.page.size.i64() nounwind readnone declare i64 @llvm.wasm.memory.size.i64() nounwind readnone -declare void @llvm.wasm.resize.memory.i64(i64) nounwind - -; CHECK-LABEL: page_size: -; CHECK-NEXT: .result i64{{$}} -; CHECK-NEXT: .local i64{{$}} -; CHECK-NEXT: page_size -; CHECK-NEXT: set_local 0, pop{{$}} -; CHECK-NEXT: return (get_local 0){{$}} -define i64 @page_size() { - %a = call i64 @llvm.wasm.page.size.i64() - ret i64 %a -} +declare void @llvm.wasm.grow.memory.i64(i64) nounwind ; CHECK-LABEL: memory_size: ; CHECK-NEXT: .result i64{{$}} @@ -31,12 +19,12 @@ define i64 @memory_size() { ret i64 %a } -; CHECK-LABEL: resize_memory: +; CHECK-LABEL: grow_memory: ; CHECK-NEXT: .param i64 ; CHECK-NEXT: .local i64{{$}} -; CHECK: resize_memory (get_local 1) +; CHECK: grow_memory (get_local 1) ; CHECK-NEXT: return -define void @resize_memory(i64 %n) { - call void @llvm.wasm.resize.memory.i64(i64 %n) +define void @grow_memory(i64 %n) { + call void @llvm.wasm.grow.memory.i64(i64 %n) ret void } |
