Revert "[OpenMP][OpenACC] Disable the unsupported -fopenacc option"

ronlieb · ronlieb · commit c289bce057b2 · 2025-03-07T09:50:11.000-06:00
This reverts commit fc76b6f.
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -1401,10 +1401,9 @@ def fno_hip_emit_relocatable : Flag<["-"], "fno-hip-emit-relocatable">,
 }
 
 // Clang specific/exclusive options for OpenACC.
-// Unsupported on AMD downstream
 def openacc_macro_override
     : Separate<["-"], "fexperimental-openacc-macro-override">,
-      Visibility<[]>,
+      Visibility<[ClangOption, CC1Option]>,
       Group<f_Group>,
       HelpText<"Overrides the _OPENACC macro value for experimental testing "
                "during OpenACC support development">;
diff --git a/clang/test/AST/ast-print-openacc-combined-construct.cpp b/clang/test/AST/ast-print-openacc-combined-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -Wno-openacc-deprecated-clause-alias -ast-print %s -o - | FileCheck %s
 
 constexpr int get_value() { return 1; }
diff --git a/clang/test/AST/ast-print-openacc-compute-construct.cpp b/clang/test/AST/ast-print-openacc-compute-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -Wno-openacc-deprecated-clause-alias -ast-print %s -o - | FileCheck %s
 
 void foo() {
diff --git a/clang/test/AST/ast-print-openacc-data-construct.cpp b/clang/test/AST/ast-print-openacc-data-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -Wno-openacc-deprecated-clause-alias -Wno-source-uses-openacc -ast-print %s -o - | FileCheck %s
 
 void foo() {
diff --git a/clang/test/AST/ast-print-openacc-init-construct.cpp b/clang/test/AST/ast-print-openacc-init-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -ast-print %s -o - | FileCheck %s
 
 unsigned Int;
diff --git a/clang/test/AST/ast-print-openacc-loop-construct.cpp b/clang/test/AST/ast-print-openacc-loop-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -Wno-openacc-deprecated-clause-alias -ast-print %s -o - | FileCheck %s
 
 struct SomeStruct{};
diff --git a/clang/test/AST/ast-print-openacc-set-construct.cpp b/clang/test/AST/ast-print-openacc-set-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -ast-print %s -o - | FileCheck %s
 
 unsigned Int;
diff --git a/clang/test/AST/ast-print-openacc-shutdown-construct.cpp b/clang/test/AST/ast-print-openacc-shutdown-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -ast-print %s -o - | FileCheck %s
 
 unsigned Int;
diff --git a/clang/test/AST/ast-print-openacc-update-construct.cpp b/clang/test/AST/ast-print-openacc-update-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -ast-print %s -o - | FileCheck %s
 void uses(bool cond) {
   int I;
diff --git a/clang/test/AST/ast-print-openacc-wait-construct.cpp b/clang/test/AST/ast-print-openacc-wait-construct.cpp
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -fopenacc -ast-print %s -o - | FileCheck %s
 
 void uses() {
diff --git a/clang/test/Driver/openacc.c b/clang/test/Driver/openacc.c
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang -S -### -fopenacc %s 2>&1 | FileCheck %s --check-prefix=CHECK-DRIVER
 // CHECK-DRIVER: "-cc1" {{.*}} "-fopenacc"
 
diff --git a/clang/test/Format/docs_updated.test b/clang/test/Format/docs_updated.test
@@ -1,5 +1,3 @@
-// Needs write access to llvm-project/clang/test/Format/../../docs/tools/plurals.txt
-// UNSUPPORTED: true
 // RUN: %python %S/../../docs/tools/dump_format_style.py -o %t.style
 // RUN: diff --strip-trailing-cr %t.style \
 // RUN:   %S/../../docs/ClangFormatStyleOptions.rst
diff --git a/clang/test/Preprocessor/openacc.c b/clang/test/Preprocessor/openacc.c
@@ -1,5 +1,3 @@
-// -fopenacc unsupported on AMD downstream
-// UNSUPPORTED: true
 // RUN: %clang_cc1 -E -fopenacc %s | FileCheck %s --check-prefix=DEFAULT
 // RUN: %clang_cc1 -E -fopenacc -fexperimental-openacc-macro-override 202211 %s | FileCheck %s --check-prefix=OVERRIDE
 
diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
@@ -58,8 +58,6 @@
     "README.txt",
     "LICENSE.txt",
     "debuginfo-tests",
-    "SemaOpenACC",              # unsupported on AMD downstream
-    "ParserOpenACC",            # unsupported on AMD downstream
 ]
 
 # test_source_root: The root path where tests are located.
diff --git a/flang/test/Lower/OpenACC/acc-enter-data-unwrap-defaultbounds.f90 b/flang/test/Lower/OpenACC/acc-enter-data-unwrap-defaultbounds.f90
@@ -1,7 +1,7 @@
 ! This test checks lowering of OpenACC enter data directive.
 
 ! RUN: bbc -fopenacc -emit-hlfir --openacc-unwrap-fir-box=true --openacc-generate-default-bounds=true %s -o - | FileCheck %s
-
+! XFAIL: *
 subroutine acc_enter_data
   integer :: async = 1
   real, dimension(10, 10) :: a, b, c
diff --git a/flang/test/Lower/pre-fir-tree05.f90 b/flang/test/Lower/pre-fir-tree05.f90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -fdebug-pre-fir-tree -fopenacc %s | FileCheck %s
 
 ! Test structure of the Pre-FIR tree with OpenACC construct
diff --git a/flang/test/Lower/pre-fir-tree07.f90 b/flang/test/Lower/pre-fir-tree07.f90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -fdebug-pre-fir-tree -fopenacc %s | FileCheck %s
 
 ! Test structure of the Pre-FIR tree with OpenACC declarative construct
diff --git a/flang/test/Lower/pre-fir-tree08.f b/flang/test/Lower/pre-fir-tree08.f
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -fdebug-pre-fir-tree -fopenacc %s | FileCheck %s
 	program rewrite_goto
 	integer b
diff --git a/flang/test/Parser/acc-unparse.f90 b/flang/test/Parser/acc-unparse.f90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -fopenacc -fdebug-unparse %s | FileCheck %s
 
 ! Test unparse does not crash with OpenACC directives.
diff --git 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 -E %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fopenmp -fopenacc -E %s 2>&1 | FileCheck %s
       program main
 ! CHECK: k01=1+ 1
       k01=1+
diff --git a/flang/test/Preprocessing/pp132.f90 b/flang/test/Preprocessing/pp132.f90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang -E -fopenmp -fopenacc %s 2>&1 | FileCheck --strict-whitespace %s
 ! CHECK:       {{^}}!$OMP   parallel default(shared) private(super_very_long_name_for_the_va&
 ! CHECK-NEXT:  {{^}}!$OMP&riable)
diff --git a/flang/test/Preprocessing/preprocessed-dirs.F90 b/flang/test/Preprocessing/preprocessed-dirs.F90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -E -fopenacc %s 2>&1 | FileCheck %s
 !CHECK: subroutine r4(x) Z real :: x Z !$acc routine Z print *, x Z end
 #define SUB(s, t) subroutine s(x) Z\
diff --git a/flang/test/Preprocessing/sentinel-after-semi.F90 b/flang/test/Preprocessing/sentinel-after-semi.F90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %flang_fc1 -fdebug-unparse -fopenacc %s 2>&1 | FileCheck %s
 ! CHECK: !$ACC DECLARE COPYIN(var)
 #define ACCDECLARE(var) integer :: var; \
diff --git a/flang/test/Semantics/cuf10.cuf b/flang/test/Semantics/cuf10.cuf
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenacc
 module m
   real, device :: a(4,8)
diff --git a/flang/test/Semantics/loop-directives.f90 b/flang/test/Semantics/loop-directives.f90
@@ -1,5 +1,3 @@
-! -fopenacc unsupported on AMD downstream
-! UNSUPPORTED: true
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -Werror
 ! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenacc -Werror
 
diff --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
@@ -77,9 +77,7 @@
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
 # directories.
-config.excludes = ["Inputs", "CMakeLists.txt", "README.txt", "LICENSE.txt",
-    "OpenACC",            # unsupported on AMD downstream
-]
+config.excludes = ["Inputs", "CMakeLists.txt", "README.txt", "LICENSE.txt"]
 
 # If the flang examples are built, add examples to the config
 if config.flang_examples:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// -fopenacc unsupported on AMD downstream`
`2`		`-// UNSUPPORTED: true`
`3`	`1`	`// RUN: %clang_cc1 -fopenacc -Wno-openacc-deprecated-clause-alias -ast-print %s -o - \| FileCheck %s`
`4`	`2`
`5`	`3`	`constexpr int get_value() { return 1; }`