[flang][cuda][openacc] Enable CUDA interop for use_device by default (#193058)

Author: clementval

flang/lib/Lower/OpenACC.cpp

@@ -1880,7 +1880,8 @@ void AccDataMap::remapDataOperandSymbols(
       llvm::cast<hlfir::DeclareOp>(*computeDef).setSkipRebox(true);
 
     symbolMap.addVariableDefinition(
-        symbol, llvm::cast<fir::FortranVariableOpInterface>(computeDef));
+        symbol, llvm::cast<fir::FortranVariableOpInterface>(computeDef),
+        /*force=*/true);
   }
 
   for (const auto &comp : components) {
@@ -2966,10 +2967,10 @@ genACCHostDataOp(Fortran::lower::AbstractConverter &converter,
 
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
-  // When CUDA Fortran is enabled, extra symbols are created in the host_data
-  // scope for use_device objects. Bind them to the outer scope's symbols before
-  // processing any clauses, since the if clause may reference these symbols.
-  if (semanticsContext.IsEnabled(Fortran::common::LanguageFeature::CUDA)) {
+  // Extra symbols are created in the host_data scope for use_device objects.
+  // Bind them to the outer scope's symbols before processing any clauses,
+  // since the if clause may reference these symbols.
+  {
     for (const Fortran::parser::AccClause &clause : accClauseList.v) {
       if (const auto *useDevice =
               std::get_if<Fortran::parser::AccClause::UseDevice>(&clause.u)) {
@@ -2981,13 +2982,7 @@ genACCHostDataOp(Fortran::lower::AbstractConverter &converter,
             if (const auto *name =
                     Fortran::parser::GetDesignatorNameIfDataRef(*designator)) {
               newSym = name->symbol;
-            } else if (const auto *arrayElement = Fortran::parser::Unwrap<
-                           Fortran::parser::ArrayElement>(*designator)) {
-              const Fortran::parser::Name &name =
-                  Fortran::parser::GetLastName(arrayElement->Base());
-              newSym = name.symbol;
-            } else if (Fortran::parser::Unwrap<
-                           Fortran::parser::StructureComponent>(*designator)) {
+            } else {
               newSym = Fortran::parser::GetFirstName(*designator).symbol;
             }
           } else if (const auto *name =

flang/lib/Semantics/resolve-names.cpp

@@ -1612,25 +1612,26 @@ bool AccVisitor::Pre(const parser::OpenACCBlockConstruct &x) {
 }
 
 void AccVisitor::CopySymbolWithDevice(const parser::Name *name) {
-  // When CUDA Fortran is enabled together with OpenACC, new
-  // symbols are created for the one appearing in the use_device
-  // clause. These new symbols have the CUDA Fortran device
-  // attribute.
-  if (context_.languageFeatures().IsEnabled(common::LanguageFeature::CUDA) &&
-      name && name->symbol) {
-    if (Symbol * copy{currScope().CopySymbol(name->symbol->GetUltimate())}) {
-      name->symbol = copy;
+  // New symbols are created for those appearing in the use_device clause.
+  // These new symbols get the CUDA device attribute.
+  if (name && name->symbol) {
+    Symbol *copy{currScope().CopySymbol(name->symbol->GetUltimate())};
+    if (copy) {
       if (auto *object{copy->GetUltimate().detailsIf<ObjectEntityDetails>()}) {
         object->set_cudaDataAttr(common::CUDADataAttr::Device);
       }
+    } else {
+      copy = FindInScope(currScope(), name->symbol->GetUltimate().name());
+    }
+    if (copy) {
+      name->symbol = copy;
     }
   }
 }
 
 void AccVisitor::CopySymbolWithDeviceStructurePath(const parser::Name *baseName,
     llvm::ArrayRef<SourceName> componentPath, parser::Designator &designator) {
-  if (!context_.languageFeatures().IsEnabled(common::LanguageFeature::CUDA) ||
-      !baseName || !baseName->symbol || componentPath.empty()) {
+  if (!baseName || !baseName->symbol || componentPath.empty()) {
     return;
   }
   const Symbol &orig{*baseName->symbol};

flang/test/Semantics/OpenACC/bug1583.f90

@@ -15,8 +15,8 @@ subroutine sub (v)
   type(t) :: v
 !$acc host_data use_device(v%c)
   !DEF: /foo EXTERNAL (Subroutine) ProcEntity
-  !REF: /m/sub/v
-  !REF: /m/t/c
+  !DEF:/m/sub/OpenACCConstruct1/vObjectEntityTYPE(t)
+  !DEF:/m/sub/OpenACCConstruct1/DerivedType1/cALLOCATABLEObjectEntityREAL(4)
   call foo(v%c)
 !$acc end host_data
  end subroutine