diff options
| -rw-r--r-- | llvm/include/llvm/IR/IntrinsicsWebAssembly.td | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td | 18 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr32.ll | 10 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr64.ll | 10 |
4 files changed, 21 insertions, 21 deletions
diff --git a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td index 3953aef43da..4234c466d97 100644 --- a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td +++ b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td @@ -14,9 +14,9 @@ let TargetPrefix = "wasm" in { // All intrinsics start with "llvm.wasm.". -// Note that memory_size is not IntrNoMem because it must be sequenced with +// Note that current_memory is not IntrNoMem because it must be sequenced with // respect to grow_memory calls. -def int_wasm_memory_size : Intrinsic<[llvm_anyint_ty], [], [IntrReadMem]>; +def int_wasm_current_memory : Intrinsic<[llvm_anyint_ty], [], [IntrReadMem]>; 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 a72da44f76c..521c664ca4a 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrMemory.td @@ -670,15 +670,15 @@ def : Pat<(truncstorei32 I64:$val, (WebAssemblywrapper texternalsym:$off)), let Defs = [ARGUMENTS] in { -// Memory size. -def MEMORY_SIZE_I32 : I<(outs I32:$dst), (ins), - [(set I32:$dst, (int_wasm_memory_size))], - "memory_size\t$dst">, - Requires<[HasAddr32]>; -def MEMORY_SIZE_I64 : I<(outs I64:$dst), (ins), - [(set I64:$dst, (int_wasm_memory_size))], - "memory_size\t$dst">, - Requires<[HasAddr64]>; +// Current memory size. +def CURRENT_MEMORY_I32 : I<(outs I32:$dst), (ins), + [(set I32:$dst, (int_wasm_current_memory))], + "current_memory\t$dst">, + Requires<[HasAddr32]>; +def CURRENT_MEMORY_I64 : I<(outs I64:$dst), (ins), + [(set I64:$dst, (int_wasm_current_memory))], + "current_memory\t$dst">, + Requires<[HasAddr64]>; // Grow memory. def GROW_MEMORY_I32 : I<(outs), (ins I32:$delta), diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll b/llvm/test/CodeGen/WebAssembly/memory-addr32.ll index e6c15633fd6..2c2d075a40d 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll +++ b/llvm/test/CodeGen/WebAssembly/memory-addr32.ll @@ -5,15 +5,15 @@ target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" target triple = "wasm32-unknown-unknown" -declare i32 @llvm.wasm.memory.size.i32() nounwind readonly +declare i32 @llvm.wasm.current.memory.i32() nounwind readonly declare void @llvm.wasm.grow.memory.i32(i32) nounwind -; CHECK-LABEL: memory_size: +; CHECK-LABEL: current_memory: ; CHECK-NEXT: .result i32{{$}} -; CHECK-NEXT: memory_size $push0={{$}} +; CHECK-NEXT: current_memory $push0={{$}} ; CHECK-NEXT: return $pop0{{$}} -define i32 @memory_size() { - %a = call i32 @llvm.wasm.memory.size.i32() +define i32 @current_memory() { + %a = call i32 @llvm.wasm.current.memory.i32() ret i32 %a } diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll b/llvm/test/CodeGen/WebAssembly/memory-addr64.ll index d504c277f30..804274d3547 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll +++ b/llvm/test/CodeGen/WebAssembly/memory-addr64.ll @@ -5,15 +5,15 @@ target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128" target triple = "wasm64-unknown-unknown" -declare i64 @llvm.wasm.memory.size.i64() nounwind readonly +declare i64 @llvm.wasm.current.memory.i64() nounwind readonly declare void @llvm.wasm.grow.memory.i64(i64) nounwind -; CHECK-LABEL: memory_size: +; CHECK-LABEL: current_memory: ; CHECK-NEXT: .result i64{{$}} -; CHECK-NEXT: memory_size $push0={{$}} +; CHECK-NEXT: current_memory $push0={{$}} ; CHECK-NEXT: return $pop0{{$}} -define i64 @memory_size() { - %a = call i64 @llvm.wasm.memory.size.i64() +define i64 @current_memory() { + %a = call i64 @llvm.wasm.current.memory.i64() ret i64 %a } |
