Skip to content

Commit 189d471

Browse files
farzonlFarzon Lotfi
farzonl
and
Farzon Lotfi
authored
[clang] Reland Add tanf16 builtin and support for tan constrained intrinsic (#94559)
Relanding this PR now that #90503 has merged. with `FTAN` landing in [TargetLoweringBase.cpp:L1021](https://github.com/llvm/llvm-project/blob/main/llvm/lib/CodeGen/TargetLoweringBase.cpp#L1020C23-L1021C63 ) There is now a llvm tan intrinsic 32\64\128 Expand case for all llvm backends. In LLVM, the `llvm.experimental.constrained.cos` and `llvm.experimental.constrained.sin` intrinsics are used for performing cosine and sine calculations with additional constraints on floating-point operations. This behavior is expected for all floating-point math intrinsics. This change adds these constraints for the `tan` intrinsic. - `Builtins.td` - replace TanF128 with F16F128MathTemplate - `CGBuiltin.cpp` - map existing tan builtins to `tan` and `constrained_tan` intrinsic - `ConstrainedOps.def` map tan and constrained_tan to an ISDOpcode. resolves #91421 --------- Co-authored-by: Farzon Lotfi <farzon@farzon.com>
1 parent 1737814 commit 189d471

26 files changed

Lines changed: 1437 additions & 21 deletions

‎clang/include/clang/Basic/Builtins.td‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,11 +482,11 @@ def SqrtF16F128 : Builtin, F16F128MathTemplate {
482482
let Prototype = "T(T)";
483483
}
484484

485-
def TanF128 : Builtin {
486-
let Spellings = ["__builtin_tanf128"];
485+
def TanF16F128 : Builtin, F16F128MathTemplate {
486+
let Spellings = ["__builtin_tan"];
487487
let Attributes = [FunctionWithBuiltinPrefix, NoThrow,
488488
ConstIgnoringErrnoAndExceptions];
489-
let Prototype = "__float128(__float128)";
489+
let Prototype = "T(T)";
490490
}
491491

492492
def TanhF128 : Builtin {

‎clang/lib/CodeGen/CGBuiltin.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2923,6 +2923,18 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
29232923
SetSqrtFPAccuracy(Call);
29242924
return RValue::get(Call);
29252925
}
2926+
2927+
case Builtin::BItan:
2928+
case Builtin::BItanf:
2929+
case Builtin::BItanl:
2930+
case Builtin::BI__builtin_tan:
2931+
case Builtin::BI__builtin_tanf:
2932+
case Builtin::BI__builtin_tanf16:
2933+
case Builtin::BI__builtin_tanl:
2934+
case Builtin::BI__builtin_tanf128:
2935+
return RValue::get(emitUnaryMaybeConstrainedFPBuiltin(
2936+
*this, E, Intrinsic::tan, Intrinsic::experimental_constrained_tan));
2937+
29262938
case Builtin::BItrunc:
29272939
case Builtin::BItruncf:
29282940
case Builtin::BItruncl:

‎clang/test/CodeGen/X86/math-builtins.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,10 @@ __builtin_sqrt(f); __builtin_sqrtf(f); __builtin_sqrtl(f); __builtin_
674674

675675
__builtin_tan(f); __builtin_tanf(f); __builtin_tanl(f); __builtin_tanf128(f);
676676

677-
// NO__ERRNO: declare double @tan(double noundef) [[READNONE]]
678-
// NO__ERRNO: declare float @tanf(float noundef) [[READNONE]]
679-
// NO__ERRNO: declare x86_fp80 @tanl(x86_fp80 noundef) [[READNONE]]
680-
// NO__ERRNO: declare fp128 @tanf128(fp128 noundef) [[READNONE]]
677+
// NO__ERRNO: declare double @llvm.tan.f64(double) [[READNONE_INTRINSIC]]
678+
// NO__ERRNO: declare float @llvm.tan.f32(float) [[READNONE_INTRINSIC]]
679+
// NO__ERRNO: declare x86_fp80 @llvm.tan.f80(x86_fp80) [[READNONE_INTRINSIC]]
680+
// NO__ERRNO: declare fp128 @llvm.tan.f128(fp128) [[READNONE_INTRINSIC]]
681681
// HAS_ERRNO: declare double @tan(double noundef) [[NOT_READNONE]]
682682
// HAS_ERRNO: declare float @tanf(float noundef) [[NOT_READNONE]]
683683
// HAS_ERRNO: declare x86_fp80 @tanl(x86_fp80 noundef) [[NOT_READNONE]]

‎clang/test/CodeGen/constrained-math-builtins.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,14 @@ void foo(double *d, float f, float *fp, long double *l, int *i, const char *c, _
183183
// CHECK: call x86_fp80 @llvm.experimental.constrained.sqrt.f80(x86_fp80 %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
184184
// CHECK: call fp128 @llvm.experimental.constrained.sqrt.f128(fp128 %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
185185

186+
__builtin_tan(f); __builtin_tanf(f); __builtin_tanl(f); __builtin_tanf128(f);
187+
188+
// CHECK: call double @llvm.experimental.constrained.tan.f64(double %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
189+
// CHECK: call float @llvm.experimental.constrained.tan.f32(float %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
190+
// CHECK: call x86_fp80 @llvm.experimental.constrained.tan.f80(x86_fp80 %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
191+
// CHECK: call fp128 @llvm.experimental.constrained.tan.f128(fp128 %{{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
192+
193+
186194
__builtin_trunc(f); __builtin_truncf(f); __builtin_truncl(f); __builtin_truncf128(f);
187195

188196
// CHECK: call double @llvm.experimental.constrained.trunc.f64(double %{{.*}}, metadata !"fpexcept.strict")
@@ -315,6 +323,11 @@ void foo(double *d, float f, float *fp, long double *l, int *i, const char *c, _
315323
// CHECK: declare x86_fp80 @llvm.experimental.constrained.sqrt.f80(x86_fp80, metadata, metadata)
316324
// CHECK: declare fp128 @llvm.experimental.constrained.sqrt.f128(fp128, metadata, metadata)
317325

326+
// CHECK: declare double @llvm.experimental.constrained.tan.f64(double, metadata, metadata)
327+
// CHECK: declare float @llvm.experimental.constrained.tan.f32(float, metadata, metadata)
328+
// CHECK: declare x86_fp80 @llvm.experimental.constrained.tan.f80(x86_fp80, metadata, metadata)
329+
// CHECK: declare fp128 @llvm.experimental.constrained.tan.f128(fp128, metadata, metadata)
330+
318331
// CHECK: declare double @llvm.experimental.constrained.trunc.f64(double, metadata)
319332
// CHECK: declare float @llvm.experimental.constrained.trunc.f32(float, metadata)
320333
// CHECK: declare x86_fp80 @llvm.experimental.constrained.trunc.f80(x86_fp80, metadata)

‎clang/test/CodeGen/math-libcalls.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -662,15 +662,15 @@ void foo(double *d, float f, float *fp, long double *l, int *i, const char *c) {
662662

663663
tan(f); tanf(f); tanl(f);
664664

665-
// NO__ERRNO: declare double @tan(double noundef) [[READNONE]]
666-
// NO__ERRNO: declare float @tanf(float noundef) [[READNONE]]
667-
// NO__ERRNO: declare x86_fp80 @tanl(x86_fp80 noundef) [[READNONE]]
665+
// NO__ERRNO: declare double @llvm.tan.f64(double) [[READNONE_INTRINSIC]]
666+
// NO__ERRNO: declare float @llvm.tan.f32(float) [[READNONE_INTRINSIC]]
667+
// NO__ERRNO: declare x86_fp80 @llvm.tan.f80(x86_fp80) [[READNONE_INTRINSIC]]
668668
// HAS_ERRNO: declare double @tan(double noundef) [[NOT_READNONE]]
669669
// HAS_ERRNO: declare float @tanf(float noundef) [[NOT_READNONE]]
670670
// HAS_ERRNO: declare x86_fp80 @tanl(x86_fp80 noundef) [[NOT_READNONE]]
671-
// HAS_MAYTRAP: declare double @tan(double noundef) [[NOT_READNONE]]
672-
// HAS_MAYTRAP: declare float @tanf(float noundef) [[NOT_READNONE]]
673-
// HAS_MAYTRAP: declare x86_fp80 @tanl(x86_fp80 noundef) [[NOT_READNONE]]
671+
// HAS_MAYTRAP: declare double @llvm.experimental.constrained.tan.f64(
672+
// HAS_MAYTRAP: declare float @llvm.experimental.constrained.tan.f32(
673+
// HAS_MAYTRAP: declare x86_fp80 @llvm.experimental.constrained.tan.f80(
674674

675675
tanh(f); tanhf(f); tanhl(f);
676676

‎clang/test/CodeGenOpenCL/builtins-f16.cl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ void test_half_builtins(half h0, half h1, half h2, int i0) {
6666
// CHECK: call half @llvm.sqrt.f16(half %h0)
6767
res = __builtin_sqrtf16(h0);
6868

69+
// CHECK: call half @llvm.tan.f16(half %h0)
70+
res = __builtin_tanf16(h0);
71+
6972
// CHECK: call half @llvm.trunc.f16(half %h0)
7073
res = __builtin_truncf16(h0);
7174

‎llvm/docs/LangRef.rst‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26244,6 +26244,42 @@ same values as the libm ``cos`` functions would, and handles error
2624426244
conditions in the same way.
2624526245

2624626246

26247+
'``llvm.experimental.constrained.tan``' Intrinsic
26248+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
26249+
26250+
Syntax:
26251+
"""""""
26252+
26253+
::
26254+
26255+
declare <type>
26256+
@llvm.experimental.constrained.tan(<type> <op1>,
26257+
metadata <rounding mode>,
26258+
metadata <exception behavior>)
26259+
26260+
Overview:
26261+
"""""""""
26262+
26263+
The '``llvm.experimental.constrained.tan``' intrinsic returns the tangent of the
26264+
first operand.
26265+
26266+
Arguments:
26267+
""""""""""
26268+
26269+
The first argument and the return type are floating-point numbers of the same
26270+
type.
26271+
26272+
The second and third arguments specify the rounding mode and exception
26273+
behavior as described above.
26274+
26275+
Semantics:
26276+
""""""""""
26277+
26278+
This function returns the tangent of the specified operand, returning the
26279+
same values as the libm ``tan`` functions would, and handles error
26280+
conditions in the same way.
26281+
26282+
2624726283
'``llvm.experimental.constrained.exp``' Intrinsic
2624826284
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2624926285

‎llvm/include/llvm/IR/ConstrainedOps.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ DAG_FUNCTION(round, 1, 0, experimental_constrained_round, FROUND)
9595
DAG_FUNCTION(roundeven, 1, 0, experimental_constrained_roundeven, FROUNDEVEN)
9696
DAG_FUNCTION(sin, 1, 1, experimental_constrained_sin, FSIN)
9797
DAG_FUNCTION(sqrt, 1, 1, experimental_constrained_sqrt, FSQRT)
98+
DAG_FUNCTION(tan, 1, 1, experimental_constrained_tan, FTAN)
9899
DAG_FUNCTION(trunc, 1, 0, experimental_constrained_trunc, FTRUNC)
99100

100101
// This is definition for fmuladd intrinsic function, that is converted into

‎llvm/include/llvm/IR/Intrinsics.td‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,10 @@ let IntrProperties = [IntrInaccessibleMemOnly, IntrWillReturn, IntrStrictFP] in
12181218
[ LLVMMatchType<0>,
12191219
llvm_metadata_ty,
12201220
llvm_metadata_ty ]>;
1221+
def int_experimental_constrained_tan : DefaultAttrsIntrinsic<[ llvm_anyfloat_ty ],
1222+
[ LLVMMatchType<0>,
1223+
llvm_metadata_ty,
1224+
llvm_metadata_ty ]>;
12211225
def int_experimental_constrained_pow : DefaultAttrsIntrinsic<[ llvm_anyfloat_ty ],
12221226
[ LLVMMatchType<0>,
12231227
LLVMMatchType<0>,

‎llvm/lib/Target/AArch64/AArch64ISelLowering.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -728,14 +728,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM,
728728
setOperationAction(ISD::FCOPYSIGN, MVT::bf16, Promote);
729729
}
730730

731-
for (auto Op : {ISD::FREM, ISD::FPOW, ISD::FPOWI,
732-
ISD::FCOS, ISD::FSIN, ISD::FSINCOS,
733-
ISD::FTAN, ISD::FEXP, ISD::FEXP2,
734-
ISD::FEXP10, ISD::FLOG, ISD::FLOG2,
735-
ISD::FLOG10, ISD::STRICT_FREM, ISD::STRICT_FPOW,
736-
ISD::STRICT_FPOWI, ISD::STRICT_FCOS, ISD::STRICT_FSIN,
737-
ISD::STRICT_FEXP, ISD::STRICT_FEXP2, ISD::STRICT_FLOG,
738-
ISD::STRICT_FLOG2, ISD::STRICT_FLOG10}) {
731+
for (auto Op : {ISD::FREM, ISD::FPOW, ISD::FPOWI,
732+
ISD::FCOS, ISD::FSIN, ISD::FSINCOS,
733+
ISD::FTAN, ISD::FEXP, ISD::FEXP2,
734+
ISD::FEXP10, ISD::FLOG, ISD::FLOG2,
735+
ISD::FLOG10, ISD::STRICT_FREM, ISD::STRICT_FPOW,
736+
ISD::STRICT_FPOWI, ISD::STRICT_FCOS, ISD::STRICT_FSIN,
737+
ISD::STRICT_FEXP, ISD::STRICT_FEXP2, ISD::STRICT_FLOG,
738+
ISD::STRICT_FLOG2, ISD::STRICT_FLOG10, ISD::STRICT_FTAN}) {
739739
setOperationAction(Op, MVT::f16, Promote);
740740
setOperationAction(Op, MVT::v4f16, Expand);
741741
setOperationAction(Op, MVT::v8f16, Expand);

0 commit comments

Comments
 (0)