-
Notifications
You must be signed in to change notification settings - Fork 13.6k
[flang] Repair recent Power build bot breakage #124950
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@llvm/pr-subscribers-flang-semantics Author: Peter Klausler (klausler) ChangesAdd AIX_WARNING expected warnings to a test that is now producing new warnings. Should fix https://lab.llvm.org/buildbot/#/builders/201/builds/2291. Full diff: https://github.com/llvm/llvm-project/pull/124950.diff 1 Files Affected:
diff --git a/flang/test/Semantics/kinds04_q10.f90 b/flang/test/Semantics/kinds04_q10.f90
index aa5c4abe2f1dfc..091bbbc19444dc 100644
--- a/flang/test/Semantics/kinds04_q10.f90
+++ b/flang/test/Semantics/kinds04_q10.f90
@@ -11,11 +11,13 @@ subroutine s(var)
real :: realvar3 = 4.0Q6
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard
real :: realvar4 = 4.0D6_8
+ !AIX_WARNING: underflow on REAL(10) to REAL(8) conversion
!WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q'
real :: realvar5 = 4.0Q6_10
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard
real :: realvar6 = 4.0Q6_16
real :: realvar7 = 4.0E6_8
+ !AIX_WARNING: underflow on REAL(10) to REAL(8) conversion
real :: realvar8 = 4.0E6_10
real :: realvar9 = 4.0E6_16
!ERROR: Unsupported REAL(KIND=32)
@@ -29,6 +31,7 @@ subroutine s(var)
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard
double precision :: doublevar5 = 4.0Q6_16
double precision :: doublevar6 = 4.0E6_8
+ !AIX_WARNING: underflow on REAL(10) to REAL(8) conversion
double precision :: doublevar7 = 4.0E6_10
double precision :: doublevar8 = 4.0E6_16
!ERROR: Unsupported REAL(KIND=32)
|
I guess something is missing. How is |
I see this when I fetch your branch.
|
I think
|
Thanks; done. |
@@ -29,6 +32,7 @@ subroutine s(var) | |||
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard | |||
double precision :: doublevar5 = 4.0Q6_16 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kinds04_q10.f90:33:36: portability: Explicit kind parameter together with non-'E' exponent letter is not standard
double precision :: doublevar5 = 4.0Q6_16
^^^^^
@@ -29,6 +32,7 @@ subroutine s(var) | |||
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard | |||
double precision :: doublevar5 = 4.0Q6_16 | |||
double precision :: doublevar6 = 4.0E6_8 | |||
!AIX_WARNING: underflow on REAL(10) to REAL(8) conversion | |||
double precision :: doublevar7 = 4.0E6_10 | |||
double precision :: doublevar8 = 4.0E6_16 | |||
!ERROR: Unsupported REAL(KIND=32) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on line 39:
kinds04_q10.f90:39:36: error: Unsupported REAL(KIND=32)
double precision :: doublevar9 = 4.0E6_32
^^^^^
on powerpc64-*-aix:
|
This works for diff --git a/flang/test/Semantics/kinds04_q10.f90 b/flang/test/Semantics/kinds04_q10.f90
index 45b72fb19184..1063697e1380 100644
--- a/flang/test/Semantics/kinds04_q10.f90
+++ b/flang/test/Semantics/kinds04_q10.f90
@@ -1,5 +1,5 @@
! RUN: not %flang_fc1 %s 2>%t.stderr
-! RUN: FileCheck %s --input-file=%t.stderr --check-prefixes=%if system-aix %{"PORTABILITY","WARNING","ERROR","AIX_WARNING"%} %else %{"PORTABILITY","WARNING","ERROR","NON_AIX_WARNING"%}
+! RUN: FileCheck %s --input-file=%t.stderr --check-prefixes=%if system-aix %{"PORTABILITY","WARNING","ERROR","AIX_WARNING"%} %else %{"PORTABILITY","WARNING","ERROR"%}
! C716 If both kind-param and exponent-letter appear, exponent-letter
! shall be E. (As an extension we also allow an exponent-letter which matches
! the kind-param)
@@ -12,13 +12,13 @@ subroutine s(var)
real :: realvar3 = 4.0Q6
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard
real :: realvar4 = 4.0D6_8
- !AIX_WARNING: underflow on REAL(10) to REAL(8) conversion
- !NON_AIX_WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q'
+ !WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q'
+ !AIX_WARNING: underflow on REAL(10) to REAL(4) conversion
real :: realvar5 = 4.0Q6_10
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard
real :: realvar6 = 4.0Q6_16
real :: realvar7 = 4.0E6_8
- !AIX_WARNING: underflow on REAL(10) to REAL(8) conversion
+ !AIX_WARNING: underflow on REAL(10) to REAL(4) conversion
real :: realvar8 = 4.0E6_10
real :: realvar9 = 4.0E6_16
!ERROR: Unsupported REAL(KIND=32) |
Please approve, @kkwli , if you're happy with this change, or let me know what else needs to be done; thanks. |
Oh, sorry, I didn't notice the CI failure. Hang on, please. |
flang/test/Semantics/kinds04_q10.f90
Outdated
@@ -1,4 +1,5 @@ | |||
! RUN: %python %S/test_errors.py %s %flang_fc1 | |||
! RUN: not %flang_fc1 %s 2>%t.stderr | |||
! RUN: FileCheck %s --input-file=%t.stderr --check-prefixes=%if system-aix %{"PORTABILITY","WARNING","ERROR","AIX_WARNING"%} %else %{"PORTABILITY","WARNING","ERROR","NON_AIX_WARNING"%} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
! RUN: FileCheck %s --input-file=%t.stderr --check-prefixes=%if system-aix %{"PORTABILITY","WARNING","ERROR","AIX_WARNING"%} %else %{"PORTABILITY","WARNING","ERROR","NON_AIX_WARNING"%} | |
! RUN: FileCheck %s --input-file=%t.stderr --check-prefixes=%if system-aix %{"PORTABILITY","WARNING","ERROR","AIX_WARNING"%} %else %{"PORTABILITY","WARNING","ERROR"%} |
flang/test/Semantics/kinds04_q10.f90
Outdated
!AIX_WARNING: underflow on REAL(10) to REAL(8) conversion | ||
!NON_AIX_WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
!AIX_WARNING: underflow on REAL(10) to REAL(8) conversion | |
!NON_AIX_WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q' | |
!WARNING: Explicit kind parameter on real constant disagrees with exponent letter 'q' | |
!AIX_WARNING: underflow on REAL(10) to REAL(4) conversion |
flang/test/Semantics/kinds04_q10.f90
Outdated
real :: realvar5 = 4.0Q6_10 | ||
!PORTABILITY: Explicit kind parameter together with non-'E' exponent letter is not standard | ||
real :: realvar6 = 4.0Q6_16 | ||
real :: realvar7 = 4.0E6_8 | ||
!AIX_WARNING: underflow on REAL(10) to REAL(8) conversion |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
!AIX_WARNING: underflow on REAL(10) to REAL(8) conversion | |
!AIX_WARNING: underflow on REAL(10) to REAL(4) conversion |
The suggested changes can make things work on |
Add AIX_WARNING expected warnings to a test that is now producing new warnings. Should fix https://lab.llvm.org/buildbot/#/builders/201/builds/2291.
Should be good to go now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks for the fix.
Add AIX_WARNING expected warnings to a test that is now producing new warnings.
Should fix https://lab.llvm.org/buildbot/#/builders/201/builds/2291.