Index: include/clang/Driver/Options.td =================================================================== --- include/clang/Driver/Options.td +++ include/clang/Driver/Options.td @@ -502,6 +502,15 @@ def fprofile_instr_generate_EQ : Joined<["-"], "fprofile-instr-generate=">, Group, Flags<[DriverOption]>, MetaVarName<"">, HelpText<"Generate instrumented code to collect execution counts into (overridden by LLVM_PROFILE_FILE env var)">; +def fpgo_train : Joined<["-"], "fpgo-train">, + Group, Flags<[DriverOption]>, + HelpText<"Instrument the code to collect profiling information into default.profraw file (overridden by fpgo-train-output or LLVM_PROFILE_FILE env var)">; +def fpgo_train_output_EQ : Joined<["-"], "fpgo-train-output=">, + Group, Flags<[DriverOption]>, MetaVarName<"">, + HelpText<"Set to be the profile output file (overridden by LLVM_PROFILE_FILE env var)">; +def fpgo_apply_EQ : Joined<["-"], "fpgo-apply=">, + Group, Flags<[DriverOption]>, MetaVarName<"">, + HelpText<"Apply profile data to the code for use in profile-guided optimization">; def fprofile_instr_use : Flag<["-"], "fprofile-instr-use">, Group, Flags<[DriverOption]>; def fprofile_instr_use_EQ : Joined<["-"], "fprofile-instr-use=">, @@ -526,6 +535,12 @@ def fno_profile_instr_generate : Flag<["-"], "fno-profile-instr-generate">, Group, Flags<[DriverOption]>, HelpText<"Disable generation of profile instrumentation.">; +def fno_pgo_train : Flag<["-"], "fno-pgo-train">, + Group, Flags<[DriverOption]>, + HelpText<"Disable profiling instrumentation.">; +def fno_pgo_apply : Flag<["-"], "fno-pgo-apply">, + Group, Flags<[DriverOption]>, + HelpText<"Disable using profile data for profile-guided optimization">; def fno_profile_generate : Flag<["-"], "fno-profile-generate">, Alias; def fno_profile_instr_use : Flag<["-"], "fno-profile-instr-use">, Index: lib/Driver/ToolChain.cpp =================================================================== --- lib/Driver/ToolChain.cpp +++ lib/Driver/ToolChain.cpp @@ -317,6 +317,7 @@ Args.hasArg(options::OPT_fprofile_generate_EQ) || Args.hasArg(options::OPT_fprofile_instr_generate) || Args.hasArg(options::OPT_fprofile_instr_generate_EQ) || + Args.hasArg(options::OPT_fpgo_train) || Args.hasArg(options::OPT_fcreate_profile) || Args.hasArg(options::OPT_coverage)) return true; Index: lib/Driver/Tools.cpp =================================================================== --- lib/Driver/Tools.cpp +++ lib/Driver/Tools.cpp @@ -3473,6 +3473,28 @@ static void addPGOAndCoverageFlags(Compilation &C, const Driver &D, const InputInfo &Output, const ArgList &Args, ArgStringList &CmdArgs) { + + auto *PGOTrainArg = + Args.getLastArg(options::OPT_fpgo_train, + options::OPT_fno_pgo_train); + if (PGOTrainArg && + PGOTrainArg->getOption().matches(options::OPT_fno_pgo_train)) + PGOTrainArg = nullptr; + + auto *PGOOutputArg = + Args.getLastArg(options::OPT_fpgo_train_output_EQ); + + if (PGOOutputArg && !PGOTrainArg) + D.Diag(diag::err_drv_argument_only_allowed_with) + << "-fpgo-train-output" + << "-fpgo-train"; + + if (PGOOutputArg) + if (PGOOutputArg->getOption().matches( + options::OPT_fpgo_train_output_EQ)) + CmdArgs.push_back(Args.MakeArgString(Twine("-fprofile-instrument-path=") + + PGOOutputArg->getValue())); + auto *ProfileGenerateArg = Args.getLastArg( options::OPT_fprofile_instr_generate, options::OPT_fprofile_instr_generate_EQ, options::OPT_fprofile_generate, @@ -3483,6 +3505,21 @@ options::OPT_fno_profile_instr_generate)) ProfileGenerateArg = nullptr; + else if (PGOTrainArg && ProfileGenerateArg) + D.Diag(diag::err_drv_argument_not_allowed_with) + << PGOTrainArg->getSpelling() + << ProfileGenerateArg->getSpelling(); + + auto *PGOApplyArg = + Args.getLastArg(options::OPT_fpgo_apply_EQ, options::OPT_fno_pgo_apply); + if (PGOApplyArg && + PGOApplyArg->getOption().matches(options::OPT_fno_pgo_apply)) + PGOApplyArg = nullptr; + + if (PGOTrainArg && PGOApplyArg) + D.Diag(diag::err_drv_argument_not_allowed_with) + << PGOTrainArg->getSpelling() << PGOApplyArg->getSpelling(); + auto *ProfileUseArg = Args.getLastArg( options::OPT_fprofile_instr_use, options::OPT_fprofile_instr_use_EQ, options::OPT_fprofile_use, options::OPT_fprofile_use_EQ, @@ -3491,6 +3528,18 @@ ProfileUseArg->getOption().matches(options::OPT_fno_profile_instr_use)) ProfileUseArg = nullptr; + if (PGOTrainArg && PGOApplyArg) + D.Diag(diag::err_drv_argument_not_allowed_with) + << PGOApplyArg->getSpelling() << PGOTrainArg->getSpelling(); + + if (PGOApplyArg && ProfileUseArg) + D.Diag(diag::err_drv_argument_not_allowed_with) + << ProfileUseArg->getSpelling() << PGOApplyArg->getSpelling(); + + if (PGOTrainArg && ProfileUseArg) + D.Diag(diag::err_drv_argument_not_allowed_with) + << ProfileUseArg->getSpelling() << PGOTrainArg->getSpelling(); + if (ProfileGenerateArg && ProfileUseArg) D.Diag(diag::err_drv_argument_not_allowed_with) << ProfileGenerateArg->getSpelling() << ProfileUseArg->getSpelling(); @@ -3511,6 +3560,18 @@ CmdArgs.push_back("-fprofile-instrument=clang"); } + if (PGOTrainArg) { + if (PGOTrainArg->getOption().matches(options::OPT_fpgo_train)) + CmdArgs.push_back("-fprofile-instrument=llvm"); + } + + if (PGOApplyArg) { + if (PGOApplyArg->getOption().matches(options::OPT_fpgo_apply_EQ)) + CmdArgs.push_back( + Args.MakeArgString(Twine("-fprofile-instrument-use-path=") + + PGOApplyArg->getValue())); + } + if (ProfileUseArg) { if (ProfileUseArg->getOption().matches(options::OPT_fprofile_instr_use_EQ)) CmdArgs.push_back(Args.MakeArgString( @@ -3581,6 +3642,8 @@ options::OPT_fno_profile_instr_generate, false) || Args.hasFlag(options::OPT_fprofile_instr_generate_EQ, options::OPT_fno_profile_instr_generate, false) || + Args.hasFlag(options::OPT_fpgo_train, + options::OPT_fno_pgo_train, false) || Args.hasArg(options::OPT_fcreate_profile) || Args.hasArg(options::OPT_coverage))) CmdArgs.push_back("--dependent-lib=libclang_rt.profile-x86_64.a"); Index: test/Driver/clang_f_opts.c =================================================================== --- test/Driver/clang_f_opts.c +++ test/Driver/clang_f_opts.c @@ -97,13 +97,22 @@ // RUN: %clang -### -S -fcoverage-mapping %s 2>&1 | FileCheck -check-prefix=CHECK-COVERAGE-AND-GEN %s // RUN: %clang -### -S -fcoverage-mapping -fno-coverage-mapping %s 2>&1 | FileCheck -check-prefix=CHECK-DISABLE-COVERAGE %s // RUN: %clang -### -S -fprofile-instr-generate -fcoverage-mapping -fno-coverage-mapping %s 2>&1 | FileCheck -check-prefix=CHECK-DISABLE-COVERAGE %s +// RUN: %clang -### -S -fpgo-train %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-GENERATE-LLVM %s +// RUN: %clang -### -S -fpgo-train-output=file %s 2>&1 | FileCheck -check-prefix=CHECK-DEFAULT-AND-TRAIN %s +// RUN: %clang -### -S -fpgo-train -fpgo-train-output=/tmp/somefile.profraw %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-GENERATE-FILE %s +// RUN: %clang -### -S -fpgo-train -fcoverage-mapping %s 2>&1 | FileCheck -check-prefix=CHECK-COVERAGE-AND-GEN %s +// RUN: %clang -### -S -fpgo-train -fprofile-instr-generate %s 2>&1 | FileCheck -check-prefix=CHECK-NO-MIX-TRAIN-GEN %s +// RUN: %clang -### -S -fpgo-train -fpgo-apply=file %s 2>&1 | FileCheck -check-prefix=CHECK-NO-MIX-GEN-USE %s // CHECK-PROFILE-GENERATE: "-fprofile-instrument=clang" +// CHECK-PROFILE-GENERATE-LLVM: "-fprofile-instrument=llvm" // CHECK-PROFILE-GENERATE-DIR: "-fprofile-instrument-path=/some/dir{{/|\\\\}}default.profraw" // CHECK-PROFILE-GENERATE-FILE: "-fprofile-instrument-path=/tmp/somefile.profraw" // CHECK-NO-MIX-GEN-USE: '{{[a-z=-]*}}' not allowed with '{{[a-z=-]*}}' +// CHECK-NO-MIX-TRAIN-GEN: '{{[a-z=-]*}}' not allowed with '{{[a-z=-]*}}' // CHECK-DISABLE-GEN-NOT: "-fprofile-instrument=clang" // CHECK-DISABLE-USE-NOT: "-fprofile-instr-use" // CHECK-COVERAGE-AND-GEN: '-fcoverage-mapping' only allowed with '-fprofile-instr-generate' +// CHECK-DEFAULT-AND-TRAIN: '-fpgo-train-output' only allowed with '-fpgo-train' // CHECK-DISABLE-COVERAGE-NOT: "-fcoverage-mapping" // RUN: %clang -### -S -fprofile-use %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE %s @@ -111,9 +120,13 @@ // RUN: mkdir -p %t.d/some/dir // RUN: %clang -### -S -fprofile-use=%t.d/some/dir %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-DIR %s // RUN: %clang -### -S -fprofile-instr-use=/tmp/somefile.prof %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-FILE %s +// RUN: %clang -### -S -fpgo-apply=/tmp/somefile.prof %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-FILE %s +// RUN: %clang -### -S -fpgo-train -fpgo-apply=/tmp/somefile.prof %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-FILE %s +// RUN: %clang -### -S -fprofile-instr-use=/tmp/somefile.prof -fpgo-apply=/tmp/somefile.prof %s 2>&1 | FileCheck -check-prefix=CHECK-NO-MIX-APPLY-USE %s // CHECK-PROFILE-USE: "-fprofile-instrument-use-path=default.profdata" // CHECK-PROFILE-USE-DIR: "-fprofile-instrument-use-path={{.*}}.d/some/dir{{/|\\\\}}default.profdata" // CHECK-PROFILE-USE-FILE: "-fprofile-instrument-use-path=/tmp/somefile.prof" +// CHECK-NO-MIX-APPLY-USE: '{{[a-z=-]*}}' not allowed with '{{[a-z=-]*}}' // RUN: %clang -### -S -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s // RUN: %clang -### -S -fno-vectorize -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s