[flang][cuda] Enable cuda with -x cuda option #84944

clementval · 2024-03-12T16:37:15Z

Flang driver was already able to enable the CUDA language feature base on the file extension but there was no command line option. This PR adds one.

llvmbot · 2024-03-12T16:37:44Z

@llvm/pr-subscribers-clang-driver
@llvm/pr-subscribers-clang

@llvm/pr-subscribers-flang-driver

Author: Valentin Clement (バレンタインクレメン) (clementval)

Changes

Flang driver was already able to enable the CUDA language feature base on the file extension but there was no command line option. This PR adds one.

Full diff: https://github.com/llvm/llvm-project/pull/84944.diff

7 Files Affected:

(modified) clang/include/clang/Driver/Options.td (+3)
(modified) clang/lib/Driver/ToolChains/Flang.cpp (+1)
(modified) flang/lib/Frontend/CompilerInvocation.cpp (+6)
(modified) flang/lib/Frontend/FrontendAction.cpp (+8-3)
(added) flang/test/Driver/cuda-option.f90 (+13)
(modified) flang/test/Driver/driver-help-hidden.f90 (+1)
(modified) flang/test/Driver/driver-help.f90 (+2)

diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index aca8c9b0d5487a..bd28ec90bf7283 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -6488,6 +6488,9 @@ defm stack_arrays : BoolOptionWithoutMarshalling<"f", "stack-arrays",
 defm loop_versioning : BoolOptionWithoutMarshalling<"f", "version-loops-for-stride",
   PosFlag<SetTrue, [], [ClangOption], "Create unit-strided versions of loops">,
    NegFlag<SetFalse, [], [ClangOption], "Do not create unit-strided loops (default)">>;
+
+def fcuda : Flag<["-"], "fcuda">, Group<f_Group>,
+  HelpText<"Enable CUDA">;
 } // let Visibility = [FC1Option, FlangOption]
 
 def J : JoinedOrSeparate<["-"], "J">,
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
index 6168b42dc78292..9b47ab0e7fcbf3 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -41,6 +41,7 @@ void Flang::addFortranDialectOptions(const ArgList &Args,
                             options::OPT_fopenmp,
                             options::OPT_fopenmp_version_EQ,
                             options::OPT_fopenacc,
+                            options::OPT_fcuda,
                             options::OPT_finput_charset_EQ,
                             options::OPT_fimplicit_none,
                             options::OPT_fno_implicit_none,
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
index 4707de0e976ca7..435f1df152c40d 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -877,6 +877,12 @@ static bool parseDialectArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
   if (args.hasArg(clang::driver::options::OPT_flarge_sizes))
     res.getDefaultKinds().set_sizeIntegerKind(8);
 
+  // -fcuda
+  if (args.hasArg(clang::driver::options::OPT_fcuda)) {
+    res.getFrontendOpts().features.Enable(
+        Fortran::common::LanguageFeature::CUDA);
+  }
+
   // -fopenmp and -fopenacc
   if (args.hasArg(clang::driver::options::OPT_fopenacc)) {
     res.getFrontendOpts().features.Enable(
diff --git a/flang/lib/Frontend/FrontendAction.cpp b/flang/lib/Frontend/FrontendAction.cpp
index 599b4e11f0cfbd..bb1c239540d9f5 100644
--- a/flang/lib/Frontend/FrontendAction.cpp
+++ b/flang/lib/Frontend/FrontendAction.cpp
@@ -86,9 +86,14 @@ bool FrontendAction::beginSourceFile(CompilerInstance &ci,
     invoc.collectMacroDefinitions();
   }
 
-  // Enable CUDA Fortran if source file is *.cuf/*.CUF.
-  invoc.getFortranOpts().features.Enable(Fortran::common::LanguageFeature::CUDA,
-                                         getCurrentInput().getIsCUDAFortran());
+  if (!invoc.getFortranOpts().features.IsEnabled(
+          Fortran::common::LanguageFeature::CUDA)) {
+    // Enable CUDA Fortran if source file is *.cuf/*.CUF and not already
+    // enabled.
+    invoc.getFortranOpts().features.Enable(
+        Fortran::common::LanguageFeature::CUDA,
+        getCurrentInput().getIsCUDAFortran());
+  }
 
   // Decide between fixed and free form (if the user didn't express any
   // preference, use the file extension to decide)
diff --git a/flang/test/Driver/cuda-option.f90 b/flang/test/Driver/cuda-option.f90
new file mode 100644
index 00000000000000..7bd1b3ddbffc3c
--- /dev/null
+++ b/flang/test/Driver/cuda-option.f90
@@ -0,0 +1,13 @@
+! Test -fcuda option
+! RUN: %flang -fc1 -cpp -fcuda -fdebug-unparse %s -o - | FileCheck %s
+
+program main
+#if _CUDA
+  integer :: var = _CUDA
+#endif
+  integer, device :: dvar
+end program
+
+! CHECK-LABEL: PROGRAM main
+! CHECK: INTEGER :: var = 1
+! CHECK: INTEGER, DEVICE :: dvar
diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90
index 44dbac44772b29..7b2e28263a825a 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -32,6 +32,7 @@
 ! CHECK-NEXT: -fbackslash             Specify that backslash in string introduces an escape character
 ! CHECK-NEXT: -fcolor-diagnostics     Enable colors in diagnostics
 ! CHECK-NEXT: -fconvert=<value>       Set endian conversion of data for unformatted files
+! CHECK-NEXT: -fcuda                  Enable CUDA
 ! CHECK-NEXT: -fdefault-double-8      Set the default double precision kind to an 8 byte wide type
 ! CHECK-NEXT: -fdefault-integer-8     Set the default integer and logical kind to an 8 byte wide type
 ! CHECK-NEXT: -fdefault-real-8        Set the default real kind to an 8 byte wide type
diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90
index b4280a454e3128..dd8a7573375d7a 100644
--- a/flang/test/Driver/driver-help.f90
+++ b/flang/test/Driver/driver-help.f90
@@ -28,6 +28,7 @@
 ! HELP-NEXT: -fbackslash             Specify that backslash in string introduces an escape character
 ! HELP-NEXT: -fcolor-diagnostics     Enable colors in diagnostics
 ! HELP-NEXT: -fconvert=<value>       Set endian conversion of data for unformatted files
+! HELP-NEXT: -fcuda                  Enable CUDA 
 ! HELP-NEXT: -fdefault-double-8      Set the default double precision kind to an 8 byte wide type
 ! HELP-NEXT: -fdefault-integer-8     Set the default integer and logical kind to an 8 byte wide type
 ! HELP-NEXT: -fdefault-real-8        Set the default real kind to an 8 byte wide type
@@ -165,6 +166,7 @@
 ! HELP-FC1-NEXT: -fbackslash             Specify that backslash in string introduces an escape character
 ! HELP-FC1-NEXT: -fcolor-diagnostics     Enable colors in diagnostics
 ! HELP-FC1-NEXT: -fconvert=<value>       Set endian conversion of data for unformatted files
+! HELP-FC1-NEXT: -fcuda                  Enable CUDA
 ! HELP-FC1-NEXT: -fdebug-dump-all        Dump symbols and the parse tree after the semantic checks
 ! HELP-FC1-NEXT: -fdebug-dump-parse-tree-no-sema
 ! HELP-FC1-NEXT:                         Dump the parse tree (skips the semantic checks)

vzakhari

LGTM!

vzakhari · 2024-03-12T16:40:49Z

clang/include/clang/Driver/Options.td

@@ -6488,6 +6488,9 @@ defm stack_arrays : BoolOptionWithoutMarshalling<"f", "stack-arrays",
 defm loop_versioning : BoolOptionWithoutMarshalling<"f", "version-loops-for-stride",
  PosFlag<SetTrue, [], [ClangOption], "Create unit-strided versions of loops">,
   NegFlag<SetFalse, [], [ClangOption], "Do not create unit-strided loops (default)">>;
+
+def fcuda : Flag<["-"], "fcuda">, Group<f_Group>,


I wonder if we also want to wire it to clang's -x cuda option. It might be good to use the same flags for clang/flang in makefiles/cmake. Though, I am not sure if the meaning of the two options is exactly the same. Maybe someone else knows.

I don't quite understand what actually -fcuda enables. Could the flag be more descriptive and the help text expanded? Also, what's the equivalent in Clang? We ought to keep both drivers in sync.

In particular, if this is something specific to Flang then I would avoid generic names like -fcuda.

I switch to use the -x cuda option which has a similar meaning.

banach-space · 2024-03-12T19:00:40Z

flang/test/Driver/cuda-option.f90

@@ -0,0 +1,13 @@
+! Test -fcuda option
+! RUN: %flang -fc1 -cpp -fcuda -fdebug-unparse %s -o - | FileCheck %s


Could you add a RUN line without enabling CUDA? Otherwise it's hard to see what's being tested and what the impact of enabling CUDA is.

Without it, it would just fail during parsing. Do you want a run line that check the failure?

banach-space · 2024-03-12T19:05:02Z

clang/include/clang/Driver/Options.td

@@ -6488,6 +6488,9 @@ defm stack_arrays : BoolOptionWithoutMarshalling<"f", "stack-arrays",
 defm loop_versioning : BoolOptionWithoutMarshalling<"f", "version-loops-for-stride",
  PosFlag<SetTrue, [], [ClangOption], "Create unit-strided versions of loops">,
   NegFlag<SetFalse, [], [ClangOption], "Do not create unit-strided loops (default)">>;
+
+def fcuda : Flag<["-"], "fcuda">, Group<f_Group>,


I don't quite understand what actually -fcuda enables. Could the flag be more descriptive and the help text expanded? Also, what's the equivalent in Clang? We ought to keep both drivers in sync.

In particular, if this is something specific to Flang then I would avoid generic names like -fcuda.

banach-space

LGTM, thanks for the updates!

…c0bd36762 Local branch amd-gfx c6ac0bd Merged main:ce1fd9281707c2163728085d126ff83041e1db51 into amd-gfx:f2b15bee0911 Remote branch main 8a8ef1c [flang][cuda] Enable cuda with -x cuda option (llvm#84944) Change-Id: Ibfc5b2c9bbcfb821a2287aa74c062f3d46ca6e4f

[flang][cuda] Add -fcuda option

e42e8fe

clementval requested review from banach-space, jeanPerier and vzakhari March 12, 2024 16:37

llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' flang:driver flang Flang issues not falling into any other category labels Mar 12, 2024

vzakhari approved these changes Mar 12, 2024

View reviewed changes

jeanPerier approved these changes Mar 12, 2024

View reviewed changes

banach-space reviewed Mar 12, 2024

View reviewed changes

fall back to -x cuda

3194ed3

clementval changed the title ~~[flang][cuda] Add -fcuda option~~ [flang][cuda] Enable cuda with -x cuda option Mar 13, 2024

banach-space approved these changes Mar 13, 2024

View reviewed changes

clementval merged commit 8a8ef1c into llvm:main Mar 13, 2024

clementval deleted the cuda_flang_option branch March 13, 2024 16:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[flang][cuda] Enable cuda with -x cuda option #84944

[flang][cuda] Enable cuda with -x cuda option #84944

Uh oh!

clementval commented Mar 12, 2024

Uh oh!

llvmbot commented Mar 12, 2024 •

edited

Loading

Uh oh!

vzakhari left a comment

Uh oh!

vzakhari Mar 12, 2024

Uh oh!

banach-space Mar 12, 2024

Uh oh!

clementval Mar 12, 2024

Uh oh!

banach-space Mar 12, 2024

Uh oh!

clementval Mar 12, 2024 •

edited

Loading

Uh oh!

clementval Mar 13, 2024

Uh oh!

banach-space Mar 12, 2024

Uh oh!

banach-space left a comment

Uh oh!

Uh oh!

		@@ -0,0 +1,13 @@
		! Test -fcuda option
		! RUN: %flang -fc1 -cpp -fcuda -fdebug-unparse %s -o - \| FileCheck %s

[flang][cuda] Enable cuda with -x cuda option #84944

[flang][cuda] Enable cuda with -x cuda option #84944

Uh oh!

Conversation

clementval commented Mar 12, 2024

Uh oh!

llvmbot commented Mar 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vzakhari left a comment

Choose a reason for hiding this comment

Uh oh!

vzakhari Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

banach-space Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

clementval Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

banach-space Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

clementval Mar 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

clementval Mar 13, 2024

Choose a reason for hiding this comment

Uh oh!

banach-space Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

banach-space left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

llvmbot commented Mar 12, 2024 •

edited

Loading

clementval Mar 12, 2024 •

edited

Loading