shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Frontend][OpenMP] Add 6.1 as a valid OpenMP version (#153628)

Browse Source 
Co-authored-by: Michael Klemm <michael.klemm@amd.com>
This commit is contained in:
Krzysztof Parzyszek 2025-08-18 09:13:27 -05:00 committed by GitHub
parent 2497864e09
commit ae75884130
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flang/lib/Frontend/CompilerInvocation.cpp
View File

@ -1187,6 +1187,7 @@ static bool parseOpenMPArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
llvm::Triple t(res.getTargetOpts().triple); llvm::Triple t(res.getTargetOpts().triple);
constexpr unsigned newestFullySupported = 31; constexpr unsigned newestFullySupported = 31;
constexpr unsigned latestFinalized = 60;
// By default OpenMP is set to the most recent fully supported version // By default OpenMP is set to the most recent fully supported version
res.getLangOpts().OpenMPVersion = newestFullySupported; res.getLangOpts().OpenMPVersion = newestFullySupported;
res.getFrontendOpts().features.Enable( res.getFrontendOpts().features.Enable(
@ -1209,12 +1210,26 @@ static bool parseOpenMPArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
diags.Report(diagID) << value << arg->getAsString(args) << versions.str(); diags.Report(diagID) << value << arg->getAsString(args) << versions.str();
}; };
auto reportFutureVersion = [&](llvm::StringRef value) {
const unsigned diagID = diags.getCustomDiagID(
clang::DiagnosticsEngine::Warning,
"The specification for OpenMP version %0 is still under development; "
"the syntax and semantics of new features may be subject to change");
std::string buffer;
llvm::raw_string_ostream versions(buffer);
llvm::interleaveComma(ompVersions, versions);
diags.Report(diagID) << value;
};
llvm::StringRef value = arg->getValue(); llvm::StringRef value = arg->getValue();
if (!value.getAsInteger(/*radix=*/10, version)) { if (!value.getAsInteger(/*radix=*/10, version)) {
if (llvm::is_contained(ompVersions, version)) { if (llvm::is_contained(ompVersions, version)) {
res.getLangOpts().OpenMPVersion = version; res.getLangOpts().OpenMPVersion = version;
if (version > newestFullySupported) if (version > latestFinalized)
reportFutureVersion(value);
else if (version > newestFullySupported)
diags.Report(clang::diag::warn_openmp_incomplete) << version; diags.Report(clang::diag::warn_openmp_incomplete) << version;
} else if (llvm::is_contained(oldVersions, version)) { } else if (llvm::is_contained(oldVersions, version)) {
const unsigned diagID = const unsigned diagID =

6
flang/test/Driver/fopenmp-version.F90
View File

@ -22,4 +22,8 @@
!RUN: not %flang -c -fopenmp -fopenmp-version=29 %s 2>&1 | FileCheck --check-prefix=ERR-BAD %s !RUN: not %flang -c -fopenmp -fopenmp-version=29 %s 2>&1 | FileCheck --check-prefix=ERR-BAD %s
!ERR-BAD: error: '29' is not a valid OpenMP version in '-fopenmp-version=29', valid versions are 31, 40, 45, 50, 51, 52, 60 !ERR-BAD: error: '29' is not a valid OpenMP version in '-fopenmp-version=29', valid versions are 31, 40, 45, 50, 51, 52, 60, 61
!RUN: %flang -c -fopenmp -fopenmp-version=61 %s 2>&1 | FileCheck --check-prefix=FUTURE %s
!FUTURE: The specification for OpenMP version 61 is still under development; the syntax and semantics of new features may be subject to change

2
llvm/lib/Frontend/OpenMP/OMP.cpp
View File

@ -190,7 +190,7 @@ bool isCombinedConstruct(Directive D) {
} }
ArrayRef<unsigned> getOpenMPVersions() { ArrayRef<unsigned> getOpenMPVersions() {
static unsigned Versions[]{31, 40, 45, 50, 51, 52, 60}; static unsigned Versions[]{31, 40, 45, 50, 51, 52, 60, 61};
return Versions; return Versions;
} }