Skip to content

[Flang][OpenMP] Disable all OpenMP semantics tests on Windows #92739

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 20, 2024
Merged

[Flang][OpenMP] Disable all OpenMP semantics tests on Windows #92739

merged 1 commit into from
May 20, 2024

Conversation

kiranchandramohan
Copy link
Contributor

@kiranchandramohan kiranchandramohan commented May 20, 2024 •
edited
Loading

Removes two XFAILed tests, the other tests are marked UNSUPPORTED only on windows.

@llvmbot llvmbot added flang Flang issues not falling into any other category flang:openmp flang:semantics labels May 20, 2024
@llvmbot
Copy link
Member

llvmbot commented May 20, 2024

@llvm/pr-subscribers-flang-openmp

Author: Kiran Chandramohan (kiranchandramohan)

Changes

Two XFAILed tests are marked unsupported on all platforms, the other tests are XFAILed only on windows.

Full diff: https://github.com/llvm/llvm-project/pull/92739.diff

5 Files Affected:

  • (modified) flang/test/Semantics/OpenMP/do02.f90 (+1-1)
  • (modified) flang/test/Semantics/OpenMP/taskloop01.f90 (+1)
  • (modified) flang/test/Semantics/OpenMP/taskloop02.f90 (+1)
  • (modified) flang/test/Semantics/OpenMP/taskloop03.f90 (+1-1)
  • (modified) flang/test/Semantics/OpenMP/taskwait.f90 (+1)
diff --git a/flang/test/Semantics/OpenMP/do02.f90 b/flang/test/Semantics/OpenMP/do02.f90
index 9749991e4f96b..22d9e70195ff7 100644
--- a/flang/test/Semantics/OpenMP/do02.f90
+++ b/flang/test/Semantics/OpenMP/do02.f90
@@ -1,5 +1,5 @@
 ! RUN: %S/test_errors.sh %s %t %flang -fopenmp
-! XFAIL: *
+! UNSUPPORTED: *
 
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
diff --git a/flang/test/Semantics/OpenMP/taskloop01.f90 b/flang/test/Semantics/OpenMP/taskloop01.f90
index 6bef584381518..d91183f55af99 100644
--- a/flang/test/Semantics/OpenMP/taskloop01.f90
+++ b/flang/test/Semantics/OpenMP/taskloop01.f90
@@ -1,6 +1,7 @@
 ! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
+! UNSUPPORTED: system-windows
 
 subroutine parallel_work
   integer i
diff --git a/flang/test/Semantics/OpenMP/taskloop02.f90 b/flang/test/Semantics/OpenMP/taskloop02.f90
index 867ef8a9806d9..8afe5ec9eefd9 100644
--- a/flang/test/Semantics/OpenMP/taskloop02.f90
+++ b/flang/test/Semantics/OpenMP/taskloop02.f90
@@ -2,6 +2,7 @@
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
 ! Invalid entry to OpenMP structured block.
+! UNSUPPORTED: system-windows
 
 program omp_taskloop
   integer i , j
diff --git a/flang/test/Semantics/OpenMP/taskloop03.f90 b/flang/test/Semantics/OpenMP/taskloop03.f90
index 7e2e426a3fe7e..81374997d7f36 100644
--- a/flang/test/Semantics/OpenMP/taskloop03.f90
+++ b/flang/test/Semantics/OpenMP/taskloop03.f90
@@ -1,5 +1,5 @@
 ! RUN: %S/test_errors.sh %s %t %flang -fopenmp
-! XFAIL: *
+! UNSUPPORTED: *
 
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
diff --git a/flang/test/Semantics/OpenMP/taskwait.f90 b/flang/test/Semantics/OpenMP/taskwait.f90
index e60051c9da8ac..ba39a4b5e2447 100644
--- a/flang/test/Semantics/OpenMP/taskwait.f90
+++ b/flang/test/Semantics/OpenMP/taskwait.f90
@@ -1,4 +1,5 @@
 ! RUN: %python %S/../test_errors.py %s %flang -fopenmp
+! UNSUPPORTED: system-windows
 
 !$omp taskwait
 end

@llvmbot
Copy link
Member

llvmbot commented May 20, 2024

@llvm/pr-subscribers-flang-semantics

Author: Kiran Chandramohan (kiranchandramohan)

Changes

Two XFAILed tests are marked unsupported on all platforms, the other tests are XFAILed only on windows.

Full diff: https://github.com/llvm/llvm-project/pull/92739.diff

5 Files Affected:

  • (modified) flang/test/Semantics/OpenMP/do02.f90 (+1-1)
  • (modified) flang/test/Semantics/OpenMP/taskloop01.f90 (+1)
  • (modified) flang/test/Semantics/OpenMP/taskloop02.f90 (+1)
  • (modified) flang/test/Semantics/OpenMP/taskloop03.f90 (+1-1)
  • (modified) flang/test/Semantics/OpenMP/taskwait.f90 (+1)
diff --git a/flang/test/Semantics/OpenMP/do02.f90 b/flang/test/Semantics/OpenMP/do02.f90
index 9749991e4f96b..22d9e70195ff7 100644
--- a/flang/test/Semantics/OpenMP/do02.f90
+++ b/flang/test/Semantics/OpenMP/do02.f90
@@ -1,5 +1,5 @@
 ! RUN: %S/test_errors.sh %s %t %flang -fopenmp
-! XFAIL: *
+! UNSUPPORTED: *
 
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
diff --git a/flang/test/Semantics/OpenMP/taskloop01.f90 b/flang/test/Semantics/OpenMP/taskloop01.f90
index 6bef584381518..d91183f55af99 100644
--- a/flang/test/Semantics/OpenMP/taskloop01.f90
+++ b/flang/test/Semantics/OpenMP/taskloop01.f90
@@ -1,6 +1,7 @@
 ! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
+! UNSUPPORTED: system-windows
 
 subroutine parallel_work
   integer i
diff --git a/flang/test/Semantics/OpenMP/taskloop02.f90 b/flang/test/Semantics/OpenMP/taskloop02.f90
index 867ef8a9806d9..8afe5ec9eefd9 100644
--- a/flang/test/Semantics/OpenMP/taskloop02.f90
+++ b/flang/test/Semantics/OpenMP/taskloop02.f90
@@ -2,6 +2,7 @@
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
 ! Invalid entry to OpenMP structured block.
+! UNSUPPORTED: system-windows
 
 program omp_taskloop
   integer i , j
diff --git a/flang/test/Semantics/OpenMP/taskloop03.f90 b/flang/test/Semantics/OpenMP/taskloop03.f90
index 7e2e426a3fe7e..81374997d7f36 100644
--- a/flang/test/Semantics/OpenMP/taskloop03.f90
+++ b/flang/test/Semantics/OpenMP/taskloop03.f90
@@ -1,5 +1,5 @@
 ! RUN: %S/test_errors.sh %s %t %flang -fopenmp
-! XFAIL: *
+! UNSUPPORTED: *
 
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
diff --git a/flang/test/Semantics/OpenMP/taskwait.f90 b/flang/test/Semantics/OpenMP/taskwait.f90
index e60051c9da8ac..ba39a4b5e2447 100644
--- a/flang/test/Semantics/OpenMP/taskwait.f90
+++ b/flang/test/Semantics/OpenMP/taskwait.f90
@@ -1,4 +1,5 @@
 ! RUN: %python %S/../test_errors.py %s %flang -fopenmp
+! UNSUPPORTED: system-windows
 
 !$omp taskwait
 end

kiranchandramohan
kiranchandramohan commented May 20, 2024
View reviewed changes
flang/test/Semantics/OpenMP/do02.f90 Outdated
@@ -1,5 +1,5 @@
! RUN: %S/test_errors.sh %s %t %flang -fopenmp
! XFAIL: *
! UNSUPPORTED: *
Copy link
Contributor Author

@kiranchandramohan kiranchandramohan May 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* does not work with UNSUPPORTED.

@kiranchandramohan kiranchandramohan changed the title [Flang][OpenMP] Disable a few long running tests [Flang][OpenMP] Disable/Remove a few long running tests May 20, 2024
@Endilll
Copy link
Contributor

Endilll commented May 20, 2024 •
edited
Loading

To be clear where this specific list of tests came from:

  1. do02.f90 is for sure known to cause the CI pause (https://discourse.llvm.org/t/flang-tests-are-extremely-slow-on-windows/78591/11)
  2. taskloop01.f90, taskloop02.f90, taskloop03.f90, and taskwait.f90 is a small set of tests I ran out of time to bisect, so they are not individually proven to be problematic.

@Endilll
Copy link
Contributor

Endilll commented May 20, 2024

It's also worth noting that the list is not exhaustive. I'd be rather surprised if this would fix our Windows CI problems, but it's a step in the right direction.

@AaronBallman AaronBallman requested a review from lnihlen May 20, 2024 12:03
tblah
tblah reviewed May 20, 2024
View reviewed changes
Copy link
Contributor

@tblah tblah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could you add a comment with the UNSUPPORTED directive to explain that these tests are intended to work but they may be one of the tests slowing down CI.

@kiranchandramohan
Copy link
Contributor Author

It's also worth noting that the list is not exhaustive. I'd be rather surprised if this would fix our Windows CI problems, but it's a step in the right direction.

Yes. This alone did not help. I will try disabling all Semantics/OpenMP tests to see whether it helps. If it helps then I will reduce the disabled ones using the SemanticsChecked list.

tblah
tblah approved these changes May 20, 2024
View reviewed changes
Copy link
Contributor

@tblah tblah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM so long as it does fix windows CI

@Endilll
Copy link
Contributor

Endilll commented May 20, 2024

It's also worth noting that the list is not exhaustive. I'd be rather surprised if this would fix our Windows CI problems, but it's a step in the right direction.

Yes. This alone did not help. I will try disabling all Semantics/OpenMP tests to see whether it helps. If it helps then I will reduce the disabled ones using the SemanticsChecked list.

Yes, that should resolve the issue with CI. I tested that yesterday.

@kiranchandramohan kiranchandramohan changed the title [Flang][OpenMP] Disable/Remove a few long running tests [Flang][OpenMP] Disable all OpenMP semantics tests on Windows May 20, 2024
@kiranchandramohan
Copy link
Contributor Author

It's also worth noting that the list is not exhaustive. I'd be rather surprised if this would fix our Windows CI problems, but it's a step in the right direction.

Yes. This alone did not help. I will try disabling all Semantics/OpenMP tests to see whether it helps. If it helps then I will reduce the disabled ones using the SemanticsChecked list.

Yes, that should resolve the issue with CI. I tested that yesterday.

This (disabling all Semantics OpenMP tests) worked. So I am going to commit this now. Will reenable the tests based on the SemanticsChecked tag in a separate PR.

@kiranchandramohan kiranchandramohan merged commit a91d5c0 into llvm:main May 20, 2024
4 checks passed
kiranchandramohan added a commit to kiranchandramohan/llvm-project that referenced this pull request May 24, 2024
@kiranchandramohan
[Flang][OpenMP] Reenable and fix final few tests 6/6
98ea51a 
Add do02.f90 and taskloop03.f90 that were removed in llvm#92739
Replace shell script tests with python.
Remove XFAIL from a test that can be enabled now.
@kiranchandramohan kiranchandramohan mentioned this pull request May 24, 2024
Merged
kiranchandramohan added a commit to kiranchandramohan/llvm-project that referenced this pull request May 24, 2024
@kiranchandramohan
[Flang][OpenMP] Reenable and fix final few tests 6/6
e22f537 
Add do02.f90 and taskloop03.f90 that were removed in llvm#92739
Replace shell script tests with python.
kiranchandramohan added a commit that referenced this pull request May 24, 2024
@kiranchandramohan
[Flang][OpenMP] Reenable and fix final few tests 6/6 (#93295)
879b726 
Add do02.f90 and taskloop03.f90 that were removed in
#92739
Replace shell script tests with python.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tblah tblah tblah approved these changes

@skatrak skatrak Awaiting requested review from skatrak

@AaronBallman AaronBallman Awaiting requested review from AaronBallman

@Endilll Endilll Awaiting requested review from Endilll

@luporl luporl Awaiting requested review from luporl

@kparzysz kparzysz Awaiting requested review from kparzysz

@lnihlen lnihlen Awaiting requested review from lnihlen

Assignees
No one assigned
Labels
flang:openmp flang:semantics flang Flang issues not falling into any other category
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kiranchandramohan @llvmbot @Endilll @tblah