From 874bf13f74d87fe641e0704b75c8765815cf12f9 Mon Sep 17 00:00:00 2001
From: Michael Klemm <michael.klemm@amd.com>
Date: Fri, 18 Oct 2024 09:29:32 +0200
Subject: [PATCH] Modify mixed OpenMP/OpenACC tests to no have OpenACC

---
 flang/test/Lower/branching-directive.f90      | 31 +------------------
 .../continuation-in-conditional-compilation.f |  7 +----
 flang/test/Preprocessing/pp132.f90            |  7 +----
 flang/test/Semantics/cuf10.cuf                |  2 +-
 flang/test/Semantics/loop-directives.f90      |  1 -
 5 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/flang/test/Lower/branching-directive.f90 b/flang/test/Lower/branching-directive.f90
index 69270d7bcbe96c..983c8b3701fbd8 100644
--- a/flang/test/Lower/branching-directive.f90
+++ b/flang/test/Lower/branching-directive.f90
@@ -1,4 +1,4 @@
-!RUN: bbc -emit-hlfir -fopenacc -fopenmp -o - %s | FileCheck %s
+!RUN: bbc -emit-hlfir -fopenmp -o - %s | FileCheck %s
 
 !https://github.com/llvm/llvm-project/issues/91526
 
@@ -57,32 +57,3 @@ subroutine simple2(x, yn)
   print *, E
 end subroutine
 
-!CHECK-LABEL: func.func @_QPacccase
-!CHECK: fir.select_case %{{[0-9]+}} : i32 [{{.*}}, ^bb[[CASE1:[0-9]+]], {{.*}}, ^bb[[CASE2:[0-9]+]], {{.*}}, ^bb[[CASE3:[0-9]+]]]
-!CHECK: ^bb[[CASE1]]:
-!CHECK:   acc.serial
-!CHECK:   cf.br ^bb[[EXIT:[0-9]+]]
-!CHECK: ^bb[[CASE2]]:
-!CHECK:   fir.call @_FortranAioOutputAscii
-!CHECK:   cf.br ^bb[[EXIT]]
-!CHECK: ^bb[[CASE3]]:
-!CHECK:   fir.call @_FortranAioOutputAscii
-!CHECK:   cf.br ^bb[[EXIT]]
-!CHECK: ^bb[[EXIT]]:
-!CHECK:   return
-subroutine acccase(var)
-  integer :: var
-  integer :: res(10)
-  select case (var)
-    case (1)
-      print *, "case 1"
-      !$acc serial
-      res(1) = 1
-      !$acc end serial
-    case (2)
-      print *, "case 2"
-    case default
-      print *, "case default"
-  end select
-end subroutine
-
diff --git a/flang/test/Parser/continuation-in-conditional-compilation.f b/flang/test/Parser/continuation-in-conditional-compilation.f
index 987112301e335c..89617742c7cd25 100644
--- a/flang/test/Parser/continuation-in-conditional-compilation.f
+++ b/flang/test/Parser/continuation-in-conditional-compilation.f
@@ -1,4 +1,4 @@
-! RUN: %flang_fc1 -fopenmp -fopenacc -E %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fopenmp -E %s 2>&1 | FileCheck %s
       program main
 ! CHECK: k01=1+ 1
       k01=1+
@@ -7,10 +7,5 @@ program main
 ! CHECK: !$omp parallel private(k01)
 !$omp parallel
 !$omp+ private(k01)
-!$omp end parallel
-
-! CHECK-NOT: comment
-!$omp parallel
-!$acc+comment
 !$omp end parallel
       end
diff --git a/flang/test/Preprocessing/pp132.f90 b/flang/test/Preprocessing/pp132.f90
index 418defb2d553ce..e53ea87c0f089e 100644
--- a/flang/test/Preprocessing/pp132.f90
+++ b/flang/test/Preprocessing/pp132.f90
@@ -1,8 +1,6 @@
-! RUN: %flang -E -fopenmp -fopenacc %s 2>&1 | FileCheck %s
+! RUN: %flang -E -fopenmp %s 2>&1 | FileCheck %s
 ! CHECK:  !$OMP parallel default(shared) private(super_very_long_name_for_the_va&
 ! CHECK:  !$OMP&riable)
-! CHECK:  !$acc data copyin(super_very_long_name_for_the_variable, another_super&
-! CHECK:  !$acc&_wordy_variable_to_test)
 ! Test correct continuations in compiler directives
 subroutine foo
   integer :: super_very_long_name_for_the_variable
@@ -12,7 +10,4 @@ subroutine foo
   another_super_wordy_variable_to_test = super_very_long_name_for_the_variable * 2
   !$OMP parallel default(shared) private(super_very_long_name_for_the_variable)
   !$omp end parallel
-
-  !$acc data copyin(super_very_long_name_for_the_variable, another_super_wordy_variable_to_test)
-  !$acc end data
 end subroutine foo
diff --git a/flang/test/Semantics/cuf10.cuf b/flang/test/Semantics/cuf10.cuf
index 047503b3cca4ea..f785be81ac94b5 100644
--- a/flang/test/Semantics/cuf10.cuf
+++ b/flang/test/Semantics/cuf10.cuf
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenacc
+! RUN: %python %S/test_errors.py %s %flang_fc1
 module m
   real, device :: a(4,8)
   real, managed, allocatable :: b(:,:)
diff --git a/flang/test/Semantics/loop-directives.f90 b/flang/test/Semantics/loop-directives.f90
index 58fb9b8082bc1a..cc23c384d272cd 100644
--- a/flang/test/Semantics/loop-directives.f90
+++ b/flang/test/Semantics/loop-directives.f90
@@ -1,5 +1,4 @@
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -Werror
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenacc -Werror
 
 subroutine empty
   ! WARNING: A DO loop must follow the VECTOR ALWAYS directive