Roll back `-ffast-math`
Summary: @public `-ffast-math` does not have measurable performance benefits. By using `NaN` for *undefined* values again, we can squeeze `YGFloatOptional` into 32 bits. This will also enable us to store `YGValue` (or a variant of it) in 32 bits. Reviewed By: astreet Differential Revision: D13403925 fbshipit-source-id: b13d026bf556f24ab4699e65fb450af13a70961b
This commit is contained in:
parent
96e4a72679
commit
6f70d4c0ac
|
@ -1,35 +1,17 @@
|
|||
/*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the LICENSE
|
||||
* file in the root directory of this source tree.
|
||||
/**
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the LICENSE
|
||||
* file in the root directory of this source tree.
|
||||
*/
|
||||
package com.facebook.yoga;
|
||||
|
||||
public class YogaConstants {
|
||||
|
||||
/**
|
||||
* Large positive number signifies that the property(float) is undefined. Earlier we used to have
|
||||
* YGundefined as NAN, but the downside of this is that we can't use -ffast-math compiler flag as
|
||||
* it assumes all floating-point calculation involve and result into finite numbers. For more
|
||||
* information regarding -ffast-math compiler flag in clang, have a look at
|
||||
* https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
|
||||
*/
|
||||
public static final float UNDEFINED = (float) (10E20);
|
||||
public static final float UNDEFINED = Float.NaN;
|
||||
|
||||
public static boolean isUndefined(float value) {
|
||||
// Value of a float in the case of it being not defined is 10.1E20. Earlier it used to be NAN,
|
||||
// the benefit of which
|
||||
// was that if NAN is involved in any mathematical expression the result was NAN. But since we
|
||||
// want to have `-ffast-math`
|
||||
// flag being used by compiler which assumes that the floating point values are not NAN and Inf,
|
||||
// we represent YGUndefined as 10.1E20.
|
||||
// But now if YGUndefined is involved in any mathematical operations this value(10.1E20) would
|
||||
// change.
|
||||
// So the following check makes sure that if the value is outside a range (-10E8, 10E8) then it
|
||||
// is undefined.
|
||||
return (Float.compare(value, (float) 10E8) >= 0 || Float.compare(value, (float) -10E8) <= 0);
|
||||
return Float.compare(value, UNDEFINED) == 0;
|
||||
}
|
||||
|
||||
public static boolean isUndefined(YogaValue value) {
|
||||
|
|
|
@ -57,22 +57,12 @@ bool YGValueEqual(const YGValue a, const YGValue b);
|
|||
// difference between two floats is less than 0.0001f or both are undefined.
|
||||
bool YGFloatsEqual(const float a, const float b);
|
||||
|
||||
// We need custom max function, since we want that, if one argument is
|
||||
// YGUndefined then the max funtion should return the other argument as the max
|
||||
// value. We wouldn't have needed a custom max function if YGUndefined was NAN
|
||||
// as fmax has the same behaviour, but with NAN we cannot use `-ffast-math`
|
||||
// compiler flag.
|
||||
float YGFloatMax(const float a, const float b);
|
||||
|
||||
YGFloatOptional YGFloatOptionalMax(
|
||||
const YGFloatOptional& op1,
|
||||
const YGFloatOptional& op2);
|
||||
|
||||
// We need custom min function, since we want that, if one argument is
|
||||
// YGUndefined then the min funtion should return the other argument as the min
|
||||
// value. We wouldn't have needed a custom min function if YGUndefined was NAN
|
||||
// as fmin has the same behaviour, but with NAN we cannot use `-ffast-math`
|
||||
// compiler flag.
|
||||
float YGFloatMin(const float a, const float b);
|
||||
|
||||
// This custom float comparision function compares the array of float with
|
||||
|
@ -106,7 +96,9 @@ inline bool YGFlexDirectionIsRow(const YGFlexDirection flexDirection) {
|
|||
flexDirection == YGFlexDirectionRowReverse;
|
||||
}
|
||||
|
||||
inline YGFloatOptional YGResolveValue(const YGValue value, const float ownerSize) {
|
||||
inline YGFloatOptional YGResolveValue(
|
||||
const YGValue value,
|
||||
const float ownerSize) {
|
||||
switch (value.unit) {
|
||||
case YGUnitUndefined:
|
||||
case YGUnitAuto:
|
||||
|
|
|
@ -27,15 +27,7 @@ namespace facebook {
|
|||
namespace yoga {
|
||||
|
||||
inline bool isUndefined(float value) {
|
||||
// Value of a float in the case of it being not defined is 10.1E20. Earlier
|
||||
// it used to be NAN, the benefit of which was that if NAN is involved in any
|
||||
// mathematical expression the result was NAN. But since we want to have
|
||||
// `-ffast-math` flag being used by compiler which assumes that the floating
|
||||
// point values are not NAN and Inf, we represent YGUndefined as 10.1E20. But
|
||||
// now if YGUndefined is involved in any mathematical operations this
|
||||
// value(10.1E20) would change. So the following check makes sure that if the
|
||||
// value is outside a range (-10E8, 10E8) then it is undefined.
|
||||
return value >= 10E8 || value <= -10E8;
|
||||
return std::isnan(value);
|
||||
}
|
||||
|
||||
} // namespace yoga
|
||||
|
|
|
@ -18,10 +18,7 @@
|
|||
/* define fmaxf if < VC12 */
|
||||
#if _MSC_VER < 1800
|
||||
__forceinline const float fmaxf(const float a, const float b) {
|
||||
if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
|
||||
return (a > b) ? a : b;
|
||||
}
|
||||
return YGFloatIsUndefined(a) ? b : a;
|
||||
return (a > b) ? a : b;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -17,14 +17,13 @@
|
|||
#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
/** Large positive number signifies that the property(float) is undefined.
|
||||
*Earlier we used to have YGundefined as NAN, but the downside of this is that
|
||||
*we can't use -ffast-math compiler flag as it assumes all floating-point
|
||||
*calculation involve and result into finite numbers. For more information
|
||||
*regarding -ffast-math compiler flag in clang, have a look at
|
||||
*https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
|
||||
**/
|
||||
#define YGUndefined 10E20F
|
||||
// Not defined in MSVC++
|
||||
#ifndef NAN
|
||||
static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
|
||||
#define NAN (*(const float*)__nan)
|
||||
#endif
|
||||
|
||||
#define YGUndefined NAN
|
||||
|
||||
#include "YGEnums.h"
|
||||
#include "YGMacros.h"
|
||||
|
|
Loading…
Reference in New Issue