Hi all,
Ping for Tim's patch!
I rebased it and added the one-step __fp16->double conversion, which, while not
necessary for correctness, is nice to have (if only for symmetry.)
We're still missing the libcalls, so this will break the conversions from/to
double. However, I agree with Tim in that it's better than incorrect results.
-Ahmed
http://reviews.llvm.org/D4602
Files:
lib/CodeGen/CGExprScalar.cpp
test/CodeGen/fp16-ops.c
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
Index: lib/CodeGen/CGExprScalar.cpp
===================================================================
--- lib/CodeGen/CGExprScalar.cpp
+++ lib/CodeGen/CGExprScalar.cpp
@@ -745,23 +745,28 @@
QualType OrigSrcType = SrcType;
llvm::Type *SrcTy = Src->getType();
- // If casting to/from storage-only half FP, use special intrinsics.
+ // Handle conversions to bool first, they are special: comparisons against 0.
+ if (DstType->isBooleanType())
+ return EmitConversionToBool(Src, SrcType);
+
+ llvm::Type *DstTy = ConvertType(DstType);
+
+ // Cast from storage-only half FP using the special intrinsic.
if (SrcType->isHalfType() && !CGF.getContext().getLangOpts().NativeHalfType &&
!CGF.getContext().getLangOpts().HalfArgsAndReturns) {
+ if (DstTy->isFloatingPointTy())
+ return Builder.CreateCall(
+ CGF.CGM.getIntrinsic(llvm::Intrinsic::convert_from_fp16, DstTy), Src);
+
+ // If this isn't an FP->FP conversion, go through float.
Src = Builder.CreateCall(
CGF.CGM.getIntrinsic(llvm::Intrinsic::convert_from_fp16,
CGF.CGM.FloatTy),
Src);
SrcType = CGF.getContext().FloatTy;
SrcTy = CGF.FloatTy;
}
- // Handle conversions to bool first, they are special: comparisons against 0.
- if (DstType->isBooleanType())
- return EmitConversionToBool(Src, SrcType);
-
- llvm::Type *DstTy = ConvertType(DstType);
-
// Ignore conversions like int -> uint.
if (SrcTy == DstTy)
return Src;
@@ -818,10 +823,14 @@
EmitFloatConversionCheck(OrigSrc, OrigSrcType, Src, SrcType, DstType,
DstTy);
- // Cast to half via float
+ // Cast to half using the intrinsic if from FP type, through float otherwise.
if (DstType->isHalfType() && !CGF.getContext().getLangOpts().NativeHalfType &&
- !CGF.getContext().getLangOpts().HalfArgsAndReturns)
+ !CGF.getContext().getLangOpts().HalfArgsAndReturns) {
+ if (SrcTy->isFloatingPointTy())
+ return Builder.CreateCall(
+ CGF.CGM.getIntrinsic(llvm::Intrinsic::convert_to_fp16, SrcTy), Src);
DstTy = CGF.FloatTy;
+ }
if (isa<llvm::IntegerType>(SrcTy)) {
bool InputSigned = SrcType->isSignedIntegerOrEnumerationType();
Index: test/CodeGen/fp16-ops.c
===================================================================
--- test/CodeGen/fp16-ops.c
+++ test/CodeGen/fp16-ops.c
@@ -5,6 +5,7 @@
volatile cond_t test;
volatile __fp16 h0 = 0.0, h1 = 1.0, h2;
volatile float f0, f1, f2;
+volatile double d0;
void foo(void) {
// CHECK-LABEL: define void @foo()
@@ -52,7 +53,7 @@
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fmul float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
- h1 = h0 * (__fp16) -2.0;
+ h1 = h0 * (__fp16) -2.0f;
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fmul float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
@@ -71,7 +72,7 @@
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fdiv float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
- h1 = (h0 / (__fp16) -2.0);
+ h1 = (h0 / (__fp16) -2.0f);
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fdiv float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
@@ -109,7 +110,7 @@
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fsub float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
- h1 = ((__fp16)-2.0 - h0);
+ h1 = ((__fp16)-2.0f - h0);
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fsub float
// CHECK: call i16 @llvm.convert.to.fp16.f32(
@@ -218,7 +219,7 @@
// Check assignments (inc. compound)
h0 = h1;
// CHECK: call i16 @llvm.convert.to.fp16.f32(
- h0 = (__fp16)-2.0;
+ h0 = (__fp16)-2.0f;
// CHECK: call i16 @llvm.convert.to.fp16.f32(
h0 = f0;
@@ -231,7 +232,7 @@
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fadd
// CHECK: call i16 @llvm.convert.to.fp16.f32(
- h0 += (__fp16)1.0;
+ h0 += (__fp16)1.0f;
// CHECK: call float @llvm.convert.from.fp16.f32(
// CHECK: fadd
// CHECK: call i16 @llvm.convert.to.fp16.f32(
@@ -281,4 +282,19 @@
// CHECK: fdiv
// CHECK: call i16 @llvm.convert.to.fp16.f32(
h0 /= f2;
+
+ // Check conversions to/from double
+ // CHECK: call i16 @llvm.convert.to.fp16.f64(
+ h0 = d0;
+
+ // CHECK: [[MID:%.*]] = fptrunc double {{%.*}} to float
+ // CHECK: call i16 @llvm.convert.to.fp16.f32(float [[MID]])
+ h0 = (float)d0;
+
+ // CHECK: call double @llvm.convert.from.fp16.f64(
+ d0 = h0;
+
+ // CHECK: [[MID:%.*]] = call float @llvm.convert.from.fp16.f32(
+ // CHECK: fpext float [[MID]] to double
+ d0 = (float)h0;
}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
