Skip to content

Commit 2bfb3ba

Browse files
klauslerklausler
authored
[flang] Make REAL/COMPLEX(10) a hard error for non-x86 targets (#124655)
Currently the use of REAL/COMPLEX(KIND=10) as a type or literal constant suffix elicits an optional warning message only. This leads to compiler internal errors during lowering when these types appear in code being compiled to non-x86_64 targets. For better error messaging, make the use of these types a hard error in semantics instead when they are not supported by the target architecture.
1 parent 631abff commit 2bfb3ba

22 files changed

+79
-64
lines changed

‎flang/include/flang/Common/Fortran-features.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENUM_CLASS(UsageWarning, Portability, PointerToUndefinable,
7171
ZeroDoStep, UnusedForallIndex, OpenMPUsage, DataLength, IgnoredDirective,
7272
HomonymousSpecific, HomonymousResult, IgnoredIntrinsicFunctionType,
7373
PreviousScalarUse, RedeclaredInaccessibleComponent, ImplicitShared,
74-
IndexVarRedefinition, IncompatibleImplicitInterfaces, BadTypeForTarget,
74+
IndexVarRedefinition, IncompatibleImplicitInterfaces,
7575
VectorSubscriptFinalization, UndefinedFunctionResult, UselessIomsg,
7676
MismatchingDummyProcedure, SubscriptedEmptyArray, UnsignedLiteralTruncation,
7777
CompatibleDeclarationsFromDistinctModules)

‎flang/lib/Common/Fortran-features.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ LanguageFeatureControl::LanguageFeatureControl() {
7979
warnUsage_.set(UsageWarning::ImplicitShared);
8080
warnUsage_.set(UsageWarning::IndexVarRedefinition);
8181
warnUsage_.set(UsageWarning::IncompatibleImplicitInterfaces);
82-
warnUsage_.set(UsageWarning::BadTypeForTarget);
8382
warnUsage_.set(UsageWarning::VectorSubscriptFinalization);
8483
warnUsage_.set(UsageWarning::UndefinedFunctionResult);
8584
warnUsage_.set(UsageWarning::UselessIomsg);

‎flang/lib/Semantics/expression.cpp‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4078,8 +4078,7 @@ bool ExpressionAnalyzer::CheckIntrinsicKind(
40784078
return true;
40794079
} else if (foldingContext_.targetCharacteristics().CanSupportType(
40804080
category, kind)) {
4081-
Warn(common::UsageWarning::BadTypeForTarget,
4082-
"%s(KIND=%jd) is not an enabled type for this target"_warn_en_US,
4081+
Say("%s(KIND=%jd) is not an enabled type for this target"_err_en_US,
40834082
ToUpperCase(EnumToString(category)), kind);
40844083
return true;
40854084
} else {
@@ -4101,20 +4100,7 @@ bool ExpressionAnalyzer::CheckIntrinsicSize(
41014100
return false;
41024101
}
41034102
}
4104-
if (foldingContext_.targetCharacteristics().IsTypeEnabled(
4105-
category, kind)) { // C712, C714, C715, C727
4106-
return true;
4107-
} else if (foldingContext_.targetCharacteristics().CanSupportType(
4108-
category, kind)) {
4109-
Warn(common::UsageWarning::BadTypeForTarget,
4110-
"%s*%jd is not an enabled type for this target"_warn_en_US,
4111-
ToUpperCase(EnumToString(category)), size);
4112-
return true;
4113-
} else {
4114-
Say("%s*%jd is not a supported type"_err_en_US,
4115-
ToUpperCase(EnumToString(category)), size);
4116-
return false;
4117-
}
4103+
return CheckIntrinsicKind(category, kind);
41184104
}
41194105

41204106
bool ExpressionAnalyzer::AddImpliedDo(parser::CharBlock name, int kind) {

‎flang/test/Evaluate/rewrite-out_of_range.F90‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
! Tests rewriting of OUT_OF_RANGE()
2-
! RUN: %flang_fc1 -fdebug-unparse -cpp %s 2>&1 | FileCheck %s --check-prefixes=CHECK%if target=x86_64{{.*}} %{,CHECK-X86-64%}
2+
! REQUIRES: target=x86-64{{.*}}
3+
! REQUIRES: system-linux
4+
! RUN: %flang_fc1 -fdebug-unparse -cpp %s 2>&1 | FileCheck %s --check-prefixes=CHECK%if target=x86_64{{.*}} %{%if system-linux %{,CHECK-X86-64%}%}
35

46
logical round
57

‎flang/test/Lower/HLFIR/convert-variable.f90‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! Test lowering of variables to fir.declare
2-
! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
2+
! RUN: bbc -emit-hlfir %s -o - | FileCheck %s --check-prefixes=CHECK,%if flang-supports-f128-math %{F128%} %else %{F64%}
33

44
subroutine scalar_numeric(x)
55
integer :: x
@@ -68,13 +68,16 @@ subroutine scalar_numeric_attributes(x)
6868
! CHECK: %[[VAL_1:.*]] = hlfir.declare %[[VAL_0]] dummy_scope %{{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in, optional, target>, uniq_name = "_QFscalar_numeric_attributesEx"} : (!fir.ref<i32>, !fir.dscope) -> (!fir.ref<i32>, !fir.ref<i32>)
6969

7070
subroutine scalar_numeric_attributes_2(x)
71-
real(16), value :: x(100)
71+
integer, parameter :: rk = merge(16, 8, selected_real_kind(33, 4931)==16)
72+
real(rk), value :: x(100)
7273
end subroutine
7374
! CHECK-LABEL: func.func @_QPscalar_numeric_attributes_2(
74-
! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100xf128>>
75+
! F128-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100xf128>>
76+
! F64-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100xf64>>
7577
! CHECK: %[[VAL_1:.*]] = arith.constant 100 : index
7678
! CHECK: %[[VAL_2:.*]] = fir.shape %[[VAL_1]] : (index) -> !fir.shape<1>
77-
! CHECK: %[[VAL_3:.*]] = hlfir.declare %[[VAL_0]](%[[VAL_2]]) dummy_scope %{{[0-9]+}} {fortran_attrs = #fir.var_attrs<value>, uniq_name = "_QFscalar_numeric_attributes_2Ex"} : (!fir.ref<!fir.array<100xf128>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<100xf128>>, !fir.ref<!fir.array<100xf128>>)
79+
! F128: %[[VAL_3:.*]] = hlfir.declare %[[VAL_0]](%[[VAL_2]]) dummy_scope %{{[0-9]+}} {fortran_attrs = #fir.var_attrs<value>, uniq_name = "_QFscalar_numeric_attributes_2Ex"} : (!fir.ref<!fir.array<100xf128>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<100xf128>>, !fir.ref<!fir.array<100xf128>>)
80+
! F64: %[[VAL_3:.*]] = hlfir.declare %[[VAL_0]](%[[VAL_2]]) dummy_scope %{{[0-9]+}} {fortran_attrs = #fir.var_attrs<value>, uniq_name = "_QFscalar_numeric_attributes_2Ex"} : (!fir.ref<!fir.array<100xf64>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<100xf64>>, !fir.ref<!fir.array<100xf64>>)
7881

7982
subroutine scalar_numeric_attributes_3(x)
8083
real, intent(in) :: x

‎flang/test/Lower/Intrinsics/abs.f90‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
1+
! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes=CHECK,CMPLX,CMPLX-PRECISE,%if flang-supports-f128-math %{F128%} %else %{F64%}
22
! RUN: bbc -emit-fir -hlfir=false --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
33
! RUN: bbc --force-mlir-complex -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
4-
! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
4+
! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes=CHECK,CMPLX,CMPLX-PRECISE,%if flang-supports-f128-math %{F128%} %else %{F64%}
55
! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
66
! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm --force-mlir-complex %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
77
! RUN: %flang_fc1 -fapprox-func -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-APPROX"
@@ -85,13 +85,18 @@ subroutine abs_testd(a, b)
8585
end subroutine
8686

8787
! CHECK-LABEL: func @_QPabs_testr16(
88-
! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<f128>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f128>{{.*}}) {
88+
! F128-SAME: %[[VAL_0:.*]]: !fir.ref<f128>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f128>{{.*}}) {
89+
! F64-SAME: %[[VAL_0:.*]]: !fir.ref<f64>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f64>{{.*}}) {
8990
subroutine abs_testr16(a, b)
90-
! CHECK: %[[VAL_2:.*]] = fir.load %[[VAL_0]] : !fir.ref<f128>
91-
! CHECK: %[[VAL_3:.*]] = math.absf %[[VAL_2]] {{.*}}: f128
92-
! CHECK: fir.store %[[VAL_3]] to %[[VAL_1]] : !fir.ref<f128>
91+
! F128: %[[VAL_2:.*]] = fir.load %[[VAL_0]] : !fir.ref<f128>
92+
! F64: %[[VAL_2:.*]] = fir.load %[[VAL_0]] : !fir.ref<f64>
93+
! F128: %[[VAL_3:.*]] = math.absf %[[VAL_2]] {{.*}}: f128
94+
! F64: %[[VAL_3:.*]] = math.absf %[[VAL_2]] {{.*}}: f64
95+
! F128: fir.store %[[VAL_3]] to %[[VAL_1]] : !fir.ref<f128>
96+
! F64: fir.store %[[VAL_3]] to %[[VAL_1]] : !fir.ref<f64>
9397
! CHECK: return
94-
real(kind=16) :: a, b
98+
integer, parameter :: rk = merge(16, 8, selected_real_kind(33, 4931)==16)
99+
real(kind=rk) :: a, b
95100
b = abs(a)
96101
end subroutine
97102

‎flang/test/Lower/Intrinsics/exponent.f90‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ subroutine exponent_test(i1, i2, x4, x8)
77
integer :: i1, i2, i3
88
real(kind = 4) :: x4
99
real(kind = 8) :: x8
10-
real(kind = 16) :: x16
1110

1211
i1 = exponent(x4)
1312
! CHECK: %[[temp0:.*]] = fir.load %{{.*}} : !fir.ref<f32>

‎flang/test/Lower/Intrinsics/fma_real16.f90‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
! REQUIRES: flang-supports-f128-math
12
! RUN: bbc -emit-fir %s -o - | FileCheck %s
23
! RUN: bbc --math-runtime=precise -emit-fir %s -o - | FileCheck %s
34
! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s

‎flang/test/Lower/Intrinsics/ieee_class_queries.f90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
! REQUIRES: flang-supports-f128-math
2-
! RUN: bbc -emit-fir -o - %s | FileCheck %s
2+
! REQUIRES: x86_64-registered-target
3+
! RUN: bbc -target x86_64-unknown-linux-gnu -emit-fir -o - %s | FileCheck %s
34

45
! CHECK-LABEL: func @_QQmain
56
use ieee_arithmetic, only: ieee_is_finite, ieee_is_nan, ieee_is_negative, &

‎flang/test/Lower/Intrinsics/modulo.f90‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s -check-prefixes=HONORINF,ALL
2-
! RUN: flang -fc1 -menable-no-infs -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s -check-prefixes=CHECK,ALL
2+
! RUN: flang -fc1 -menable-no-infs -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s -check-prefixes=CHECK,ALL,%if flang-supports-f128-math %{F128%} %else %{F64%}
33

44
! ALL-LABEL: func @_QPmodulo_testr(
55
! ALL-SAME: %[[arg0:.*]]: !fir.ref<f64>{{.*}}, %[[arg1:.*]]: !fir.ref<f64>{{.*}}, %[[arg2:.*]]: !fir.ref<f64>{{.*}}) {
@@ -39,9 +39,12 @@ subroutine modulo_testi(r, a, p)
3939
end subroutine
4040

4141
! CHECK-LABEL: func @_QPmodulo_testr16(
42-
! CHECK-SAME: %[[arg0:.*]]: !fir.ref<f128>{{.*}}, %[[arg1:.*]]: !fir.ref<f128>{{.*}}, %[[arg2:.*]]: !fir.ref<f128>{{.*}}) {
42+
! F128-SAME: %[[arg0:.*]]: !fir.ref<f128>{{.*}}, %[[arg1:.*]]: !fir.ref<f128>{{.*}}, %[[arg2:.*]]: !fir.ref<f128>{{.*}}) {
43+
! F64-SAME: %[[arg0:.*]]: !fir.ref<f64>{{.*}}, %[[arg1:.*]]: !fir.ref<f64>{{.*}}, %[[arg2:.*]]: !fir.ref<f64>{{.*}}) {
4344
subroutine modulo_testr16(r, a, p)
44-
real(16) :: r, a, p
45-
! CHECK: fir.call @_FortranAModuloReal16({{.*}}){{.*}}: (f128, f128, !fir.ref<i8>, i32) -> f128
45+
integer, parameter :: rk = merge(16, 8, selected_real_kind(33, 4931)==16)
46+
real(rk) :: r, a, p
47+
!F128: fir.call @_FortranAModuloReal16({{.*}}){{.*}}: (f128, f128, !fir.ref<i8>, i32) -> f128
48+
!F64: arith.remf %0, %1 fastmath<ninf,contract> : f64
4649
r = modulo(a, p)
4750
end subroutine

0 commit comments

Comments
 (0)