Author: Kaviya Rajendiran Date: 2026-08-27T16:02:02+05:30 New Revision: be851f53bfeb5f416d6b14d7bc4c5a384609e47d
URL: https://github.com/llvm/llvm-project/commit/be851f53bfeb5f416d6b14d7bc4c5a384609e47d DIFF: https://github.com/llvm/llvm-project/commit/be851f53bfeb5f416d6b14d7bc4c5a384609e47d.diff LOG: [FLANG][Driver] Support -fno-profile-generate and -fprofile-generate=<dir> in flang (#216643) Added support for PGO options `-fno-profile-generate` and `-fno-profile-generate` in flang. Added: Modified: clang/include/clang/Options/Options.td clang/lib/Driver/ToolChains/Flang.cpp flang/lib/Frontend/CompilerInvocation.cpp flang/test/Driver/flang-f-opts.f90 flang/test/Profile/gcc-flag-compatibility.f90 Removed: ################################################################################ diff --git a/clang/include/clang/Options/Options.td b/clang/include/clang/Options/Options.td index eb5a009b5628c..f5cd81279b343 100644 --- a/clang/include/clang/Options/Options.td +++ b/clang/include/clang/Options/Options.td @@ -1954,7 +1954,7 @@ def fprofile_generate : Flag<["-"], "fprofile-generate">, Group<f_Group>, Visibility<[ClangOption, CLOption, FlangOption, FC1Option]>, HelpText<"Generate instrumented code to collect execution counts into default.profraw (overridden by LLVM_PROFILE_FILE env var)">; def fprofile_generate_EQ : Joined<["-"], "fprofile-generate=">, - Group<f_Group>, Visibility<[ClangOption, CLOption]>, + Group<f_Group>, Visibility<[ClangOption, CLOption, FlangOption, FC1Option]>, MetaVarName<"<directory>">, HelpText<"Generate instrumented code to collect execution counts into <directory>/default.profraw (overridden by LLVM_PROFILE_FILE env var)">; def fcs_profile_generate : Flag<["-"], "fcs-profile-generate">, @@ -1975,7 +1975,7 @@ def fno_profile_instr_generate : Flag<["-"], "fno-profile-instr-generate">, Group<f_Group>, Visibility<[ClangOption, CLOption]>, HelpText<"Disable generation of profile instrumentation.">; def fno_profile_generate : Flag<["-"], "fno-profile-generate">, - Group<f_Group>, Visibility<[ClangOption, CLOption]>, + Group<f_Group>, Visibility<[ClangOption, CLOption, FlangOption]>, HelpText<"Disable generation of profile instrumentation.">; def fno_profile_instr_use : Flag<["-"], "fno-profile-instr-use">, Group<f_Group>, Visibility<[ClangOption, CLOption]>, diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp index ccd99b5e0892c..7562206f93438 100644 --- a/clang/lib/Driver/ToolChains/Flang.cpp +++ b/clang/lib/Driver/ToolChains/Flang.cpp @@ -1244,7 +1244,18 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, const JobAction &JA, options::OPT_fno_pseudo_probe_for_profiling, false)) CmdArgs.push_back("-fpseudo-probe-for-profiling"); + // TODO: Consider reusing Clang's addPGOAndCoverageFlags() for + // -fprofile-generate and other similar options handling instead of + // duplicating driver logic here. + if (Arg *PGOGenerateArg = Args.getLastArg( + options::OPT_fprofile_generate, options::OPT_fprofile_generate_EQ, + options::OPT_fno_profile_generate)) { + if (!PGOGenerateArg->getOption().matches(options::OPT_fno_profile_generate)) + PGOGenerateArg->render(Args, CmdArgs); + } + addSplitMachineFunctionsArgs(TC.getDriver(), Args, CmdArgs, TC.getTriple()); + Args.addAllArgs(CmdArgs, {options::OPT_fprofile_use_EQ}); } void Flang::ConstructJob(Compilation &C, const JobAction &JA, @@ -1377,10 +1388,6 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA, // TODO: Handle interactions between -w, -pedantic, -Wall, -WOption Args.AddLastArg(CmdArgs, options::OPT_w); - // recognise options: fprofile-generate -fprofile-use= - Args.addAllArgs( - CmdArgs, {options::OPT_fprofile_generate, options::OPT_fprofile_use_EQ}); - addPGOAndCoverageFlags(TC, JA, Args, CmdArgs); // Forward flags for OpenMP. We don't do this if the current action is an diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp index 87a25f3101ddd..6c89570920c46 100644 --- a/flang/lib/Frontend/CompilerInvocation.cpp +++ b/flang/lib/Frontend/CompilerInvocation.cpp @@ -498,8 +498,15 @@ static void parseCodeGenArgs(Fortran::frontend::CodeGenOptions &opts, opts.IsPIE = 1; } - if (args.hasArg(clang::options::OPT_fprofile_generate)) { + if (const llvm::opt::Arg *a = + args.getLastArg(clang::options::OPT_fprofile_generate, + clang::options::OPT_fprofile_generate_EQ)) { opts.setProfileInstr(llvm::driver::ProfileInstrKind::ProfileIRInstr); + if (a->getOption().matches(clang::options::OPT_fprofile_generate_EQ)) { + llvm::SmallString<128> path(a->getValue()); + llvm::sys::path::append(path, "default_%m.profraw"); + opts.InstrProfileOutput = std::string(path); + } } if (auto A = args.getLastArg(clang::options::OPT_fprofile_use_EQ)) { diff --git a/flang/test/Driver/flang-f-opts.f90 b/flang/test/Driver/flang-f-opts.f90 index 3f53adaf56271..a082545206ea3 100644 --- a/flang/test/Driver/flang-f-opts.f90 +++ b/flang/test/Driver/flang-f-opts.f90 @@ -11,6 +11,18 @@ ! RUN: %flang -### -S -fprofile-generate %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-GENERATE-LLVM %s ! CHECK-PROFILE-GENERATE-LLVM: "-fprofile-generate" + +! RUN: rm -rf %t.pgodir && mkdir -p %t.pgodir +! RUN: %flang -### -fprofile-generate=%t.pgodir %s 2>&1| FileCheck -check-prefix=PROFILE-GENERATE-EQ %s +! PROFILE-GENERATE-EQ: "-fprofile-generate={{.*}}pgodir" + +! RUN: %flang -### -fprofile-generate -fno-profile-generate %s 2>&1 | FileCheck -check-prefix=NO-PROFILE-GENERATE %s +! NO-PROFILE-GENERATE: "-fc1" +! NO-PROFILE-GENERATE-NOT: "-fprofile-generate" + +! RUN: %flang -### -fno-profile-generate -fprofile-generate %s 2>&1 | FileCheck -check-prefix=PROFILE-GENERATE %s +! PROFILE-GENERATE: "-fprofile-generate" + ! RUN: %flang -### -S -fprofile-use=%S %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-DIR %s ! CHECK-PROFILE-USE-DIR: "-fprofile-use={{.*}}" ! diff --git a/flang/test/Profile/gcc-flag-compatibility.f90 b/flang/test/Profile/gcc-flag-compatibility.f90 index 4490c45232d28..c7847db2f154e 100644 --- a/flang/test/Profile/gcc-flag-compatibility.f90 +++ b/flang/test/Profile/gcc-flag-compatibility.f90 @@ -5,7 +5,10 @@ ! -fprofile-use=<dir>/file Uses the profile file <dir>/file ! On AIX, -flto used to be required with -fprofile-generate. gcc-flag-compatibility-aix.c is used to do the testing on AIX with -flto -! RUN: %flang %s -c -S -o - -emit-llvm -fprofile-generate | FileCheck -check-prefix=PROFILE-GEN %s +! RUN: %flang %s -S -emit-llvm -o - -fprofile-generate | FileCheck -check-prefix=PROFILE-GEN %s +! RUN: rm -rf %t.gendir +! RUN: mkdir -p %t.gendir +! RUN: %flang %s -S -emit-llvm -fprofile-generate=%t.gendir -o - | FileCheck -check-prefix=PROFILE-GEN %s ! PROFILE-GEN: @__profc_{{_?}}main = {{(private|internal)}} global [1 x i64] zeroinitializer, section ! PROFILE-GEN: @__profd_{{_?}}main = @@ -14,9 +17,9 @@ ! RUN: rm -rf %t.dir ! RUN: mkdir -p %t.dir/some/path ! RUN: llvm-profdata merge %S/Inputs/gcc-flag-compatibility_IR.proftext -o %t.dir/some/path/file.prof -! RUN: %flang %s -o - -emit-llvm -S -fprofile-use=%t.dir/some/path/file.prof | FileCheck -check-prefix=PROFILE-USE-IR1 %s +! RUN: %flang %s -S -emit-llvm -fprofile-use=%t.dir/some/path/file.prof -o - | FileCheck -check-prefix=PROFILE-USE-IR1 %s ! RUN: llvm-profdata merge %S/Inputs/gcc-flag-compatibility_IR_entry.proftext -o %t.dir/some/path/file.prof -! RUN: %flang %s -o - -emit-llvm -S -fprofile-use=%t.dir/some/path/file.prof | FileCheck -check-prefix=PROFILE-USE-IR2 %s +! RUN: %flang %s -S -emit-llvm -fprofile-use=%t.dir/some/path/file.prof -o - | FileCheck -check-prefix=PROFILE-USE-IR2 %s ! PROFILE-USE-IR1: = !{!"branch_weights", i32 100, i32 1} ! PROFILE-USE-IR2: = !{!"branch_weights", i32 1, i32 100} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
