Skip to content

Commit c332445

Browse files
keithkeith
committed
[clang] Add -fprofile-prefix-map
This flag allows you to re-write absolute paths in coverage data analogous to -fdebug-prefix-map. This flag is also implied by -ffile-prefix-map.
1 parent f851db3 commit c332445

File tree

8 files changed

+73
-9
lines changed

8 files changed

+73
-9
lines changed

‎clang/include/clang/Basic/CodeGenOptions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ class CodeGenOptions : public CodeGenOptionsBase {
169169
std::string RecordCommandLine;
170170

171171
std::map<std::string, std::string> DebugPrefixMap;
172+
std::map<std::string, std::string> ProfilePrefixMap;
172173

173174
/// The ABI to use for passing floating point arguments.
174175
std::string FloatABI;

‎clang/include/clang/Driver/Options.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2601,6 +2601,10 @@ def fdebug_prefix_map_EQ
26012601
: Joined<["-"], "fdebug-prefix-map=">, Group<f_Group>,
26022602
Flags<[CC1Option,CC1AsOption]>,
26032603
HelpText<"remap file source paths in debug info">;
2604+
def fprofile_prefix_map_EQ
2605+
: Joined<["-"], "fprofile-prefix-map=">, Group<f_Group>,
2606+
Flags<[CC1Option]>,
2607+
HelpText<"remap file source paths in coverage info">;
26042608
def ffile_prefix_map_EQ
26052609
: Joined<["-"], "ffile-prefix-map=">, Group<f_Group>,
26062610
HelpText<"remap file source paths in debug info and predefined preprocessor macros">;

‎clang/lib/CodeGen/CoverageMappingGen.cpp

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,13 +1544,6 @@ struct CounterCoverageMappingBuilder
15441544
}
15451545
};
15461546

1547-
std::string normalizeFilename(StringRef Filename) {
1548-
llvm::SmallString<256> Path(Filename);
1549-
llvm::sys::fs::make_absolute(Path);
1550-
llvm::sys::path::remove_dots(Path, /*remove_dot_dot=*/true);
1551-
return std::string(Path);
1552-
}
1553-
15541547
} // end anonymous namespace
15551548

15561549
static void dump(llvm::raw_ostream &OS, StringRef FunctionName,
@@ -1592,6 +1585,23 @@ static void dump(llvm::raw_ostream &OS, StringRef FunctionName,
15921585
}
15931586
}
15941587

1588+
CoverageMappingModuleGen::CoverageMappingModuleGen(
1589+
CodeGenModule &CGM, CoverageSourceInfo &SourceInfo)
1590+
: CGM(CGM), SourceInfo(SourceInfo) {
1591+
ProfilePrefixMap = CGM.getCodeGenOpts().ProfilePrefixMap;
1592+
}
1593+
1594+
std::string CoverageMappingModuleGen::normalizeFilename(StringRef Filename) {
1595+
llvm::SmallString<256> Path(Filename);
1596+
llvm::sys::fs::make_absolute(Path);
1597+
llvm::sys::path::remove_dots(Path, /*remove_dot_dot=*/true);
1598+
for (const auto &Entry : ProfilePrefixMap) {
1599+
if (llvm::sys::path::replace_path_prefix(Path, Entry.first, Entry.second))
1600+
break;
1601+
}
1602+
return Path.str().str();
1603+
}
1604+
15951605
static std::string getInstrProfSection(const CodeGenModule &CGM,
15961606
llvm::InstrProfSectKind SK) {
15971607
return llvm::getInstrProfSectionName(

‎clang/lib/CodeGen/CoverageMappingGen.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ class CoverageMappingModuleGen {
9393
llvm::SmallDenseMap<const FileEntry *, unsigned, 8> FileEntries;
9494
std::vector<llvm::Constant *> FunctionNames;
9595
std::vector<FunctionInfo> FunctionRecords;
96+
std::map<std::string, std::string> ProfilePrefixMap;
97+
98+
std::string normalizeFilename(StringRef Filename);
9699

97100
/// Emit a function record.
98101
void emitFunctionMappingRecord(const FunctionInfo &Info,
@@ -101,8 +104,7 @@ class CoverageMappingModuleGen {
101104
public:
102105
static CoverageSourceInfo *setUpCoverageCallbacks(Preprocessor &PP);
103106

104-
CoverageMappingModuleGen(CodeGenModule &CGM, CoverageSourceInfo &SourceInfo)
105-
: CGM(CGM), SourceInfo(SourceInfo) {}
107+
CoverageMappingModuleGen(CodeGenModule &CGM, CoverageSourceInfo &SourceInfo);
106108

107109
CoverageSourceInfo &getSourceInfo() const {
108110
return SourceInfo;

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,21 @@ static void addMacroPrefixMapArg(const Driver &D, const ArgList &Args,
656656
}
657657
}
658658

659+
/// Add a CC1 and CC1AS option to specify the coverage file path prefix map.
660+
static void addProfilePrefixMapArg(const Driver &D, const ArgList &Args,
661+
ArgStringList &CmdArgs) {
662+
for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
663+
options::OPT_fprofile_prefix_map_EQ)) {
664+
StringRef Map = A->getValue();
665+
if (Map.find('=') == StringRef::npos)
666+
D.Diag(diag::err_drv_invalid_argument_to_option)
667+
<< Map << A->getOption().getName();
668+
else
669+
CmdArgs.push_back(Args.MakeArgString("-fprofile-prefix-map=" + Map));
670+
A->claim();
671+
}
672+
}
673+
659674
/// Vectorize at all optimization levels greater than 1 except for -Oz.
660675
/// For -Oz the loop vectorizer is disabled, while the slp vectorizer is
661676
/// enabled.
@@ -1360,6 +1375,7 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
13601375
}
13611376

13621377
addMacroPrefixMapArg(D, Args, CmdArgs);
1378+
addProfilePrefixMapArg(D, Args, CmdArgs);
13631379
}
13641380

13651381
// FIXME: Move to target hook.

‎clang/lib/Frontend/CompilerInvocation.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,12 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
990990
{std::string(Split.first), std::string(Split.second)});
991991
}
992992

993+
for (const auto &Arg : Args.getAllArgValues(OPT_fprofile_prefix_map_EQ)) {
994+
auto Split = StringRef(Arg).split('=');
995+
Opts.ProfilePrefixMap.insert(
996+
{std::string(Split.first), std::string(Split.second)});
997+
}
998+
993999
const llvm::Triple::ArchType DebugEntryValueArchs[] = {
9941000
llvm::Triple::x86, llvm::Triple::x86_64, llvm::Triple::aarch64,
9951001
llvm::Triple::arm, llvm::Triple::armeb, llvm::Triple::mips,

‎clang/test/Driver/debug-prefix-map.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,39 @@
11
// RUN: %clang -### -fdebug-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-INVALID
22
// RUN: %clang -### -fmacro-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-INVALID
3+
// RUN: %clang -### -fprofile-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-INVALID
34
// RUN: %clang -### -ffile-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-FILE-INVALID
45

56
// RUN: %clang -### -fdebug-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-SIMPLE
67
// RUN: %clang -### -fmacro-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-SIMPLE
8+
// RUN: %clang -### -fprofile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-SIMPLE
79
// RUN: %clang -### -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-SIMPLE
810
// RUN: %clang -### -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-SIMPLE
11+
// RUN: %clang -### -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-SIMPLE
912

1013
// RUN: %clang -### -fdebug-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-COMPLEX
1114
// RUN: %clang -### -fmacro-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-COMPLEX
15+
// RUN: %clang -### -fprofile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-COMPLEX
1216
// RUN: %clang -### -ffile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-COMPLEX
1317
// RUN: %clang -### -ffile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-COMPLEX
18+
// RUN: %clang -### -ffile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-COMPLEX
1419

1520
// RUN: %clang -### -fdebug-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-EMPTY
1621
// RUN: %clang -### -fmacro-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-EMPTY
22+
// RUN: %clang -### -fprofile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-EMPTY
1723
// RUN: %clang -### -ffile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-EMPTY
1824
// RUN: %clang -### -ffile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-EMPTY
25+
// RUN: %clang -### -ffile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-PROFILE-EMPTY
1926

2027
// CHECK-DEBUG-INVALID: error: invalid argument 'old' to -fdebug-prefix-map
2128
// CHECK-MACRO-INVALID: error: invalid argument 'old' to -fmacro-prefix-map
29+
// CHECK-PROFILE-INVALID: error: invalid argument 'old' to -fprofile-prefix-map
2230
// CHECK-FILE-INVALID: error: invalid argument 'old' to -ffile-prefix-map
2331
// CHECK-DEBUG-SIMPLE: fdebug-prefix-map=old=new
2432
// CHECK-MACRO-SIMPLE: fmacro-prefix-map=old=new
33+
// CHECK-PROFILE-SIMPLE: fprofile-prefix-map=old=new
2534
// CHECK-DEBUG-COMPLEX: fdebug-prefix-map=old=n=ew
2635
// CHECK-MACRO-COMPLEX: fmacro-prefix-map=old=n=ew
36+
// CHECK-PROFILE-COMPLEX: fprofile-prefix-map=old=n=ew
2737
// CHECK-DEBUG-EMPTY: fdebug-prefix-map=old=
2838
// CHECK-MACRO-EMPTY: fmacro-prefix-map=old=
39+
// CHECK-PROFILE-EMPTY: fprofile-prefix-map=old=

‎clang/test/Profile/profile-prefix-map.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// %s expands to an absolute path, so to test relative paths we need to create a
2+
// clean directory, put the source there, and cd into it.
3+
// RUN: rm -rf %t
4+
// RUN: mkdir -p %t/root/nested
5+
// RUN: echo "void f1() {}" > %t/root/nested/profile-prefix-map.c
6+
// RUN: cd %t/root
7+
8+
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c nested/profile-prefix-map.c -o - | FileCheck --check-prefix=ABSOLUTE %s
9+
//
10+
// ABSOLUTE: @__llvm_coverage_mapping = {{.*"\\01.*root.*nested.*profile-prefix-map\.c}}
11+
12+
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c nested/profile-prefix-map.c -fprofile-prefix-map=%/t/root=. -o - | FileCheck --check-prefix=PROFILE-PREFIX-MAP %s --implicit-check-not=root
13+
//
14+
// PROFILE-PREFIX-MAP: @__llvm_coverage_mapping = {{.*"\\01[^/]*}}.{{/|\\+}}nested{{.*profile-prefix-map\.c}}

0 commit comments

Comments
 (0)