[flang][openacc] Support readonly modifier for declare copyin in module file

[clementval]

Summary

Distinguish between copyin and copyin with the readonly modifier.

Depends on D157121

[clementval]

Rebase

[razvanlupusoru]

Looks great! Nice catch!

[clementval]

clang-format

flang/include/flang/Semantics/symbol.h

ENUM_CLASS(Flag,
       EntryDummyArgument,
       CompilerCreated, // A compiler created symbol
       // For compiler created symbols that are constant but cannot legally have
       // the PARAMETER attribute.
       ReadOnly,
       // OpenACC data-sharing attribute
       AccPrivate, AccFirstPrivate, AccShared,
       // OpenACC data-mapping attribute
-      AccCopy, AccCopyIn, AccCopyOut, AccCreate, AccDelete, AccPresent, AccLink,
-      AccDeviceResident, AccDevicePtr,
+      AccCopy, AccCopyIn, AccCopyInReadOnly, AccCopyOut, AccCreate, AccDelete,
+      AccPresent, AccLink, AccDeviceResident, AccDevicePtr,
       // OpenACC declare
       AccDeclare,
       // OpenACC data-movement attribute
       AccDevice, AccHost, AccSelf,
       // OpenACC miscellaneous flags
       AccCommonBlock, AccThreadPrivate, AccReduction, AccNone, AccPreDetermined,
       // OpenMP data-sharing attribute
       OmpShared, OmpPrivate, OmpLinear, OmpFirstPrivate, OmpLastPrivate,

flang/lib/Semantics/mod-file.cpp

llvm::raw_ostream &PutLower(llvm::raw_ostream &os, std::string_view str) {
   return os;
 }
 
 void ModFileWriter::PutDirective(llvm::raw_ostream &os, const Symbol &symbol) {
   if (symbol.test(Symbol::Flag::AccDeclare)) {
     os << "!$acc declare ";
     if (symbol.test(Symbol::Flag::AccCopy)) {
       os << "copy";
-    } else if (symbol.test(Symbol::Flag::AccCopyIn)) {
+    } else if (symbol.test(Symbol::Flag::AccCopyIn) || symbol.test(Symbol::Flag::AccCopyInReadOnly)) {
       os << "copyin";
     } else if (symbol.test(Symbol::Flag::AccCopyOut)) {
       os << "copyout";
     } else if (symbol.test(Symbol::Flag::AccCreate)) {
       os << "create";
     } else if (symbol.test(Symbol::Flag::AccPresent)) {
       os << "present";
     } else if (symbol.test(Symbol::Flag::AccDevicePtr)) {
       os << "deviceptr";
     } else if (symbol.test(Symbol::Flag::AccDeviceResident)) {
       os << "device_resident";
     } else if (symbol.test(Symbol::Flag::AccLink)) {
       os << "link";
     }
-    os << "(" << symbol.name() << ")\n";
+    os << "(";
+    if (symbol.test(Symbol::Flag::AccCopyInReadOnly)) {
+      os << "readonly: ";
+    }
+    os << symbol.name() << ")\n";
   }
 }
 
 struct Temp {
   Temp(int fd, std::string path) : fd{fd}, path{path} {}
   Temp(Temp &&t) : fd{std::exchange(t.fd, -1)}, path{std::move(t.path)} {}
   ~Temp() {
     if (fd >= 0) {

flang/lib/Semantics/resolve-directives.cpp

public:
   bool Pre(const parser::AccClause::Create &x) {
     const auto &objectList{std::get<parser::AccObjectList>(x.v.t)};
     ResolveAccObjectList(objectList, Symbol::Flag::AccCreate);
     return false;
   }
 
   bool Pre(const parser::AccClause::Copyin &x) {
     const auto &objectList{std::get<parser::AccObjectList>(x.v.t)};
+    const auto &modifier{std::get<std::optional<parser::AccDataModifier>>(x.v.t)};
+    if (modifier && (*modifier).v == parser::AccDataModifier::Modifier::ReadOnly) {
+      ResolveAccObjectList(objectList, Symbol::Flag::AccCopyInReadOnly);
+    } else {
       ResolveAccObjectList(objectList, Symbol::Flag::AccCopyIn);
+    }
     return false;
   }
 
   bool Pre(const parser::AccClause::Copyout &x) {
     const auto &objectList{std::get<parser::AccObjectList>(x.v.t)};
     ResolveAccObjectList(objectList, Symbol::Flag::AccCopyOut);
     return false;
   }
Symbol::Flags dataMappingAttributeFlags{Symbol::Flag::AccCreate,
       Symbol::Flag::AccDelete, Symbol::Flag::AccPresent};
 
   Symbol::Flags accFlagsRequireNewSymbol{Symbol::Flag::AccPrivate,
       Symbol::Flag::AccFirstPrivate, Symbol::Flag::AccReduction};
 
   Symbol::Flags accDataMvtFlags{
       Symbol::Flag::AccDevice, Symbol::Flag::AccHost, Symbol::Flag::AccSelf};
 
-  Symbol::Flags accFlagsRequireMark{Symbol::Flag::AccCreate,
-      Symbol::Flag::AccCopyIn, Symbol::Flag::AccCopy, Symbol::Flag::AccCopyOut,
-      Symbol::Flag::AccDevicePtr, Symbol::Flag::AccDeviceResident,
-      Symbol::Flag::AccLink, Symbol::Flag::AccPresent};
+  Symbol::Flags accFlagsRequireMark{
+      Symbol::Flag::AccCreate, Symbol::Flag::AccCopyIn,
+      Symbol::Flag::AccCopyInReadOnly, Symbol::Flag::AccCopy,
+      Symbol::Flag::AccCopyOut, Symbol::Flag::AccDevicePtr,
+      Symbol::Flag::AccDeviceResident, Symbol::Flag::AccLink,
+      Symbol::Flag::AccPresent};
 
   void PrivatizeAssociatedLoopIndex(const parser::OpenACCLoopConstruct &);
   void ResolveAccObjectList(const parser::AccObjectList &, Symbol::Flag);
   void ResolveAccObject(const parser::AccObject &, Symbol::Flag);
   Symbol *ResolveAcc(const parser::Name &, Symbol::Flag, Scope &);
   Symbol *ResolveAcc(Symbol &, Symbol::Flag, Scope &);
   Symbol *ResolveName(const parser::Name &, bool parentScope = false);
   Symbol *ResolveAccCommonBlockName(const parser::Name *);

flang/test/Semantics/OpenACC/acc-module.f90

 ! RUN: %python %S/../test_modfile.py %s %flang_fc1 -fopenacc
 
 module acc_mod
   real :: data_create(100)
   !$acc declare create(data_create)
 
   real :: data_copyin(10)
   !$acc declare copyin(data_copyin)
 
+  real :: data_copyinro(10)
+  !$acc declare copyin(readonly: data_copyinro)
+
   real :: data_device_resident(20)
   !$acc declare device_resident(data_device_resident)
 
   integer :: data_link(50)
   !$acc declare link(data_link)
 end module
 
 !Expect: acc_mod.mod
 ! module acc_mod
 ! real(4)::data_create(1_8:100_8)
 ! !$acc declare create(data_create)
 ! real(4)::data_copyin(1_8:10_8)
 ! !$acc declare copyin(data_copyin)
+! real(4)::data_copyinro(1_8:10_8)
+! !$acc declare copyin(readonly: data_copyinro)
 ! real(4)::data_device_resident(1_8:20_8)
 ! !$acc declare device_resident(data_device_resident)
 ! integer(4)::data_link(1_8:50_8)
 ! !$acc declare link(data_link)
 ! end