[llvm-commits] [llvm] r48189 - in /llvm/trunk: include/llvm/CodeGen/RuntimeLibcalls.h lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/TargetLowering.cpp test/CodeGen/PowerPC/int-fp-conv.ll test/CodeGen/PowerPC/itofp128.ll
Dan Gohman
gohman at apple.com
Mon Mar 10 16:03:31 PDT 2008
Author: djg
Date: Mon Mar 10 18:03:31 2008
New Revision: 48189
URL: http://llvm.org/viewvc/llvm-project?rev=48189&view=rev
Log:
Implement more support for fp-to-i128 and i128-to-fp conversions.
Added:
llvm/trunk/test/CodeGen/PowerPC/int-fp-conv.ll
llvm/trunk/test/CodeGen/PowerPC/itofp128.ll
Modified:
llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h
llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Modified: llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h?rev=48189&r1=48188&r2=48189&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h (original)
+++ llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h Mon Mar 10 18:03:31 2008
@@ -93,17 +93,25 @@
FPROUND_F64_F32,
FPTOSINT_F32_I32,
FPTOSINT_F32_I64,
+ FPTOSINT_F32_I128,
FPTOSINT_F64_I32,
FPTOSINT_F64_I64,
+ FPTOSINT_F64_I128,
FPTOSINT_F80_I64,
+ FPTOSINT_F80_I128,
FPTOSINT_PPCF128_I64,
+ FPTOSINT_PPCF128_I128,
FPTOUINT_F32_I32,
FPTOUINT_F32_I64,
+ FPTOUINT_F32_I128,
FPTOUINT_F64_I32,
FPTOUINT_F64_I64,
+ FPTOUINT_F64_I128,
FPTOUINT_F80_I32,
FPTOUINT_F80_I64,
+ FPTOUINT_F80_I128,
FPTOUINT_PPCF128_I64,
+ FPTOUINT_PPCF128_I128,
SINTTOFP_I32_F32,
SINTTOFP_I32_F64,
SINTTOFP_I64_F32,
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=48189&r1=48188&r2=48189&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Mon Mar 10 18:03:31 2008
@@ -3826,40 +3826,78 @@
}
break;
}
- // Convert f32 / f64 to i32 / i64.
+ // Convert f32 / f64 to i32 / i64 / i128.
RTLIB::Libcall LC = RTLIB::UNKNOWN_LIBCALL;
switch (Node->getOpcode()) {
case ISD::FP_TO_SINT: {
- if (OVT == MVT::f32)
- LC = (VT == MVT::i32)
- ? RTLIB::FPTOSINT_F32_I32 : RTLIB::FPTOSINT_F32_I64;
- else if (OVT == MVT::f64)
- LC = (VT == MVT::i32)
- ? RTLIB::FPTOSINT_F64_I32 : RTLIB::FPTOSINT_F64_I64;
- else if (OVT == MVT::f80) {
- assert(VT == MVT::i64);
- LC = RTLIB::FPTOSINT_F80_I64;
- }
- else if (OVT == MVT::ppcf128) {
- assert(VT == MVT::i64);
- LC = RTLIB::FPTOSINT_PPCF128_I64;
+ if (VT == MVT::i32) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOSINT_F32_I32;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOSINT_F64_I32;
+ else
+ assert(0 && "Unexpected i32-to-fp conversion!");
+ } else if (VT == MVT::i64) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOSINT_F32_I64;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOSINT_F64_I64;
+ else if (OVT == MVT::f80)
+ LC = RTLIB::FPTOSINT_F80_I64;
+ else if (OVT == MVT::ppcf128)
+ LC = RTLIB::FPTOSINT_PPCF128_I64;
+ else
+ assert(0 && "Unexpected i64-to-fp conversion!");
+ } else if (VT == MVT::i128) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOSINT_F32_I128;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOSINT_F64_I128;
+ else if (OVT == MVT::f80)
+ LC = RTLIB::FPTOSINT_F80_I128;
+ else if (OVT == MVT::ppcf128)
+ LC = RTLIB::FPTOSINT_PPCF128_I128;
+ else
+ assert(0 && "Unexpected i128-to-fp conversion!");
+ } else {
+ assert(0 && "Unexpectd int-to-fp conversion!");
}
break;
}
case ISD::FP_TO_UINT: {
- if (OVT == MVT::f32)
- LC = (VT == MVT::i32)
- ? RTLIB::FPTOUINT_F32_I32 : RTLIB::FPTOSINT_F32_I64;
- else if (OVT == MVT::f64)
- LC = (VT == MVT::i32)
- ? RTLIB::FPTOUINT_F64_I32 : RTLIB::FPTOSINT_F64_I64;
- else if (OVT == MVT::f80) {
- LC = (VT == MVT::i32)
- ? RTLIB::FPTOUINT_F80_I32 : RTLIB::FPTOUINT_F80_I64;
- }
- else if (OVT == MVT::ppcf128) {
- assert(VT == MVT::i64);
- LC = RTLIB::FPTOUINT_PPCF128_I64;
+ if (VT == MVT::i32) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOUINT_F32_I32;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOUINT_F64_I32;
+ else if (OVT == MVT::f80)
+ LC = RTLIB::FPTOUINT_F80_I32;
+ else
+ assert(0 && "Unexpected i32-to-fp conversion!");
+ } else if (VT == MVT::i64) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOUINT_F32_I64;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOUINT_F64_I64;
+ else if (OVT == MVT::f80)
+ LC = RTLIB::FPTOUINT_F80_I64;
+ else if (OVT == MVT::ppcf128)
+ LC = RTLIB::FPTOUINT_PPCF128_I64;
+ else
+ assert(0 && "Unexpected i64-to-fp conversion!");
+ } else if (VT == MVT::i128) {
+ if (OVT == MVT::f32)
+ LC = RTLIB::FPTOUINT_F32_I128;
+ else if (OVT == MVT::f64)
+ LC = RTLIB::FPTOUINT_F64_I128;
+ else if (OVT == MVT::f80)
+ LC = RTLIB::FPTOUINT_F80_I128;
+ else if (OVT == MVT::ppcf128)
+ LC = RTLIB::FPTOUINT_PPCF128_I128;
+ else
+ assert(0 && "Unexpected i128-to-fp conversion!");
+ } else {
+ assert(0 && "Unexpectd int-to-fp conversion!");
}
break;
}
@@ -5428,9 +5466,12 @@
assert(TLI.getLibcallName(LC) && "Don't know how to expand this SINT_TO_FP!");
Source = DAG.getNode(ISD::SINT_TO_FP, DestTy, Source);
- SDOperand UnusedHiPart;
- return ExpandLibCall(TLI.getLibcallName(LC), Source.Val, isSigned,
- UnusedHiPart);
+ SDOperand HiPart;
+ SDOperand Result = ExpandLibCall(TLI.getLibcallName(LC), Source.Val, isSigned,
+ HiPart);
+ if (Result.getValueType() != DestTy)
+ Result = DAG.getNode(ISD::BUILD_PAIR, DestTy, Result, HiPart);
+ return Result;
}
/// ExpandLegalINT_TO_FP - This function is responsible for legalizing a
@@ -6177,16 +6218,31 @@
}
RTLIB::Libcall LC = RTLIB::UNKNOWN_LIBCALL;
- if (Node->getOperand(0).getValueType() == MVT::f32)
- LC = RTLIB::FPTOSINT_F32_I64;
- else if (Node->getOperand(0).getValueType() == MVT::f64)
- LC = RTLIB::FPTOSINT_F64_I64;
- else if (Node->getOperand(0).getValueType() == MVT::f80)
- LC = RTLIB::FPTOSINT_F80_I64;
- else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
- LC = RTLIB::FPTOSINT_PPCF128_I64;
- Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
- false/*sign irrelevant*/, Hi);
+ if (VT == MVT::i64) {
+ if (Node->getOperand(0).getValueType() == MVT::f32)
+ LC = RTLIB::FPTOSINT_F32_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::f64)
+ LC = RTLIB::FPTOSINT_F64_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::f80)
+ LC = RTLIB::FPTOSINT_F80_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
+ LC = RTLIB::FPTOSINT_PPCF128_I64;
+ Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
+ false/*sign irrelevant*/, Hi);
+ } else if (VT == MVT::i128) {
+ if (Node->getOperand(0).getValueType() == MVT::f32)
+ LC = RTLIB::FPTOSINT_F32_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::f64)
+ LC = RTLIB::FPTOSINT_F64_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::f80)
+ LC = RTLIB::FPTOSINT_F80_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
+ LC = RTLIB::FPTOSINT_PPCF128_I128;
+ Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
+ false/*sign irrelevant*/, Hi);
+ } else {
+ assert(0 && "Unexpected uint-to-fp conversion!");
+ }
break;
}
@@ -6209,16 +6265,31 @@
}
RTLIB::Libcall LC = RTLIB::UNKNOWN_LIBCALL;
- if (Node->getOperand(0).getValueType() == MVT::f32)
- LC = RTLIB::FPTOUINT_F32_I64;
- else if (Node->getOperand(0).getValueType() == MVT::f64)
- LC = RTLIB::FPTOUINT_F64_I64;
- else if (Node->getOperand(0).getValueType() == MVT::f80)
- LC = RTLIB::FPTOUINT_F80_I64;
- else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
- LC = RTLIB::FPTOUINT_PPCF128_I64;
- Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
- false/*sign irrelevant*/, Hi);
+ if (VT == MVT::i64) {
+ if (Node->getOperand(0).getValueType() == MVT::f32)
+ LC = RTLIB::FPTOUINT_F32_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::f64)
+ LC = RTLIB::FPTOUINT_F64_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::f80)
+ LC = RTLIB::FPTOUINT_F80_I64;
+ else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
+ LC = RTLIB::FPTOUINT_PPCF128_I64;
+ Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
+ false/*sign irrelevant*/, Hi);
+ } else if (VT == MVT::i128) {
+ if (Node->getOperand(0).getValueType() == MVT::f32)
+ LC = RTLIB::FPTOUINT_F32_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::f64)
+ LC = RTLIB::FPTOUINT_F64_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::f80)
+ LC = RTLIB::FPTOUINT_F80_I128;
+ else if (Node->getOperand(0).getValueType() == MVT::ppcf128)
+ LC = RTLIB::FPTOUINT_PPCF128_I128;
+ Lo = ExpandLibCall(TLI.getLibcallName(LC), Node,
+ false/*sign irrelevant*/, Hi);
+ } else {
+ assert(0 && "Unexpected uint-to-fp conversion!");
+ }
break;
}
@@ -6631,7 +6702,7 @@
case ISD::UINT_TO_FP: {
bool isSigned = Node->getOpcode() == ISD::SINT_TO_FP;
MVT::ValueType SrcVT = Node->getOperand(0).getValueType();
- if (VT == MVT::ppcf128 && SrcVT != MVT::i64) {
+ if (VT == MVT::ppcf128 && SrcVT == MVT::i32) {
static const uint64_t zero = 0;
if (isSigned) {
Hi = LegalizeOp(DAG.getNode(ISD::SINT_TO_FP, MVT::f64,
@@ -6674,26 +6745,6 @@
Lo, Hi);
break;
}
- RTLIB::Libcall LC = RTLIB::UNKNOWN_LIBCALL;
- if (Node->getOperand(0).getValueType() == MVT::i64) {
- if (VT == MVT::f32)
- LC = isSigned ? RTLIB::SINTTOFP_I64_F32 : RTLIB::UINTTOFP_I64_F32;
- else if (VT == MVT::f64)
- LC = isSigned ? RTLIB::SINTTOFP_I64_F64 : RTLIB::UINTTOFP_I64_F64;
- else if (VT == MVT::f80) {
- assert(isSigned);
- LC = RTLIB::SINTTOFP_I64_F80;
- }
- else if (VT == MVT::ppcf128) {
- assert(isSigned);
- LC = RTLIB::SINTTOFP_I64_PPCF128;
- }
- } else {
- if (VT == MVT::f32)
- LC = isSigned ? RTLIB::SINTTOFP_I32_F32 : RTLIB::UINTTOFP_I32_F32;
- else
- LC = isSigned ? RTLIB::SINTTOFP_I32_F64 : RTLIB::UINTTOFP_I32_F64;
- }
// Promote the operand if needed.
if (getTypeAction(SrcVT) == Promote) {
@@ -6705,15 +6756,9 @@
Node = DAG.UpdateNodeOperands(Op, Tmp).Val;
}
- const char *LibCall = TLI.getLibcallName(LC);
- if (LibCall)
- Lo = ExpandLibCall(TLI.getLibcallName(LC), Node, isSigned, Hi);
- else {
- Lo = ExpandIntToFP(Node->getOpcode() == ISD::SINT_TO_FP, VT,
- Node->getOperand(0));
- if (getTypeAction(Lo.getValueType()) == Expand)
- ExpandOp(Lo, Lo, Hi);
- }
+ Lo = ExpandIntToFP(Node->getOpcode() == ISD::SINT_TO_FP, VT,
+ Node->getOperand(0));
+ ExpandOp(Lo, Lo, Hi);
break;
}
}
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=48189&r1=48188&r2=48189&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Mon Mar 10 18:03:31 2008
@@ -90,17 +90,25 @@
Names[RTLIB::FPROUND_F64_F32] = "__truncdfsf2";
Names[RTLIB::FPTOSINT_F32_I32] = "__fixsfsi";
Names[RTLIB::FPTOSINT_F32_I64] = "__fixsfdi";
+ Names[RTLIB::FPTOSINT_F32_I128] = "__fixsfti";
Names[RTLIB::FPTOSINT_F64_I32] = "__fixdfsi";
Names[RTLIB::FPTOSINT_F64_I64] = "__fixdfdi";
+ Names[RTLIB::FPTOSINT_F64_I128] = "__fixdfti";
Names[RTLIB::FPTOSINT_F80_I64] = "__fixxfdi";
+ Names[RTLIB::FPTOSINT_F80_I128] = "__fixxfti";
Names[RTLIB::FPTOSINT_PPCF128_I64] = "__fixtfdi";
+ Names[RTLIB::FPTOSINT_PPCF128_I128] = "__fixtfti";
Names[RTLIB::FPTOUINT_F32_I32] = "__fixunssfsi";
Names[RTLIB::FPTOUINT_F32_I64] = "__fixunssfdi";
+ Names[RTLIB::FPTOUINT_F32_I128] = "__fixunssfti";
Names[RTLIB::FPTOUINT_F64_I32] = "__fixunsdfsi";
Names[RTLIB::FPTOUINT_F64_I64] = "__fixunsdfdi";
+ Names[RTLIB::FPTOUINT_F64_I128] = "__fixunsdfti";
Names[RTLIB::FPTOUINT_F80_I32] = "__fixunsxfsi";
Names[RTLIB::FPTOUINT_F80_I64] = "__fixunsxfdi";
+ Names[RTLIB::FPTOUINT_F80_I128] = "__fixunsxfti";
Names[RTLIB::FPTOUINT_PPCF128_I64] = "__fixunstfdi";
+ Names[RTLIB::FPTOUINT_PPCF128_I128] = "__fixunstfti";
Names[RTLIB::SINTTOFP_I32_F32] = "__floatsisf";
Names[RTLIB::SINTTOFP_I32_F64] = "__floatsidf";
Names[RTLIB::SINTTOFP_I64_F32] = "__floatdisf";
Added: llvm/trunk/test/CodeGen/PowerPC/int-fp-conv.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/int-fp-conv.ll?rev=48189&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/int-fp-conv.ll (added)
+++ llvm/trunk/test/CodeGen/PowerPC/int-fp-conv.ll Mon Mar 10 18:03:31 2008
@@ -0,0 +1,17 @@
+; RUN: llvm-as < %s | llc -march=ppc64 > %t
+; RUN: grep __floattitf %t
+; RUN: grep __fixunstfti %t
+
+target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128"
+target triple = "powerpc64-apple-darwin9.2.0"
+
+define ppc_fp128 @foo(i128 %a) nounwind {
+entry:
+ %tmp2829 = uitofp i128 %a to ppc_fp128 ; <i64> [#uses=1]
+ ret ppc_fp128 %tmp2829
+}
+define i128 @boo(ppc_fp128 %a) nounwind {
+entry:
+ %tmp2829 = fptoui ppc_fp128 %a to i128 ; <i64> [#uses=1]
+ ret i128 %tmp2829
+}
Added: llvm/trunk/test/CodeGen/PowerPC/itofp128.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/itofp128.ll?rev=48189&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/itofp128.ll (added)
+++ llvm/trunk/test/CodeGen/PowerPC/itofp128.ll Mon Mar 10 18:03:31 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | llc -march=ppc64
+
+target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128"
+target triple = "powerpc64-apple-darwin9.2.0"
+
+define i128 @__fixunstfti(ppc_fp128 %a) nounwind {
+entry:
+ %tmp1213 = uitofp i128 0 to ppc_fp128 ; <ppc_fp128> [#uses=1]
+ %tmp15 = sub ppc_fp128 %a, %tmp1213 ; <ppc_fp128> [#uses=1]
+ %tmp2829 = fptoui ppc_fp128 %tmp15 to i64 ; <i64> [#uses=1]
+ %tmp282930 = zext i64 %tmp2829 to i128 ; <i128> [#uses=1]
+ %tmp32 = add i128 %tmp282930, 0 ; <i128> [#uses=1]
+ ret i128 %tmp32
+}
More information about the llvm-commits
mailing list