Skip to content

Commit

Permalink
[flang] Make real type of kind 10 target dependent
Browse files Browse the repository at this point in the history
The real(10) is supported on x86_64. On aarch64, the value of
selected_real_kind(16) should be 16 rather than 10 since real(10)
is not supported on x86_64. Previously, the real type support check
is not target dependent. Support it now through the target triple
information.

Reviewed By: clementval

Differential Revision: https://reviews.llvm.org/D134021
  • Loading branch information
PeixinQiao committed Oct 2, 2022
1 parent aef03c9 commit d11e406
Show file tree
Hide file tree
Showing 11 changed files with 213 additions and 36 deletions.
1 change: 0 additions & 1 deletion flang/lib/Evaluate/target.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ namespace Fortran::evaluate {
Rounding TargetCharacteristics::defaultRounding;

TargetCharacteristics::TargetCharacteristics() {
// TODO: Fill in the type information from command-line targeting information.
auto enableCategoryKinds{[this](TypeCategory category) {
for (int kind{0}; kind < maxKind; ++kind) {
if (CanSupportType(category, kind)) {
Expand Down
8 changes: 8 additions & 0 deletions flang/lib/Frontend/CompilerInvocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,14 @@ void CompilerInvocation::setSemanticsOpts(
.set_warnOnNonstandardUsage(getEnableConformanceChecks())
.set_warningsAreErrors(getWarnAsErr())
.set_moduleFileSuffix(getModuleFileSuffix());

llvm::Triple targetTriple{llvm::Triple(this->targetOpts.triple)};
// FIXME: Handle real(3) ?
if (targetTriple.getArch() != llvm::Triple::ArchType::x86 &&
targetTriple.getArch() != llvm::Triple::ArchType::x86_64) {
semanticsContext->targetCharacteristics().DisableType(
Fortran::common::TypeCategory::Real, /*kind=*/10);
}
}

/// Set \p loweringOptions controlling lowering behavior based
Expand Down
10 changes: 10 additions & 0 deletions flang/module/__fortran_ieee_exceptions.f90
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,25 @@
! Define specifics with 1 LOGICAL or REAL argument for generic G.
#define SPECIFICS_L(G) \
G(1) G(2) G(4) G(8)
#if __x86_64__
#define SPECIFICS_R(G) \
G(2) G(3) G(4) G(8) G(10) G(16)
#else
#define SPECIFICS_R(G) \
G(2) G(3) G(4) G(8) G(16)
#endif

! Set PRIVATE accessibility for specifics with 1 LOGICAL or REAL argument for
! generic G.
#define PRIVATE_L(G) private :: \
G##_l1, G##_l2, G##_l4, G##_l8
#if __x86_64__
#define PRIVATE_R(G) private :: \
G##_a2, G##_a3, G##_a4, G##_a8, G##_a10, G##_a16
#else
#define PRIVATE_R(G) private :: \
G##_a2, G##_a3, G##_a4, G##_a8, G##_a16
#endif

interface ieee_get_flag
elemental subroutine ieee_get_flag_0(flag, flag_value)
Expand Down
47 changes: 47 additions & 0 deletions flang/module/ieee_arithmetic.f90
Original file line number Diff line number Diff line change
Expand Up @@ -99,57 +99,104 @@ end function ieee_round_ne
G(1) G(2) G(4) G(8) G(16)
#define SPECIFICS_L(G) \
G(1) G(2) G(4) G(8)
#if __x86_64__
#define SPECIFICS_R(G) \
G(2) G(3) G(4) G(8) G(10) G(16)
#else
#define SPECIFICS_R(G) \
G(2) G(3) G(4) G(8) G(16)
#endif
#define SPECIFICS_II(G) \
G(1,1) G(1,2) G(1,4) G(1,8) G(1,16) \
G(2,1) G(2,2) G(2,4) G(2,8) G(2,16) \
G(4,1) G(4,2) G(4,4) G(4,8) G(4,16) \
G(8,1) G(8,2) G(8,4) G(8,8) G(8,16) \
G(16,1) G(16,2) G(16,4) G(16,8) G(16,16)
#if __x86_64__
#define SPECIFICS_RI(G) \
G(2,1) G(2,2) G(2,4) G(2,8) G(2,16) \
G(3,1) G(3,2) G(3,4) G(3,8) G(3,16) \
G(4,1) G(4,2) G(4,4) G(4,8) G(4,16) \
G(8,1) G(8,2) G(8,4) G(8,8) G(8,16) \
G(10,1) G(10,2) G(10,4) G(10,8) G(10,16) \
G(16,1) G(16,2) G(16,4) G(16,8) G(16,16)
#else
#define SPECIFICS_RI(G) \
G(2,1) G(2,2) G(2,4) G(2,8) G(2,16) \
G(3,1) G(3,2) G(3,4) G(3,8) G(3,16) \
G(4,1) G(4,2) G(4,4) G(4,8) G(4,16) \
G(8,1) G(8,2) G(8,4) G(8,8) G(8,16) \
G(16,1) G(16,2) G(16,4) G(16,8) G(16,16)
#endif

#if __x86_64__
#define SPECIFICS_RR(G) \
G(2,2) G(2,3) G(2,4) G(2,8) G(2,10) G(2,16) \
G(3,2) G(3,3) G(3,4) G(3,8) G(3,10) G(3,16) \
G(4,2) G(4,3) G(4,4) G(4,8) G(4,10) G(4,16) \
G(8,2) G(8,3) G(8,4) G(8,8) G(8,10) G(8,16) \
G(10,2) G(10,3) G(10,4) G(10,8) G(10,10) G(10,16) \
G(16,2) G(16,3) G(16,4) G(16,8) G(16,10) G(16,16)
#else
#define SPECIFICS_RR(G) \
G(2,2) G(2,3) G(2,4) G(2,8) G(2,16) \
G(3,2) G(3,3) G(3,4) G(3,8) G(3,16) \
G(4,2) G(4,3) G(4,4) G(4,8) G(4,16) \
G(8,2) G(8,3) G(8,4) G(8,8) G(8,16) \
G(16,2) G(16,3) G(16,4) G(16,8) G(16,16)
#endif

! Set PRIVATE accessibility for specifics with 1 or 2 INTEGER, LOGICAL, or REAL
! arguments for generic G.
#define PRIVATE_I(G) private :: \
G##_i1, G##_i2, G##_i4, G##_i8, G##_i16
#define PRIVATE_L(G) private :: \
G##_l1, G##_l2, G##_l4, G##_l8
#if __x86_64__
#define PRIVATE_R(G) private :: \
G##_a2, G##_a3, G##_a4, G##_a8, G##_a10, G##_a16
#else
#define PRIVATE_R(G) private :: \
G##_a2, G##_a3, G##_a4, G##_a8, G##_a16
#endif
#define PRIVATE_II(G) private :: \
G##_i1_i1, G##_i1_i2, G##_i1_i4, G##_i1_i8, G##_i1_i16, \
G##_i2_i1, G##_i2_i2, G##_i2_i4, G##_i2_i8, G##_i2_i16, \
G##_i4_i1, G##_i4_i2, G##_i4_i4, G##_i4_i8, G##_i4_i16, \
G##_i8_i1, G##_i8_i2, G##_i8_i4, G##_i8_i8, G##_i8_i16, \
G##_i16_i1, G##_i16_i2, G##_i16_i4, G##_i16_i8, G##_i16_i16
#if __x86_64__
#define PRIVATE_RI(G) private :: \
G##_a2_i1, G##_a2_i2, G##_a2_i4, G##_a2_i8, G##_a2_i16, \
G##_a3_i1, G##_a3_i2, G##_a3_i4, G##_a3_i8, G##_a3_i16, \
G##_a4_i1, G##_a4_i2, G##_a4_i4, G##_a4_i8, G##_a4_i16, \
G##_a8_i1, G##_a8_i2, G##_a8_i4, G##_a8_i8, G##_a8_i16, \
G##_a10_i1, G##_a10_i2, G##_a10_i4, G##_a10_i8, G##_a10_i16, \
G##_a16_i1, G##_a16_i2, G##_a16_i4, G##_a16_i8, G##_a16_i16
#else
#define PRIVATE_RI(G) private :: \
G##_a2_i1, G##_a2_i2, G##_a2_i4, G##_a2_i8, G##_a2_i16, \
G##_a3_i1, G##_a3_i2, G##_a3_i4, G##_a3_i8, G##_a3_i16, \
G##_a4_i1, G##_a4_i2, G##_a4_i4, G##_a4_i8, G##_a4_i16, \
G##_a8_i1, G##_a8_i2, G##_a8_i4, G##_a8_i8, G##_a8_i16, \
G##_a16_i1, G##_a16_i2, G##_a16_i4, G##_a16_i8, G##_a16_i16
#endif
#if __x86_64__
#define PRIVATE_RR(G) private :: \
G##_a2_a2, G##_a2_a3, G##_a2_a4, G##_a2_a8, G##_a2_a10, G##_a2_a16, \
G##_a3_a2, G##_a3_a3, G##_a3_a4, G##_a3_a8, G##_a3_a10, G##_a3_a16, \
G##_a4_a2, G##_a4_a3, G##_a4_a4, G##_a4_a8, G##_a4_a10, G##_a4_a16, \
G##_a8_a2, G##_a8_a3, G##_a8_a4, G##_a8_a8, G##_a8_a10, G##_a8_a16, \
G##_a10_a2, G##_a10_a3, G##_a10_a4, G##_a10_a8, G##_a10_a10, G##_a10_a16, \
G##_a16_a2, G##_a16_a3, G##_a16_a4, G##_a16_a8, G##_a16_a10, G##_a16_a16
#else
#define PRIVATE_RR(G) private :: \
G##_a2_a2, G##_a2_a3, G##_a2_a4, G##_a2_a8, G##_a2_a16, \
G##_a3_a2, G##_a3_a3, G##_a3_a4, G##_a3_a8, G##_a3_a16, \
G##_a4_a2, G##_a4_a3, G##_a4_a4, G##_a4_a8, G##_a4_a16, \
G##_a8_a2, G##_a8_a3, G##_a8_a4, G##_a8_a8, G##_a8_a16, \
G##_a16_a2, G##_a16_a3, G##_a16_a4, G##_a16_a8, G##_a16_a16
#endif

#define IEEE_CLASS_R(XKIND) \
elemental type(ieee_class_type) function ieee_class_a##XKIND(x); \
Expand Down
31 changes: 28 additions & 3 deletions flang/test/Evaluate/folding07.f90
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ module m
real(8), parameter :: &
eps8 = epsilon(0._8), zeps8 = real(z'3cb0000000000000', kind=8), &
deps8 = 2.2204460492503130808472633361816406250e-16_8
#if __x86_64__
real(10), parameter :: &
eps10 = epsilon(0._10), zeps10 = real(z'3fc08000000000000000', kind=10), &
deps10 = 1.08420217248550443400745280086994171142578125e-19_10
#endif
real(16), parameter :: &
eps16 = epsilon(0._16), &
zeps16 = real(z'3f8f0000000000000000000000000000', kind=16), &
Expand All @@ -36,7 +38,9 @@ module m
logical, parameter :: test_eps3 = eps3 == zeps3 .and. eps3 == deps3
logical, parameter :: test_eps4 = eps4 == zeps4 .and. eps4 == deps4
logical, parameter :: test_eps8 = eps8 == zeps8 .and. eps8 == deps8
#if __x86_64__
logical, parameter :: test_eps10 = eps10 == zeps10 .and. eps10 == deps10
#endif
logical, parameter :: test_eps16 = eps16 == zeps16 .and. eps16 == deps16

integer(1), parameter :: &
Expand Down Expand Up @@ -73,6 +77,7 @@ module m
&1540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868&
&5084551339423045832369032229481658085593321233482747978262041447231687381771809192998812504040261841&
&24858368e308_8
#if __x86_64__
real(10), parameter :: &
ahuge10 = huge(0._10), zahuge10 = real(z'7ffeffffffffffffffff', kind=10), &
dahuge10 = 1.1897314953572317650212638530309702051690633222946242004403237338917370055229707226164102903365288828&
Expand Down Expand Up @@ -125,6 +130,7 @@ module m
&8416350972529537091114317204887747405539054009425375424119317944175137064689643861517718849867010341&
&5325423859110896247108853858086888377772586485641459342621210866475884892600317623459607695088491496&
&6244415660441955208681198977024e4932_10
#endif
real(16), parameter :: &
ahuge16 = huge(0._16), zahuge16 = real(z'7ffeffffffffffffffffffffffffffff', kind=16), &
dahuge16 = 1.1897314953572317650857593266280070161964690526416940455296988842121635797553123923249740128484620735&
Expand Down Expand Up @@ -181,20 +187,26 @@ module m
logical, parameter :: test_ahuge3 = ahuge3 == zahuge3 .and. ahuge3 == dahuge3
logical, parameter :: test_ahuge4 = ahuge4 == zahuge4 .and. ahuge4 == dahuge4
logical, parameter :: test_ahuge8 = ahuge8 == zahuge8 .and. ahuge8 == dahuge8
#if __x86_64__
logical, parameter :: test_ahuge10 = ahuge10 == zahuge10 .and. ahuge10 == dahuge10
#endif
logical, parameter :: test_ahuge16 = ahuge16 == zahuge16 .and. ahuge16 == dahuge16

real(2), parameter :: tiny2 = tiny(0._2), ztiny2 = real(z'0400', kind=2)
real(3), parameter :: tiny3 = tiny(0._3), ztiny3 = real(z'0080', kind=3)
real(4), parameter :: tiny4 = tiny(0._4), ztiny4 = real(z'00800000', kind=4)
real(8), parameter :: tiny8 = tiny(0._8), ztiny8 = real(z'0010000000000000', kind=8)
#if __x86_64__
real(10), parameter :: tiny10 = tiny(0._10), ztiny10 = real(z'00018000000000000000', kind=10)
#endif
real(16), parameter :: tiny16 = tiny(0._16), ztiny16 = real(z'00010000000000000000000000000000', kind=16)
logical, parameter :: test_tiny2 = tiny2 == ztiny2
logical, parameter :: test_tiny3 = tiny3 == ztiny3
logical, parameter :: test_tiny4 = tiny4 == ztiny4
logical, parameter :: test_tiny8 = tiny8 == ztiny8
#if __x86_64__
logical, parameter :: test_tiny10 = tiny10 == ztiny10
#endif
logical, parameter :: test_tiny16 = tiny16 == ztiny16

real, parameter :: nan = real(z'7fc12345')
Expand Down Expand Up @@ -222,27 +234,35 @@ module m
max3 = maxexponent(0._3), &
max4 = maxexponent(0._4), &
max8 = maxexponent(0._8), &
max10 = maxexponent(0._10), &
max16 = maxexponent(0._16)
#if __x86_64__
integer, parameter :: max10 = maxexponent(0._10)
#endif
logical, parameter :: test_max2 = max2 == 16
logical, parameter :: test_max3 = max3 == 128
logical, parameter :: test_max4 = max4 == 128
logical, parameter :: test_max8 = max8 == 1024
#if __x86_64__
logical, parameter :: test_max10 = max10 == 16384
#endif
logical, parameter :: test_max16 = max16 == 16384

integer, parameter :: &
min2 = minexponent(0._2), &
min3 = minexponent(0._3), &
min4 = minexponent(0._4), &
min8 = minexponent(0._8), &
min10 = minexponent(0._10), &
min16 = minexponent(0._16)
#if __x86_64__
integer, parameter :: min10 = minexponent(0._10)
#endif
logical, parameter :: test_min2 = min2 == -13
logical, parameter :: test_min3 = min3 == -125
logical, parameter :: test_min4 = min4 == -125
logical, parameter :: test_min8 = min8 == -1021
#if __x86_64__
logical, parameter :: test_min10 = min10 == -16381
#endif
logical, parameter :: test_min16 = min16 == -16381

integer, parameter :: &
Expand All @@ -262,13 +282,18 @@ module m
arange3 = range(0._3), zrange3 = range((0._3, 0._3)), &
arange4 = range(0._4), zrange4 = range((0._4, 0._4)), &
arange8 = range(0._8), zrange8 = range((0._8, 0._8)), &
arange10 = range(0._10), zrange10 = range((0._10, 0._10)), &
arange16 = range(0._16), zrange16 = range((0._16, 0._16))
#if __x86_64__
integer, parameter :: arange10 = &
range(0._10), zrange10 = range((0._10, 0._10))
#endif
logical, parameter :: test_arange2 = arange2 == 4 .and. zrange2 == 4
logical, parameter :: test_arange3 = arange3 == 37 .and. zrange3 == 37
logical, parameter :: test_zrange4 = arange4 == 37 .and. zrange4 == 37
logical, parameter :: test_zrange8 = arange8 == 307 .and. zrange8 == 307
#if __x86_64__
logical, parameter :: test_zrange10 = arange10 == 4931 .and. zrange10 == 4931
#endif
logical, parameter :: test_zrange16 = arange16 == 4931 .and. zrange16 == 4931

logical, parameter :: test_set_exponent_z = set_exponent(0., 999) == 0.
Expand Down
6 changes: 0 additions & 6 deletions flang/test/Semantics/kinds03.f90
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@
!DEF: /MainProgram1/a8 ObjectEntity TYPE(rpdt(k=8_4))
type(rpdt(8)) :: a8
!REF: /MainProgram1/rpdt
!DEF: /MainProgram1/a10 ObjectEntity TYPE(rpdt(k=10_4))
type(rpdt(10)) :: a10
!REF: /MainProgram1/rpdt
!DEF: /MainProgram1/a16 ObjectEntity TYPE(rpdt(k=16_4))
type(rpdt(16)) :: a16
!REF: /MainProgram1/zpdt
Expand All @@ -75,9 +72,6 @@
!DEF: /MainProgram1/z8 ObjectEntity TYPE(zpdt(k=8_4))
type(zpdt(8)) :: z8
!REF: /MainProgram1/zpdt
!DEF: /MainProgram1/z10 ObjectEntity TYPE(zpdt(k=10_4))
type(zpdt(10)) :: z10
!REF: /MainProgram1/zpdt
!DEF: /MainProgram1/z16 ObjectEntity TYPE(zpdt(k=16_4))
type(zpdt(16)) :: z16
!REF: /MainProgram1/lpdt
Expand Down
Loading

0 comments on commit d11e406

Please sign in to comment.