RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-25 15:01:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Run clang-format before making changes to StackMaps. NFC.

Browse Source 
llvm-svn: 241754
This commit is contained in:
Juergen Ributzka 2015-07-08 22:42:09 +00:00
parent 3eb81c15a2
commit ce43222043
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/llvm/CodeGen/StackMaps.h
View File

@ -1,5 +1,4 @@
//===------------------- StackMaps.h - StackMaps ----------------*- C++ -*-===// //===------------------- StackMaps.h - StackMaps ----------------*- C++ -*-===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
@ -42,10 +41,12 @@ class PatchPointOpers {
public: public:
/// Enumerate the meta operands. /// Enumerate the meta operands.
enum { IDPos, NBytesPos, TargetPos, NArgPos, CCPos, MetaEnd }; enum { IDPos, NBytesPos, TargetPos, NArgPos, CCPos, MetaEnd };
private: private:
const MachineInstr *MI; const MachineInstr *MI;
bool HasDef; bool HasDef;
bool IsAnyReg; bool IsAnyReg;
public: public:
explicit PatchPointOpers(const MachineInstr *MI); explicit PatchPointOpers(const MachineInstr *MI);
@ -66,8 +67,8 @@ public:
/// Get the operand index of the variable list of non-argument operands. /// Get the operand index of the variable list of non-argument operands.
/// These hold the "live state". /// These hold the "live state".
unsigned getVarIdx() const { unsigned getVarIdx() const {
return getMetaIdx() + MetaEnd return getMetaIdx() + MetaEnd +
+ MI->getOperand(getMetaIdx(NArgPos)).getImm(); MI->getOperand(getMetaIdx(NArgPos)).getImm();
} }
/// Get the index at which stack map locations will be recorded. /// Get the index at which stack map locations will be recorded.
@ -98,15 +99,10 @@ private:
// These values are relative offests from the start of the statepoint meta // These values are relative offests from the start of the statepoint meta
// arguments (i.e. the end of the call arguments). // arguments (i.e. the end of the call arguments).
enum { enum { CCOffset = 1, FlagsOffset = 3, NumVMSArgsOffset = 5 };
CCOffset = 1,
FlagsOffset = 3,
NumVMSArgsOffset = 5
};
public: public:
explicit StatepointOpers(const MachineInstr *MI): explicit StatepointOpers(const MachineInstr *MI) : MI(MI) {}
MI(MI) { }
/// Get starting index of non call related arguments /// Get starting index of non call related arguments
/// (calling convention, statepoint flags, vm state and gc state). /// (calling convention, statepoint flags, vm state and gc state).
@ -134,15 +130,21 @@ private:
class StackMaps { class StackMaps {
public: public:
struct Location { struct Location {
enum LocationType { Unprocessed, Register, Direct, Indirect, Constant, enum LocationType {
ConstantIndex }; Unprocessed,
Register,
Direct,
Indirect,
Constant,
ConstantIndex
};
LocationType LocType; LocationType LocType;
unsigned Size; unsigned Size;
unsigned Reg; unsigned Reg;
int64_t Offset; int64_t Offset;
Location() : LocType(Unprocessed), Size(0), Reg(0), Offset(0) {} Location() : LocType(Unprocessed), Size(0), Reg(0), Offset(0) {}
Location(LocationType LocType, unsigned Size, unsigned Reg, int64_t Offset) Location(LocationType LocType, unsigned Size, unsigned Reg, int64_t Offset)
: LocType(LocType), Size(Size), Reg(Reg), Offset(Offset) {} : LocType(LocType), Size(Size), Reg(Reg), Offset(Offset) {}
}; };
struct LiveOutReg { struct LiveOutReg {
@ -152,12 +154,12 @@ public:
LiveOutReg() : Reg(0), RegNo(0), Size(0) {} LiveOutReg() : Reg(0), RegNo(0), Size(0) {}
LiveOutReg(unsigned short Reg, unsigned short RegNo, unsigned short Size) LiveOutReg(unsigned short Reg, unsigned short RegNo, unsigned short Size)
: Reg(Reg), RegNo(RegNo), Size(Size) {} : Reg(Reg), RegNo(RegNo), Size(Size) {}
void MarkInvalid() { Reg = 0; } void MarkInvalid() { Reg = 0; }
// Only sort by the dwarf register number. // Only sort by the dwarf register number.
bool operator< (const LiveOutReg &LO) const { return RegNo < LO.RegNo; } bool operator<(const LiveOutReg &LO) const { return RegNo < LO.RegNo; }
static bool IsInvalid(const LiveOutReg &LO) { return LO.Reg == 0; } static bool IsInvalid(const LiveOutReg &LO) { return LO.Reg == 0; }
}; };
@ -205,8 +207,8 @@ private:
CallsiteInfo() : CSOffsetExpr(nullptr), ID(0) {} CallsiteInfo() : CSOffsetExpr(nullptr), ID(0) {}
CallsiteInfo(const MCExpr *CSOffsetExpr, uint64_t ID, CallsiteInfo(const MCExpr *CSOffsetExpr, uint64_t ID,
LocationVec &&Locations, LiveOutVec &&LiveOuts) LocationVec &&Locations, LiveOutVec &&LiveOuts)
: CSOffsetExpr(CSOffsetExpr), ID(ID), Locations(std::move(Locations)), : CSOffsetExpr(CSOffsetExpr), ID(ID), Locations(std::move(Locations)),
LiveOuts(std::move(LiveOuts)) {} LiveOuts(std::move(LiveOuts)) {}
}; };
typedef std::vector<CallsiteInfo> CallsiteInfoList; typedef std::vector<CallsiteInfo> CallsiteInfoList;
@ -218,8 +220,8 @@ private:
MachineInstr::const_mop_iterator MachineInstr::const_mop_iterator
parseOperand(MachineInstr::const_mop_iterator MOI, parseOperand(MachineInstr::const_mop_iterator MOI,
MachineInstr::const_mop_iterator MOE, MachineInstr::const_mop_iterator MOE, LocationVec &Locs,
LocationVec &Locs, LiveOutVec &LiveOuts) const; LiveOutVec &LiveOuts) const;
/// \brief Create a live-out register record for the given register @p Reg. /// \brief Create a live-out register record for the given register @p Reg.
LiveOutReg createLiveOutReg(unsigned Reg, LiveOutReg createLiveOutReg(unsigned Reg,
@ -254,7 +256,6 @@ private:
void print(raw_ostream &OS); void print(raw_ostream &OS);
void debug() { print(dbgs()); } void debug() { print(dbgs()); }
}; };
} }
#endif #endif

77
lib/CodeGen/StackMaps.cpp
View File

@ -29,17 +29,17 @@ using namespace llvm;
#define DEBUG_TYPE "stackmaps" #define DEBUG_TYPE "stackmaps"
static cl::opt<int> StackMapVersion("stackmap-version", cl::init(1), static cl::opt<int> StackMapVersion(
cl::desc("Specify the stackmap encoding version (default = 1)")); "stackmap-version", cl::init(1),
cl::desc("Specify the stackmap encoding version (default = 1)"));
const char *StackMaps::WSMP = "Stack Maps: "; const char *StackMaps::WSMP = "Stack Maps: ";
PatchPointOpers::PatchPointOpers(const MachineInstr *MI) PatchPointOpers::PatchPointOpers(const MachineInstr *MI)
: MI(MI), : MI(MI), HasDef(MI->getOperand(0).isReg() && MI->getOperand(0).isDef() &&
HasDef(MI->getOperand(0).isReg() && MI->getOperand(0).isDef() && !MI->getOperand(0).isImplicit()),
!MI->getOperand(0).isImplicit()), IsAnyReg(MI->getOperand(getMetaIdx(CCPos)).getImm() ==
IsAnyReg(MI->getOperand(getMetaIdx(CCPos)).getImm() == CallingConv::AnyReg) CallingConv::AnyReg) {
{
#ifndef NDEBUG #ifndef NDEBUG
unsigned CheckStartIdx = 0, e = MI->getNumOperands(); unsigned CheckStartIdx = 0, e = MI->getNumOperands();
while (CheckStartIdx < e && MI->getOperand(CheckStartIdx).isReg() && while (CheckStartIdx < e && MI->getOperand(CheckStartIdx).isReg() &&
@ -81,17 +81,18 @@ static unsigned getDwarfRegNum(unsigned Reg, const TargetRegisterInfo *TRI) {
RegNo = TRI->getDwarfRegNum(*SR, false); RegNo = TRI->getDwarfRegNum(*SR, false);
assert(RegNo >= 0 && "Invalid Dwarf register number."); assert(RegNo >= 0 && "Invalid Dwarf register number.");
return (unsigned) RegNo; return (unsigned)RegNo;
} }
MachineInstr::const_mop_iterator MachineInstr::const_mop_iterator
StackMaps::parseOperand(MachineInstr::const_mop_iterator MOI, StackMaps::parseOperand(MachineInstr::const_mop_iterator MOI,
MachineInstr::const_mop_iterator MOE, MachineInstr::const_mop_iterator MOE, LocationVec &Locs,
LocationVec &Locs, LiveOutVec &LiveOuts) const { LiveOutVec &LiveOuts) const {
const TargetRegisterInfo *TRI = AP.MF->getSubtarget().getRegisterInfo(); const TargetRegisterInfo *TRI = AP.MF->getSubtarget().getRegisterInfo();
if (MOI->isImm()) { if (MOI->isImm()) {
switch (MOI->getImm()) { switch (MOI->getImm()) {
default: llvm_unreachable("Unrecognized operand type."); default:
llvm_unreachable("Unrecognized operand type.");
case StackMaps::DirectMemRefOp: { case StackMaps::DirectMemRefOp: {
unsigned Size = AP.TM.getDataLayout()->getPointerSizeInBits(); unsigned Size = AP.TM.getDataLayout()->getPointerSizeInBits();
assert((Size % 8) == 0 && "Need pointer size in bytes."); assert((Size % 8) == 0 && "Need pointer size in bytes.");
@ -143,8 +144,7 @@ StackMaps::parseOperand(MachineInstr::const_mop_iterator MOI,
if (SubRegIdx) if (SubRegIdx)
Offset = TRI->getSubRegIdxOffset(SubRegIdx); Offset = TRI->getSubRegIdxOffset(SubRegIdx);
Locs.push_back( Locs.push_back(Location(Location::Register, RC->getSize(), RegNo, Offset));
Location(Location::Register, RC->getSize(), RegNo, Offset));
return ++MOI; return ++MOI;
} }
@ -174,10 +174,10 @@ void StackMaps::print(raw_ostream &OS) {
break; break;
case Location::Register: case Location::Register:
OS << "Register "; OS << "Register ";
if (TRI) if (TRI)
OS << TRI->getName(Loc.Reg); OS << TRI->getName(Loc.Reg);
else else
OS << Loc.Reg; OS << Loc.Reg;
break; break;
case Location::Direct: case Location::Direct:
OS << "Direct "; OS << "Direct ";
@ -249,8 +249,8 @@ StackMaps::parseRegisterLiveOutMask(const uint32_t *Mask) const {
// in the list. Merge entries that refer to the same dwarf register and use // in the list. Merge entries that refer to the same dwarf register and use
// the maximum size that needs to be spilled. // the maximum size that needs to be spilled.
std::sort(LiveOuts.begin(), LiveOuts.end()); std::sort(LiveOuts.begin(), LiveOuts.end());
for (LiveOutVec::iterator I = LiveOuts.begin(), E = LiveOuts.end(); for (LiveOutVec::iterator I = LiveOuts.begin(), E = LiveOuts.end(); I != E;
I != E; ++I) { ++I) {
for (LiveOutVec::iterator II = std::next(I); II != E; ++II) { for (LiveOutVec::iterator II = std::next(I); II != E; ++II) {
if (I->RegNo != II->RegNo) { if (I->RegNo != II->RegNo) {
// Skip all the now invalid entries. // Skip all the now invalid entries.
@ -263,8 +263,9 @@ StackMaps::parseRegisterLiveOutMask(const uint32_t *Mask) const {
II->MarkInvalid(); II->MarkInvalid();
} }
} }
LiveOuts.erase(std::remove_if(LiveOuts.begin(), LiveOuts.end(), LiveOuts.erase(
LiveOutReg::IsInvalid), LiveOuts.end()); std::remove_if(LiveOuts.begin(), LiveOuts.end(), LiveOutReg::IsInvalid),
LiveOuts.end());
return LiveOuts; return LiveOuts;
} }
@ -282,8 +283,8 @@ void StackMaps::recordStackMapOpers(const MachineInstr &MI, uint64_t ID,
if (recordResult) { if (recordResult) {
assert(PatchPointOpers(&MI).hasDef() && "Stackmap has no return value."); assert(PatchPointOpers(&MI).hasDef() && "Stackmap has no return value.");
parseOperand(MI.operands_begin(), std::next(MI.operands_begin()), parseOperand(MI.operands_begin(), std::next(MI.operands_begin()), Locations,
Locations, LiveOuts); LiveOuts);
} }
// Parse operands. // Parse operands.
@ -292,8 +293,8 @@ void StackMaps::recordStackMapOpers(const MachineInstr &MI, uint64_t ID,
} }
// Move large constants into the constant pool. // Move large constants into the constant pool.
for (LocationVec::iterator I = Locations.begin(), E = Locations.end(); for (LocationVec::iterator I = Locations.begin(), E = Locations.end(); I != E;
I != E; ++I) { ++I) {
// Constants are encoded as sign-extended integers. // Constants are encoded as sign-extended integers.
// -1 is directly encoded as .long 0xFFFFFFFF with no constant pool. // -1 is directly encoded as .long 0xFFFFFFFF with no constant pool.
if (I->LocType == Location::Constant && !isInt<32>(I->Offset)) { if (I->LocType == Location::Constant && !isInt<32>(I->Offset)) {
@ -316,9 +317,8 @@ void StackMaps::recordStackMapOpers(const MachineInstr &MI, uint64_t ID,
// Create an expression to calculate the offset of the callsite from function // Create an expression to calculate the offset of the callsite from function
// entry. // entry.
const MCExpr *CSOffsetExpr = MCBinaryExpr::createSub( const MCExpr *CSOffsetExpr = MCBinaryExpr::createSub(
MCSymbolRefExpr::create(MILabel, OutContext), MCSymbolRefExpr::create(MILabel, OutContext),
MCSymbolRefExpr::create(AP.CurrentFnSymForSize, OutContext), MCSymbolRefExpr::create(AP.CurrentFnSymForSize, OutContext), OutContext);
OutContext);
CSInfos.emplace_back(CSOffsetExpr, ID, std::move(Locations), CSInfos.emplace_back(CSOffsetExpr, ID, std::move(Locations),
std::move(LiveOuts)); std::move(LiveOuts));
@ -326,10 +326,10 @@ void StackMaps::recordStackMapOpers(const MachineInstr &MI, uint64_t ID,
// Record the stack size of the current function. // Record the stack size of the current function.
const MachineFrameInfo *MFI = AP.MF->getFrameInfo(); const MachineFrameInfo *MFI = AP.MF->getFrameInfo();
const TargetRegisterInfo *RegInfo = AP.MF->getSubtarget().getRegisterInfo(); const TargetRegisterInfo *RegInfo = AP.MF->getSubtarget().getRegisterInfo();
const bool DynamicFrameSize = MFI->hasVarSizedObjects() || const bool DynamicFrameSize =
RegInfo->needsStackRealignment(*(AP.MF)); MFI->hasVarSizedObjects() || RegInfo->needsStackRealignment(*(AP.MF));
FnStackSize[AP.CurrentFnSym] = FnStackSize[AP.CurrentFnSym] =
DynamicFrameSize ? UINT64_MAX : MFI->getStackSize(); DynamicFrameSize ? UINT64_MAX : MFI->getStackSize();
} }
void StackMaps::recordStackMap(const MachineInstr &MI) { void StackMaps::recordStackMap(const MachineInstr &MI) {
@ -347,7 +347,7 @@ void StackMaps::recordPatchPoint(const MachineInstr &MI) {
int64_t ID = opers.getMetaOper(PatchPointOpers::IDPos).getImm(); int64_t ID = opers.getMetaOper(PatchPointOpers::IDPos).getImm();
MachineInstr::const_mop_iterator MOI = MachineInstr::const_mop_iterator MOI =
std::next(MI.operands_begin(), opers.getStackMapStartIdx()); std::next(MI.operands_begin(), opers.getStackMapStartIdx());
recordStackMapOpers(MI, ID, MOI, MI.operands_end(), recordStackMapOpers(MI, ID, MOI, MI.operands_end(),
opers.isAnyReg() && opers.hasDef()); opers.isAnyReg() && opers.hasDef());
@ -356,15 +356,14 @@ void StackMaps::recordPatchPoint(const MachineInstr &MI) {
LocationVec &Locations = CSInfos.back().Locations; LocationVec &Locations = CSInfos.back().Locations;
if (opers.isAnyReg()) { if (opers.isAnyReg()) {
unsigned NArgs = opers.getMetaOper(PatchPointOpers::NArgPos).getImm(); unsigned NArgs = opers.getMetaOper(PatchPointOpers::NArgPos).getImm();
for (unsigned i = 0, e = (opers.hasDef() ? NArgs+1 : NArgs); i != e; ++i) for (unsigned i = 0, e = (opers.hasDef() ? NArgs + 1 : NArgs); i != e; ++i)
assert(Locations[i].LocType == Location::Register && assert(Locations[i].LocType == Location::Register &&
"anyreg arg must be in reg."); "anyreg arg must be in reg.");
} }
#endif #endif
} }
void StackMaps::recordStatepoint(const MachineInstr &MI) { void StackMaps::recordStatepoint(const MachineInstr &MI) {
assert(MI.getOpcode() == TargetOpcode::STATEPOINT && assert(MI.getOpcode() == TargetOpcode::STATEPOINT && "expected statepoint");
"expected statepoint");
StatepointOpers opers(&MI); StatepointOpers opers(&MI);
// Record all the deopt and gc operands (they're contiguous and run from the // Record all the deopt and gc operands (they're contiguous and run from the
@ -387,8 +386,8 @@ void StackMaps::recordStatepoint(const MachineInstr &MI) {
void StackMaps::emitStackmapHeader(MCStreamer &OS) { void StackMaps::emitStackmapHeader(MCStreamer &OS) {
// Header. // Header.
OS.EmitIntValue(StackMapVersion, 1); // Version. OS.EmitIntValue(StackMapVersion, 1); // Version.
OS.EmitIntValue(0, 1); // Reserved. OS.EmitIntValue(0, 1); // Reserved.
OS.EmitIntValue(0, 2); // Reserved. OS.EmitIntValue(0, 2); // Reserved.
// Num functions. // Num functions.
DEBUG(dbgs() << WSMP << "#functions = " << FnStackSize.size() << '\n'); DEBUG(dbgs() << WSMP << "#functions = " << FnStackSize.size() << '\n');
@ -412,7 +411,7 @@ void StackMaps::emitFunctionFrameRecords(MCStreamer &OS) {
DEBUG(dbgs() << WSMP << "functions:\n"); DEBUG(dbgs() << WSMP << "functions:\n");
for (auto const &FR : FnStackSize) { for (auto const &FR : FnStackSize) {
DEBUG(dbgs() << WSMP << "function addr: " << FR.first DEBUG(dbgs() << WSMP << "function addr: " << FR.first
<< " frame size: " << FR.second); << " frame size: " << FR.second);
OS.EmitSymbolValue(FR.first, 8); OS.EmitSymbolValue(FR.first, 8);
OS.EmitIntValue(FR.second, 8); OS.EmitIntValue(FR.second, 8);
} }
@ -511,7 +510,7 @@ void StackMaps::emitCallsiteEntries(MCStreamer &OS) {
/// Serialize the stackmap data. /// Serialize the stackmap data.
void StackMaps::serializeToStackMapSection() { void StackMaps::serializeToStackMapSection() {
(void) WSMP; (void)WSMP;
// Bail out if there's no stack map data. // Bail out if there's no stack map data.
assert((!CSInfos.empty() || (CSInfos.empty() && ConstPool.empty())) && assert((!CSInfos.empty() || (CSInfos.empty() && ConstPool.empty())) &&
"Expected empty constant pool too!"); "Expected empty constant pool too!");