Skip to content

Commit 2f7ade4

Browse files
kstoimenovkstoimenov
committed
Revert "[aarch64][win] Add support for import call optimization (equivalent to MSVC /d2ImportCallOptimization) (#121516)"
Breaks sanitizer build: https://lab.llvm.org/buildbot/#/builders/52/builds/5179 This reverts commits: 5ee0a71 d997a72
1 parent b3ad84b commit 2f7ade4

25 files changed

+38
-673
lines changed

‎llvm/include/llvm/CodeGen/MIRYamlMapping.h

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,6 @@ template <> struct ScalarTraits<FrameIndex> {
457457
static QuotingType mustQuote(StringRef S) { return needsQuotes(S); }
458458
};
459459

460-
/// Identifies call instruction location in machine function.
461-
struct MachineInstrLoc {
462-
unsigned BlockNum;
463-
unsigned Offset;
464-
465-
bool operator==(const MachineInstrLoc &Other) const {
466-
return BlockNum == Other.BlockNum && Offset == Other.Offset;
467-
}
468-
};
469-
470460
/// Serializable representation of CallSiteInfo.
471461
struct CallSiteInfo {
472462
// Representation of call argument and register which is used to
@@ -480,6 +470,16 @@ struct CallSiteInfo {
480470
}
481471
};
482472

473+
/// Identifies call instruction location in machine function.
474+
struct MachineInstrLoc {
475+
unsigned BlockNum;
476+
unsigned Offset;
477+
478+
bool operator==(const MachineInstrLoc &Other) const {
479+
return BlockNum == Other.BlockNum && Offset == Other.Offset;
480+
}
481+
};
482+
483483
MachineInstrLoc CallLocation;
484484
std::vector<ArgRegPair> ArgForwardingRegs;
485485

@@ -595,26 +595,6 @@ template <> struct MappingTraits<MachineJumpTable::Entry> {
595595
}
596596
};
597597

598-
struct CalledGlobal {
599-
MachineInstrLoc CallSite;
600-
StringValue Callee;
601-
unsigned Flags;
602-
603-
bool operator==(const CalledGlobal &Other) const {
604-
return CallSite == Other.CallSite && Callee == Other.Callee &&
605-
Flags == Other.Flags;
606-
}
607-
};
608-
609-
template <> struct MappingTraits<CalledGlobal> {
610-
static void mapping(IO &YamlIO, CalledGlobal &CG) {
611-
YamlIO.mapRequired("bb", CG.CallSite.BlockNum);
612-
YamlIO.mapRequired("offset", CG.CallSite.Offset);
613-
YamlIO.mapRequired("callee", CG.Callee);
614-
YamlIO.mapRequired("flags", CG.Flags);
615-
}
616-
};
617-
618598
} // end namespace yaml
619599
} // end namespace llvm
620600

@@ -626,7 +606,6 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::FixedMachineStackObject)
626606
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::CallSiteInfo)
627607
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::MachineConstantPoolValue)
628608
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::MachineJumpTable::Entry)
629-
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::CalledGlobal)
630609

631610
namespace llvm {
632611
namespace yaml {
@@ -785,7 +764,6 @@ struct MachineFunction {
785764
std::vector<DebugValueSubstitution> DebugValueSubstitutions;
786765
MachineJumpTable JumpTableInfo;
787766
std::vector<StringValue> MachineMetadataNodes;
788-
std::vector<CalledGlobal> CalledGlobals;
789767
BlockStringValue Body;
790768
};
791769

@@ -844,9 +822,6 @@ template <> struct MappingTraits<MachineFunction> {
844822
if (!YamlIO.outputting() || !MF.MachineMetadataNodes.empty())
845823
YamlIO.mapOptional("machineMetadataNodes", MF.MachineMetadataNodes,
846824
std::vector<StringValue>());
847-
if (!YamlIO.outputting() || !MF.CalledGlobals.empty())
848-
YamlIO.mapOptional("calledGlobals", MF.CalledGlobals,
849-
std::vector<CalledGlobal>());
850825
YamlIO.mapOptional("body", MF.Body, BlockStringValue());
851826
}
852827
};

‎llvm/include/llvm/CodeGen/MachineFunction.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,6 @@ class LLVM_ABI MachineFunction {
354354
/// a table of valid targets for Windows EHCont Guard.
355355
std::vector<MCSymbol *> CatchretTargets;
356356

357-
/// Mapping of call instruction to the global value and target flags that it
358-
/// calls, if applicable.
359-
DenseMap<const MachineInstr *, std::pair<const GlobalValue *, unsigned>>
360-
CalledGlobalsMap;
361-
362357
/// \name Exception Handling
363358
/// \{
364359

@@ -1187,26 +1182,6 @@ class LLVM_ABI MachineFunction {
11871182
CatchretTargets.push_back(Target);
11881183
}
11891184

1190-
/// Tries to get the global and target flags for a call site, if the
1191-
/// instruction is a call to a global.
1192-
std::pair<const GlobalValue *, unsigned>
1193-
tryGetCalledGlobal(const MachineInstr *MI) const {
1194-
return CalledGlobalsMap.lookup(MI);
1195-
}
1196-
1197-
/// Notes the global and target flags for a call site.
1198-
void addCalledGlobal(const MachineInstr *MI,
1199-
std::pair<const GlobalValue *, unsigned> Details) {
1200-
assert(MI && "MI must not be null");
1201-
assert(Details.first && "Global must not be null");
1202-
CalledGlobalsMap.insert({MI, Details});
1203-
}
1204-
1205-
/// Iterates over the full set of call sites and their associated globals.
1206-
auto getCalledGlobals() const {
1207-
return llvm::make_range(CalledGlobalsMap.begin(), CalledGlobalsMap.end());
1208-
}
1209-
12101185
/// \name Exception Handling
12111186
/// \{
12121187

‎llvm/include/llvm/CodeGen/SelectionDAG.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ class SelectionDAG {
293293
MDNode *HeapAllocSite = nullptr;
294294
MDNode *PCSections = nullptr;
295295
MDNode *MMRA = nullptr;
296-
std::pair<const GlobalValue *, unsigned> CalledGlobal{};
297296
bool NoMerge = false;
298297
};
299298
/// Out-of-line extra information for SDNodes.
@@ -2374,19 +2373,6 @@ class SelectionDAG {
23742373
auto It = SDEI.find(Node);
23752374
return It != SDEI.end() ? It->second.MMRA : nullptr;
23762375
}
2377-
/// Set CalledGlobal to be associated with Node.
2378-
void addCalledGlobal(const SDNode *Node, const GlobalValue *GV,
2379-
unsigned OpFlags) {
2380-
SDEI[Node].CalledGlobal = {GV, OpFlags};
2381-
}
2382-
/// Return CalledGlobal associated with Node, or a nullopt if none exists.
2383-
std::optional<std::pair<const GlobalValue *, unsigned>>
2384-
getCalledGlobal(const SDNode *Node) {
2385-
auto I = SDEI.find(Node);
2386-
return I != SDEI.end()
2387-
? std::make_optional(std::move(I->second).CalledGlobal)
2388-
: std::nullopt;
2389-
}
23902376
/// Set NoMergeSiteInfo to be associated with Node if NoMerge is true.
23912377
void addNoMergeSiteInfo(const SDNode *Node, bool NoMerge) {
23922378
if (NoMerge)

‎llvm/include/llvm/MC/MCObjectFileInfo.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ class MCObjectFileInfo {
7373
/// to emit them into.
7474
MCSection *CompactUnwindSection = nullptr;
7575

76-
/// If import call optimization is supported by the target, this is the
77-
/// section to emit import call data to.
78-
MCSection *ImportCallSection = nullptr;
79-
8076
// Dwarf sections for debug info. If a target supports debug info, these must
8177
// be set.
8278
MCSection *DwarfAbbrevSection = nullptr;
@@ -273,7 +269,6 @@ class MCObjectFileInfo {
273269
MCSection *getBSSSection() const { return BSSSection; }
274270
MCSection *getReadOnlySection() const { return ReadOnlySection; }
275271
MCSection *getLSDASection() const { return LSDASection; }
276-
MCSection *getImportCallSection() const { return ImportCallSection; }
277272
MCSection *getCompactUnwindSection() const { return CompactUnwindSection; }
278273
MCSection *getDwarfAbbrevSection() const { return DwarfAbbrevSection; }
279274
MCSection *getDwarfInfoSection() const { return DwarfInfoSection; }

‎llvm/include/llvm/MC/MCStreamer.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -569,14 +569,6 @@ class MCStreamer {
569569
/// \param Symbol - Symbol the image relative relocation should point to.
570570
virtual void emitCOFFImgRel32(MCSymbol const *Symbol, int64_t Offset);
571571

572-
/// Emits the physical number of the section containing the given symbol as
573-
/// assigned during object writing (i.e., this is not a runtime relocation).
574-
virtual void emitCOFFSecNumber(MCSymbol const *Symbol);
575-
576-
/// Emits the offset of the symbol from the beginning of the section during
577-
/// object writing (i.e., this is not a runtime relocation).
578-
virtual void emitCOFFSecOffset(MCSymbol const *Symbol);
579-
580572
/// Emits an lcomm directive with XCOFF csect information.
581573
///
582574
/// \param LabelSym - Label on the block of storage.

‎llvm/include/llvm/MC/MCWinCOFFObjectWriter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class WinCOFFObjectWriter final : public MCObjectWriter {
7272
const MCFixup &Fixup, MCValue Target,
7373
uint64_t &FixedValue) override;
7474
uint64_t writeObject(MCAssembler &Asm) override;
75-
int getSectionNumber(const MCSection &Section) const;
7675
};
7776

7877
/// Construct a new Win COFF writer instance.

‎llvm/include/llvm/MC/MCWinCOFFStreamer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ class MCWinCOFFStreamer : public MCObjectStreamer {
5858
void emitCOFFSectionIndex(MCSymbol const *Symbol) override;
5959
void emitCOFFSecRel32(MCSymbol const *Symbol, uint64_t Offset) override;
6060
void emitCOFFImgRel32(MCSymbol const *Symbol, int64_t Offset) override;
61-
void emitCOFFSecNumber(MCSymbol const *Symbol) override;
62-
void emitCOFFSecOffset(MCSymbol const *Symbol) override;
6361
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
6462
Align ByteAlignment) override;
6563
void emitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size,

‎llvm/lib/CodeGen/MIRParser/MIRParser.cpp

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ class MIRParserImpl {
158158
MachineFunction &MF,
159159
const yaml::MachineFunction &YMF);
160160

161-
bool parseCalledGlobals(PerFunctionMIParsingState &PFS, MachineFunction &MF,
162-
const yaml::MachineFunction &YMF);
163-
164161
private:
165162
bool parseMDNode(PerFunctionMIParsingState &PFS, MDNode *&Node,
166163
const yaml::StringValue &Source);
@@ -186,9 +183,6 @@ class MIRParserImpl {
186183

187184
void setupDebugValueTracking(MachineFunction &MF,
188185
PerFunctionMIParsingState &PFS, const yaml::MachineFunction &YamlMF);
189-
190-
bool parseMachineInst(MachineFunction &MF, yaml::MachineInstrLoc MILoc,
191-
MachineInstr const *&MI);
192186
};
193187

194188
} // end namespace llvm
@@ -463,34 +457,24 @@ bool MIRParserImpl::computeFunctionProperties(
463457
return false;
464458
}
465459

466-
bool MIRParserImpl::parseMachineInst(MachineFunction &MF,
467-
yaml::MachineInstrLoc MILoc,
468-
MachineInstr const *&MI) {
469-
if (MILoc.BlockNum >= MF.size()) {
470-
return error(Twine(MF.getName()) +
471-
Twine(" instruction block out of range.") +
472-
" Unable to reference bb:" + Twine(MILoc.BlockNum));
473-
}
474-
auto BB = std::next(MF.begin(), MILoc.BlockNum);
475-
if (MILoc.Offset >= BB->size())
476-
return error(
477-
Twine(MF.getName()) + Twine(" instruction offset out of range.") +
478-
" Unable to reference instruction at bb: " + Twine(MILoc.BlockNum) +
479-
" at offset:" + Twine(MILoc.Offset));
480-
MI = &*std::next(BB->instr_begin(), MILoc.Offset);
481-
return false;
482-
}
483-
484460
bool MIRParserImpl::initializeCallSiteInfo(
485461
PerFunctionMIParsingState &PFS, const yaml::MachineFunction &YamlMF) {
486462
MachineFunction &MF = PFS.MF;
487463
SMDiagnostic Error;
488464
const TargetMachine &TM = MF.getTarget();
489465
for (auto &YamlCSInfo : YamlMF.CallSitesInfo) {
490-
yaml::MachineInstrLoc MILoc = YamlCSInfo.CallLocation;
491-
const MachineInstr *CallI;
492-
if (parseMachineInst(MF, MILoc, CallI))
493-
return true;
466+
yaml::CallSiteInfo::MachineInstrLoc MILoc = YamlCSInfo.CallLocation;
467+
if (MILoc.BlockNum >= MF.size())
468+
return error(Twine(MF.getName()) +
469+
Twine(" call instruction block out of range.") +
470+
" Unable to reference bb:" + Twine(MILoc.BlockNum));
471+
auto CallB = std::next(MF.begin(), MILoc.BlockNum);
472+
if (MILoc.Offset >= CallB->size())
473+
return error(Twine(MF.getName()) +
474+
Twine(" call instruction offset out of range.") +
475+
" Unable to reference instruction at bb: " +
476+
Twine(MILoc.BlockNum) + " at offset:" + Twine(MILoc.Offset));
477+
auto CallI = std::next(CallB->instr_begin(), MILoc.Offset);
494478
if (!CallI->isCall(MachineInstr::IgnoreBundle))
495479
return error(Twine(MF.getName()) +
496480
Twine(" call site info should reference call "
@@ -657,9 +641,6 @@ MIRParserImpl::initializeMachineFunction(const yaml::MachineFunction &YamlMF,
657641
if (initializeCallSiteInfo(PFS, YamlMF))
658642
return true;
659643

660-
if (parseCalledGlobals(PFS, MF, YamlMF))
661-
return true;
662-
663644
setupDebugValueTracking(MF, PFS, YamlMF);
664645

665646
MF.getSubtarget().mirFileLoaded(MF);
@@ -1130,37 +1111,6 @@ bool MIRParserImpl::parseMachineMetadataNodes(
11301111
return false;
11311112
}
11321113

1133-
bool MIRParserImpl::parseCalledGlobals(PerFunctionMIParsingState &PFS,
1134-
MachineFunction &MF,
1135-
const yaml::MachineFunction &YMF) {
1136-
Function &F = MF.getFunction();
1137-
for (const auto &YamlCG : YMF.CalledGlobals) {
1138-
yaml::MachineInstrLoc MILoc = YamlCG.CallSite;
1139-
const MachineInstr *CallI;
1140-
if (parseMachineInst(MF, MILoc, CallI))
1141-
return true;
1142-
if (!CallI->isCall(MachineInstr::IgnoreBundle))
1143-
return error(Twine(MF.getName()) +
1144-
Twine(" called global should reference call "
1145-
"instruction. Instruction at bb:") +
1146-
Twine(MILoc.BlockNum) + " at offset:" + Twine(MILoc.Offset) +
1147-
" is not a call instruction");
1148-
1149-
auto Callee =
1150-
F.getParent()->getValueSymbolTable().lookup(YamlCG.Callee.Value);
1151-
if (!Callee)
1152-
return error(YamlCG.Callee.SourceRange.Start,
1153-
"use of undefined global '" + YamlCG.Callee.Value + "'");
1154-
if (!isa<GlobalValue>(Callee))
1155-
return error(YamlCG.Callee.SourceRange.Start,
1156-
"use of non-global value '" + YamlCG.Callee.Value + "'");
1157-
1158-
MF.addCalledGlobal(CallI, {cast<GlobalValue>(Callee), YamlCG.Flags});
1159-
}
1160-
1161-
return false;
1162-
}
1163-
11641114
SMDiagnostic MIRParserImpl::diagFromMIStringDiag(const SMDiagnostic &Error,
11651115
SMRange SourceRange) {
11661116
assert(SourceRange.isValid() && "Invalid source range");

‎llvm/lib/CodeGen/MIRPrinter.cpp

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ class MIRPrinter {
133133
void convertMachineMetadataNodes(yaml::MachineFunction &YMF,
134134
const MachineFunction &MF,
135135
MachineModuleSlotTracker &MST);
136-
void convertCalledGlobals(yaml::MachineFunction &YMF,
137-
const MachineFunction &MF,
138-
MachineModuleSlotTracker &MST);
139136

140137
private:
141138
void initRegisterMaskIds(const MachineFunction &MF);
@@ -272,8 +269,6 @@ void MIRPrinter::print(const MachineFunction &MF) {
272269
// function.
273270
convertMachineMetadataNodes(YamlMF, MF, MST);
274271

275-
convertCalledGlobals(YamlMF, MF, MST);
276-
277272
yaml::Output Out(OS);
278273
if (!SimplifyMIR)
279274
Out.setWriteDefaultValues(true);
@@ -560,7 +555,7 @@ void MIRPrinter::convertCallSiteObjects(yaml::MachineFunction &YMF,
560555
const auto *TRI = MF.getSubtarget().getRegisterInfo();
561556
for (auto CSInfo : MF.getCallSitesInfo()) {
562557
yaml::CallSiteInfo YmlCS;
563-
yaml::MachineInstrLoc CallLocation;
558+
yaml::CallSiteInfo::MachineInstrLoc CallLocation;
564559

565560
// Prepare instruction position.
566561
MachineBasicBlock::const_instr_iterator CallI = CSInfo.first->getIterator();
@@ -601,32 +596,6 @@ void MIRPrinter::convertMachineMetadataNodes(yaml::MachineFunction &YMF,
601596
}
602597
}
603598

604-
void MIRPrinter::convertCalledGlobals(yaml::MachineFunction &YMF,
605-
const MachineFunction &MF,
606-
MachineModuleSlotTracker &MST) {
607-
for (const auto &[CallInst, CG] : MF.getCalledGlobals()) {
608-
// If the call instruction was dropped, then we don't need to print it.
609-
auto BB = CallInst->getParent();
610-
if (BB) {
611-
yaml::MachineInstrLoc CallSite;
612-
CallSite.BlockNum = CallInst->getParent()->getNumber();
613-
CallSite.Offset = std::distance(CallInst->getParent()->instr_begin(),
614-
CallInst->getIterator());
615-
616-
yaml::CalledGlobal YamlCG{CallSite, CG.first->getName().str(), CG.second};
617-
YMF.CalledGlobals.push_back(YamlCG);
618-
}
619-
}
620-
621-
// Sort by position of call instructions.
622-
llvm::sort(YMF.CalledGlobals.begin(), YMF.CalledGlobals.end(),
623-
[](yaml::CalledGlobal A, yaml::CalledGlobal B) {
624-
if (A.CallSite.BlockNum == B.CallSite.BlockNum)
625-
return A.CallSite.Offset < B.CallSite.Offset;
626-
return A.CallSite.BlockNum < B.CallSite.BlockNum;
627-
});
628-
}
629-
630599
void MIRPrinter::convert(yaml::MachineFunction &MF,
631600
const MachineConstantPool &ConstantPool) {
632601
unsigned ID = 0;

‎llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -908,10 +908,6 @@ EmitSchedule(MachineBasicBlock::iterator &InsertPos) {
908908
It->setMMRAMetadata(MF, MMRA);
909909
}
910910

911-
if (auto CalledGlobal = DAG->getCalledGlobal(Node))
912-
if (CalledGlobal->first)
913-
MF.addCalledGlobal(MI, *CalledGlobal);
914-
915911
return MI;
916912
};
917913

0 commit comments

Comments
 (0)