[flang-commits] [flang] [flang][cuda] Update attribute compatibily check for unified matching rule (PR #90679)
Valentin Clement バレンタイン クレメン via flang-commits
flang-commits at lists.llvm.org
Tue Apr 30 18:01:24 PDT 2024
https://github.com/clementval updated https://github.com/llvm/llvm-project/pull/90679
>From e920a88fa7042108267b4e7809342f4258913c38 Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Tue, 30 Apr 2024 15:42:08 -0700
Subject: [PATCH 1/2] [flang][cuda] Update attribute compatibily check for
unified matching rule
---
flang/include/flang/Common/Fortran.h | 5 +++--
flang/lib/Common/Fortran.cpp | 24 +++++++++++++++++++++++-
flang/lib/Semantics/check-call.cpp | 5 +++--
flang/test/Semantics/cuf13.cuf | 9 +++++++++
4 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/flang/include/flang/Common/Fortran.h b/flang/include/flang/Common/Fortran.h
index 2a53452a2774ff..c63362a966a6b1 100644
--- a/flang/include/flang/Common/Fortran.h
+++ b/flang/include/flang/Common/Fortran.h
@@ -114,8 +114,9 @@ static constexpr IgnoreTKRSet ignoreTKRAll{IgnoreTKR::Type, IgnoreTKR::Kind,
IgnoreTKR::Rank, IgnoreTKR::Device, IgnoreTKR::Managed};
std::string AsFortran(IgnoreTKRSet);
-bool AreCompatibleCUDADataAttrs(
- std::optional<CUDADataAttr>, std::optional<CUDADataAttr>, IgnoreTKRSet);
+bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr>,
+ std::optional<CUDADataAttr>, IgnoreTKRSet,
+ bool allowUnifiedMatchingRule = false);
static constexpr char blankCommonObjectName[] = "__BLNK__";
diff --git a/flang/lib/Common/Fortran.cpp b/flang/lib/Common/Fortran.cpp
index 8ada8fe210a30f..c8efe0bb234328 100644
--- a/flang/lib/Common/Fortran.cpp
+++ b/flang/lib/Common/Fortran.cpp
@@ -97,8 +97,12 @@ std::string AsFortran(IgnoreTKRSet tkr) {
return result;
}
+/// Check compatibilty of CUDA attribute.
+/// When `allowUnifiedMatchingRule` is enabled, argument `x` represents the
+/// dummy argument attribute while `y` represents the actual argument attribute.
bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr> x,
- std::optional<CUDADataAttr> y, IgnoreTKRSet ignoreTKR) {
+ std::optional<CUDADataAttr> y, IgnoreTKRSet ignoreTKR,
+ bool allowUnifiedMatchingRule) {
if (!x && !y) {
return true;
} else if (x && y && *x == *y) {
@@ -114,6 +118,24 @@ bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr> x,
x.value_or(CUDADataAttr::Managed) == CUDADataAttr::Managed &&
y.value_or(CUDADataAttr::Managed) == CUDADataAttr::Managed) {
return true;
+ } else if (allowUnifiedMatchingRule) {
+ if (!x) { // Dummy argument has no attribute -> host
+ if (y && *y == CUDADataAttr::Managed || *y == CUDADataAttr::Unified) {
+ return true;
+ }
+ } else {
+ if (*x == CUDADataAttr::Device && y &&
+ (*y == CUDADataAttr::Managed || *y == CUDADataAttr::Unified)) {
+ return true;
+ } else if (*x == CUDADataAttr::Managed && y &&
+ *y == CUDADataAttr::Unified) {
+ return true;
+ } else if (*x == CUDADataAttr::Unified && y &&
+ *y == CUDADataAttr::Managed) {
+ return true;
+ }
+ }
+ return false;
} else {
return false;
}
diff --git a/flang/lib/Semantics/check-call.cpp b/flang/lib/Semantics/check-call.cpp
index db0949e905a658..f0da779785142a 100644
--- a/flang/lib/Semantics/check-call.cpp
+++ b/flang/lib/Semantics/check-call.cpp
@@ -897,8 +897,9 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,
actualDataAttr = common::CUDADataAttr::Device;
}
}
- if (!common::AreCompatibleCUDADataAttrs(
- dummyDataAttr, actualDataAttr, dummy.ignoreTKR)) {
+ if (!common::AreCompatibleCUDADataAttrs(dummyDataAttr, actualDataAttr,
+ dummy.ignoreTKR,
+ /*allowUnifiedMatchingRule=*/true)) {
auto toStr{[](std::optional<common::CUDADataAttr> x) {
return x ? "ATTRIBUTES("s +
parser::ToUpperCaseLetters(common::EnumToString(*x)) + ")"s
diff --git a/flang/test/Semantics/cuf13.cuf b/flang/test/Semantics/cuf13.cuf
index 7c6673e21bf11b..6db829002fae67 100644
--- a/flang/test/Semantics/cuf13.cuf
+++ b/flang/test/Semantics/cuf13.cuf
@@ -6,6 +6,10 @@ module matching
module procedure sub_device
end interface
+ interface subman
+ module procedure sub_host
+ end interface
+
contains
subroutine sub_host(a)
integer :: a(:)
@@ -21,8 +25,13 @@ program m
use matching
integer, pinned, allocatable :: a(:)
+ integer, managed, allocatable :: b(:)
logical :: plog
allocate(a(100), pinned = plog)
+ allocate(b(200))
call sub(a)
+
+ call subman(b)
+
end
>From 953779f471895e73efd9a9ec58cefce013fa06d8 Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Tue, 30 Apr 2024 18:00:45 -0700
Subject: [PATCH 2/2] Remove default value
---
flang/include/flang/Common/Fortran.h | 3 +--
flang/lib/Evaluate/characteristics.cpp | 10 ++++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/flang/include/flang/Common/Fortran.h b/flang/include/flang/Common/Fortran.h
index c63362a966a6b1..3b965fe60c2f02 100644
--- a/flang/include/flang/Common/Fortran.h
+++ b/flang/include/flang/Common/Fortran.h
@@ -115,8 +115,7 @@ static constexpr IgnoreTKRSet ignoreTKRAll{IgnoreTKR::Type, IgnoreTKR::Kind,
std::string AsFortran(IgnoreTKRSet);
bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr>,
- std::optional<CUDADataAttr>, IgnoreTKRSet,
- bool allowUnifiedMatchingRule = false);
+ std::optional<CUDADataAttr>, IgnoreTKRSet, bool allowUnifiedMatchingRule);
static constexpr char blankCommonObjectName[] = "__BLNK__";
diff --git a/flang/lib/Evaluate/characteristics.cpp b/flang/lib/Evaluate/characteristics.cpp
index 20f7476425ace6..ab03ca5ed2d5a2 100644
--- a/flang/lib/Evaluate/characteristics.cpp
+++ b/flang/lib/Evaluate/characteristics.cpp
@@ -362,8 +362,9 @@ bool DummyDataObject::IsCompatibleWith(const DummyDataObject &actual,
}
}
if (!attrs.test(Attr::Value) &&
- !common::AreCompatibleCUDADataAttrs(
- cudaDataAttr, actual.cudaDataAttr, ignoreTKR)) {
+ !common::AreCompatibleCUDADataAttrs(cudaDataAttr, actual.cudaDataAttr,
+ ignoreTKR,
+ /*allowUnifiedMatchingRule=*/false)) {
if (whyNot) {
*whyNot = "incompatible CUDA data attributes";
}
@@ -1754,8 +1755,9 @@ bool DistinguishUtils::Distinguishable(
} else if (y.attrs.test(Attr::Allocatable) && x.attrs.test(Attr::Pointer) &&
x.intent != common::Intent::In) {
return true;
- } else if (!common::AreCompatibleCUDADataAttrs(
- x.cudaDataAttr, y.cudaDataAttr, x.ignoreTKR | y.ignoreTKR)) {
+ } else if (!common::AreCompatibleCUDADataAttrs(x.cudaDataAttr, y.cudaDataAttr,
+ x.ignoreTKR | y.ignoreTKR,
+ /*allowUnifiedMatchingRule=*/false)) {
return true;
} else if (features_.IsEnabled(
common::LanguageFeature::DistinguishableSpecifics) &&
More information about the flang-commits
mailing list