From: Dan Gohman <dan433584@gmail.com>
Date: Fri, 2 Oct 2015 19:21:15 +0000 (+0000)
Subject: [WebAssembly] Add a memory_size intrinsic.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=7eb00c4bc2209608864d5d89636d088ec6df2991

[WebAssembly] Add a memory_size intrinsic.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249171 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/IR/IntrinsicsWebAssembly.td b/include/llvm/IR/IntrinsicsWebAssembly.td
index af3a97f3ebb..8c67549c2c9 100644
--- a/include/llvm/IR/IntrinsicsWebAssembly.td
+++ b/include/llvm/IR/IntrinsicsWebAssembly.td
@@ -15,5 +15,6 @@
 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]>;
 
 }
diff --git a/lib/Target/WebAssembly/WebAssemblyInstrMemory.td b/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
index 84b8847f2a1..410fd47d370 100644
--- a/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrMemory.td
@@ -98,3 +98,11 @@ def page_size_I32 : I<(outs I32:$dst), (ins),
 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))]>,
+                      Requires<[HasAddr32]>;
+def memory_size_I64 : I<(outs I64:$dst), (ins),
+                        [(set I64:$dst, (int_wasm_memory_size))]>,
+                      Requires<[HasAddr64]>;
diff --git a/test/CodeGen/WebAssembly/memory-addr32.ll b/test/CodeGen/WebAssembly/memory-addr32.ll
index 63297a30135..3c1173aaac3 100644
--- a/test/CodeGen/WebAssembly/memory-addr32.ll
+++ b/test/CodeGen/WebAssembly/memory-addr32.ll
@@ -6,6 +6,7 @@ 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
 
 ; CHECK-LABEL: (func $page_size
 ; CHECK-NEXT: (result i32)
@@ -15,3 +16,12 @@ define i32 @page_size() {
   %a = call i32 @llvm.wasm.page.size.i32()
   ret i32 %a
 }
+
+; CHECK-LABEL: (func $memory_size
+; CHECK-NEXT: (result i32)
+; CHECK-NEXT: (setlocal @0 (memory_size))
+; CHECK-NEXT: (return @0)
+define i32 @memory_size() {
+  %a = call i32 @llvm.wasm.memory.size.i32()
+  ret i32 %a
+}
diff --git a/test/CodeGen/WebAssembly/memory-addr64.ll b/test/CodeGen/WebAssembly/memory-addr64.ll
index 4395d9c3740..e4a6190b45c 100644
--- a/test/CodeGen/WebAssembly/memory-addr64.ll
+++ b/test/CodeGen/WebAssembly/memory-addr64.ll
@@ -6,6 +6,7 @@ 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
 
 ; CHECK-LABEL: (func $page_size
 ; CHECK-NEXT: (result i64)
@@ -15,3 +16,12 @@ define i64 @page_size() {
   %a = call i64 @llvm.wasm.page.size.i64()
   ret i64 %a
 }
+
+; CHECK-LABEL: (func $memory_size
+; CHECK-NEXT: (result i64)
+; CHECK-NEXT: (setlocal @0 (memory_size))
+; CHECK-NEXT: (return @0)
+define i64 @memory_size() {
+  %a = call i64 @llvm.wasm.memory.size.i64()
+  ret i64 %a
+}