Skip to content

Commit

Permalink
[DebugInfo][InstrRef][NFC] Cache some PHI resolutions
Browse files Browse the repository at this point in the history
Install a cache of DBG_INSTR_REF -> ValueIDNum resolutions, for scenarios
where the value has to be reconstructed from several DBG_PHIs. Whenever
this happens, it's because branch folding + tail duplication has messed
with the SSA form of the program, and we have to solve a mini SSA problem
to find the variable value. This is always called twice, so it makes sense
to cache the value.

This gives a ~0.5% geomean compile-time-performance improvement on CTMark.

Differential Revision: https://reviews.llvm.org/D118455

(cherry picked from commit d556eb7)
  • Loading branch information
jmorse authored and tstellar committed Feb 7, 2022
1 parent b391c02 commit e870e07
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
16 changes: 16 additions & 0 deletions llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
Expand Up @@ -3122,6 +3122,7 @@ bool InstrRefBasedLDV::ExtendRanges(MachineFunction &MF,
DebugPHINumToValue.clear();
OverlapFragments.clear();
SeenFragments.clear();
SeenDbgPHIs.clear();

return Changed;
}
Expand Down Expand Up @@ -3387,6 +3388,21 @@ Optional<ValueIDNum> InstrRefBasedLDV::resolveDbgPHIs(MachineFunction &MF,
ValueIDNum **MLiveIns,
MachineInstr &Here,
uint64_t InstrNum) {
// This function will be called twice per DBG_INSTR_REF, and might end up
// computing lots of SSA information: memoize it.
auto SeenDbgPHIIt = SeenDbgPHIs.find(&Here);
if (SeenDbgPHIIt != SeenDbgPHIs.end())
return SeenDbgPHIIt->second;

Optional<ValueIDNum> Result =
resolveDbgPHIsImpl(MF, MLiveOuts, MLiveIns, Here, InstrNum);
SeenDbgPHIs.insert({&Here, Result});
return Result;
}

Optional<ValueIDNum> InstrRefBasedLDV::resolveDbgPHIsImpl(
MachineFunction &MF, ValueIDNum **MLiveOuts, ValueIDNum **MLiveIns,
MachineInstr &Here, uint64_t InstrNum) {
// Pick out records of DBG_PHI instructions that have been observed. If there
// are none, then we cannot compute a value number.
auto RangePair = std::equal_range(DebugPHINumToValue.begin(),
Expand Down
12 changes: 12 additions & 0 deletions llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
Expand Up @@ -864,6 +864,12 @@ class InstrRefBasedLDV : public LDVImpl {
OverlapMap OverlapFragments;
VarToFragments SeenFragments;

/// Mapping of DBG_INSTR_REF instructions to their values, for those
/// DBG_INSTR_REFs that call resolveDbgPHIs. These variable references solve
/// a mini SSA problem caused by DBG_PHIs being cloned, this collection caches
/// the result.
DenseMap<MachineInstr *, Optional<ValueIDNum>> SeenDbgPHIs;

/// True if we need to examine call instructions for stack clobbers. We
/// normally assume that they don't clobber SP, but stack probes on Windows
/// do.
Expand Down Expand Up @@ -944,6 +950,12 @@ class InstrRefBasedLDV : public LDVImpl {
ValueIDNum **MLiveIns, MachineInstr &Here,
uint64_t InstrNum);

Optional<ValueIDNum> resolveDbgPHIsImpl(MachineFunction &MF,
ValueIDNum **MLiveOuts,
ValueIDNum **MLiveIns,
MachineInstr &Here,
uint64_t InstrNum);

/// Step through the function, recording register definitions and movements
/// in an MLocTracker. Convert the observations into a per-block transfer
/// function in \p MLocTransfer, suitable for using with the machine value
Expand Down

0 comments on commit e870e07

Please sign in to comment.