Author: xur
Date: Thu Feb 4 12:39:09 2016
New Revision: 259811
URL: http://llvm.org/viewvc/llvm-project?rev=259811&view=rev
Log:
[PGO] cc1 option name change for profile instrumentation
This patch changes cc1 option -fprofile-instr-generate to an enum option
-fprofile-instrument={clang|none}. It also changes cc1 options
-fprofile-instr-generate= to -fprofile-instrument-path=.
The driver level option -fprofile-instr-generate and -fprofile-instr-generate=
remain intact. This change will pave the way to integrate new PGO
instrumentation in IR level.
Review: http://reviews.llvm.org/D16730
Modified:
cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
cfe/trunk/include/clang/Driver/CC1Options.td
cfe/trunk/include/clang/Driver/Options.td
cfe/trunk/include/clang/Frontend/CodeGenOptions.def
cfe/trunk/include/clang/Frontend/CodeGenOptions.h
cfe/trunk/lib/CodeGen/BackendUtil.cpp
cfe/trunk/lib/CodeGen/CGStmt.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.h
cfe/trunk/lib/CodeGen/CodeGenPGO.cpp
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/lib/Frontend/CompilerInvocation.cpp
cfe/trunk/test/CoverageMapping/block-storage-starts-region.m
cfe/trunk/test/CoverageMapping/break.c
cfe/trunk/test/CoverageMapping/builtinmacro.c
cfe/trunk/test/CoverageMapping/casts.c
cfe/trunk/test/CoverageMapping/classtemplate.cpp
cfe/trunk/test/CoverageMapping/comment-in-macro.c
cfe/trunk/test/CoverageMapping/continue.c
cfe/trunk/test/CoverageMapping/control-flow-macro.c
cfe/trunk/test/CoverageMapping/decl.c
cfe/trunk/test/CoverageMapping/header.cpp
cfe/trunk/test/CoverageMapping/if.c
cfe/trunk/test/CoverageMapping/implicit-def-in-macro.m
cfe/trunk/test/CoverageMapping/includehell.cpp
cfe/trunk/test/CoverageMapping/ir.c
cfe/trunk/test/CoverageMapping/label.cpp
cfe/trunk/test/CoverageMapping/lambda.cpp
cfe/trunk/test/CoverageMapping/logical.cpp
cfe/trunk/test/CoverageMapping/loopmacro.c
cfe/trunk/test/CoverageMapping/loops.cpp
cfe/trunk/test/CoverageMapping/macro-expansion.c
cfe/trunk/test/CoverageMapping/macro-expressions.cpp
cfe/trunk/test/CoverageMapping/macroception.c
cfe/trunk/test/CoverageMapping/macroparams.c
cfe/trunk/test/CoverageMapping/macroparams2.c
cfe/trunk/test/CoverageMapping/macros.c
cfe/trunk/test/CoverageMapping/macroscopes.cpp
cfe/trunk/test/CoverageMapping/md.cpp
cfe/trunk/test/CoverageMapping/moremacros.c
cfe/trunk/test/CoverageMapping/nestedclass.cpp
cfe/trunk/test/CoverageMapping/objc.m
cfe/trunk/test/CoverageMapping/preprocessor.c
cfe/trunk/test/CoverageMapping/return.c
cfe/trunk/test/CoverageMapping/switch.c
cfe/trunk/test/CoverageMapping/switchmacro.c
cfe/trunk/test/CoverageMapping/system_macro.c
cfe/trunk/test/CoverageMapping/templates.cpp
cfe/trunk/test/CoverageMapping/test.c
cfe/trunk/test/CoverageMapping/trycatch.cpp
cfe/trunk/test/CoverageMapping/trymacro.cpp
cfe/trunk/test/CoverageMapping/unreachable-macro.c
cfe/trunk/test/CoverageMapping/unused_names.c
cfe/trunk/test/CoverageMapping/while.c
cfe/trunk/test/Driver/clang_f_opts.c
cfe/trunk/test/Profile/c-captured.c
cfe/trunk/test/Profile/c-general.c
cfe/trunk/test/Profile/c-generate.c
cfe/trunk/test/Profile/c-indirect-call.c
cfe/trunk/test/Profile/c-linkage-available_externally.c
cfe/trunk/test/Profile/c-linkage.c
cfe/trunk/test/Profile/c-unreachable-after-switch.c
cfe/trunk/test/Profile/cxx-implicit.cpp
cfe/trunk/test/Profile/cxx-lambda.cpp
cfe/trunk/test/Profile/cxx-linkage.cpp
cfe/trunk/test/Profile/cxx-rangefor.cpp
cfe/trunk/test/Profile/cxx-structors.cpp
cfe/trunk/test/Profile/cxx-templates.cpp
cfe/trunk/test/Profile/cxx-virtual-destructor-calls.cpp
cfe/trunk/test/Profile/objc-general.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Thu Feb 4 12:39:09
2016
@@ -27,6 +27,8 @@ def err_drv_invalid_thread_model_for_tar
"invalid thread model '%0' in '%1' for this target">;
def err_drv_invalid_linker_name : Error<
"invalid linker name in argument '%0'">;
+def err_drv_invalid_pgo_instrumentor: Error<
+ "invalid PGO instrumentor in argument '%0'">;
def err_drv_invalid_rtlib_name : Error<
"invalid runtime library name in argument '%0'">;
def err_drv_unsupported_rtlib_for_platform : Error<
Modified: cfe/trunk/include/clang/Driver/CC1Options.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/CC1Options.td (original)
+++ cfe/trunk/include/clang/Driver/CC1Options.td Thu Feb 4 12:39:09 2016
@@ -268,6 +268,12 @@ def fsanitize_coverage_trace_cmp
def fsanitize_coverage_8bit_counters
: Flag<["-"], "fsanitize-coverage-8bit-counters">,
HelpText<"Enable frequency counters in sanitizer coverage">;
+def fprofile_instrument_EQ: Joined<["-"], "fprofile-instrument=">,
+ HelpText<"Enable PGO instrumentation. The accepted values is clang or "
+ "none">;
+def fprofile_instrument_path_EQ: Joined<["-"], "fprofile-instrument-path=">,
+ HelpText<"Generate instrumented code to collect execution counts into "
+ "<file> (overridden by LLVM_PROFILE_FILE env var)">;
//===----------------------------------------------------------------------===//
// Dependency Output Options
Modified: cfe/trunk/include/clang/Driver/Options.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Thu Feb 4 12:39:09 2016
@@ -446,10 +446,10 @@ def fprofile_sample_use_EQ : Joined<["-"
def fauto_profile_EQ : Joined<["-"], "fauto-profile=">,
Alias<fprofile_sample_use_EQ>;
def fprofile_instr_generate : Flag<["-"], "fprofile-instr-generate">,
- Group<f_Group>, Flags<[CC1Option]>,
+ Group<f_Group>, Flags<[DriverOption]>,
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<[CC1Option]>, MetaVarName<"<file>">,
+ Group<f_Group>, Flags<[DriverOption]>, 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]>;
Modified: cfe/trunk/include/clang/Frontend/CodeGenOptions.def
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/CodeGenOptions.def?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/include/clang/Frontend/CodeGenOptions.def (original)
+++ cfe/trunk/include/clang/Frontend/CodeGenOptions.def Thu Feb 4 12:39:09 2016
@@ -103,8 +103,8 @@ CODEGENOPT(OmitLeafFramePointer , 1, 0)
VALUE_CODEGENOPT(OptimizationLevel, 2, 0) ///< The -O[0-3] option specified.
VALUE_CODEGENOPT(OptimizeSize, 2, 0) ///< If -Os (==1) or -Oz (==2) is
specified.
-CODEGENOPT(ProfileInstrGenerate , 1, 0) ///< Instrument code to generate
- ///< execution counts to use with PGO.
+/// \brief Choose profile instrumenation kind or no instrumentation.
+ENUM_CODEGENOPT(ProfileInstr, ProfileInstrKind, 2, ProfileNoInstr)
CODEGENOPT(CoverageMapping , 1, 0) ///< Generate coverage mapping regions to
///< enable code coverage analysis.
CODEGENOPT(DumpCoverageMapping , 1, 0) ///< Dump the generated coverage mapping
Modified: cfe/trunk/include/clang/Frontend/CodeGenOptions.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/CodeGenOptions.h?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/include/clang/Frontend/CodeGenOptions.h (original)
+++ cfe/trunk/include/clang/Frontend/CodeGenOptions.h Thu Feb 4 12:39:09 2016
@@ -85,6 +85,12 @@ public:
SRCK_InRegs // Small structs in registers (-freg-struct-return).
};
+ enum ProfileInstrKind {
+ ProfileNoInstr, // No instrumentation.
+ ProfileClangInstr // Clang instrumentation to generate execution counts
+ // to use with PGO.
+ };
+
/// The code model to use (-mcmodel).
std::string CodeModel;
@@ -218,6 +224,11 @@ public:
const std::vector<std::string> &getNoBuiltinFuncs() const {
return NoBuiltinFuncs;
}
+
+ /// \brief Check if Clang profile instrumenation is on.
+ bool hasProfileClangInstr() const {
+ return getProfileInstr() == ProfileClangInstr;
+ }
};
} // end namespace clang
Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original)
+++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Thu Feb 4 12:39:09 2016
@@ -429,7 +429,7 @@ void EmitAssemblyHelper::CreatePasses(Fu
MPM->add(createStripSymbolsPass(true));
}
- if (CodeGenOpts.ProfileInstrGenerate) {
+ if (CodeGenOpts.hasProfileClangInstr()) {
InstrProfOptions Options;
Options.NoRedZone = CodeGenOpts.DisableRedZone;
Options.InstrProfileOutput = CodeGenOpts.InstrProfileOutput;
Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Thu Feb 4 12:39:09 2016
@@ -1159,7 +1159,7 @@ void CodeGenFunction::EmitCaseStmt(const
// If the body of the case is just a 'break', try to not emit an empty block.
// If we're profiling or we're not optimizing, leave the block in for better
// debug and coverage analysis.
- if (!CGM.getCodeGenOpts().ProfileInstrGenerate &&
+ if (!CGM.getCodeGenOpts().hasProfileClangInstr() &&
CGM.getCodeGenOpts().OptimizationLevel > 0 &&
isa<BreakStmt>(S.getSubStmt())) {
JumpDest Block = BreakContinueStack.back().BreakBlock;
@@ -1206,7 +1206,7 @@ void CodeGenFunction::EmitCaseStmt(const
if (SwitchWeights)
SwitchWeights->push_back(getProfileCount(NextCase));
- if (CGM.getCodeGenOpts().ProfileInstrGenerate) {
+ if (CGM.getCodeGenOpts().hasProfileClangInstr()) {
CaseDest = createBasicBlock("sw.bb");
EmitBlockWithFallThrough(CaseDest, &S);
}
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.cpp Thu Feb 4 12:39:09 2016
@@ -883,7 +883,7 @@ void CodeGenFunction::EmitFunctionBody(F
void CodeGenFunction::EmitBlockWithFallThrough(llvm::BasicBlock *BB,
const Stmt *S) {
llvm::BasicBlock *SkipCountBB = nullptr;
- if (HaveInsertPoint() && CGM.getCodeGenOpts().ProfileInstrGenerate) {
+ if (HaveInsertPoint() && CGM.getCodeGenOpts().hasProfileClangInstr()) {
// When instrumenting for profiling, the fallthrough to certain
// statements needs to skip over the instrumentation code so that we
// get an accurate count.
Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Thu Feb 4 12:39:09 2016
@@ -952,7 +952,7 @@ private:
public:
/// Increment the profiler's counter for the given statement.
void incrementProfileCounter(const Stmt *S) {
- if (CGM.getCodeGenOpts().ProfileInstrGenerate)
+ if (CGM.getCodeGenOpts().hasProfileClangInstr())
PGO.emitCounterIncrement(Builder, S);
PGO.setCurrentStmt(S);
}
Modified: cfe/trunk/lib/CodeGen/CodeGenPGO.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenPGO.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenPGO.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenPGO.cpp Thu Feb 4 12:39:09 2016
@@ -37,7 +37,7 @@ void CodeGenPGO::setFuncName(StringRef N
PGOReader ? PGOReader->getVersion() : llvm::IndexedInstrProf::Version);
// If we're generating a profile, create a variable for the name.
- if (CGM.getCodeGenOpts().ProfileInstrGenerate)
+ if (CGM.getCodeGenOpts().hasProfileClangInstr())
FuncNameVar = llvm::createPGOFuncNameVar(CGM.getModule(), Linkage,
FuncName);
}
@@ -610,7 +610,7 @@ uint64_t PGOHash::finalize() {
void CodeGenPGO::assignRegionCounters(GlobalDecl GD, llvm::Function *Fn) {
const Decl *D = GD.getDecl();
- bool InstrumentRegions = CGM.getCodeGenOpts().ProfileInstrGenerate;
+ bool InstrumentRegions = CGM.getCodeGenOpts().hasProfileClangInstr();
llvm::IndexedInstrProfReader *PGOReader = CGM.getPGOReader();
if (!InstrumentRegions && !PGOReader)
return;
@@ -729,7 +729,7 @@ CodeGenPGO::applyFunctionAttributes(llvm
}
void CodeGenPGO::emitCounterIncrement(CGBuilderTy &Builder, const Stmt *S) {
- if (!CGM.getCodeGenOpts().ProfileInstrGenerate || !RegionCounterMap)
+ if (!CGM.getCodeGenOpts().hasProfileClangInstr() || !RegionCounterMap)
return;
if (!Builder.GetInsertBlock())
return;
@@ -754,7 +754,7 @@ void CodeGenPGO::valueProfile(CGBuilderT
if (!ValuePtr || !ValueSite || !Builder.GetInsertBlock())
return;
- bool InstrumentValueSites = CGM.getCodeGenOpts().ProfileInstrGenerate;
+ bool InstrumentValueSites = CGM.getCodeGenOpts().hasProfileClangInstr();
if (InstrumentValueSites && RegionCounterMap) {
llvm::LLVMContext &Ctx = CGM.getLLVMContext();
auto *I8PtrTy = llvm::Type::getInt8PtrTy(Ctx);
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Thu Feb 4 12:39:09 2016
@@ -3224,15 +3224,17 @@ static void addPGOAndCoverageFlags(Compi
if (ProfileGenerateArg) {
if (ProfileGenerateArg->getOption().matches(
options::OPT_fprofile_instr_generate_EQ))
- ProfileGenerateArg->render(Args, CmdArgs);
+ CmdArgs.push_back(Args.MakeArgString(Twine("-fprofile-instrument-path=")
+
+ ProfileGenerateArg->getValue()));
else if (ProfileGenerateArg->getOption().matches(
options::OPT_fprofile_generate_EQ)) {
SmallString<128> Path(ProfileGenerateArg->getValue());
llvm::sys::path::append(Path, "default.profraw");
CmdArgs.push_back(
- Args.MakeArgString(Twine("-fprofile-instr-generate=") + Path));
- } else
- Args.AddAllArgs(CmdArgs, options::OPT_fprofile_instr_generate);
+ Args.MakeArgString(Twine("-fprofile-instrument-path=") + Path));
+ }
+ // The default is to use Clang Instrumentation.
+ CmdArgs.push_back("-fprofile-instrument=clang");
}
if (ProfileUseArg) {
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Thu Feb 4 12:39:09 2016
@@ -477,9 +477,28 @@ static bool ParseCodeGenArgs(CodeGenOpti
Opts.DisableIntegratedAS = Args.hasArg(OPT_fno_integrated_as);
Opts.Autolink = !Args.hasArg(OPT_fno_autolink);
Opts.SampleProfileFile = Args.getLastArgValue(OPT_fprofile_sample_use_EQ);
- Opts.ProfileInstrGenerate = Args.hasArg(OPT_fprofile_instr_generate) ||
- Args.hasArg(OPT_fprofile_instr_generate_EQ);
- Opts.InstrProfileOutput =
Args.getLastArgValue(OPT_fprofile_instr_generate_EQ);
+
+ enum PGOInstrumentor { Unknown, None, Clang };
+ if (Arg *A = Args.getLastArg(OPT_fprofile_instrument_EQ)) {
+ StringRef Value = A->getValue();
+ PGOInstrumentor Method = llvm::StringSwitch<PGOInstrumentor>(Value)
+ .Case("clang", Clang)
+ .Case("none", None)
+ .Default(Unknown);
+ switch (Method) {
+ case Clang:
+ Opts.setProfileInstr(CodeGenOptions::ProfileClangInstr);
+ break;
+ case None:
+ break;
+ case Unknown:
+ Diags.Report(diag::err_drv_invalid_pgo_instrumentor)
+ << A->getAsString(Args) << Value;
+ break;
+ }
+ }
+
+ Opts.InstrProfileOutput =
Args.getLastArgValue(OPT_fprofile_instrument_path_EQ);
Opts.InstrProfileInput = Args.getLastArgValue(OPT_fprofile_instr_use_EQ);
Opts.CoverageMapping =
Args.hasFlag(OPT_fcoverage_mapping, OPT_fno_coverage_mapping, false);
Modified: cfe/trunk/test/CoverageMapping/block-storage-starts-region.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/block-storage-starts-region.m?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/block-storage-starts-region.m (original)
+++ cfe/trunk/test/CoverageMapping/block-storage-starts-region.m Thu Feb 4
12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin
-fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin
-fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
@interface Foo
@end
Modified: cfe/trunk/test/CoverageMapping/break.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/break.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/break.c (original)
+++ cfe/trunk/test/CoverageMapping/break.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name break.c %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name break.c %s | FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0
int cnt = 0; // CHECK-NEXT: File 0, [[@LINE+1]]:9 -> [[@LINE+1]]:18 =
#0
Modified: cfe/trunk/test/CoverageMapping/builtinmacro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/builtinmacro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/builtinmacro.c (original)
+++ cfe/trunk/test/CoverageMapping/builtinmacro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %s |
FileCheck %s
// Test the coverage mapping generation for built-in macroes.
Modified: cfe/trunk/test/CoverageMapping/casts.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/casts.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/casts.c (original)
+++ cfe/trunk/test/CoverageMapping/casts.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name casts.c %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name casts.c %s | FileCheck %s
int main() { // CHECK: File
0, [[@LINE]]:12 -> [[@LINE+4]]:2 = #0
// CHECK-NEXT:
File 0, [[@LINE+1]]:41 -> [[@LINE+1]]:54 = #1
Modified: cfe/trunk/test/CoverageMapping/classtemplate.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/classtemplate.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/classtemplate.cpp (original)
+++ cfe/trunk/test/CoverageMapping/classtemplate.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -fprofile-instr-generate
-fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name
classtemplate.cpp %s > %tmapping
+// RUN: %clang_cc1 -triple %itanium_abi_triple -fprofile-instrument=clang
-fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name
classtemplate.cpp %s > %tmapping
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-CONSTRUCTOR
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-GETTER
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-SETTER
Modified: cfe/trunk/test/CoverageMapping/comment-in-macro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/comment-in-macro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/comment-in-macro.c (original)
+++ cfe/trunk/test/CoverageMapping/comment-in-macro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
#define x1 "" // ...
#define x2 return 0
Modified: cfe/trunk/test/CoverageMapping/continue.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/continue.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/continue.c (original)
+++ cfe/trunk/test/CoverageMapping/continue.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %s |
FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 ->
[[@LINE+21]]:2 = #0
int j = 0; // CHECK-NEXT: File 0, [[@LINE+2]]:18 ->
[[@LINE+2]]:24 = (#0 + #1)
Modified: cfe/trunk/test/CoverageMapping/control-flow-macro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/control-flow-macro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/control-flow-macro.c (original)
+++ cfe/trunk/test/CoverageMapping/control-flow-macro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
#define ifc if
Modified: cfe/trunk/test/CoverageMapping/decl.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/decl.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/decl.c (original)
+++ cfe/trunk/test/CoverageMapping/decl.c Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Ensure that declarations without definitions don't have maps emitted for
them
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s > %t
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s > %t
// FileCheck -input-file %t %s
// RUN: FileCheck -check-prefix BAR -input-file %t %s
Modified: cfe/trunk/test/CoverageMapping/header.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/header.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/header.cpp (original)
+++ cfe/trunk/test/CoverageMapping/header.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name header.cpp %s > %tmapping
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name header.cpp %s > %tmapping
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-FUNC
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-STATIC-FUNC
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-STATIC-FUNC2
Modified: cfe/trunk/test/CoverageMapping/if.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/if.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/if.c (original)
+++ cfe/trunk/test/CoverageMapping/if.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name if.c %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name if.c %s | FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2
= #0
int i = 0;
Modified: cfe/trunk/test/CoverageMapping/implicit-def-in-macro.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/implicit-def-in-macro.m?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/implicit-def-in-macro.m (original)
+++ cfe/trunk/test/CoverageMapping/implicit-def-in-macro.m Thu Feb 4 12:39:09
2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin
-fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin
-fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
@interface Foo
@end
Modified: cfe/trunk/test/CoverageMapping/includehell.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/includehell.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/includehell.cpp (original)
+++ cfe/trunk/test/CoverageMapping/includehell.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name includehell.cpp %s >
%tmapping
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name includehell.cpp %s >
%tmapping
int main() {
int x = 0;
Modified: cfe/trunk/test/CoverageMapping/ir.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/ir.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/ir.c (original)
+++ cfe/trunk/test/CoverageMapping/ir.c Thu Feb 4 12:39:09 2016
@@ -1,5 +1,5 @@
// Check the data structures emitted by coverage mapping
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name ir.c %s -o
- -emit-llvm -fprofile-instr-generate -fcoverage-mapping | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name ir.c %s -o
- -emit-llvm -fprofile-instrument=clang -fcoverage-mapping | FileCheck %s
void foo(void) { }
Modified: cfe/trunk/test/CoverageMapping/label.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/label.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/label.cpp (original)
+++ cfe/trunk/test/CoverageMapping/label.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name label.cpp %s | FileCheck
%s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name label.cpp %s | FileCheck
%s
// CHECK: func
void func() { // CHECK-NEXT: File 0, [[@LINE]]:13 ->
{{[0-9]+}}:2 = #0
Modified: cfe/trunk/test/CoverageMapping/lambda.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/lambda.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/lambda.cpp (original)
+++ cfe/trunk/test/CoverageMapping/lambda.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -x c++ -std=c++11 -triple %itanium_abi_triple
-fprofile-instr-generate -fcoverage-mapping -dump-coverage-mapping
-emit-llvm-only %s -main-file-name lambda.cpp | FileCheck %s
+// RUN: %clang_cc1 -x c++ -std=c++11 -triple %itanium_abi_triple
-fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping
-emit-llvm-only %s -main-file-name lambda.cpp | FileCheck %s
// CHECK-LABEL: _Z3fooi:
void foo(int i) { // CHECK: File 0, [[@LINE]]:17 -> {{[0-9]+}}:2 = #0
Modified: cfe/trunk/test/CoverageMapping/logical.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/logical.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/logical.cpp (original)
+++ cfe/trunk/test/CoverageMapping/logical.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %s |
FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 ->
[[@LINE+10]]:2 = #0
bool bt = true;
Modified: cfe/trunk/test/CoverageMapping/loopmacro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/loopmacro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/loopmacro.c (original)
+++ cfe/trunk/test/CoverageMapping/loopmacro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loopmacro.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loopmacro.c %s |
FileCheck %s
// CHECK: main
// CHECK-NEXT: File 0, {{[0-9]+}}:12 -> {{[0-9]+}}:2 = #0
Modified: cfe/trunk/test/CoverageMapping/loops.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/loops.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/loops.cpp (original)
+++ cfe/trunk/test/CoverageMapping/loops.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck
%s
+// RUN: %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck
%s
// CHECK: rangedFor
void rangedFor() { // CHECK-NEXT: File 0, [[@LINE]]:18 ->
{{[0-9]+}}:2 = #0
Modified: cfe/trunk/test/CoverageMapping/macro-expansion.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macro-expansion.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macro-expansion.c (original)
+++ cfe/trunk/test/CoverageMapping/macro-expansion.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %s |
FileCheck %s
// CHECK: func
// CHECK: File 1, [[@LINE+5]]:12 -> [[@LINE+5]]:38 = #0
Modified: cfe/trunk/test/CoverageMapping/macro-expressions.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macro-expressions.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macro-expressions.cpp (original)
+++ cfe/trunk/test/CoverageMapping/macro-expressions.cpp Thu Feb 4 12:39:09
2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expressions.cpp %s
| FileCheck %s
+// RUN: %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expressions.cpp %s
| FileCheck %s
#define EXPR(x) (x)
#define NEXPR(x) (!x)
Modified: cfe/trunk/test/CoverageMapping/macroception.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macroception.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macroception.c (original)
+++ cfe/trunk/test/CoverageMapping/macroception.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroception.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroception.c %s |
FileCheck %s
#define M2 {
#define M1 M2
Modified: cfe/trunk/test/CoverageMapping/macroparams.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macroparams.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macroparams.c (original)
+++ cfe/trunk/test/CoverageMapping/macroparams.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroparams.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroparams.c %s |
FileCheck %s
// CHECK: main
// CHECK-NEXT: File 0, {{[0-9]+}}:12 -> {{[0-9]+}}:2 = #0
Modified: cfe/trunk/test/CoverageMapping/macroparams2.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macroparams2.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macroparams2.c (original)
+++ cfe/trunk/test/CoverageMapping/macroparams2.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroparams2.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroparams2.c %s |
FileCheck %s
#define MACRO(REFS, CALLS) (4 * (CALLS) < (REFS))
Modified: cfe/trunk/test/CoverageMapping/macros.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macros.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macros.c (original)
+++ cfe/trunk/test/CoverageMapping/macros.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macros.c %s | FileCheck
%s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macros.c %s | FileCheck
%s
#define MACRO return; bar()
#define MACRO_2 bar()
Modified: cfe/trunk/test/CoverageMapping/macroscopes.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/macroscopes.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/macroscopes.cpp (original)
+++ cfe/trunk/test/CoverageMapping/macroscopes.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroscopes.cpp %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macroscopes.cpp %s |
FileCheck %s
#define starts_a_scope for (int i = 0; i < 2; ++i) {
Modified: cfe/trunk/test/CoverageMapping/md.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/md.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/md.cpp (original)
+++ cfe/trunk/test/CoverageMapping/md.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -std=c++11 %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -std=c++11 %s | FileCheck %s
#define BREAK break
Modified: cfe/trunk/test/CoverageMapping/moremacros.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/moremacros.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/moremacros.c (original)
+++ cfe/trunk/test/CoverageMapping/moremacros.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %s |
FileCheck %s
#define LBRAC {
#define RBRAC }
Modified: cfe/trunk/test/CoverageMapping/nestedclass.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/nestedclass.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/nestedclass.cpp (original)
+++ cfe/trunk/test/CoverageMapping/nestedclass.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name nestedclass.cpp %s >
%tmapping
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name nestedclass.cpp %s >
%tmapping
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-OUTER
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-INNER
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-INNERMOST
Modified: cfe/trunk/test/CoverageMapping/objc.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/objc.m?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/objc.m (original)
+++ cfe/trunk/test/CoverageMapping/objc.m Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name objc.m -triple
x86_64-apple-darwin -fobjc-runtime=macosx-fragile-10.5 %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name objc.m -triple
x86_64-apple-darwin -fobjc-runtime=macosx-fragile-10.5 %s | FileCheck %s
@interface A
- (void)bork:(int)msg;
Modified: cfe/trunk/test/CoverageMapping/preprocessor.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/preprocessor.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/preprocessor.c (original)
+++ cfe/trunk/test/CoverageMapping/preprocessor.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name preprocessor.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name preprocessor.c %s |
FileCheck %s
// CHECK: func
void func() { // CHECK: File 0, [[@LINE]]:13 -> [[@LINE+5]]:2 = #0
Modified: cfe/trunk/test/CoverageMapping/return.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/return.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/return.c (original)
+++ cfe/trunk/test/CoverageMapping/return.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name return.c %s | FileCheck
%s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name return.c %s | FileCheck
%s
// CHECK: func
void func() { // CHECK: File 0, [[@LINE]]:13 ->
[[@LINE+3]]:2 = #0
Modified: cfe/trunk/test/CoverageMapping/switch.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/switch.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/switch.c (original)
+++ cfe/trunk/test/CoverageMapping/switch.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name switch.c %s | FileCheck
%s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name switch.c %s | FileCheck
%s
// CHECK: foo
void foo(int i) { // CHECK-NEXT: File 0, [[@LINE]]:17 -> [[@LINE+8]]:2 = #0
switch(i) {
Modified: cfe/trunk/test/CoverageMapping/switchmacro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/switchmacro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/switchmacro.c (original)
+++ cfe/trunk/test/CoverageMapping/switchmacro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name switchmacro.c %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name switchmacro.c %s |
FileCheck %s
#define FOO(x) (void)x
Modified: cfe/trunk/test/CoverageMapping/system_macro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/system_macro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/system_macro.c (original)
+++ cfe/trunk/test/CoverageMapping/system_macro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name system_macro.c -o - %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name system_macro.c -o - %s |
FileCheck %s
#ifdef IS_SYSHEADER
Modified: cfe/trunk/test/CoverageMapping/templates.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/templates.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/templates.cpp (original)
+++ cfe/trunk/test/CoverageMapping/templates.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name templates.cpp %s |
FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name templates.cpp %s |
FileCheck %s
template<typename T>
void unused(T x) {
Modified: cfe/trunk/test/CoverageMapping/test.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/test.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/test.c (original)
+++ cfe/trunk/test/CoverageMapping/test.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name test.c %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name test.c %s | FileCheck %s
void bar();
static void static_func();
Modified: cfe/trunk/test/CoverageMapping/trycatch.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/trycatch.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/trycatch.cpp (original)
+++ cfe/trunk/test/CoverageMapping/trycatch.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions
-fcxx-exceptions -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name trycatch.cpp %s |
FileCheck %s
+// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions
-fcxx-exceptions -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name trycatch.cpp %s |
FileCheck %s
class Error {
};
Modified: cfe/trunk/test/CoverageMapping/trymacro.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/trymacro.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/trymacro.cpp (original)
+++ cfe/trunk/test/CoverageMapping/trymacro.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions
-fcxx-exceptions -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name trymacro.cpp %s |
FileCheck %s
+// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions
-fcxx-exceptions -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name trymacro.cpp %s |
FileCheck %s
// CHECK: Z3fn1v:
void fn1() try { return; } // CHECK: [[@LINE]]:12 -> [[@LINE+1]]:14 = #1
Modified: cfe/trunk/test/CoverageMapping/unreachable-macro.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/unreachable-macro.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/unreachable-macro.c (original)
+++ cfe/trunk/test/CoverageMapping/unreachable-macro.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
#define WHILE while (0) {}
Modified: cfe/trunk/test/CoverageMapping/unused_names.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/unused_names.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/unused_names.c (original)
+++ cfe/trunk/test/CoverageMapping/unused_names.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping -emit-llvm
-main-file-name unused_names.c -o - %s > %t
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm
-main-file-name unused_names.c -o - %s > %t
// RUN: FileCheck -input-file %t %s
// RUN: FileCheck -check-prefix=SYSHEADER -input-file %t %s
Modified: cfe/trunk/test/CoverageMapping/while.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CoverageMapping/while.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/CoverageMapping/while.c (original)
+++ cfe/trunk/test/CoverageMapping/while.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instr-generate -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck
%s
+// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping
-dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck
%s
// CHECK: main
int main() { // CHECK-NEXT: File 0, [[@LINE]]:12 ->
[[@LINE+8]]:2 = #0
Modified: cfe/trunk/test/Driver/clang_f_opts.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang_f_opts.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Driver/clang_f_opts.c (original)
+++ cfe/trunk/test/Driver/clang_f_opts.c Thu Feb 4 12:39:09 2016
@@ -97,11 +97,11 @@
// 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
-// CHECK-PROFILE-GENERATE: "-fprofile-instr-generate"
-// CHECK-PROFILE-GENERATE-DIR:
"-fprofile-instr-generate=/some/dir{{/|\\\\}}default.profraw"
-// CHECK-PROFILE-GENERATE-FILE:
"-fprofile-instr-generate=/tmp/somefile.profraw"
+// CHECK-PROFILE-GENERATE: "-fprofile-instrument=clang"
+// 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-DISABLE-GEN-NOT: "-fprofile-instr-generate"
+// 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-DISABLE-COVERAGE-NOT: "-fcoverage-mapping"
Modified: cfe/trunk/test/Profile/c-captured.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-captured.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-captured.c (original)
+++ cfe/trunk/test/Profile/c-captured.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
c-captured.c %s -o - -emit-llvm -fprofile-instr-generate | FileCheck
-check-prefix=PGOGEN -check-prefix=PGOALL %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
c-captured.c %s -o - -emit-llvm -fprofile-instrument=clang | FileCheck
-check-prefix=PGOGEN -check-prefix=PGOALL %s
// RUN: llvm-profdata merge %S/Inputs/c-captured.proftext -o %t.profdata
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
c-captured.c %s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck
-check-prefix=PGOUSE -check-prefix=PGOALL %s
Modified: cfe/trunk/test/Profile/c-general.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-general.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-general.c (original)
+++ cfe/trunk/test/Profile/c-general.c Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Test instrumentation of general constructs in C.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c
%s -o - -emit-llvm -fprofile-instr-generate | FileCheck -check-prefix=PGOGEN %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c
%s -o - -emit-llvm -fprofile-instrument=clang | FileCheck -check-prefix=PGOGEN
%s
// RUN: llvm-profdata merge %S/Inputs/c-general.proftext -o %t.profdata
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-general.c
%s -o - -emit-llvm -fprofile-instr-use=%t.profdata | FileCheck
-check-prefix=PGOUSE %s
Modified: cfe/trunk/test/Profile/c-generate.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-generate.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-generate.c (original)
+++ cfe/trunk/test/Profile/c-generate.c Thu Feb 4 12:39:09 2016
@@ -1,9 +1,14 @@
-// Check that the -fprofile-instr-generate= form works.
-// RUN: %clang_cc1 -main-file-name c-generate.c %s -o - -emit-llvm
-fprofile-instr-generate=c-generate-test.profraw | FileCheck %s
-
-// CHECK: private constant [24 x i8] c"c-generate-test.profraw\00"
-// CHECK: call void @__llvm_profile_override_default_filename(i8*
getelementptr inbounds ([24 x i8], [24 x i8]* @0, i32 0, i32 0))
-// CHECK: declare void @__llvm_profile_override_default_filename(i8*)
+// Check that the -fprofile-instrument-path= form works.
+// RUN: %clang_cc1 -main-file-name c-generate.c %s -o - -emit-llvm
-fprofile-instrument=clang -fprofile-instrument-path=c-generate-test.profraw |
FileCheck %s --check-prefix=PROF-INSTR-PATH
+// RUN: %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=none | FileCheck %s
--check-prefix=PROF-INSTR-NONE
+// RUN: not %clang_cc1 %s -o - -emit-llvm -fprofile-instrument=garbage 2>&1 |
FileCheck %s --check-prefix=PROF-INSTR-GARBAGE
+//
+// PROF-INSTR-PATH: private constant [24 x i8] c"c-generate-test.profraw\00"
+// PROF-INSTR-PATH: call void @__llvm_profile_override_default_filename(i8*
getelementptr inbounds ([24 x i8], [24 x i8]* @0, i32 0, i32 0))
+// PROF-INSTR-PATH: declare void @__llvm_profile_override_default_filename(i8*)
+//
+// PROF-INSTR-NONE-NOT: @__profn_main
+// PROF-INSTR-GARBAGE: invalid PGO instrumentor in argument
'-fprofile-instrument=garbage'
int main(void) {
return 0;
Modified: cfe/trunk/test/Profile/c-indirect-call.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-indirect-call.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-indirect-call.c (original)
+++ cfe/trunk/test/Profile/c-indirect-call.c Thu Feb 4 12:39:09 2016
@@ -1,5 +1,5 @@
// Check the data structures emitted by instrumentation.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
c-indirect-call.c %s -o - -emit-llvm -fprofile-instr-generate -mllvm
-enable-value-profiling | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm
-enable-value-profiling | FileCheck %s
void (*foo)(void);
Modified: cfe/trunk/test/Profile/c-linkage-available_externally.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-linkage-available_externally.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-linkage-available_externally.c (original)
+++ cfe/trunk/test/Profile/c-linkage-available_externally.c Thu Feb 4 12:39:09
2016
@@ -1,6 +1,6 @@
// Make sure instrumentation data from available_externally functions doesn't
// get thrown out and are emitted with the expected linkage.
-// RUN: %clang_cc1 -O2 -triple x86_64-apple-macosx10.9 -main-file-name
c-linkage-available_externally.c %s -o - -emit-llvm -fprofile-instr-generate |
FileCheck %s
+// RUN: %clang_cc1 -O2 -triple x86_64-apple-macosx10.9 -main-file-name
c-linkage-available_externally.c %s -o - -emit-llvm -fprofile-instrument=clang
| FileCheck %s
// CHECK: @__profc_foo = linkonce_odr hidden global [1 x i64] zeroinitializer,
section "__DATA,__llvm_prf_cnts", align 8
// CHECK: @__profd_foo = linkonce_odr hidden global {{.*}} i64* getelementptr
inbounds ([1 x i64], [1 x i64]* @__profc_foo, i32 0, i32 0){{.*}}, section
"__DATA,__llvm_prf_data", align 8
Modified: cfe/trunk/test/Profile/c-linkage.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-linkage.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-linkage.c (original)
+++ cfe/trunk/test/Profile/c-linkage.c Thu Feb 4 12:39:09 2016
@@ -1,5 +1,5 @@
// Check that the profiling counters and data we create have the linkage we
expect
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-linkage.c
%s -o - -emit-llvm -fprofile-instr-generate | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-linkage.c
%s -o - -emit-llvm -fprofile-instrument=clang | FileCheck %s
// CHECK: @__profc_foo = private global
// CHECK: @__profd_foo = private global
Modified: cfe/trunk/test/Profile/c-unreachable-after-switch.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-unreachable-after-switch.c?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/c-unreachable-after-switch.c (original)
+++ cfe/trunk/test/Profile/c-unreachable-after-switch.c Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -O3 -triple x86_64-apple-macosx10.10 -main-file-name
c-unreachable-after-switch.c %s -o - -emit-llvm -fprofile-instr-generate |
FileCheck %s
+// RUN: %clang_cc1 -O3 -triple x86_64-apple-macosx10.10 -main-file-name
c-unreachable-after-switch.c %s -o - -emit-llvm -fprofile-instrument=clang |
FileCheck %s
// CHECK: @[[C:__profc_foo]] = private global [3 x i64] zeroinitializer
Modified: cfe/trunk/test/Profile/cxx-implicit.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-implicit.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-implicit.cpp (original)
+++ cfe/trunk/test/Profile/cxx-implicit.cpp Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Ensure that implicit methods aren't instrumented.
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-implicit.cpp -o - -emit-llvm -fprofile-instr-generate | FileCheck %s
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-implicit.cpp -o - -emit-llvm -fprofile-instrument=clang | FileCheck %s
// An implicit constructor is generated for Base. We should not emit counters
// for it.
Modified: cfe/trunk/test/Profile/cxx-lambda.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-lambda.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-lambda.cpp (original)
+++ cfe/trunk/test/Profile/cxx-lambda.cpp Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Tests for instrumentation of C++11 lambdas
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-lambda.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-generate > %tgen
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-lambda.cpp -std=c++11 -o - -emit-llvm -fprofile-instrument=clang > %tgen
// RUN: FileCheck --input-file=%tgen -check-prefix=PGOGEN %s
// RUN: FileCheck --input-file=%tgen -check-prefix=LMBGEN %s
Modified: cfe/trunk/test/Profile/cxx-linkage.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-linkage.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-linkage.cpp (original)
+++ cfe/trunk/test/Profile/cxx-linkage.cpp Thu Feb 4 12:39:09 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9.0 -emit-llvm
-main-file-name cxx-linkage.cpp %s -o - -fprofile-instr-generate | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9.0 -emit-llvm
-main-file-name cxx-linkage.cpp %s -o - -fprofile-instrument=clang | FileCheck
%s
// CHECK: @__profc__Z3foov = private global
// CHECK: @__profd__Z3foov = private global
Modified: cfe/trunk/test/Profile/cxx-rangefor.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-rangefor.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-rangefor.cpp (original)
+++ cfe/trunk/test/Profile/cxx-rangefor.cpp Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Tests for instrumentation of C++11 range-for
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-rangefor.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-generate > %tgen
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-rangefor.cpp -std=c++11 -o - -emit-llvm -fprofile-instrument=clang > %tgen
// RUN: FileCheck --input-file=%tgen -check-prefix=CHECK -check-prefix=PGOGEN
%s
// RUN: llvm-profdata merge %S/Inputs/cxx-rangefor.proftext -o %t.profdata
Modified: cfe/trunk/test/Profile/cxx-structors.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-structors.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-structors.cpp (original)
+++ cfe/trunk/test/Profile/cxx-structors.cpp Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Tests for instrumentation of C++ constructors and destructors.
//
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.11.0 -x c++ %s -o -
-emit-llvm -fprofile-instr-generate | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.11.0 -x c++ %s -o -
-emit-llvm -fprofile-instrument=clang | FileCheck %s
struct Foo {
Foo() {}
Modified: cfe/trunk/test/Profile/cxx-templates.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-templates.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-templates.cpp (original)
+++ cfe/trunk/test/Profile/cxx-templates.cpp Thu Feb 4 12:39:09 2016
@@ -1,7 +1,7 @@
// Tests for instrumentation of templated code. Each instantiation of a
template
// should be instrumented separately.
-// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-templates.cpp -std=c++11 -o - -emit-llvm -fprofile-instr-generate > %tgen
+// RUN: %clang_cc1 -x c++ %s -triple %itanium_abi_triple -main-file-name
cxx-templates.cpp -std=c++11 -o - -emit-llvm -fprofile-instrument=clang > %tgen
// RUN: FileCheck --input-file=%tgen -check-prefix=T0GEN -check-prefix=ALL %s
// RUN: FileCheck --input-file=%tgen -check-prefix=T100GEN -check-prefix=ALL %s
Modified: cfe/trunk/test/Profile/cxx-virtual-destructor-calls.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-virtual-destructor-calls.cpp?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/cxx-virtual-destructor-calls.cpp (original)
+++ cfe/trunk/test/Profile/cxx-virtual-destructor-calls.cpp Thu Feb 4 12:39:09
2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -main-file-name
cxx-virtual-destructor-calls.cpp %s -o - -fprofile-instr-generate | FileCheck %s
+// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -main-file-name
cxx-virtual-destructor-calls.cpp %s -o - -fprofile-instrument=clang | FileCheck
%s
struct Member {
~Member();
Modified: cfe/trunk/test/Profile/objc-general.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/objc-general.m?rev=259811&r1=259810&r2=259811&view=diff
==============================================================================
--- cfe/trunk/test/Profile/objc-general.m (original)
+++ cfe/trunk/test/Profile/objc-general.m Thu Feb 4 12:39:09 2016
@@ -1,6 +1,6 @@
// Test instrumentation of general constructs in objective C.
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instr-generate | FileCheck
-check-prefix=PGOGEN %s
+// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instrument=clang |
FileCheck -check-prefix=PGOGEN %s
// RUN: llvm-profdata merge %S/Inputs/objc-general.proftext -o %t.profdata
// RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name
objc-general.m %s -o - -emit-llvm -fblocks -fprofile-instr-use=%t.profdata |
FileCheck -check-prefix=PGOUSE %s
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
