[flang][openacc] Retain the declare information in module file declaration

[clementval]

Summary

F18 produce a module file with a declaration part. This patch
propagates the OpenACC declare information in the module file along the variable
declaration.

Depends on D157042

[razvanlupusoru]

Looks great to me. Excellent start!

Any ideas whether declare bounds should also be stored somewhere?

[clementval]

In D157121#4561370, @razvanlupusoru wrote:

Looks great to me. Excellent start!

Any ideas whether declare bounds should also be stored somewhere?

Bounds will currently be lost indeed. I need to check where we can store this information.

[clementval]

Rebase + fix test

[clementval]

Use test_modfile.py to check module file output

flang/lib/Semantics/mod-file.h

private:
   void PutTypeParam(llvm::raw_ostream &, const Symbol &);
   void PutSubprogram(const Symbol &);
   void PutGeneric(const Symbol &);
   void PutUse(const Symbol &);
   void PutUseExtraAttr(Attr, const Symbol &, const Symbol &);
   llvm::raw_ostream &PutAttrs(llvm::raw_ostream &, Attrs,
       const std::string * = nullptr, bool = false, std::string before = ","s,
       std::string after = ""s) const;
+  void PutDirective(llvm::raw_ostream &, const Symbol &);
 };
 
 class ModFileReader {
 public:
   // directories specifies where to search for module files
   ModFileReader(SemanticsContext &context) : context_{context} {}
   // Find and read the module file for a module or submodule.
   // If ancestor is specified, look for a submodule of that module.

flang/lib/Semantics/mod-file.cpp

common::visit(
                   x.isExplicitBindName(), ""s);
               decls_ << "::/" << symbol.name() << "/\n";
             }
           },
           [](const HostAssocDetails &) {},
           [](const MiscDetails &) {},
           [&](const auto &) {
             PutEntity(decls_, symbol);
+            PutDirective(decls_, symbol);
             if (symbol.test(Symbol::Flag::OmpThreadprivate)) {
               decls_ << "!$omp threadprivate(" << symbol.name() << ")\n";
             }
           },
       },
       symbol.details());
 }
 

 
 llvm::raw_ostream &PutLower(llvm::raw_ostream &os, std::string_view str) {
   for (char c : str) {
     os << parser::ToLowerCaseLetter(c);
   }
   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)) {
+      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";
+  }
+}
+
 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) {
       llvm::sys::fs::file_t native{llvm::sys::fs::convertFDToNativeFile(fd)};
       llvm::sys::fs::closeFile(native);
       llvm::sys::fs::remove(path.c_str());

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_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_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