[ProfileData] Unify getInstrProf*SectionName helpers
This is a version of D32090 that unifies all of the
`getInstrProf*SectionName` helper functions. (Note: the build failures
which D32090 would have addressed were fixed with r300352.)
We should unify these helper functions because they are hard to use in
their current form. E.g we recently introduced more helpers to fix
section naming for COFF files. This scheme doesn't totally succeed at
hiding low-level details about section naming, so we should switch to an
API that is easier to maintain.
This is not an NFC commit because it fixes llvm-cov's testing support
for COFF files (this falls out of the API change naturally). This is an
area where we lack tests -- I will see about adding one as a follow up.
Testing: check-clang, check-profile, check-llvm.
Differential Revision: https://reviews.llvm.org/D32097
llvm-svn: 300381
diff --git a/llvm/lib/ProfileData/InstrProf.cpp b/llvm/lib/ProfileData/InstrProf.cpp
index a8f5b7f..64a65cc 100644
--- a/llvm/lib/ProfileData/InstrProf.cpp
+++ b/llvm/lib/ProfileData/InstrProf.cpp
@@ -138,103 +138,45 @@
namespace {
-enum InstrProfSectKind {
-#define INSTR_PROF_SECT_ENTRY(Kind, SectName, SectNameCommon, SectNameCoff, \
- Prefix) \
- Kind,
-#include "llvm/ProfileData/InstrProfData.inc"
-};
-
-const char *InstrProfSectName[] = {
-#define INSTR_PROF_SECT_ENTRY(Kind, SectName, SectNameCommon, SectNameCoff, \
- Prefix) \
- SectName,
-#include "llvm/ProfileData/InstrProfData.inc"
-};
-
const char *InstrProfSectNameCommon[] = {
-#define INSTR_PROF_SECT_ENTRY(Kind, SectName, SectNameCommon, SectNameCoff, \
- Prefix) \
+#define INSTR_PROF_SECT_ENTRY(Kind, SectNameCommon, SectNameCoff, Prefix) \
SectNameCommon,
#include "llvm/ProfileData/InstrProfData.inc"
};
const char *InstrProfSectNameCoff[] = {
-#define INSTR_PROF_SECT_ENTRY(Kind, SectName, SectNameCommon, SectNameCoff, \
- Prefix) \
+#define INSTR_PROF_SECT_ENTRY(Kind, SectNameCommon, SectNameCoff, Prefix) \
SectNameCoff,
#include "llvm/ProfileData/InstrProfData.inc"
};
const char *InstrProfSectNamePrefix[] = {
-#define INSTR_PROF_SECT_ENTRY(Kind, SectName, SectNameCommon, SectNameCoff, \
- Prefix) \
+#define INSTR_PROF_SECT_ENTRY(Kind, SectNameCommon, SectNameCoff, Prefix) \
Prefix,
#include "llvm/ProfileData/InstrProfData.inc"
};
-std::string getInstrProfSectionName(bool isCoff, InstrProfSectKind Kind) {
- return isCoff ? InstrProfSectNameCoff[Kind] : InstrProfSectNameCommon[Kind];
-}
-
-std::string getInstrProfSectionName(const Module *M, InstrProfSectKind Kind) {
- if (!M)
- return InstrProfSectName[Kind];
-
- bool AddSegment = Triple(M->getTargetTriple()).isOSBinFormatMachO();
- std::string SectName;
- if (Triple(M->getTargetTriple()).isOSBinFormatCOFF())
- SectName = InstrProfSectNameCoff[Kind];
- else
- SectName = InstrProfSectNameCommon[Kind];
-
- if (AddSegment) {
- SectName = InstrProfSectNamePrefix[Kind] + SectName;
- if (Kind == IPSK_data) {
- SectName += ",regular,live_support";
- }
- }
- return SectName;
-}
-
} // namespace
namespace llvm {
-std::string getInstrProfCountersSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_cnts);
-}
+std::string getInstrProfSectionName(InstrProfSectKind IPSK,
+ Triple::ObjectFormatType OF,
+ bool AddSegmentInfo) {
+ std::string SectName;
-std::string getInstrProfNameSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_name);
-}
+ if (OF == Triple::MachO && AddSegmentInfo)
+ SectName = InstrProfSectNamePrefix[IPSK];
-std::string getInstrProfNameSectionNameInObject(bool isCoff) {
- return getInstrProfSectionName(isCoff, IPSK_name);
-}
+ if (OF == Triple::COFF)
+ SectName += InstrProfSectNameCoff[IPSK];
+ else
+ SectName += InstrProfSectNameCommon[IPSK];
-std::string getInstrProfDataSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_data);
-}
+ if (OF == Triple::MachO && IPSK == IPSK_data && AddSegmentInfo)
+ SectName += ",regular,live_support";
-std::string getInstrProfDataSectionNameInObject(bool isCoff) {
- return getInstrProfSectionName(isCoff, IPSK_data);
-}
-
-std::string getInstrProfValuesSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_vals);
-}
-
-std::string getInstrProfVNodesSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_vnodes);
-}
-
-std::string getInstrProfCoverageSectionName(const Module *M) {
- return getInstrProfSectionName(M, IPSK_covmap);
-}
-
-std::string getInstrProfCoverageSectionNameInObject(bool isCoff) {
- return getInstrProfSectionName(isCoff, IPSK_covmap);
+ return SectName;
}
void SoftInstrProfErrors::addError(instrprof_error IE) {