CbC/CbC_llvm: lib/CodeGen/StackMaps.cpp comparison

comparison lib/CodeGen/StackMaps.cpp @ 120:1172e4bd9c6f

update 4.0.0

author	mir3636
date	Fri, 25 Nov 2016 19:14:25 +0900
parents	afa8332a0e37
children	803732b1fca8

comparison

equal deleted inserted replaced

-:34baf5011add
+:1172e4bd9c6f
 using namespace llvm;
 #define DEBUG_TYPE "stackmaps"
 static cl::opt<int> StackMapVersion(
-"stackmap-version", cl::init(1),
+"stackmap-version", cl::init(2),
-cl::desc("Specify the stackmap encoding version (default = 1)"));
+cl::desc("Specify the stackmap encoding version (default = 2)"));
 const char *StackMaps::WSMP = "Stack Maps: ";
+StackMapOpers::StackMapOpers(const MachineInstr *MI)
+: MI(MI) {
+assert(getVarIdx() <= MI->getNumOperands() &&
+"invalid stackmap definition");
+}
 PatchPointOpers::PatchPointOpers(const MachineInstr *MI)
 : MI(MI), HasDef(MI->getOperand(0).isReg() && MI->getOperand(0).isDef() &&
-!MI->getOperand(0).isImplicit()),
+!MI->getOperand(0).isImplicit()) {
-IsAnyReg(MI->getOperand(getMetaIdx(CCPos)).getImm() ==
-CallingConv::AnyReg) {
 #ifndef NDEBUG
 unsigned CheckStartIdx = 0, e = MI->getNumOperands();
 while (CheckStartIdx < e && MI->getOperand(CheckStartIdx).isReg() &&
 MI->getOperand(CheckStartIdx).isDef() &&
 !MI->getOperand(CheckStartIdx).isImplicit())
 assert(ScratchIdx != e && "No scratch register available");
 return ScratchIdx;
 }
 StackMaps::StackMaps(AsmPrinter &AP) : AP(AP) {
-if (StackMapVersion != 1)
+if (StackMapVersion != 2)
 llvm_unreachable("Unsupported stackmap version!");
 }
 /// Go up the super-register chain until we hit a valid dwarf register number.
 static unsigned getDwarfRegNum(unsigned Reg, const TargetRegisterInfo *TRI) {
 II->Reg = 0; // mark for deletion.
 }
 }
 LiveOuts.erase(
-std::remove_if(LiveOuts.begin(), LiveOuts.end(),
+remove_if(LiveOuts, [](const LiveOutReg &LO) { return LO.Reg == 0; }),
-[](const LiveOutReg &LO) { return LO.Reg == 0; }),
 LiveOuts.end());
 return LiveOuts;
 }
 MCSymbolRefExpr::create(AP.CurrentFnSymForSize, OutContext), OutContext);
 CSInfos.emplace_back(CSOffsetExpr, ID, std::move(Locations),
 std::move(LiveOuts));
-// Record the stack size of the current function.
+// Record the stack size of the current function and update callsite count.
-const MachineFrameInfo *MFI = AP.MF->getFrameInfo();
+const MachineFrameInfo &MFI = AP.MF->getFrameInfo();
 const TargetRegisterInfo *RegInfo = AP.MF->getSubtarget().getRegisterInfo();
 bool HasDynamicFrameSize =
-MFI->hasVarSizedObjects() || RegInfo->needsStackRealignment(*(AP.MF));
+MFI.hasVarSizedObjects() || RegInfo->needsStackRealignment(*(AP.MF));
-FnStackSize[AP.CurrentFnSym] =
+uint64_t FrameSize = HasDynamicFrameSize ? UINT64_MAX : MFI.getStackSize();
-HasDynamicFrameSize ? UINT64_MAX : MFI->getStackSize();
+auto CurrentIt = FnInfos.find(AP.CurrentFnSym);
+if (CurrentIt != FnInfos.end())
+CurrentIt->second.RecordCount++;
+else
+FnInfos.insert(std::make_pair(AP.CurrentFnSym, FunctionInfo(FrameSize)));
 }
 void StackMaps::recordStackMap(const MachineInstr &MI) {
 assert(MI.getOpcode() == TargetOpcode::STACKMAP && "expected stackmap");
-int64_t ID = MI.getOperand(0).getImm();
+StackMapOpers opers(&MI);
-recordStackMapOpers(MI, ID, std::next(MI.operands_begin(), 2),
+const int64_t ID = MI.getOperand(PatchPointOpers::IDPos).getImm();
+recordStackMapOpers(MI, ID, std::next(MI.operands_begin(), opers.getVarIdx()),
 MI.operands_end());
 }
 void StackMaps::recordPatchPoint(const MachineInstr &MI) {
 assert(MI.getOpcode() == TargetOpcode::PATCHPOINT && "expected patchpoint");
 PatchPointOpers opers(&MI);
-int64_t ID = opers.getMetaOper(PatchPointOpers::IDPos).getImm();
+const int64_t ID = opers.getID();
 auto MOI = std::next(MI.operands_begin(), opers.getStackMapStartIdx());
 recordStackMapOpers(MI, ID, MOI, MI.operands_end(),
 opers.isAnyReg() && opers.hasDef());
 #ifndef NDEBUG
 // verify anyregcc
 auto &Locations = CSInfos.back().Locations;
 if (opers.isAnyReg()) {
-unsigned NArgs = opers.getMetaOper(PatchPointOpers::NArgPos).getImm();
+unsigned NArgs = opers.getNumCallArgs();
 for (unsigned i = 0, e = (opers.hasDef() ? NArgs + 1 : NArgs); i != e; ++i)
 assert(Locations[i].Type == Location::Register &&
 "anyreg arg must be in reg.");
 }
 #endif
 }
 /// Emit the stackmap header.
 ///
 /// Header {
-///   uint8  : Stack Map Version (currently 1)
+///   uint8  : Stack Map Version (currently 2)
 ///   uint8  : Reserved (expected to be 0)
 ///   uint16 : Reserved (expected to be 0)
 /// }
 /// uint32 : NumFunctions
 /// uint32 : NumConstants
 OS.EmitIntValue(StackMapVersion, 1); // Version.
 OS.EmitIntValue(0, 1);               // Reserved.
 OS.EmitIntValue(0, 2);               // Reserved.
 // Num functions.
-DEBUG(dbgs() << WSMP << "#functions = " << FnStackSize.size() << '\n');
+DEBUG(dbgs() << WSMP << "#functions = " << FnInfos.size() << '\n');
-OS.EmitIntValue(FnStackSize.size(), 4);
+OS.EmitIntValue(FnInfos.size(), 4);
 // Num constants.
 DEBUG(dbgs() << WSMP << "#constants = " << ConstPool.size() << '\n');
 OS.EmitIntValue(ConstPool.size(), 4);
 // Num callsites.
 DEBUG(dbgs() << WSMP << "#callsites = " << CSInfos.size() << '\n');
 /// Emit the function frame record for each function.
 ///
 /// StkSizeRecord[NumFunctions] {
 ///   uint64 : Function Address
 ///   uint64 : Stack Size
+///   uint64 : Record Count
 /// }
 void StackMaps::emitFunctionFrameRecords(MCStreamer &OS) {
 // Function Frame records.
 DEBUG(dbgs() << WSMP << "functions:\n");
-for (auto const &FR : FnStackSize) {
+for (auto const &FR : FnInfos) {
 DEBUG(dbgs() << WSMP << "function addr: " << FR.first
-<< " frame size: " << FR.second);
+<< " frame size: " << FR.second.StackSize
+<< " callsite count: " << FR.second.RecordCount << '\n');
 OS.EmitSymbolValue(FR.first, 8);
-OS.EmitIntValue(FR.second, 8);
+OS.EmitIntValue(FR.second.StackSize, 8);
+OS.EmitIntValue(FR.second.RecordCount, 8);
 }
 }
 /// Emit the constant pool.
 ///
 /// Serialize the stackmap data.
 void StackMaps::serializeToStackMapSection() {
 (void)WSMP;
 // Bail out if there's no stack map data.
-assert((!CSInfos.empty() || (CSInfos.empty() && ConstPool.empty())) &&
+assert((!CSInfos.empty() || ConstPool.empty()) &&
 "Expected empty constant pool too!");
-assert((!CSInfos.empty() || (CSInfos.empty() && FnStackSize.empty())) &&
+assert((!CSInfos.empty() || FnInfos.empty()) &&
 "Expected empty function record too!");
 if (CSInfos.empty())
 return;
 MCContext &OutContext = AP.OutStreamer->getContext();

Mercurial > hg > CbC > CbC_llvm

comparison lib/CodeGen/StackMaps.cpp @ 120:1172e4bd9c6f