https://github.com/wzssyqa updated
https://github.com/llvm/llvm-project/pull/96281
>From c08b0a8d34107dc4563c434485ba5f326ab8df93 Mon Sep 17 00:00:00 2001
From: YunQiang Su <s...@gcc.gnu.org>
Date: Fri, 21 Jun 2024 14:28:42 +0800
Subject: [PATCH 1/7] Clang: Support minimumnum and maximumnum intrinsics
We just introduce llvm.minimumnum and llvm.maximumnum intrinsics
support to llvm. Let's support them in Clang.
See: #93033
---
clang/include/clang/Basic/Builtins.td | 28 +++++++++++++++++++
clang/lib/CodeGen/CGBuiltin.cpp | 24 ++++++++++++++++
.../Tooling/Inclusions/Stdlib/CSymbolMap.inc | 6 ++++
.../Inclusions/Stdlib/StdSymbolMap.inc | 18 ++++++++++++
clang/test/CodeGen/builtins.c | 18 ++++++++++++
clang/test/CodeGen/math-libcalls.c | 25 +++++++++++++++++
6 files changed, 119 insertions(+)
diff --git a/clang/include/clang/Basic/Builtins.td
b/clang/include/clang/Basic/Builtins.td
index 7068473a0e12ac..a7e2ee30d9d732 100644
--- a/clang/include/clang/Basic/Builtins.td
+++ b/clang/include/clang/Basic/Builtins.td
@@ -215,6 +215,18 @@ def FminF16F128 : Builtin, F16F128MathTemplate {
let Prototype = "T(T, T)";
}
+def FmaximumNumF16F128 : Builtin, F16F128MathTemplate {
+ let Spellings = ["__builtin_fmaximum_num"];
+ let Attributes = [FunctionWithBuiltinPrefix, NoThrow, Const, Constexpr];
+ let Prototype = "T(T, T)";
+}
+
+def FminimumNumF16F128 : Builtin, F16F128MathTemplate {
+ let Spellings = ["__builtin_fminimum_num"];
+ let Attributes = [FunctionWithBuiltinPrefix, NoThrow, Const, Constexpr];
+ let Prototype = "T(T, T)";
+}
+
def Atan2F128 : Builtin {
let Spellings = ["__builtin_atan2f128"];
let Attributes = [FunctionWithBuiltinPrefix, NoThrow,
ConstIgnoringErrnoAndExceptions];
@@ -3728,6 +3740,22 @@ def Fmin : FPMathTemplate, LibBuiltin<"math.h"> {
let OnlyBuiltinPrefixedAliasIsConstexpr = 1;
}
+def FmaximumNum : FPMathTemplate, LibBuiltin<"math.h"> {
+ let Spellings = ["fmaximum_num"];
+ let Attributes = [NoThrow, Const];
+ let Prototype = "T(T, T)";
+ let AddBuiltinPrefixedAlias = 1;
+ let OnlyBuiltinPrefixedAliasIsConstexpr = 1;
+}
+
+def FminimumNum : FPMathTemplate, LibBuiltin<"math.h"> {
+ let Spellings = ["fminimum_num"];
+ let Attributes = [NoThrow, Const];
+ let Prototype = "T(T, T)";
+ let AddBuiltinPrefixedAlias = 1;
+ let OnlyBuiltinPrefixedAliasIsConstexpr = 1;
+}
+
def Hypot : FPMathTemplate, LibBuiltin<"math.h"> {
let Spellings = ["hypot"];
let Attributes = [NoThrow, ConstIgnoringErrnoAndExceptions];
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index ff678ee04f9c2a..955d6dd2dd1d5e 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -2869,6 +2869,30 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl
GD, unsigned BuiltinID,
Intrinsic::minnum,
Intrinsic::experimental_constrained_minnum));
+ case Builtin::BIfmaximum_num:
+ case Builtin::BIfmaximum_numf:
+ case Builtin::BIfmaximum_numl:
+ case Builtin::BI__builtin_fmaximum_num:
+ case Builtin::BI__builtin_fmaximum_numf:
+ case Builtin::BI__builtin_fmaximum_numf16:
+ case Builtin::BI__builtin_fmaximum_numl:
+ case Builtin::BI__builtin_fmaximum_numf128:
+ return RValue::get(emitBinaryMaybeConstrainedFPBuiltin(
+ *this, E, Intrinsic::maximumnum,
+ Intrinsic::experimental_constrained_maximumnum));
+
+ case Builtin::BIfminimum_num:
+ case Builtin::BIfminimum_numf:
+ case Builtin::BIfminimum_numl:
+ case Builtin::BI__builtin_fminimum_num:
+ case Builtin::BI__builtin_fminimum_numf:
+ case Builtin::BI__builtin_fminimum_numf16:
+ case Builtin::BI__builtin_fminimum_numl:
+ case Builtin::BI__builtin_fminimum_numf128:
+ return RValue::get(emitBinaryMaybeConstrainedFPBuiltin(
+ *this, E, Intrinsic::minimumnum,
+ Intrinsic::experimental_constrained_minimumnum));
+
// fmod() is a special-case. It maps to the frem instruction rather than an
// LLVM intrinsic.
case Builtin::BIfmod:
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
b/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
index 463ce921f0672f..af2dcb632fbb64 100644
--- a/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
+++ b/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
@@ -475,6 +475,12 @@ SYMBOL(fmaxl, None, <math.h>)
SYMBOL(fmin, None, <math.h>)
SYMBOL(fminf, None, <math.h>)
SYMBOL(fminl, None, <math.h>)
+SYMBOL(fmaximum_num, None, <math.h>)
+SYMBOL(fmaximum_numf, None, <math.h>)
+SYMBOL(fmaximum_numfl, None, <math.h>)
+SYMBOL(fminimum_num, None, <math.h>)
+SYMBOL(fminimum_numf, None, <math.h>)
+SYMBOL(fminimum_numl, None, <math.h>)
SYMBOL(fmod, None, <math.h>)
SYMBOL(fmodf, None, <math.h>)
SYMBOL(fmodl, None, <math.h>)
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
b/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
index b46bd2e4d7a4b5..442316ce8d4ff6 100644
--- a/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
+++ b/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
@@ -1295,6 +1295,24 @@ SYMBOL(fminf, None, <math.h>)
SYMBOL(fminl, std::, <cmath>)
SYMBOL(fminl, None, <cmath>)
SYMBOL(fminl, None, <math.h>)
+SYMBOL(fmaximum_num, std::, <cmath>)
+SYMBOL(fmaximum_num, None, <cmath>)
+SYMBOL(fmaximum_num, None, <math.h>)
+SYMBOL(fmaximum_numf, std::, <cmath>)
+SYMBOL(fmaximum_numf, None, <cmath>)
+SYMBOL(fmaximum_numf, None, <math.h>)
+SYMBOL(fmaximum_numl, std::, <cmath>)
+SYMBOL(fmaximum_numl, None, <cmath>)
+SYMBOL(fmaximum_numl, None, <math.h>)
+SYMBOL(fminimum_num, std::, <cmath>)
+SYMBOL(fminimum_num, None, <cmath>)
+SYMBOL(fminimum_num, None, <math.h>)
+SYMBOL(fminimum_numf, std::, <cmath>)
+SYMBOL(fminimum_numf, None, <cmath>)
+SYMBOL(fminimum_numf, None, <math.h>)
+SYMBOL(fminimum_numl, std::, <cmath>)
+SYMBOL(fminimum_numl, None, <cmath>)
+SYMBOL(fminimum_numl, None, <math.h>)
SYMBOL(fmod, std::, <cmath>)
SYMBOL(fmod, None, <cmath>)
SYMBOL(fmod, None, <math.h>)
diff --git a/clang/test/CodeGen/builtins.c b/clang/test/CodeGen/builtins.c
index 6383a3c65e3750..2ac2cf44c4c771 100644
--- a/clang/test/CodeGen/builtins.c
+++ b/clang/test/CodeGen/builtins.c
@@ -353,6 +353,24 @@ void test_float_builtin_ops(float F, double D, long double
LD) {
resld = __builtin_fmaxl(LD, LD);
// CHECK: call x86_fp80 @llvm.maxnum.f80
+ resf = __builtin_fminimum_numf(F, F);
+ // CHECK: call float @llvm.minimumnum.f32
+
+ resd = __builtin_fminimum_num(D, D);
+ // CHECK: call double @llvm.minimumnum.f64
+
+ resld = __builtin_fminimum_numl(LD, LD);
+ // CHECK: call x86_fp80 @llvm.minimumnum.f80
+
+ resf = __builtin_fmaximum_numf(F, F);
+ // CHECK: call float @llvm.maximumnum.f32
+
+ resd = __builtin_fmaximum_num(D, D);
+ // CHECK: call double @llvm.maximumnum.f64
+
+ resld = __builtin_fmaximum_numl(LD, LD);
+ // CHECK: call x86_fp80 @llvm.maximumnum.f80
+
resf = __builtin_fabsf(F);
// CHECK: call float @llvm.fabs.f32
diff --git a/clang/test/CodeGen/math-libcalls.c
b/clang/test/CodeGen/math-libcalls.c
index 5b23a4a3faef36..9ba17baa3cd39a 100644
--- a/clang/test/CodeGen/math-libcalls.c
+++ b/clang/test/CodeGen/math-libcalls.c
@@ -372,6 +372,31 @@ void foo(double *d, float f, float *fp, long double *l,
int *i, const char *c) {
// HAS_MAYTRAP: declare float @llvm.experimental.constrained.minnum.f32(
// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.minnum.f80(
+ fmaximum_num(f,f); fmaximum_numf(f,f); fmaximum_numl(f,f);
+
+// NO__ERRNO: declare double @llvm.maximumnum.f64(double, double)
[[READNONE_INTRINSIC]]
+// NO__ERRNO: declare float @llvm.maximumnum.f32(float, float)
[[READNONE_INTRINSIC]]
+// NO__ERRNO: declare x86_fp80 @llvm.maximumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare double @llvm.maximumnum.f64(double, double)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare float @llvm.maximumnum.f32(float, float)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare x86_fp80 @llvm.maximumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
+// HAS_MAYTRAP: declare double @llvm.experimental.constrained.maximumnum.f64(
+// HAS_MAYTRAP: declare float @llvm.experimental.constrained.maximumnum.f32(
+// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.maximumnum.f80(
+
+ fminimum_num(f,f); fminimum_numf(f,f); fminimum_numl(f,f);
+
+// NO__ERRNO: declare double @llvm.minimumnum.f64(double, double)
[[READNONE_INTRINSIC]]
+// NO__ERRNO: declare float @llvm.minimumnum.f32(float, float)
[[READNONE_INTRINSIC]]
+// NO__ERRNO: declare x86_fp80 @llvm.minimumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare double @llvm.minimumnum.f64(double, double)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare float @llvm.minimumnum.f32(float, float)
[[READNONE_INTRINSIC]]
+// HAS_ERRNO: declare x86_fp80 @llvm.minimumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
+// HAS_MAYTRAP: declare double @llvm.experimental.constrained.minimumnum.f64(
+// HAS_MAYTRAP: declare float @llvm.experimental.constrained.minimumnum.f32(
+// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.minimumnum.f80(
+
+
hypot(f,f); hypotf(f,f); hypotl(f,f);
// NO__ERRNO: declare double @hypot(double noundef, double noundef)
[[READNONE]]
>From 8e43dd142a9b3f409a4b6e808694d6fc09d63e0e Mon Sep 17 00:00:00 2001
From: YunQiang Su <s...@gcc.gnu.org>
Date: Wed, 26 Jun 2024 13:33:26 +0800
Subject: [PATCH 2/7] Add ExprConstant support
---
clang/lib/AST/ExprConstant.cpp | 27 +++++++++++++++++++++++
clang/test/Preprocessor/feature_tests.cpp | 4 +++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 4d5af96093cfeb..ec5ebdf0818f2f 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -15314,6 +15314,33 @@ bool FloatExprEvaluator::VisitCallExpr(const CallExpr
*E) {
Result = RHS;
return true;
}
+
+ case Builtin::BI__builtin_fmaximum_num:
+ case Builtin::BI__builtin_fmaximum_numf:
+ case Builtin::BI__builtin_fmaximum_numl:
+ case Builtin::BI__builtin_fmaximum_numf16:
+ case Builtin::BI__builtin_fmaximum_numf128: {
+ APFloat RHS(0.);
+ if (!EvaluateFloat(E->getArg(0), Result, Info) ||
+ !EvaluateFloat(E->getArg(1), RHS, Info))
+ return false;
+ Result = maximumnum(Result, RHS);
+ return true;
+ }
+
+ case Builtin::BI__builtin_fminimum_num:
+ case Builtin::BI__builtin_fminimum_numf:
+ case Builtin::BI__builtin_fminimum_numl:
+ case Builtin::BI__builtin_fminimum_numf16:
+ case Builtin::BI__builtin_fminimum_numf128: {
+ APFloat RHS(0.);
+ if (!EvaluateFloat(E->getArg(0), Result, Info) ||
+ !EvaluateFloat(E->getArg(1), RHS, Info))
+ return false;
+ Result = minimumnum(Result, RHS);
+ return true;
+ }
+
}
}
diff --git a/clang/test/Preprocessor/feature_tests.cpp
b/clang/test/Preprocessor/feature_tests.cpp
index 13e2a9a261b667..a6079817734133 100644
--- a/clang/test/Preprocessor/feature_tests.cpp
+++ b/clang/test/Preprocessor/feature_tests.cpp
@@ -58,7 +58,9 @@
// Check __has_constexpr_builtin
#if !__has_constexpr_builtin(__builtin_fmax) || \
- !__has_constexpr_builtin(__builtin_fmin)
+ !__has_constexpr_builtin(__builtin_fmin) || \
+ !__has_constexpr_builtin(__builtin_fmaximum_num) || \
+ !__has_constexpr_builtin(__builtin_fmaximum_num)
#error Clang should have these constexpr builtins
#endif
>From 4dc133f4257c11b2dbbbf7ce25777e92f7400107 Mon Sep 17 00:00:00 2001
From: YunQiang Su <yunqi...@isrc.iscas.ac.cn>
Date: Fri, 11 Oct 2024 14:04:49 +0800
Subject: [PATCH 3/7] remove experimental_constrained_minimumnum
---
clang/lib/CodeGen/CGBuiltin.cpp | 10 ++++------
clang/test/CodeGen/math-libcalls.c | 12 ++++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 955d6dd2dd1d5e..b9eba5dc7775b6 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -2877,9 +2877,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl
GD, unsigned BuiltinID,
case Builtin::BI__builtin_fmaximum_numf16:
case Builtin::BI__builtin_fmaximum_numl:
case Builtin::BI__builtin_fmaximum_numf128:
- return RValue::get(emitBinaryMaybeConstrainedFPBuiltin(
- *this, E, Intrinsic::maximumnum,
- Intrinsic::experimental_constrained_maximumnum));
+ return RValue::get(
+ emitBuiltinWithOneOverloadedType<2>(*this, E,
Intrinsic::maximumnum));
case Builtin::BIfminimum_num:
case Builtin::BIfminimum_numf:
@@ -2889,9 +2888,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl
GD, unsigned BuiltinID,
case Builtin::BI__builtin_fminimum_numf16:
case Builtin::BI__builtin_fminimum_numl:
case Builtin::BI__builtin_fminimum_numf128:
- return RValue::get(emitBinaryMaybeConstrainedFPBuiltin(
- *this, E, Intrinsic::minimumnum,
- Intrinsic::experimental_constrained_minimumnum));
+ return RValue::get(
+ emitBuiltinWithOneOverloadedType<2>(*this, E,
Intrinsic::minimumnum));
// fmod() is a special-case. It maps to the frem instruction rather than an
// LLVM intrinsic.
diff --git a/clang/test/CodeGen/math-libcalls.c
b/clang/test/CodeGen/math-libcalls.c
index 9ba17baa3cd39a..265619071c16e1 100644
--- a/clang/test/CodeGen/math-libcalls.c
+++ b/clang/test/CodeGen/math-libcalls.c
@@ -380,9 +380,9 @@ void foo(double *d, float f, float *fp, long double *l, int
*i, const char *c) {
// HAS_ERRNO: declare double @llvm.maximumnum.f64(double, double)
[[READNONE_INTRINSIC]]
// HAS_ERRNO: declare float @llvm.maximumnum.f32(float, float)
[[READNONE_INTRINSIC]]
// HAS_ERRNO: declare x86_fp80 @llvm.maximumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
-// HAS_MAYTRAP: declare double @llvm.experimental.constrained.maximumnum.f64(
-// HAS_MAYTRAP: declare float @llvm.experimental.constrained.maximumnum.f32(
-// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.maximumnum.f80(
+// HAS_MAYTRAP: declare double @llvm.maximumnum.f64(
+// HAS_MAYTRAP: declare float @llvm.maximumnum.f32(
+// HAS_MAYTRAP: declare x86_fp80 @llvm.maximumnum.f80(
fminimum_num(f,f); fminimum_numf(f,f); fminimum_numl(f,f);
@@ -392,9 +392,9 @@ void foo(double *d, float f, float *fp, long double *l, int
*i, const char *c) {
// HAS_ERRNO: declare double @llvm.minimumnum.f64(double, double)
[[READNONE_INTRINSIC]]
// HAS_ERRNO: declare float @llvm.minimumnum.f32(float, float)
[[READNONE_INTRINSIC]]
// HAS_ERRNO: declare x86_fp80 @llvm.minimumnum.f80(x86_fp80, x86_fp80)
[[READNONE_INTRINSIC]]
-// HAS_MAYTRAP: declare double @llvm.experimental.constrained.minimumnum.f64(
-// HAS_MAYTRAP: declare float @llvm.experimental.constrained.minimumnum.f32(
-// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.minimumnum.f80(
+// HAS_MAYTRAP: declare double @llvm.minimumnum.f64(
+// HAS_MAYTRAP: declare float @llvm.minimumnum.f32(
+// HAS_MAYTRAP: declare x86_fp80 @llvm.minimumnum.f80(
hypot(f,f); hypotf(f,f); hypotl(f,f);
>From d86a27007600f4f880956f7eb9361b28a4723cd0 Mon Sep 17 00:00:00 2001
From: YunQiang Su <yunqi...@isrc.iscas.ac.cn>
Date: Fri, 11 Oct 2024 14:10:31 +0800
Subject: [PATCH 4/7] fix code style
---
clang/lib/AST/ExprConstant.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index ec5ebdf0818f2f..9e303d33650f23 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -15340,7 +15340,6 @@ bool FloatExprEvaluator::VisitCallExpr(const CallExpr
*E) {
Result = minimumnum(Result, RHS);
return true;
}
-
}
}
>From c41366539c544ec107e1b5e92b54abcc9a364cc6 Mon Sep 17 00:00:00 2001
From: YunQiang Su <yunqi...@isrc.iscas.ac.cn>
Date: Fri, 11 Oct 2024 20:35:11 +0800
Subject: [PATCH 5/7] remove from StdSymbolMap.inc
---
.../Tooling/Inclusions/Stdlib/CSymbolMap.inc | 6 ------
.../Tooling/Inclusions/Stdlib/StdSymbolMap.inc | 18 ------------------
clang/test/CodeGen/math-libcalls.c | 4 ++--
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
b/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
index af2dcb632fbb64..463ce921f0672f 100644
--- a/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
+++ b/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
@@ -475,12 +475,6 @@ SYMBOL(fmaxl, None, <math.h>)
SYMBOL(fmin, None, <math.h>)
SYMBOL(fminf, None, <math.h>)
SYMBOL(fminl, None, <math.h>)
-SYMBOL(fmaximum_num, None, <math.h>)
-SYMBOL(fmaximum_numf, None, <math.h>)
-SYMBOL(fmaximum_numfl, None, <math.h>)
-SYMBOL(fminimum_num, None, <math.h>)
-SYMBOL(fminimum_numf, None, <math.h>)
-SYMBOL(fminimum_numl, None, <math.h>)
SYMBOL(fmod, None, <math.h>)
SYMBOL(fmodf, None, <math.h>)
SYMBOL(fmodl, None, <math.h>)
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
b/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
index 442316ce8d4ff6..b46bd2e4d7a4b5 100644
--- a/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
+++ b/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
@@ -1295,24 +1295,6 @@ SYMBOL(fminf, None, <math.h>)
SYMBOL(fminl, std::, <cmath>)
SYMBOL(fminl, None, <cmath>)
SYMBOL(fminl, None, <math.h>)
-SYMBOL(fmaximum_num, std::, <cmath>)
-SYMBOL(fmaximum_num, None, <cmath>)
-SYMBOL(fmaximum_num, None, <math.h>)
-SYMBOL(fmaximum_numf, std::, <cmath>)
-SYMBOL(fmaximum_numf, None, <cmath>)
-SYMBOL(fmaximum_numf, None, <math.h>)
-SYMBOL(fmaximum_numl, std::, <cmath>)
-SYMBOL(fmaximum_numl, None, <cmath>)
-SYMBOL(fmaximum_numl, None, <math.h>)
-SYMBOL(fminimum_num, std::, <cmath>)
-SYMBOL(fminimum_num, None, <cmath>)
-SYMBOL(fminimum_num, None, <math.h>)
-SYMBOL(fminimum_numf, std::, <cmath>)
-SYMBOL(fminimum_numf, None, <cmath>)
-SYMBOL(fminimum_numf, None, <math.h>)
-SYMBOL(fminimum_numl, std::, <cmath>)
-SYMBOL(fminimum_numl, None, <cmath>)
-SYMBOL(fminimum_numl, None, <math.h>)
SYMBOL(fmod, std::, <cmath>)
SYMBOL(fmod, None, <cmath>)
SYMBOL(fmod, None, <math.h>)
diff --git a/clang/test/CodeGen/math-libcalls.c
b/clang/test/CodeGen/math-libcalls.c
index 265619071c16e1..4217d615be7628 100644
--- a/clang/test/CodeGen/math-libcalls.c
+++ b/clang/test/CodeGen/math-libcalls.c
@@ -372,7 +372,7 @@ void foo(double *d, float f, float *fp, long double *l, int
*i, const char *c) {
// HAS_MAYTRAP: declare float @llvm.experimental.constrained.minnum.f32(
// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.minnum.f80(
- fmaximum_num(f,f); fmaximum_numf(f,f); fmaximum_numl(f,f);
+ fmaximum_num(*d,*d); fmaximum_numf(f,f); fmaximum_numl(*l,*l);
// NO__ERRNO: declare double @llvm.maximumnum.f64(double, double)
[[READNONE_INTRINSIC]]
// NO__ERRNO: declare float @llvm.maximumnum.f32(float, float)
[[READNONE_INTRINSIC]]
@@ -384,7 +384,7 @@ void foo(double *d, float f, float *fp, long double *l, int
*i, const char *c) {
// HAS_MAYTRAP: declare float @llvm.maximumnum.f32(
// HAS_MAYTRAP: declare x86_fp80 @llvm.maximumnum.f80(
- fminimum_num(f,f); fminimum_numf(f,f); fminimum_numl(f,f);
+ fminimum_num(*d,*d); fminimum_numf(f,f); fminimum_numl(*l,*l);
// NO__ERRNO: declare double @llvm.minimumnum.f64(double, double)
[[READNONE_INTRINSIC]]
// NO__ERRNO: declare float @llvm.minimumnum.f32(float, float)
[[READNONE_INTRINSIC]]
>From 874c5b5f8991c09e1bfff5ea7863665335dc161e Mon Sep 17 00:00:00 2001
From: YunQiang Su <yunqi...@isrc.iscas.ac.cn>
Date: Fri, 11 Oct 2024 21:34:57 +0800
Subject: [PATCH 6/7] add constexpr evaluation and passes a int
---
clang/test/CodeGen/builtins.c | 51 +++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 5 deletions(-)
diff --git a/clang/test/CodeGen/builtins.c b/clang/test/CodeGen/builtins.c
index 2ac2cf44c4c771..eda6c67fdad00c 100644
--- a/clang/test/CodeGen/builtins.c
+++ b/clang/test/CodeGen/builtins.c
@@ -69,6 +69,13 @@ int main(void) {
P(issignaling, (1.));
P(isfpclass, (1., 1));
+ Q(fmaximum_num, (1.0, 2.0));
+ Q(fmaximum_numf, (1.0, 2.0));
+ Q(fmaximum_numl, (1.0, 2.0));
+ Q(fminimum_num, (1.0, 2.0));
+ Q(fminimum_numf, (1.0, 2.0));
+ Q(fminimum_numl, (1.0, 2.0));
+
// Bitwise & Numeric Functions
P(abs, (N));
@@ -305,7 +312,7 @@ void test_float_builtins(__fp16 *H, float F, double D, long
double LD) {
}
// CHECK-LABEL: define{{.*}} void @test_float_builtin_ops
-void test_float_builtin_ops(float F, double D, long double LD) {
+void test_float_builtin_ops(float F, double D, long double LD, int I) {
volatile float resf;
volatile double resd;
volatile long double resld;
@@ -356,20 +363,54 @@ void test_float_builtin_ops(float F, double D, long
double LD) {
resf = __builtin_fminimum_numf(F, F);
// CHECK: call float @llvm.minimumnum.f32
+ resf = __builtin_fminimum_numf(I, I);
+ // CHECK: sitofp i32 {{%[0-9]+}} to float
+ // CHECK: sitofp i32 {{%[0-9]+}} to float
+ // CHECK: call float @llvm.minimumnum.f32
+
+ resf = __builtin_fminimum_numf(1.0, 2.0);
+ // CHECK: store volatile float 1.000000e+00, ptr %resf
+
resd = __builtin_fminimum_num(D, D);
// CHECK: call double @llvm.minimumnum.f64
- resld = __builtin_fminimum_numl(LD, LD);
- // CHECK: call x86_fp80 @llvm.minimumnum.f80
+ resd = __builtin_fminimum_num(I, I);
+ // CHECK: sitofp i32 {{%[0-9]+}} to double
+ // CHECK: sitofp i32 {{%[0-9]+}} to double
+ // CHECK: call double @llvm.minimumnum.f64
+
+ resd = __builtin_fminimum_num(1.0, 2.0);
+ // CHECK: store volatile double 1.000000e+00, ptr %resd
+
+ //FIXME: __builtin_fminimum_numl is not supported well yet.
+ resld = __builtin_fminimum_numl(1.0, 2.0);
+ // CHECK: store volatile x86_fp80 0xK3FFF8000000000000000, ptr %resld, align
16
resf = __builtin_fmaximum_numf(F, F);
// CHECK: call float @llvm.maximumnum.f32
+ resf = __builtin_fmaximum_numf(I, I);
+ // CHECK: sitofp i32 {{%[0-9]+}} to float
+ // CHECK: sitofp i32 {{%[0-9]+}} to float
+ // CHECK: call float @llvm.maximumnum.f32
+
+ resf = __builtin_fmaximum_numf(1.0, 2.0);
+ // CHECK: store volatile float 2.000000e+00, ptr %resf
+
resd = __builtin_fmaximum_num(D, D);
// CHECK: call double @llvm.maximumnum.f64
- resld = __builtin_fmaximum_numl(LD, LD);
- // CHECK: call x86_fp80 @llvm.maximumnum.f80
+ resd = __builtin_fmaximum_num(I, I);
+ // CHECK: sitofp i32 {{%[0-9]+}} to double
+ // CHECK: sitofp i32 {{%[0-9]+}} to double
+ // CHECK: call double @llvm.maximumnum.f64
+
+ resd = __builtin_fmaximum_num(1.0, 2.0);
+ // CHECK: store volatile double 2.000000e+00, ptr %resd
+
+ //FIXME: __builtin_fmaximum_numl is not supported well yet.
+ resld = __builtin_fmaximum_numl(1.0, 2.0);
+ // CHECK: store volatile x86_fp80 0xK40008000000000000000, ptr %resld, align
16
resf = __builtin_fabsf(F);
// CHECK: call float @llvm.fabs.f32
>From 361d8d383ddb4048d3272a612c362f0287de8d8e Mon Sep 17 00:00:00 2001
From: YunQiang Su <yunqi...@isrc.iscas.ac.cn>
Date: Fri, 11 Oct 2024 21:39:18 +0800
Subject: [PATCH 7/7] fix typo in clang/test/Preprocessor/feature_tests.cpp
---
clang/test/Preprocessor/feature_tests.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/Preprocessor/feature_tests.cpp
b/clang/test/Preprocessor/feature_tests.cpp
index a6079817734133..3bda3db70ed0da 100644
--- a/clang/test/Preprocessor/feature_tests.cpp
+++ b/clang/test/Preprocessor/feature_tests.cpp
@@ -60,7 +60,7 @@
#if !__has_constexpr_builtin(__builtin_fmax) || \
!__has_constexpr_builtin(__builtin_fmin) || \
!__has_constexpr_builtin(__builtin_fmaximum_num) || \
- !__has_constexpr_builtin(__builtin_fmaximum_num)
+ !__has_constexpr_builtin(__builtin_fminimum_num)
#error Clang should have these constexpr builtins
#endif
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
