diff options
| author | Bob Haarman <llvm@inglorion.net> | 2016-11-30 03:25:36 +0000 |
|---|---|---|
| committer | Bob Haarman <llvm@inglorion.net> | 2016-11-30 03:25:36 +0000 |
| commit | 2fae56fce48abcb0c80a31432697ec666beb5493 (patch) | |
| tree | aefb558cb5a7a69bca563f7c3957ee29ddffd134 | |
| parent | 176f892fa7372b9af624be736a6f9f4098828554 (diff) | |
| download | bcm5719-llvm-2fae56fce48abcb0c80a31432697ec666beb5493.tar.gz bcm5719-llvm-2fae56fce48abcb0c80a31432697ec666beb5493.zip | |
make -fprofile-instr-generate and -fprofile-instr-use work with clang-cl
Summary: Makes -fprofile-instr-generate and -fprofile-instr-use work
with clang-cl so that profile-guided optimization can be used.
Differential Revision: https://reviews.llvm.org/D27086
llvm-svn: 288230
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 8 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index fa2511de142..316eafd6839 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -510,15 +510,15 @@ def fprofile_sample_use_EQ : Joined<["-"], "fprofile-sample-use=">, def fauto_profile_EQ : Joined<["-"], "fauto-profile=">, Alias<fprofile_sample_use_EQ>; def fprofile_instr_generate : Flag<["-"], "fprofile-instr-generate">, - Group<f_Group>, Flags<[DriverOption]>, + Group<f_Group>, Flags<[CoreOption]>, HelpText<"Generate instrumented code to collect execution counts into default.profraw file (overriden by '=' form of option or LLVM_PROFILE_FILE env var)">; def fprofile_instr_generate_EQ : Joined<["-"], "fprofile-instr-generate=">, - Group<f_Group>, Flags<[DriverOption]>, MetaVarName<"<file>">, + Group<f_Group>, Flags<[CoreOption]>, MetaVarName<"<file>">, HelpText<"Generate instrumented code to collect execution counts into <file> (overridden by LLVM_PROFILE_FILE env var)">; def fprofile_instr_use : Flag<["-"], "fprofile-instr-use">, Group<f_Group>, - Flags<[DriverOption]>; + Flags<[CoreOption]>; def fprofile_instr_use_EQ : Joined<["-"], "fprofile-instr-use=">, - Group<f_Group>, Flags<[DriverOption]>, + Group<f_Group>, Flags<[CoreOption]>, HelpText<"Use instrumentation data for profile-guided optimization">; def fcoverage_mapping : Flag<["-"], "fcoverage-mapping">, Group<f_Group>, Flags<[CC1Option]>, diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index ec0bd572ba9..5054d8ad1f1 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -59,6 +59,19 @@ // RUN: %clang_cl /Z7 -### -- %s 2>&1 | FileCheck -check-prefix=gdefcolumn %s // gdefcolumn-NOT: -dwarf-column-info +// RUN: %clang_cl -### /FA -fprofile-instr-generate -- %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-GENERATE %s +// RUN: %clang_cl -### /FA -fprofile-instr-generate=/tmp/somefile.profraw -- %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-GENERATE-FILE %s +// RUN: %clang_cl -### /FA -fprofile-instr-generate -fprofile-instr-use -- %s 2>&1 | FileCheck -check-prefix=CHECK-NO-MIX-GEN-USE %s +// RUN: %clang_cl -### /FA -fprofile-instr-generate -fprofile-instr-use=file -- %s 2>&1 | FileCheck -check-prefix=CHECK-NO-MIX-GEN-USE %s +// CHECK-PROFILE-GENERATE: "-fprofile-instrument=clang" +// CHECK-PROFILE-GENERATE-FILE: "-fprofile-instrument-path=/tmp/somefile.profraw" +// CHECK-NO-MIX-GEN-USE: '{{[a-z=-]*}}' not allowed with '{{[a-z=-]*}}' + +// RUN: %clang_cl -### /FA -fprofile-instr-use -- %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE %s +// RUN: %clang_cl -### /FA -fprofile-instr-use=/tmp/somefile.prof -- %s 2>&1 | FileCheck -check-prefix=CHECK-PROFILE-USE-FILE %s +// CHECK-PROFILE-USE: "-fprofile-instrument-use-path=default.profdata" +// CHECK-PROFILE-USE-FILE: "-fprofile-instrument-use-path=/tmp/somefile.prof" + // RUN: %clang_cl /GA -### -- %s 2>&1 | FileCheck -check-prefix=GA %s // GA: -ftls-model=local-exec |
