Skip to content

Commit 30d8000

Browse files
authored
[flang][cuda] Allow SHARED actual to DEVICE dummy (#115215)
Update the compatibility rules to allow SHARED actual argument passed to DEVICE dummy argument. Emit a warning in that case.
1 parent 29a5c05 commit 30d8000

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

flang/include/flang/Common/Fortran.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ static constexpr IgnoreTKRSet ignoreTKRAll{IgnoreTKR::Type, IgnoreTKR::Kind,
118118
std::string AsFortran(IgnoreTKRSet);
119119

120120
bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr>,
121-
std::optional<CUDADataAttr>, IgnoreTKRSet, bool allowUnifiedMatchingRule,
121+
std::optional<CUDADataAttr>, IgnoreTKRSet, std::optional<std::string> *,
122+
bool allowUnifiedMatchingRule,
122123
const LanguageFeatureControl *features = nullptr);
123124

124125
static constexpr char blankCommonObjectName[] = "__BLNK__";

flang/lib/Common/Fortran.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ std::string AsFortran(IgnoreTKRSet tkr) {
103103
/// dummy argument attribute while `y` represents the actual argument attribute.
104104
bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr> x,
105105
std::optional<CUDADataAttr> y, IgnoreTKRSet ignoreTKR,
106-
bool allowUnifiedMatchingRule, const LanguageFeatureControl *features) {
106+
std::optional<std::string> *warning, bool allowUnifiedMatchingRule,
107+
const LanguageFeatureControl *features) {
107108
bool isCudaManaged{features
108109
? features->IsEnabled(common::LanguageFeature::CudaManaged)
109110
: false};
@@ -134,8 +135,12 @@ bool AreCompatibleCUDADataAttrs(std::optional<CUDADataAttr> x,
134135
} else {
135136
if (*x == CUDADataAttr::Device) {
136137
if ((y &&
137-
(*y == CUDADataAttr::Managed || *y == CUDADataAttr::Unified)) ||
138+
(*y == CUDADataAttr::Managed || *y == CUDADataAttr::Unified ||
139+
*y == CUDADataAttr::Shared)) ||
138140
(!y && (isCudaUnified || isCudaManaged))) {
141+
if (y && *y == CUDADataAttr::Shared && warning) {
142+
*warning = "SHARED attribute ignored"s;
143+
}
139144
return true;
140145
}
141146
} else if (*x == CUDADataAttr::Managed) {

flang/lib/Evaluate/characteristics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ bool DummyDataObject::IsCompatibleWith(const DummyDataObject &actual,
371371
}
372372
if (!attrs.test(Attr::Value) &&
373373
!common::AreCompatibleCUDADataAttrs(cudaDataAttr, actual.cudaDataAttr,
374-
ignoreTKR,
374+
ignoreTKR, warning,
375375
/*allowUnifiedMatchingRule=*/false)) {
376376
if (whyNot) {
377377
*whyNot = "incompatible CUDA data attributes";
@@ -1771,7 +1771,7 @@ bool DistinguishUtils::Distinguishable(
17711771
x.intent != common::Intent::In) {
17721772
return true;
17731773
} else if (!common::AreCompatibleCUDADataAttrs(x.cudaDataAttr, y.cudaDataAttr,
1774-
x.ignoreTKR | y.ignoreTKR,
1774+
x.ignoreTKR | y.ignoreTKR, nullptr,
17751775
/*allowUnifiedMatchingRule=*/false)) {
17761776
return true;
17771777
} else if (features_.IsEnabled(

flang/lib/Semantics/check-call.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,8 +976,9 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,
976976
actualDataAttr = common::CUDADataAttr::Device;
977977
}
978978
}
979+
std::optional<std::string> warning;
979980
if (!common::AreCompatibleCUDADataAttrs(dummyDataAttr, actualDataAttr,
980-
dummy.ignoreTKR,
981+
dummy.ignoreTKR, &warning,
981982
/*allowUnifiedMatchingRule=*/true, &context.languageFeatures())) {
982983
auto toStr{[](std::optional<common::CUDADataAttr> x) {
983984
return x ? "ATTRIBUTES("s +
@@ -988,6 +989,10 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,
988989
"%s has %s but its associated actual argument has %s"_err_en_US,
989990
dummyName, toStr(dummyDataAttr), toStr(actualDataAttr));
990991
}
992+
if (warning && context.ShouldWarn(common::UsageWarning::CUDAUsage)) {
993+
messages.Say(common::UsageWarning::CUDAUsage, "%s"_warn_en_US,
994+
std::move(*warning));
995+
}
991996
}
992997

993998
// Warning for breaking F'2023 change with character allocatables

flang/test/Semantics/cuf17.cuf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
! RUN: bbc -emit-hlfir -fcuda %s 2>&1 | FileCheck %s
2+
3+
module mod1
4+
contains
5+
6+
attributes(device) subroutine sub1(adev)
7+
real, device :: adev(10)
8+
end
9+
10+
attributes(global) subroutine sub2()
11+
real, shared :: adev(10)
12+
!WARNING: SHARED attribute ignored
13+
call sub1(adev)
14+
end subroutine
15+
16+
end module
17+
18+
! CHECK: warning: SHARED attribute ignored

0 commit comments

Comments
 (0)