2020-07-26 12:11:30 -05:00
|
|
|
#include "LLVMWrapper.h"
|
2020-07-02 13:27:15 -05:00
|
|
|
#include "llvm/ProfileData/Coverage/CoverageMapping.h"
|
|
|
|
#include "llvm/ProfileData/Coverage/CoverageMappingWriter.h"
|
|
|
|
#include "llvm/ProfileData/InstrProf.h"
|
|
|
|
#include "llvm/ADT/ArrayRef.h"
|
|
|
|
|
|
|
|
#include <iostream>
|
|
|
|
|
|
|
|
using namespace llvm;
|
|
|
|
|
2023-05-07 22:57:20 -05:00
|
|
|
// FFI equivalent of enum `llvm::coverage::Counter::CounterKind`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L97-L99
|
|
|
|
enum class LLVMRustCounterKind {
|
|
|
|
Zero = 0,
|
|
|
|
CounterValueReference = 1,
|
|
|
|
Expression = 2,
|
|
|
|
};
|
|
|
|
|
|
|
|
// FFI equivalent of struct `llvm::coverage::Counter`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L94-L149
|
|
|
|
struct LLVMRustCounter {
|
|
|
|
LLVMRustCounterKind CounterKind;
|
|
|
|
uint32_t ID;
|
|
|
|
};
|
|
|
|
|
|
|
|
static coverage::Counter fromRust(LLVMRustCounter Counter) {
|
|
|
|
switch (Counter.CounterKind) {
|
|
|
|
case LLVMRustCounterKind::Zero:
|
|
|
|
return coverage::Counter::getZero();
|
|
|
|
case LLVMRustCounterKind::CounterValueReference:
|
|
|
|
return coverage::Counter::getCounter(Counter.ID);
|
|
|
|
case LLVMRustCounterKind::Expression:
|
|
|
|
return coverage::Counter::getExpression(Counter.ID);
|
|
|
|
}
|
|
|
|
report_fatal_error("Bad LLVMRustCounterKind!");
|
|
|
|
}
|
|
|
|
|
|
|
|
// FFI equivalent of enum `llvm::coverage::CounterMappingRegion::RegionKind`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L213-L234
|
|
|
|
enum class LLVMRustCounterMappingRegionKind {
|
|
|
|
CodeRegion = 0,
|
|
|
|
ExpansionRegion = 1,
|
|
|
|
SkippedRegion = 2,
|
|
|
|
GapRegion = 3,
|
|
|
|
BranchRegion = 4,
|
|
|
|
};
|
|
|
|
|
|
|
|
static coverage::CounterMappingRegion::RegionKind
|
|
|
|
fromRust(LLVMRustCounterMappingRegionKind Kind) {
|
|
|
|
switch (Kind) {
|
|
|
|
case LLVMRustCounterMappingRegionKind::CodeRegion:
|
|
|
|
return coverage::CounterMappingRegion::CodeRegion;
|
|
|
|
case LLVMRustCounterMappingRegionKind::ExpansionRegion:
|
|
|
|
return coverage::CounterMappingRegion::ExpansionRegion;
|
|
|
|
case LLVMRustCounterMappingRegionKind::SkippedRegion:
|
|
|
|
return coverage::CounterMappingRegion::SkippedRegion;
|
|
|
|
case LLVMRustCounterMappingRegionKind::GapRegion:
|
|
|
|
return coverage::CounterMappingRegion::GapRegion;
|
|
|
|
case LLVMRustCounterMappingRegionKind::BranchRegion:
|
|
|
|
return coverage::CounterMappingRegion::BranchRegion;
|
|
|
|
}
|
|
|
|
report_fatal_error("Bad LLVMRustCounterMappingRegionKind!");
|
|
|
|
}
|
|
|
|
|
|
|
|
// FFI equivalent of struct `llvm::coverage::CounterMappingRegion`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L211-L304
|
2021-02-20 09:43:05 -06:00
|
|
|
struct LLVMRustCounterMappingRegion {
|
2023-05-07 22:57:20 -05:00
|
|
|
LLVMRustCounter Count;
|
|
|
|
LLVMRustCounter FalseCount;
|
2021-02-20 09:43:05 -06:00
|
|
|
uint32_t FileID;
|
|
|
|
uint32_t ExpandedFileID;
|
|
|
|
uint32_t LineStart;
|
|
|
|
uint32_t ColumnStart;
|
|
|
|
uint32_t LineEnd;
|
|
|
|
uint32_t ColumnEnd;
|
2023-05-07 22:57:20 -05:00
|
|
|
LLVMRustCounterMappingRegionKind Kind;
|
|
|
|
};
|
|
|
|
|
|
|
|
// FFI equivalent of enum `llvm::coverage::CounterExpression::ExprKind`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L154
|
|
|
|
enum class LLVMRustCounterExprKind {
|
|
|
|
Subtract = 0,
|
|
|
|
Add = 1,
|
2021-02-20 09:43:05 -06:00
|
|
|
};
|
|
|
|
|
2023-05-07 22:57:20 -05:00
|
|
|
// FFI equivalent of struct `llvm::coverage::CounterExpression`
|
|
|
|
// https://github.com/rust-lang/llvm-project/blob/ea6fa9c2/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h#L151-L160
|
|
|
|
struct LLVMRustCounterExpression {
|
|
|
|
LLVMRustCounterExprKind Kind;
|
|
|
|
LLVMRustCounter LHS;
|
|
|
|
LLVMRustCounter RHS;
|
|
|
|
};
|
|
|
|
|
|
|
|
static coverage::CounterExpression::ExprKind
|
|
|
|
fromRust(LLVMRustCounterExprKind Kind) {
|
|
|
|
switch (Kind) {
|
|
|
|
case LLVMRustCounterExprKind::Subtract:
|
|
|
|
return coverage::CounterExpression::Subtract;
|
|
|
|
case LLVMRustCounterExprKind::Add:
|
|
|
|
return coverage::CounterExpression::Add;
|
|
|
|
}
|
|
|
|
report_fatal_error("Bad LLVMRustCounterExprKind!");
|
|
|
|
}
|
|
|
|
|
2020-07-02 13:27:15 -05:00
|
|
|
extern "C" void LLVMRustCoverageWriteFilenamesSectionToBuffer(
|
|
|
|
const char* const Filenames[],
|
|
|
|
size_t FilenamesLen,
|
|
|
|
RustStringRef BufferOut) {
|
2021-03-16 15:32:00 -05:00
|
|
|
SmallVector<std::string,32> FilenameRefs;
|
|
|
|
for (size_t i = 0; i < FilenamesLen; i++) {
|
|
|
|
FilenameRefs.push_back(std::string(Filenames[i]));
|
|
|
|
}
|
2023-01-11 09:39:01 -06:00
|
|
|
auto FilenamesWriter =
|
|
|
|
coverage::CoverageFilenamesSectionWriter(ArrayRef<std::string>(FilenameRefs));
|
2020-11-23 14:56:07 -06:00
|
|
|
RawRustStringOstream OS(BufferOut);
|
|
|
|
FilenamesWriter.write(OS);
|
2020-07-02 13:27:15 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void LLVMRustCoverageWriteMappingToBuffer(
|
|
|
|
const unsigned *VirtualFileMappingIDs,
|
|
|
|
unsigned NumVirtualFileMappingIDs,
|
2023-05-07 22:57:20 -05:00
|
|
|
const LLVMRustCounterExpression *RustExpressions,
|
2020-07-24 23:14:28 -05:00
|
|
|
unsigned NumExpressions,
|
2023-05-09 03:38:47 -05:00
|
|
|
const LLVMRustCounterMappingRegion *RustMappingRegions,
|
2020-07-24 23:14:28 -05:00
|
|
|
unsigned NumMappingRegions,
|
2020-07-02 13:27:15 -05:00
|
|
|
RustStringRef BufferOut) {
|
2021-02-20 09:43:05 -06:00
|
|
|
// Convert from FFI representation to LLVM representation.
|
|
|
|
SmallVector<coverage::CounterMappingRegion, 0> MappingRegions;
|
|
|
|
MappingRegions.reserve(NumMappingRegions);
|
2023-01-11 09:39:01 -06:00
|
|
|
for (const auto &Region : ArrayRef<LLVMRustCounterMappingRegion>(
|
|
|
|
RustMappingRegions, NumMappingRegions)) {
|
2021-02-20 09:43:05 -06:00
|
|
|
MappingRegions.emplace_back(
|
2023-05-07 22:57:20 -05:00
|
|
|
fromRust(Region.Count), fromRust(Region.FalseCount),
|
|
|
|
Region.FileID, Region.ExpandedFileID,
|
2021-02-20 09:43:05 -06:00
|
|
|
Region.LineStart, Region.ColumnStart, Region.LineEnd, Region.ColumnEnd,
|
2023-05-07 22:57:20 -05:00
|
|
|
fromRust(Region.Kind));
|
2021-02-20 09:43:05 -06:00
|
|
|
}
|
2023-05-07 22:57:20 -05:00
|
|
|
|
|
|
|
std::vector<coverage::CounterExpression> Expressions;
|
|
|
|
Expressions.reserve(NumExpressions);
|
|
|
|
for (const auto &Expression :
|
|
|
|
ArrayRef<LLVMRustCounterExpression>(RustExpressions, NumExpressions)) {
|
|
|
|
Expressions.emplace_back(fromRust(Expression.Kind),
|
|
|
|
fromRust(Expression.LHS),
|
|
|
|
fromRust(Expression.RHS));
|
|
|
|
}
|
|
|
|
|
2020-07-02 13:27:15 -05:00
|
|
|
auto CoverageMappingWriter = coverage::CoverageMappingWriter(
|
2023-01-11 09:39:01 -06:00
|
|
|
ArrayRef<unsigned>(VirtualFileMappingIDs, NumVirtualFileMappingIDs),
|
2023-05-07 22:57:20 -05:00
|
|
|
Expressions,
|
2021-02-20 09:43:05 -06:00
|
|
|
MappingRegions);
|
2020-07-02 13:27:15 -05:00
|
|
|
RawRustStringOstream OS(BufferOut);
|
|
|
|
CoverageMappingWriter.write(OS);
|
|
|
|
}
|
|
|
|
|
LLVM IR coverage encoding aligns closer to Clang's
I found some areas for improvement while attempting to debug the
SegFault issue when running rust programs compiled using MSVC, with
coverage instrumentation.
I discovered that LLVM's coverage writer was generating incomplete
function name variable names (that's not a typo: the name of the
variable that holds a function name).
The existing implementation used one-up numbers to distinguish
variables, and correcting the names did not fix the MSVC coverage bug,
but the fix in this PR makes the names and resulting LLVM IR easier to
follow and more consistent with Clang's implementation.
I also changed the way the `-Zinstrument-coverage` option is supported
in symbol_export.rs. The original implementation was incorrect, and the
corrected version matches the handling for `-Zprofile-generate`, as it
turns out.
(An argument could be made that maybe `-Zinstrument-coverage` should
automatically enable `-Cprofile-generate`. In fact, if
`-Cprofile-generate` is analagous to Clang's `-fprofile-generate`, as
some documentation implies, Clang always requires this flag for its
implementation of source-based code coverage. This would require a
little more validation, and if implemented, would probably require
updating some of the user-facing messages related to
`-Cprofile-generate` to not be so specific to the PGO use case.)
None of these changes fixed the MSVC coverage problems, but they should
still be welcome improvements.
Lastly, I added some additional FIXME comments in instrument_coverage.rs
describing issues I found with the generated LLVM IR that would be
resolved if the coverage instrumentation is injected with a `Statement`
instead of as a new `BasicBlock`. I describe seven advantages of this
change, but it requires some discussion before making a change like
this.
2020-08-06 00:53:11 -05:00
|
|
|
extern "C" LLVMValueRef LLVMRustCoverageCreatePGOFuncNameVar(LLVMValueRef F, const char *FuncName) {
|
|
|
|
StringRef FuncNameRef(FuncName);
|
|
|
|
return wrap(createPGOFuncNameVar(*cast<Function>(unwrap(F)), FuncNameRef));
|
|
|
|
}
|
|
|
|
|
2020-11-23 14:56:07 -06:00
|
|
|
extern "C" uint64_t LLVMRustCoverageHashByteArray(
|
|
|
|
const char *Bytes,
|
2023-07-07 02:19:41 -05:00
|
|
|
size_t NumBytes) {
|
2020-11-23 14:56:07 -06:00
|
|
|
StringRef StrRef(Bytes, NumBytes);
|
|
|
|
return IndexedInstrProf::ComputeHash(StrRef);
|
2020-07-02 13:27:15 -05:00
|
|
|
}
|
|
|
|
|
2020-11-23 14:56:07 -06:00
|
|
|
static void WriteSectionNameToString(LLVMModuleRef M,
|
|
|
|
InstrProfSectKind SK,
|
|
|
|
RustStringRef Str) {
|
2020-07-02 13:27:15 -05:00
|
|
|
Triple TargetTriple(unwrap(M)->getTargetTriple());
|
2020-11-23 14:56:07 -06:00
|
|
|
auto name = getInstrProfSectionName(SK, TargetTriple.getObjectFormat());
|
2020-07-02 13:27:15 -05:00
|
|
|
RawRustStringOstream OS(Str);
|
|
|
|
OS << name;
|
|
|
|
}
|
|
|
|
|
2020-11-23 14:56:07 -06:00
|
|
|
extern "C" void LLVMRustCoverageWriteMapSectionNameToString(LLVMModuleRef M,
|
|
|
|
RustStringRef Str) {
|
|
|
|
WriteSectionNameToString(M, IPSK_covmap, Str);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" void LLVMRustCoverageWriteFuncSectionNameToString(LLVMModuleRef M,
|
|
|
|
RustStringRef Str) {
|
|
|
|
WriteSectionNameToString(M, IPSK_covfun, Str);
|
|
|
|
}
|
|
|
|
|
2020-07-02 13:27:15 -05:00
|
|
|
extern "C" void LLVMRustCoverageWriteMappingVarNameToString(RustStringRef Str) {
|
|
|
|
auto name = getCoverageMappingVarName();
|
|
|
|
RawRustStringOstream OS(Str);
|
|
|
|
OS << name;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" uint32_t LLVMRustCoverageMappingVersion() {
|
2021-10-19 04:09:43 -05:00
|
|
|
return coverage::CovMapVersion::Version6;
|
2020-07-02 13:27:15 -05:00
|
|
|
}
|