[llvm] 57f334d - [Support] Remove Log2 workaround for Android API level < 18
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 11 10:39:46 PDT 2022
Author: Fangrui Song
Date: 2022-08-11T17:39:41Z
New Revision: 57f334d81764ff0f46e5f8b29799e369b68a7918
URL: https://github.com/llvm/llvm-project/commit/57f334d81764ff0f46e5f8b29799e369b68a7918
DIFF: https://github.com/llvm/llvm-project/commit/57f334d81764ff0f46e5f8b29799e369b68a7918.diff
LOG: [Support] Remove Log2 workaround for Android API level < 18
The function added by D9467 is unneeded.
https://github.com/android/ndk/wiki/Changelog-r24 shows that the NDK has
moved forward to at least a minimum target API of 19.
Reviewed By: srhines
Differential Revision: https://reviews.llvm.org/D131656
Added:
Modified:
llvm/include/llvm/Support/MathExtras.h
llvm/lib/Analysis/ConstantFolding.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
index 94ecae9fc995..a396e6999787 100644
--- a/llvm/include/llvm/Support/MathExtras.h
+++ b/llvm/include/llvm/Support/MathExtras.h
@@ -22,10 +22,6 @@
#include <limits>
#include <type_traits>
-#ifdef __ANDROID_NDK__
-#include <android/api-level.h>
-#endif
-
#ifdef _MSC_VER
// Declare these intrinsics manually rather including intrin.h. It's very
// expensive, and MathExtras.h is popular.
@@ -608,15 +604,6 @@ template <size_t kValue> constexpr inline size_t CTLog2() {
template <> constexpr inline size_t CTLog2<1>() { return 0; }
-/// Return the log base 2 of the specified value.
-inline double Log2(double Value) {
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
- return __builtin_log(Value) / __builtin_log(2.0);
-#else
- return log2(Value);
-#endif
-}
-
/// Return the floor log base 2 of the specified value, -1 if the value is zero.
/// (32 bit edition.)
/// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2
diff --git a/llvm/lib/Analysis/ConstantFolding.cpp b/llvm/lib/Analysis/ConstantFolding.cpp
index 46c29870407d..5194d85ee1e4 100644
--- a/llvm/lib/Analysis/ConstantFolding.cpp
+++ b/llvm/lib/Analysis/ConstantFolding.cpp
@@ -2150,7 +2150,7 @@ static Constant *ConstantFoldScalarCall1(StringRef Name,
return ConstantFoldFP(log, APF, Ty);
case Intrinsic::log2:
// TODO: What about hosts that lack a C99 library?
- return ConstantFoldFP(Log2, APF, Ty);
+ return ConstantFoldFP(log2, APF, Ty);
case Intrinsic::log10:
// TODO: What about hosts that lack a C99 library?
return ConstantFoldFP(log10, APF, Ty);
@@ -2279,7 +2279,7 @@ static Constant *ConstantFoldScalarCall1(StringRef Name,
case LibFunc_log2f_finite:
if (!APF.isNegative() && !APF.isZero() && TLI->has(Func))
// TODO: What about hosts that lack a C99 library?
- return ConstantFoldFP(Log2, APF, Ty);
+ return ConstantFoldFP(log2, APF, Ty);
break;
case LibFunc_log10:
case LibFunc_log10f:
More information about the llvm-commits
mailing list