[llvm] r185099 - Revert "[APFloat] Removed APFloat constructor which initialized to either zero/NaN but allowed you to arbitrarily set the category of the float."

[Michael Gottesman]

Looks like both the ppc-64 and mips bots are still failing after I reverted this change.

Since:

1. The mips bot always performs a clean build,
2. The ppc64-bot failed again after a clean build (I asked the ppc-64 maintainers to clean the bot which they did... Thanks Will!),

I think it is safe to assume that this change was not the cause of the failures that said builders were seeing. Thus I am going to recommit this patch.

Michael

On Jun 27, 2013, at 1:40 PM, Michael Gottesman <mgottesman at apple.com> wrote:

> Author: mgottesman
> Date: Thu Jun 27 15:40:11 2013
> New Revision: 185099
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=185099&view=rev
> Log:
> Revert "[APFloat] Removed APFloat constructor which initialized to either zero/NaN but allowed you to arbitrarily set the category of the float."
> 
> This reverts commit r185095. This is causing a FileCheck failure on
> the 3dnow intrinsics on at least the mips/ppc bots but not on the x86
> bots.
> 
> Reverting while I figure out what is going on.
> 
> Modified:
>    llvm/trunk/include/llvm/ADT/APFloat.h
>    llvm/trunk/lib/Support/APFloat.cpp
>    llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp
> 
> Modified: llvm/trunk/include/llvm/ADT/APFloat.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APFloat.h?rev=185099&r1=185098&r2=185099&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ADT/APFloat.h (original)
> +++ llvm/trunk/include/llvm/ADT/APFloat.h Thu Jun 27 15:40:11 2013
> @@ -191,6 +191,7 @@ public:
>   APFloat(const fltSemantics &); // Default construct to 0.0
>   APFloat(const fltSemantics &, StringRef);
>   APFloat(const fltSemantics &, integerPart);
> +  APFloat(const fltSemantics &, fltCategory, bool negative);
>   APFloat(const fltSemantics &, uninitializedTag);
>   APFloat(const fltSemantics &, const APInt &);
>   explicit APFloat(double d);
> 
> Modified: llvm/trunk/lib/Support/APFloat.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=185099&r1=185098&r2=185099&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/APFloat.cpp (original)
> +++ llvm/trunk/lib/Support/APFloat.cpp Thu Jun 27 15:40:11 2013
> @@ -795,6 +795,17 @@ APFloat::APFloat(const fltSemantics &our
>   initialize(&ourSemantics);
> }
> 
> +APFloat::APFloat(const fltSemantics &ourSemantics,
> +                 fltCategory ourCategory, bool negative) {
> +  initialize(&ourSemantics);
> +  category = ourCategory;
> +  sign = negative;
> +  if (isFiniteNonZero())
> +    category = fcZero;
> +  else if (ourCategory == fcNaN)
> +    makeNaN();
> +}
> +
> APFloat::APFloat(const fltSemantics &ourSemantics, StringRef text) {
>   initialize(&ourSemantics);
>   convertFromString(text, rmNearestTiesToEven);
> @@ -2395,8 +2406,8 @@ APFloat::roundSignificandWithExponent(co
>     excessPrecision = calcSemantics.precision - semantics->precision;
>     truncatedBits = excessPrecision;
> 
> -    APFloat decSig = APFloat::getZero(calcSemantics, sign);
> -    APFloat pow5(calcSemantics);
> +    APFloat decSig(calcSemantics, fcZero, sign);
> +    APFloat pow5(calcSemantics, fcZero, false);
> 
>     sigStatus = decSig.convertFromUnsignedParts(decSigParts, sigPartCount,
>                                                 rmNearestTiesToEven);
> @@ -3377,16 +3388,15 @@ APFloat APFloat::getSmallest(const fltSe
> }
> 
> APFloat APFloat::getSmallestNormalized(const fltSemantics &Sem, bool Negative) {
> -  APFloat Val(Sem, uninitialized);
> +  APFloat Val(Sem, fcNormal, Negative);
> 
>   // We want (in interchange format):
>   //   sign = {Negative}
>   //   exponent = 0..0
>   //   significand = 10..0
> 
> -  Val.zeroSignificand();
> -  Val.sign = Negative;
>   Val.exponent = Sem.minExponent;
> +  Val.zeroSignificand();
>   Val.significandParts()[partCountForBits(Sem.precision)-1] |=
>     (((integerPart) 1) << ((Sem.precision - 1) % integerPartWidth));
> 
> 
> Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=185099&r1=185098&r2=185099&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original)
> +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Thu Jun 27 15:40:11 2013
> @@ -2888,7 +2888,7 @@ Instruction *InstCombiner::FoldFCmp_IntT
>   if (!LHSUnsigned) {
>     // If the RHS value is > SignedMax, fold the comparison.  This handles +INF
>     // and large values.
> -    APFloat SMax(RHS.getSemantics());
> +    APFloat SMax(RHS.getSemantics(), APFloat::fcZero, false);
>     SMax.convertFromAPInt(APInt::getSignedMaxValue(IntWidth), true,
>                           APFloat::rmNearestTiesToEven);
>     if (SMax.compare(RHS) == APFloat::cmpLessThan) {  // smax < 13123.0
> @@ -2900,7 +2900,7 @@ Instruction *InstCombiner::FoldFCmp_IntT
>   } else {
>     // If the RHS value is > UnsignedMax, fold the comparison. This handles
>     // +INF and large values.
> -    APFloat UMax(RHS.getSemantics());
> +    APFloat UMax(RHS.getSemantics(), APFloat::fcZero, false);
>     UMax.convertFromAPInt(APInt::getMaxValue(IntWidth), false,
>                           APFloat::rmNearestTiesToEven);
>     if (UMax.compare(RHS) == APFloat::cmpLessThan) {  // umax < 13123.0
> @@ -2913,7 +2913,7 @@ Instruction *InstCombiner::FoldFCmp_IntT
> 
>   if (!LHSUnsigned) {
>     // See if the RHS value is < SignedMin.
> -    APFloat SMin(RHS.getSemantics());
> +    APFloat SMin(RHS.getSemantics(), APFloat::fcZero, false);
>     SMin.convertFromAPInt(APInt::getSignedMinValue(IntWidth), true,
>                           APFloat::rmNearestTiesToEven);
>     if (SMin.compare(RHS) == APFloat::cmpGreaterThan) { // smin > 12312.0
> @@ -2924,7 +2924,7 @@ Instruction *InstCombiner::FoldFCmp_IntT
>     }
>   } else {
>     // See if the RHS value is < UnsignedMin.
> -    APFloat SMin(RHS.getSemantics());
> +    APFloat SMin(RHS.getSemantics(), APFloat::fcZero, false);
>     SMin.convertFromAPInt(APInt::getMinValue(IntWidth), true,
>                           APFloat::rmNearestTiesToEven);
>     if (SMin.compare(RHS) == APFloat::cmpGreaterThan) { // umin > 12312.0
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130627/6ae8e79b/attachment.html>