Skip to content

Commit 413f6b9

Browse files
authored
[TableGen][GISel][NFC] clang-tidy GlobalISelEmitter.cpp (#90492)
Fixes a couple of style issues, such as: - unused includes - variable naming - `else if` after `return`
1 parent c3598b1 commit 413f6b9

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

llvm/utils/TableGen/GlobalISelEmitter.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@
4545
#include "llvm/Support/CodeGenCoverage.h"
4646
#include "llvm/Support/CommandLine.h"
4747
#include "llvm/Support/Error.h"
48-
#include "llvm/Support/SaveAndRestore.h"
4948
#include "llvm/Support/ScopedPrinter.h"
5049
#include "llvm/TableGen/Error.h"
5150
#include "llvm/TableGen/Record.h"
5251
#include "llvm/TableGen/TableGenBackend.h"
53-
#include <numeric>
5452
#include <string>
5553

5654
using namespace llvm;
@@ -792,8 +790,8 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
792790
"nested predicate that uses operands");
793791
TreePattern *TP = Predicate.getOrigPatFragRecord();
794792
WaitingForNamedOperands = TP->getNumArgs();
795-
for (unsigned i = 0; i < WaitingForNamedOperands; ++i)
796-
StoreIdxForName[getScopedName(Call.Scope, TP->getArgName(i))] = i;
793+
for (unsigned I = 0; I < WaitingForNamedOperands; ++I)
794+
StoreIdxForName[getScopedName(Call.Scope, TP->getArgName(I))] = I;
797795
}
798796
InsnMatcher.addPredicate<GenericInstructionPredicateMatcher>(Predicate);
799797
continue;
@@ -878,8 +876,8 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
878876
if (IsIntrinsic && !II)
879877
return failedImport("Expected IntInit containing intrinsic ID)");
880878

881-
for (unsigned i = 0; i != NumChildren; ++i) {
882-
const TreePatternNode &SrcChild = Src.getChild(i);
879+
for (unsigned I = 0; I != NumChildren; ++I) {
880+
const TreePatternNode &SrcChild = Src.getChild(I);
883881

884882
// We need to determine the meaning of a literal integer based on the
885883
// context. If this is a field required to be an immediate (such as an
@@ -888,19 +886,19 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
888886
// argument that is required to be an immediate, we should not emit an LLT
889887
// type check, and should not be looking for a G_CONSTANT defined
890888
// register.
891-
bool OperandIsImmArg = SrcGIOrNull->isInOperandImmArg(i);
889+
bool OperandIsImmArg = SrcGIOrNull->isInOperandImmArg(I);
892890

893891
// SelectionDAG allows pointers to be represented with iN since it doesn't
894892
// distinguish between pointers and integers but they are different types
895893
// in GlobalISel. Coerce integers to pointers to address space 0 if the
896894
// context indicates a pointer.
897895
//
898-
bool OperandIsAPointer = SrcGIOrNull->isInOperandAPointer(i);
896+
bool OperandIsAPointer = SrcGIOrNull->isInOperandAPointer(I);
899897

900898
if (IsIntrinsic) {
901899
// For G_INTRINSIC/G_INTRINSIC_W_SIDE_EFFECTS, the operand immediately
902900
// following the defs is an intrinsic ID.
903-
if (i == 0) {
901+
if (I == 0) {
904902
OperandMatcher &OM =
905903
InsnMatcher.addOperand(OpIdx++, SrcChild.getName(), TempOpIdx);
906904
OM.addPredicate<IntrinsicIDOperandMatcher>(II);
@@ -911,8 +909,8 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
911909
//
912910
// Note that we have to look at the i-1th parameter, because we don't
913911
// have the intrinsic ID in the intrinsic's parameter list.
914-
OperandIsAPointer |= II->isParamAPointer(i - 1);
915-
OperandIsImmArg |= II->isParamImmArg(i - 1);
912+
OperandIsAPointer |= II->isParamAPointer(I - 1);
913+
OperandIsImmArg |= II->isParamImmArg(I - 1);
916914
}
917915

918916
if (auto Error =
@@ -967,9 +965,9 @@ Error GlobalISelEmitter::importChildMatcher(
967965
// The "name" of a non-leaf complex pattern (MY_PAT $op1, $op2) is
968966
// "MY_PAT:op1:op2" and the ones with same "name" represent same operand.
969967
std::string PatternName = std::string(SrcChild.getOperator()->getName());
970-
for (unsigned i = 0; i < SrcChild.getNumChildren(); ++i) {
968+
for (unsigned I = 0; I < SrcChild.getNumChildren(); ++I) {
971969
PatternName += ":";
972-
PatternName += SrcChild.getChild(i).getName();
970+
PatternName += SrcChild.getChild(I).getName();
973971
}
974972
SrcChildName = PatternName;
975973
}
@@ -1042,11 +1040,11 @@ Error GlobalISelEmitter::importChildMatcher(
10421040
OM, SrcChild.getOperator(), TempOpIdx))
10431041
return Error;
10441042

1045-
for (unsigned i = 0, e = SrcChild.getNumChildren(); i != e; ++i) {
1046-
auto &SubOperand = SrcChild.getChild(i);
1043+
for (unsigned I = 0, E = SrcChild.getNumChildren(); I != E; ++I) {
1044+
auto &SubOperand = SrcChild.getChild(I);
10471045
if (!SubOperand.getName().empty()) {
10481046
if (auto Error = Rule.defineComplexSubOperand(
1049-
SubOperand.getName(), SrcChild.getOperator(), RendererID, i,
1047+
SubOperand.getName(), SrcChild.getOperator(), RendererID, I,
10501048
SrcChildName))
10511049
return Error;
10521050
}
@@ -1232,10 +1230,12 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderer(
12321230
if (DstChild.getOperator()->getName() == "tframeindex") {
12331231
DstMIBuilder.addRenderer<CopyRenderer>(DstChild.getName());
12341232
return InsertPt;
1235-
} else if (DstChild.getOperator()->getName() == "imm") {
1233+
}
1234+
if (DstChild.getOperator()->getName() == "imm") {
12361235
DstMIBuilder.addRenderer<CopyConstantAsImmRenderer>(DstChild.getName());
12371236
return InsertPt;
1238-
} else if (DstChild.getOperator()->getName() == "fpimm") {
1237+
}
1238+
if (DstChild.getOperator()->getName() == "fpimm") {
12391239
DstMIBuilder.addRenderer<CopyFConstantAsFPImmRenderer>(
12401240
DstChild.getName());
12411241
return InsertPt;
@@ -1748,7 +1748,7 @@ Error GlobalISelEmitter::importDefaultOperandRenderers(
17481748

17491749
if (const DefInit *DefaultDefOp = dyn_cast<DefInit>(DefaultOp)) {
17501750
std::optional<LLTCodeGen> OpTyOrNone = MVTToLLT(N.getSimpleType(0));
1751-
auto Def = DefaultDefOp->getDef();
1751+
auto *Def = DefaultDefOp->getDef();
17521752
if (Def->getName() == "undef_tied_input") {
17531753
unsigned TempRegID = M.allocateTempRegID();
17541754
M.insertAction<MakeTempRegisterAction>(InsertPt, *OpTyOrNone,
@@ -2449,13 +2449,13 @@ void GlobalISelEmitter::run(raw_ostream &OS) {
24492449
}
24502450

24512451
// Comparison function to order records by name.
2452-
auto orderByName = [](const Record *A, const Record *B) {
2452+
auto OrderByName = [](const Record *A, const Record *B) {
24532453
return A->getName() < B->getName();
24542454
};
24552455

24562456
std::vector<Record *> ComplexPredicates =
24572457
RK.getAllDerivedDefinitions("GIComplexOperandMatcher");
2458-
llvm::sort(ComplexPredicates, orderByName);
2458+
llvm::sort(ComplexPredicates, OrderByName);
24592459

24602460
std::vector<StringRef> CustomRendererFns;
24612461
transform(RK.getAllDerivedDefinitions("GICustomOperandRenderer"),

0 commit comments

Comments
 (0)