From 0ff46edca1d33670d7568ca60d6013d3d3158b8b Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Mon, 24 Aug 2015 18:23:13 +0000 Subject: [PATCH] [WebAssembly] Implement floating point rounding operators. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245859 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../WebAssembly/WebAssemblyISelLowering.cpp | 9 +++-- .../WebAssembly/WebAssemblyInstrFloat.td | 19 ++++----- test/CodeGen/WebAssembly/fp32.ll | 40 +++++++++++++++++++ test/CodeGen/WebAssembly/fp64.ll | 40 +++++++++++++++++++ 4 files changed, 96 insertions(+), 12 deletions(-) diff --git a/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp b/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp index b4143240c99..4cb3a3138e8 100644 --- a/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp +++ b/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp @@ -120,10 +120,13 @@ WebAssemblyTargetLowering::WebAssemblyTargetLowering( ISD::SETULT, ISD::SETULE, ISD::SETUGT, ISD::SETUGE}) setCondCodeAction(CC, T, Expand); // Expand floating-point library function operators. - for (auto Op : {ISD::FSIN, ISD::FCOS, ISD::FSINCOS, ISD::FPOWI, ISD::FPOW, - ISD::FLOG, ISD::FLOG2, ISD::FLOG10, ISD::FEXP, ISD::FEXP2, - ISD::FMINNAN, ISD::FMAXNAN}) + for (auto Op : {ISD::FSIN, ISD::FCOS, ISD::FSINCOS, ISD::FPOWI, ISD::FPOW}) setOperationAction(Op, T, Expand); + // Note supported floating-point library function operators that otherwise + // default to expand. + for (auto Op : {ISD::FCEIL, ISD::FFLOOR, ISD::FTRUNC, ISD::FNEARBYINT, + ISD::FRINT}) + setOperationAction(Op, T, Legal); } for (auto T : {MVT::i32, MVT::i64}) { diff --git a/lib/Target/WebAssembly/WebAssemblyInstrFloat.td b/lib/Target/WebAssembly/WebAssemblyInstrFloat.td index 87d1a98b98e..69db7e71ae1 100644 --- a/lib/Target/WebAssembly/WebAssemblyInstrFloat.td +++ b/lib/Target/WebAssembly/WebAssemblyInstrFloat.td @@ -16,17 +16,20 @@ defm FADD : BinaryFP; defm FSUB : BinaryFP; defm FMUL : BinaryFP; defm FDIV : BinaryFP; +defm SQRT : UnaryFP; + defm FABS : UnaryFP; defm FNEG : UnaryFP; defm COPYSIGN : BinaryFP; -/* - * TODO(jfb): add and test these: - * defm CEIL : UnaryFP; - * defm FLOOR : UnaryFP; - * defm TRUNC : UnaryFP; - * defm NEARESTINT : UnaryFP; - */ +defm CEIL : UnaryFP; +defm FLOOR : UnaryFP; +defm TRUNC : UnaryFP; +defm NEARESTINT : UnaryFP; + +// WebAssembly doesn't expose inexact exceptions, so map frint to fnearbyint. +def : Pat<(frint f32:$src), (NEARESTINT_F32 f32:$src)>; +def : Pat<(frint f64:$src), (NEARESTINT_F64 f64:$src)>; defm EQ : ComparisonFP; defm NE : ComparisonFP; @@ -49,8 +52,6 @@ def : Pat<(setle f64:$lhs, f64:$rhs), (LE_F64 f64:$lhs, f64:$rhs)>; def : Pat<(setgt f64:$lhs, f64:$rhs), (GT_F64 f64:$lhs, f64:$rhs)>; def : Pat<(setge f64:$lhs, f64:$rhs), (GE_F64 f64:$lhs, f64:$rhs)>; -defm SQRT : UnaryFP; - /* * TODO(jfb): Add the following for 32-bit and 64-bit. * diff --git a/test/CodeGen/WebAssembly/fp32.ll b/test/CodeGen/WebAssembly/fp32.ll index 74cf2de9fe1..279aaba44b9 100644 --- a/test/CodeGen/WebAssembly/fp32.ll +++ b/test/CodeGen/WebAssembly/fp32.ll @@ -8,6 +8,11 @@ target triple = "wasm32-unknown-unknown" declare float @llvm.fabs.f32(float) declare float @llvm.copysign.f32(float, float) declare float @llvm.sqrt.f32(float) +declare float @llvm.ceil.f32(float) +declare float @llvm.floor.f32(float) +declare float @llvm.trunc.f32(float) +declare float @llvm.nearbyint.f32(float) +declare float @llvm.rint.f32(float) ; CHECK-LABEL: fadd32: ; CHECK-NEXT: (setlocal @0 (argument 1)) @@ -67,3 +72,38 @@ define float @sqrt32(float %x) { %a = call float @llvm.sqrt.f32(float %x) ret float %a } + +; CHECK-LABEL: ceil32: +; CHECK: (setlocal @1 (ceil @0)) +define float @ceil32(float %x) { + %a = call float @llvm.ceil.f32(float %x) + ret float %a +} + +; CHECK-LABEL: floor32: +; CHECK: (setlocal @1 (floor @0)) +define float @floor32(float %x) { + %a = call float @llvm.floor.f32(float %x) + ret float %a +} + +; CHECK-LABEL: trunc32: +; CHECK: (setlocal @1 (trunc @0)) +define float @trunc32(float %x) { + %a = call float @llvm.trunc.f32(float %x) + ret float %a +} + +; CHECK-LABEL: nearestint32: +; CHECK: (setlocal @1 (nearestint @0)) +define float @nearestint32(float %x) { + %a = call float @llvm.nearbyint.f32(float %x) + ret float %a +} + +; CHECK-LABEL: nearestint32_via_rint: +; CHECK: (setlocal @1 (nearestint @0)) +define float @nearestint32_via_rint(float %x) { + %a = call float @llvm.rint.f32(float %x) + ret float %a +} diff --git a/test/CodeGen/WebAssembly/fp64.ll b/test/CodeGen/WebAssembly/fp64.ll index 7aa666e5948..948d48470d6 100644 --- a/test/CodeGen/WebAssembly/fp64.ll +++ b/test/CodeGen/WebAssembly/fp64.ll @@ -8,6 +8,11 @@ target triple = "wasm32-unknown-unknown" declare double @llvm.fabs.f64(double) declare double @llvm.copysign.f64(double, double) declare double @llvm.sqrt.f64(double) +declare double @llvm.ceil.f64(double) +declare double @llvm.floor.f64(double) +declare double @llvm.trunc.f64(double) +declare double @llvm.nearbyint.f64(double) +declare double @llvm.rint.f64(double) ; CHECK-LABEL: fadd64: ; CHECK-NEXT: (setlocal @0 (argument 1)) @@ -67,3 +72,38 @@ define double @sqrt64(double %x) { %a = call double @llvm.sqrt.f64(double %x) ret double %a } + +; CHECK-LABEL: ceil64: +; CHECK: (setlocal @1 (ceil @0)) +define double @ceil64(double %x) { + %a = call double @llvm.ceil.f64(double %x) + ret double %a +} + +; CHECK-LABEL: floor64: +; CHECK: (setlocal @1 (floor @0)) +define double @floor64(double %x) { + %a = call double @llvm.floor.f64(double %x) + ret double %a +} + +; CHECK-LABEL: trunc64: +; CHECK: (setlocal @1 (trunc @0)) +define double @trunc64(double %x) { + %a = call double @llvm.trunc.f64(double %x) + ret double %a +} + +; CHECK-LABEL: nearestint64: +; CHECK: (setlocal @1 (nearestint @0)) +define double @nearestint64(double %x) { + %a = call double @llvm.nearbyint.f64(double %x) + ret double %a +} + +; CHECK-LABEL: nearestint64_via_rint: +; CHECK: (setlocal @1 (nearestint @0)) +define double @nearestint64_via_rint(double %x) { + %a = call double @llvm.rint.f64(double %x) + ret double %a +} -- 2.34.1