[llvm] r254863 - [WebAssembly] Implement direct calls to external symbols.
Dan Gohman via llvm-commits
llvm-commits at lists.llvm.org
Sat Dec 5 12:41:36 PST 2015
Author: djg
Date: Sat Dec 5 14:41:36 2015
New Revision: 254863
URL: http://llvm.org/viewvc/llvm-project?rev=254863&view=rev
Log:
[WebAssembly] Implement direct calls to external symbols.
Added:
llvm/trunk/test/CodeGen/WebAssembly/frem.ll
Modified:
llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrCall.td
llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.td
llvm/trunk/test/CodeGen/WebAssembly/global.ll
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrCall.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrCall.td?rev=254863&r1=254862&r2=254863&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrCall.td (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrCall.td Sat Dec 5 14:41:36 2015
@@ -12,20 +12,22 @@
///
//===----------------------------------------------------------------------===//
+// TODO: addr64: These currently assume the callee address is 32-bit.
+
let Defs = [ARGUMENTS] in {
// Call sequence markers. These have an immediate which represents the amount of
// stack space to allocate or free, which is used for varargs lowering.
let isCodeGenOnly = 1 in {
-def ADJCALLSTACKDOWN : I<(outs), (ins i64imm:$amt),
+def ADJCALLSTACKDOWN : I<(outs), (ins i32imm:$amt),
[(WebAssemblycallseq_start timm:$amt)]>;
-def ADJCALLSTACKUP : I<(outs), (ins i64imm:$amt),
+def ADJCALLSTACKUP : I<(outs), (ins i32imm:$amt),
[(WebAssemblycallseq_end timm:$amt, undef)]>;
} // isCodeGenOnly = 1
multiclass CALL<WebAssemblyRegClass vt> {
- def CALL_#vt : I<(outs vt:$dst), (ins global:$callee, variable_ops),
- [(set vt:$dst, (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee)))],
+ def CALL_#vt : I<(outs vt:$dst), (ins i32imm:$callee, variable_ops),
+ [(set vt:$dst, (WebAssemblycall1 (i32 imm:$callee)))],
"call \t$dst, $callee">;
def CALL_INDIRECT_#vt : I<(outs vt:$dst), (ins I32:$callee, variable_ops),
[(set vt:$dst, (WebAssemblycall1 I32:$callee))],
@@ -37,8 +39,8 @@ let Uses = [SP32, SP64], isCall = 1 in {
defm : CALL<F32>;
defm : CALL<F64>;
- def CALL_VOID : I<(outs), (ins global:$callee, variable_ops),
- [(WebAssemblycall0 (WebAssemblywrapper tglobaladdr:$callee))],
+ def CALL_VOID : I<(outs), (ins i32imm:$callee, variable_ops),
+ [(WebAssemblycall0 (i32 imm:$callee))],
"call \t$callee">;
def CALL_INDIRECT_VOID : I<(outs), (ins I32:$callee, variable_ops),
[(WebAssemblycall0 I32:$callee)],
@@ -46,3 +48,27 @@ let Uses = [SP32, SP64], isCall = 1 in {
} // Uses = [SP32,SP64], isCall = 1
} // Defs = [ARGUMENTS]
+
+// Patterns for matching a direct call to a global address.
+def : Pat<(i32 (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee))),
+ (CALL_I32 tglobaladdr:$callee)>;
+def : Pat<(i64 (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee))),
+ (CALL_I64 tglobaladdr:$callee)>;
+def : Pat<(f32 (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee))),
+ (CALL_F32 tglobaladdr:$callee)>;
+def : Pat<(f64 (WebAssemblycall1 (WebAssemblywrapper tglobaladdr:$callee))),
+ (CALL_F64 tglobaladdr:$callee)>;
+def : Pat<(WebAssemblycall0 (WebAssemblywrapper tglobaladdr:$callee)),
+ (CALL_VOID tglobaladdr:$callee)>;
+
+// Patterns for matching a direct call to an external symbol.
+def : Pat<(i32 (WebAssemblycall1 (WebAssemblywrapper texternalsym:$callee))),
+ (CALL_I32 texternalsym:$callee)>;
+def : Pat<(i64 (WebAssemblycall1 (WebAssemblywrapper texternalsym:$callee))),
+ (CALL_I64 texternalsym:$callee)>;
+def : Pat<(f32 (WebAssemblycall1 (WebAssemblywrapper texternalsym:$callee))),
+ (CALL_F32 texternalsym:$callee)>;
+def : Pat<(f64 (WebAssemblycall1 (WebAssemblywrapper texternalsym:$callee))),
+ (CALL_F64 texternalsym:$callee)>;
+def : Pat<(WebAssemblycall0 (WebAssemblywrapper texternalsym:$callee)),
+ (CALL_VOID texternalsym:$callee)>;
Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.td?rev=254863&r1=254862&r2=254863&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.td (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.td Sat Dec 5 14:41:36 2015
@@ -68,7 +68,6 @@ def WebAssemblywrapper : SDNode<"WebAss
def bb_op : Operand<OtherVT>;
def tjumptable_op : Operand<iPTR>;
-def global : Operand<iPTR>;
//===----------------------------------------------------------------------===//
// WebAssembly Instruction Format Definitions.
Added: llvm/trunk/test/CodeGen/WebAssembly/frem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/frem.ll?rev=254863&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/frem.ll (added)
+++ llvm/trunk/test/CodeGen/WebAssembly/frem.ll Sat Dec 5 14:41:36 2015
@@ -0,0 +1,26 @@
+; RUN: llc < %s -asm-verbose=false | FileCheck %s
+
+; Test that the frem instruction works.
+
+target datalayout = "e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+; CHECK-LABEL: frem32:
+; CHECK-NEXT: .param f32, f32{{$}}
+; CHECK-NEXT: .result f32{{$}}
+; CHECK-NEXT: call $push0=, fmodf, $0, $1{{$}}
+; CHECK-NEXT: return $pop0{{$}}
+define float @frem32(float %x, float %y) {
+ %a = frem float %x, %y
+ ret float %a
+}
+
+; CHECK-LABEL: frem64:
+; CHECK-NEXT: .param f64, f64{{$}}
+; CHECK-NEXT: .result f64{{$}}
+; CHECK-NEXT: call $push0=, fmod, $0, $1{{$}}
+; CHECK-NEXT: return $pop0{{$}}
+define double @frem64(double %x, double %y) {
+ %a = frem double %x, %y
+ ret double %a
+}
Modified: llvm/trunk/test/CodeGen/WebAssembly/global.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/global.ll?rev=254863&r1=254862&r2=254863&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/global.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/global.ll Sat Dec 5 14:41:36 2015
@@ -21,8 +21,7 @@ define i32 @foo() {
; CHECK-LABEL: call_memcpy:
; CHECK-NEXT: .param i32, i32, i32{{$}}
; CHECK-NEXT: .result i32{{$}}
-; CHECK-NEXT: i32.const $push0=, memcpy{{$}}
-; CHECK-NEXT: call_indirect $pop0, $0, $1, $2{{$}}
+; CHECK-NEXT: call memcpy, $0, $1, $2{{$}}
; CHECK-NEXT: return $0{{$}}
declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture readonly, i32, i32, i1)
define i8* @call_memcpy(i8* %p, i8* nocapture readonly %q, i32 %n) {
More information about the llvm-commits
mailing list