Skip to content

Commit 36192fd

Browse files
vzakharivzakhari
authored
Revert "[flang][runtime] Use cuda::std::complex in F18 runtime CUDA build." (#109173)
Reverts #109078
1 parent 3793264 commit 36192fd

23 files changed

+381
-480
lines changed

‎flang/include/flang/Common/float80.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎flang/include/flang/Runtime/complex.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎flang/include/flang/Runtime/cpp-type.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
#include "flang/Common/Fortran.h"
1515
#include "flang/Common/float128.h"
16-
#include "flang/Common/float80.h"
1716
#include "flang/Common/uint128.h"
18-
#include "flang/Runtime/complex.h"
17+
#include <complex>
1918
#include <cstdint>
2019
#if __cplusplus >= 202302
2120
#include <stdfloat>
@@ -71,9 +70,9 @@ template <> struct CppTypeForHelper<TypeCategory::Real, 8> {
7170
using type = double;
7271
#endif
7372
};
74-
#if HAS_FLOAT80
73+
#if LDBL_MANT_DIG == 64
7574
template <> struct CppTypeForHelper<TypeCategory::Real, 10> {
76-
using type = CppFloat80Type;
75+
using type = long double;
7776
};
7877
#endif
7978
#if __STDCPP_FLOAT128_T__
@@ -90,7 +89,7 @@ template <> struct CppTypeForHelper<TypeCategory::Real, 16> {
9089
#endif
9190

9291
template <int KIND> struct CppTypeForHelper<TypeCategory::Complex, KIND> {
93-
using type = rtcmplx::complex<CppTypeFor<TypeCategory::Real, KIND>>;
92+
using type = std::complex<CppTypeFor<TypeCategory::Real, KIND>>;
9493
};
9594

9695
template <> struct CppTypeForHelper<TypeCategory::Character, 1> {

‎flang/include/flang/Runtime/matmul-instances.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ FOREACH_MATMUL_TYPE_PAIR(MATMUL_DIRECT_INSTANCE)
111111
FOREACH_MATMUL_TYPE_PAIR_WITH_INT16(MATMUL_INSTANCE)
112112
FOREACH_MATMUL_TYPE_PAIR_WITH_INT16(MATMUL_DIRECT_INSTANCE)
113113

114-
#if MATMUL_FORCE_ALL_TYPES || HAS_FLOAT80
114+
#if MATMUL_FORCE_ALL_TYPES || LDBL_MANT_DIG == 64
115115
MATMUL_INSTANCE(Integer, 16, Real, 10)
116116
MATMUL_INSTANCE(Integer, 16, Complex, 10)
117117
MATMUL_INSTANCE(Real, 10, Integer, 16)
@@ -133,7 +133,7 @@ MATMUL_DIRECT_INSTANCE(Complex, 16, Integer, 16)
133133
#endif
134134
#endif // MATMUL_FORCE_ALL_TYPES || (defined __SIZEOF_INT128__ && !AVOID_NATIVE_UINT128_T)
135135

136-
#if MATMUL_FORCE_ALL_TYPES || HAS_FLOAT80
136+
#if MATMUL_FORCE_ALL_TYPES || LDBL_MANT_DIG == 64
137137
#define FOREACH_MATMUL_TYPE_PAIR_WITH_REAL10(macro) \
138138
macro(Integer, 1, Real, 10) \
139139
macro(Integer, 1, Complex, 10) \
@@ -193,7 +193,7 @@ MATMUL_DIRECT_INSTANCE(Complex, 10, Complex, 16)
193193
MATMUL_DIRECT_INSTANCE(Complex, 16, Real, 10)
194194
MATMUL_DIRECT_INSTANCE(Complex, 16, Complex, 10)
195195
#endif
196-
#endif // MATMUL_FORCE_ALL_TYPES || HAS_FLOAT80
196+
#endif // MATMUL_FORCE_ALL_TYPES || LDBL_MANT_DIG == 64
197197

198198
#if MATMUL_FORCE_ALL_TYPES || (LDBL_MANT_DIG == 113 || HAS_FLOAT128)
199199
#define FOREACH_MATMUL_TYPE_PAIR_WITH_REAL16(macro) \

‎flang/include/flang/Runtime/numeric.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CppTypeFor<TypeCategory::Integer, 8> RTDECL(Ceiling8_8)(
4444
CppTypeFor<TypeCategory::Integer, 16> RTDECL(Ceiling8_16)(
4545
CppTypeFor<TypeCategory::Real, 8>);
4646
#endif
47-
#if HAS_FLOAT80
47+
#if LDBL_MANT_DIG == 64
4848
CppTypeFor<TypeCategory::Integer, 1> RTDECL(Ceiling10_1)(
4949
CppTypeFor<TypeCategory::Real, 10>);
5050
CppTypeFor<TypeCategory::Integer, 2> RTDECL(Ceiling10_2)(
@@ -78,7 +78,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(ErfcScaled4)(
7878
CppTypeFor<TypeCategory::Real, 4>);
7979
CppTypeFor<TypeCategory::Real, 8> RTDECL(ErfcScaled8)(
8080
CppTypeFor<TypeCategory::Real, 8>);
81-
#if HAS_FLOAT80
81+
#if LDBL_MANT_DIG == 64
8282
CppTypeFor<TypeCategory::Real, 10> RTDECL(ErfcScaled10)(
8383
CppTypeFor<TypeCategory::Real, 10>);
8484
#endif
@@ -96,7 +96,7 @@ CppTypeFor<TypeCategory::Integer, 4> RTDECL(Exponent8_4)(
9696
CppTypeFor<TypeCategory::Real, 8>);
9797
CppTypeFor<TypeCategory::Integer, 8> RTDECL(Exponent8_8)(
9898
CppTypeFor<TypeCategory::Real, 8>);
99-
#if HAS_FLOAT80
99+
#if LDBL_MANT_DIG == 64
100100
CppTypeFor<TypeCategory::Integer, 4> RTDECL(Exponent10_4)(
101101
CppTypeFor<TypeCategory::Real, 10>);
102102
CppTypeFor<TypeCategory::Integer, 8> RTDECL(Exponent10_8)(
@@ -134,7 +134,7 @@ CppTypeFor<TypeCategory::Integer, 8> RTDECL(Floor8_8)(
134134
CppTypeFor<TypeCategory::Integer, 16> RTDECL(Floor8_16)(
135135
CppTypeFor<TypeCategory::Real, 8>);
136136
#endif
137-
#if HAS_FLOAT80
137+
#if LDBL_MANT_DIG == 64
138138
CppTypeFor<TypeCategory::Integer, 1> RTDECL(Floor10_1)(
139139
CppTypeFor<TypeCategory::Real, 10>);
140140
CppTypeFor<TypeCategory::Integer, 2> RTDECL(Floor10_2)(
@@ -168,7 +168,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(Fraction4)(
168168
CppTypeFor<TypeCategory::Real, 4>);
169169
CppTypeFor<TypeCategory::Real, 8> RTDECL(Fraction8)(
170170
CppTypeFor<TypeCategory::Real, 8>);
171-
#if HAS_FLOAT80
171+
#if LDBL_MANT_DIG == 64
172172
CppTypeFor<TypeCategory::Real, 10> RTDECL(Fraction10)(
173173
CppTypeFor<TypeCategory::Real, 10>);
174174
#endif
@@ -180,7 +180,7 @@ CppTypeFor<TypeCategory::Real, 16> RTDECL(Fraction16)(
180180
// ISNAN / IEEE_IS_NAN
181181
bool RTDECL(IsNaN4)(CppTypeFor<TypeCategory::Real, 4>);
182182
bool RTDECL(IsNaN8)(CppTypeFor<TypeCategory::Real, 8>);
183-
#if HAS_FLOAT80
183+
#if LDBL_MANT_DIG == 64
184184
bool RTDECL(IsNaN10)(CppTypeFor<TypeCategory::Real, 10>);
185185
#endif
186186
#if LDBL_MANT_DIG == 113 || HAS_FLOAT128
@@ -212,7 +212,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(ModReal4)(
212212
CppTypeFor<TypeCategory::Real, 8> RTDECL(ModReal8)(
213213
CppTypeFor<TypeCategory::Real, 8>, CppTypeFor<TypeCategory::Real, 8>,
214214
const char *sourceFile = nullptr, int sourceLine = 0);
215-
#if HAS_FLOAT80
215+
#if LDBL_MANT_DIG == 64
216216
CppTypeFor<TypeCategory::Real, 10> RTDECL(ModReal10)(
217217
CppTypeFor<TypeCategory::Real, 10>, CppTypeFor<TypeCategory::Real, 10>,
218218
const char *sourceFile = nullptr, int sourceLine = 0);
@@ -247,7 +247,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(ModuloReal4)(
247247
CppTypeFor<TypeCategory::Real, 8> RTDECL(ModuloReal8)(
248248
CppTypeFor<TypeCategory::Real, 8>, CppTypeFor<TypeCategory::Real, 8>,
249249
const char *sourceFile = nullptr, int sourceLine = 0);
250-
#if HAS_FLOAT80
250+
#if LDBL_MANT_DIG == 64
251251
CppTypeFor<TypeCategory::Real, 10> RTDECL(ModuloReal10)(
252252
CppTypeFor<TypeCategory::Real, 10>, CppTypeFor<TypeCategory::Real, 10>,
253253
const char *sourceFile = nullptr, int sourceLine = 0);
@@ -283,7 +283,7 @@ CppTypeFor<TypeCategory::Integer, 8> RTDECL(Nint8_8)(
283283
CppTypeFor<TypeCategory::Integer, 16> RTDECL(Nint8_16)(
284284
CppTypeFor<TypeCategory::Real, 8>);
285285
#endif
286-
#if HAS_FLOAT80
286+
#if LDBL_MANT_DIG == 64
287287
CppTypeFor<TypeCategory::Integer, 1> RTDECL(Nint10_1)(
288288
CppTypeFor<TypeCategory::Real, 10>);
289289
CppTypeFor<TypeCategory::Integer, 2> RTDECL(Nint10_2)(
@@ -319,7 +319,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(Nearest4)(
319319
CppTypeFor<TypeCategory::Real, 4>, bool positive);
320320
CppTypeFor<TypeCategory::Real, 8> RTDECL(Nearest8)(
321321
CppTypeFor<TypeCategory::Real, 8>, bool positive);
322-
#if HAS_FLOAT80
322+
#if LDBL_MANT_DIG == 64
323323
CppTypeFor<TypeCategory::Real, 10> RTDECL(Nearest10)(
324324
CppTypeFor<TypeCategory::Real, 10>, bool positive);
325325
#endif
@@ -333,7 +333,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(RRSpacing4)(
333333
CppTypeFor<TypeCategory::Real, 4>);
334334
CppTypeFor<TypeCategory::Real, 8> RTDECL(RRSpacing8)(
335335
CppTypeFor<TypeCategory::Real, 8>);
336-
#if HAS_FLOAT80
336+
#if LDBL_MANT_DIG == 64
337337
CppTypeFor<TypeCategory::Real, 10> RTDECL(RRSpacing10)(
338338
CppTypeFor<TypeCategory::Real, 10>);
339339
#endif
@@ -347,7 +347,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(SetExponent4)(
347347
CppTypeFor<TypeCategory::Real, 4>, std::int64_t);
348348
CppTypeFor<TypeCategory::Real, 8> RTDECL(SetExponent8)(
349349
CppTypeFor<TypeCategory::Real, 8>, std::int64_t);
350-
#if HAS_FLOAT80
350+
#if LDBL_MANT_DIG == 64
351351
CppTypeFor<TypeCategory::Real, 10> RTDECL(SetExponent10)(
352352
CppTypeFor<TypeCategory::Real, 10>, std::int64_t);
353353
#endif
@@ -361,7 +361,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(Scale4)(
361361
CppTypeFor<TypeCategory::Real, 4>, std::int64_t);
362362
CppTypeFor<TypeCategory::Real, 8> RTDECL(Scale8)(
363363
CppTypeFor<TypeCategory::Real, 8>, std::int64_t);
364-
#if HAS_FLOAT80
364+
#if LDBL_MANT_DIG == 64
365365
CppTypeFor<TypeCategory::Real, 10> RTDECL(Scale10)(
366366
CppTypeFor<TypeCategory::Real, 10>, std::int64_t);
367367
#endif
@@ -410,7 +410,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(Spacing4)(
410410
CppTypeFor<TypeCategory::Real, 4>);
411411
CppTypeFor<TypeCategory::Real, 8> RTDECL(Spacing8)(
412412
CppTypeFor<TypeCategory::Real, 8>);
413-
#if HAS_FLOAT80
413+
#if LDBL_MANT_DIG == 64
414414
CppTypeFor<TypeCategory::Real, 10> RTDECL(Spacing10)(
415415
CppTypeFor<TypeCategory::Real, 10>);
416416
#endif
@@ -425,7 +425,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(FPow4i)(
425425
CppTypeFor<TypeCategory::Real, 8> RTDECL(FPow8i)(
426426
CppTypeFor<TypeCategory::Real, 8> b,
427427
CppTypeFor<TypeCategory::Integer, 4> e);
428-
#if HAS_FLOAT80
428+
#if LDBL_MANT_DIG == 64
429429
CppTypeFor<TypeCategory::Real, 10> RTDECL(FPow10i)(
430430
CppTypeFor<TypeCategory::Real, 10> b,
431431
CppTypeFor<TypeCategory::Integer, 4> e);
@@ -442,7 +442,7 @@ CppTypeFor<TypeCategory::Real, 4> RTDECL(FPow4k)(
442442
CppTypeFor<TypeCategory::Real, 8> RTDECL(FPow8k)(
443443
CppTypeFor<TypeCategory::Real, 8> b,
444444
CppTypeFor<TypeCategory::Integer, 8> e);
445-
#if HAS_FLOAT80
445+
#if LDBL_MANT_DIG == 64
446446
CppTypeFor<TypeCategory::Real, 10> RTDECL(FPow10k)(
447447
CppTypeFor<TypeCategory::Real, 10> b,
448448
CppTypeFor<TypeCategory::Integer, 8> e);

0 commit comments

Comments
 (0)