maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Hexagon] Add HexagonMCInstrInfo::IsABranchingInst, NFC

This commit is contained in:
Brian Cain 2021-12-28 09:51:27 -08:00 committed by Krzysztof Parzyszek
parent c5327137df
commit 1e7bd93ff2
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCChecker.cpp
View File

@ -317,8 +317,7 @@ bool HexagonMCChecker::checkAXOK() {
void HexagonMCChecker::reportBranchErrors() { void HexagonMCChecker::reportBranchErrors() {
for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) { for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) {
MCInstrDesc const &Desc = HexagonMCInstrInfo::getDesc(MCII, I); if (HexagonMCInstrInfo::IsABranchingInst(MCII, STI, I))
if (Desc.isBranch() || Desc.isCall() || Desc.isReturn())
reportNote(I.getLoc(), "Branching instruction"); reportNote(I.getLoc(), "Branching instruction");
} }
} }
@ -328,8 +327,7 @@ bool HexagonMCChecker::checkHWLoop() {
!HexagonMCInstrInfo::isOuterLoop(MCB)) !HexagonMCInstrInfo::isOuterLoop(MCB))
return true; return true;
for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) { for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) {
MCInstrDesc const &Desc = HexagonMCInstrInfo::getDesc(MCII, I); if (HexagonMCInstrInfo::IsABranchingInst(MCII, STI, I)) {
if (Desc.isBranch() || Desc.isCall() || Desc.isReturn()) {
reportError(MCB.getLoc(), reportError(MCB.getLoc(),
"Branches cannot be in a packet with hardware loops"); "Branches cannot be in a packet with hardware loops");
reportBranchErrors(); reportBranchErrors();
@ -342,8 +340,7 @@ bool HexagonMCChecker::checkHWLoop() {
bool HexagonMCChecker::checkCOFMax1() { bool HexagonMCChecker::checkCOFMax1() {
SmallVector<MCInst const *, 2> BranchLocations; SmallVector<MCInst const *, 2> BranchLocations;
for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) { for (auto const &I : HexagonMCInstrInfo::bundleInstructions(MCII, MCB)) {
MCInstrDesc const &Desc = HexagonMCInstrInfo::getDesc(MCII, I); if (HexagonMCInstrInfo::IsABranchingInst(MCII, STI, I))
if (Desc.isBranch() || Desc.isCall() || Desc.isReturn())
BranchLocations.push_back(&I); BranchLocations.push_back(&I);
} }
for (unsigned J = 0, N = BranchLocations.size(); J < N; ++J) { for (unsigned J = 0, N = BranchLocations.size(); J < N; ++J) {

8
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp
View File

@ -1030,3 +1030,11 @@ unsigned HexagonMCInstrInfo::SubregisterBit(unsigned Consumer,
return Consumer == Producer; return Consumer == Producer;
return 0; return 0;
} }
bool HexagonMCInstrInfo::IsABranchingInst(MCInstrInfo const &MCII,
MCSubtargetInfo const &STI,
MCInst const &I) {
assert(!HexagonMCInstrInfo::isBundle(I));
MCInstrDesc const &Desc = HexagonMCInstrInfo::getDesc(MCII, I);
return (Desc.isBranch() || Desc.isCall() || Desc.isReturn());
}

2
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.h
View File

@ -95,6 +95,8 @@ bool canonicalizePacket(MCInstrInfo const &MCII, MCSubtargetInfo const &STI,
MCContext &Context, MCInst &MCB, MCContext &Context, MCInst &MCB,
HexagonMCChecker *Checker, HexagonMCChecker *Checker,
bool AttemptCompatibility = false); bool AttemptCompatibility = false);
bool IsABranchingInst(MCInstrInfo const &MCII, MCSubtargetInfo const &STI,
MCInst const &I);
// Create a duplex instruction given the two subinsts // Create a duplex instruction given the two subinsts
MCInst *deriveDuplex(MCContext &Context, unsigned iClass, MCInst const &inst0, MCInst *deriveDuplex(MCContext &Context, unsigned iClass, MCInst const &inst0,