Skip to content

Commit 3ba8dde

Browse files
Anton Sidorenkoigcbot
authored andcommitted
Remove unnecessary 'virtual'
And add 'override'
1 parent ac6d87c commit 3ba8dde

32 files changed

+168
-139
lines changed

IGC/VectorCompiler/lib/GenXCodeGen/GenXAnalysisDumper.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class GenXAnalysisDumper : public FunctionPass {
3333
static char ID;
3434
explicit GenXAnalysisDumper(FunctionPass *P, const char *Suffix)
3535
: FunctionPass(ID), P(P), Suffix(Suffix) { }
36-
virtual StringRef getPassName() const { return "GenX analysis dumper pass"; }
37-
void getAnalysisUsage(AnalysisUsage &AU) const {
36+
StringRef getPassName() const override { return "GenX analysis dumper pass"; }
37+
void getAnalysisUsage(AnalysisUsage &AU) const override {
3838
FunctionPass::getAnalysisUsage(AU);
3939
AU.setPreservesAll();
4040
}
41-
bool runOnFunction(Function &F);
41+
bool runOnFunction(Function &F) override;
4242
};
4343

4444
// GenXGroupAnalysisDumper : a pass to dump an analysis to a file
@@ -49,12 +49,12 @@ class GenXGroupAnalysisDumper : public FunctionGroupPass {
4949
static char ID;
5050
explicit GenXGroupAnalysisDumper(FunctionGroupPass *P, const char *Suffix)
5151
: FunctionGroupPass(ID), P(P), Suffix(Suffix) { }
52-
virtual StringRef getPassName() const { return "GenX analysis dumper pass"; }
53-
void getAnalysisUsage(AnalysisUsage &AU) const {
52+
StringRef getPassName() const override { return "GenX analysis dumper pass"; }
53+
void getAnalysisUsage(AnalysisUsage &AU) const override {
5454
FunctionGroupPass::getAnalysisUsage(AU);
5555
AU.setPreservesAll();
5656
}
57-
bool runOnFunctionGroup(FunctionGroup &FG);
57+
bool runOnFunctionGroup(FunctionGroup &FG) override;
5858
};
5959

6060
} // end anonymous namespace

IGC/VectorCompiler/lib/GenXCodeGen/GenXArgIndirection.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ class GenXArgIndirection : public FunctionGroupPass {
381381
public:
382382
static char ID;
383383
explicit GenXArgIndirection() : FunctionGroupPass(ID) { }
384-
virtual StringRef getPassName() const { return "GenX arg indirection"; }
385-
void getAnalysisUsage(AnalysisUsage &AU) const {
384+
StringRef getPassName() const override { return "GenX arg indirection"; }
385+
void getAnalysisUsage(AnalysisUsage &AU) const override {
386386
FunctionGroupPass::getAnalysisUsage(AU);
387387
AU.addRequired<FunctionGroupAnalysis>();
388388
AU.addRequired<GenXNumbering>();
@@ -395,11 +395,14 @@ class GenXArgIndirection : public FunctionGroupPass {
395395
AU.addPreserved<GenXModule>();
396396
AU.addPreserved<FunctionGroupAnalysis>();
397397
}
398-
bool runOnFunctionGroup(FunctionGroup &FG);
398+
bool runOnFunctionGroup(FunctionGroup &FG) override;
399399
// createPrinterPass : get a pass to print the IR, together with the GenX
400400
// specific analyses
401-
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
402-
{ return createGenXGroupPrinterPass(O, Banner); }
401+
Pass *createPrinterPass(raw_ostream &O,
402+
const std::string &Banner) const override {
403+
return createGenXGroupPrinterPass(O, Banner);
404+
}
405+
403406
private:
404407
void gatherArgLRs();
405408
bool processArgLR(LiveRange *ArgLR);

IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,15 +519,15 @@ class GenXGroupBaling : public FunctionGroupPass, public GenXBaling {
519519
static char ID;
520520
explicit GenXGroupBaling(BalingKind Kind = BalingKind::BK_Legalization, GenXSubtarget *ST = nullptr)
521521
: FunctionGroupPass(ID), GenXBaling(Kind, ST) {}
522-
virtual StringRef getPassName() const {
522+
StringRef getPassName() const override {
523523
return "GenX instruction baling analysis for a function group";
524524
}
525525
void getAnalysisUsage(AnalysisUsage &AU) const override;
526-
bool runOnFunctionGroup(FunctionGroup &FG);
526+
bool runOnFunctionGroup(FunctionGroup &FG) override;
527527
// createPrinterPass : get a pass to print the IR, together with the GenX
528528
// specific analyses
529-
virtual Pass *createPrinterPass(raw_ostream &O,
530-
const std::string &Banner) const {
529+
Pass *createPrinterPass(raw_ostream &O,
530+
const std::string &Banner) const override {
531531
return createGenXGroupPrinterPass(O, Banner);
532532
}
533533
// processFunctionGroup : process all the Functions in a FunctionGroup

IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@ class GenXCFSimplification : public FunctionPass {
4545
public:
4646
static char ID;
4747
explicit GenXCFSimplification() : FunctionPass(ID) { }
48-
virtual StringRef getPassName() const { return "GenX SIMD CF simplification"; }
49-
void getAnalysisUsage(AnalysisUsage &AU) const;
50-
bool runOnFunction(Function &F);
48+
StringRef getPassName() const override {
49+
return "GenX SIMD CF simplification";
50+
}
51+
void getAnalysisUsage(AnalysisUsage &AU) const override;
52+
bool runOnFunction(Function &F) override;
53+
5154
private:
5255
bool isBranchedOverBlock(BasicBlock *BB);
5356
BasicBlock *processBranchedOverBlock(BasicBlock *BB);

IGC/VectorCompiler/lib/GenXCodeGen/GenXCategory.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,17 @@ namespace {
186186
public:
187187
static char ID;
188188
explicit GenXCategory() : FunctionGroupPass(ID) { }
189-
virtual StringRef getPassName() const { return "GenX category conversion"; }
190-
void getAnalysisUsage(AnalysisUsage &AU) const;
191-
bool runOnFunctionGroup(FunctionGroup &FG);
189+
StringRef getPassName() const override {
190+
return "GenX category conversion";
191+
}
192+
void getAnalysisUsage(AnalysisUsage &AU) const override;
193+
bool runOnFunctionGroup(FunctionGroup &FG) override;
192194
// createPrinterPass : get a pass to print the IR, together with the GenX
193195
// specific analyses
194-
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
195-
{ return createGenXGroupPrinterPass(O, Banner); }
196+
Pass *createPrinterPass(raw_ostream &O,
197+
const std::string &Banner) const override {
198+
return createGenXGroupPrinterPass(O, Banner);
199+
}
196200
unsigned getCategoryForPhiIncomings(PHINode *Phi) const;
197201
unsigned getCategoryForCallArg(Function *Callee, unsigned ArgNo) const;
198202
unsigned getCategoryForInlasmConstraintedOp(CallInst *CI, unsigned ArgNo,

IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,11 +480,11 @@ class GenXCisaBuilder : public FunctionGroupPass {
480480
static char ID;
481481
explicit GenXCisaBuilder() : FunctionGroupPass(ID) {}
482482

483-
virtual StringRef getPassName() const {
483+
StringRef getPassName() const override {
484484
return "GenX CISA construction pass";
485485
}
486-
void getAnalysisUsage(AnalysisUsage &AU) const;
487-
bool runOnFunctionGroup(FunctionGroup &FG);
486+
void getAnalysisUsage(AnalysisUsage &AU) const override;
487+
bool runOnFunctionGroup(FunctionGroup &FG) override;
488488

489489
LLVMContext &getContext() {
490490
IGC_ASSERT(Ctx);
@@ -6385,22 +6385,22 @@ class GenXFinalizer : public ModulePass {
63856385
static char ID;
63866386
explicit GenXFinalizer(raw_pwrite_stream &o) : ModulePass(ID), Out(o) {}
63876387

6388-
virtual StringRef getPassName() const { return "GenX Finalizer"; }
6388+
StringRef getPassName() const override { return "GenX Finalizer"; }
63896389

63906390
LLVMContext &getContext() {
63916391
IGC_ASSERT(Ctx);
63926392
return *Ctx;
63936393
}
63946394

6395-
void getAnalysisUsage(AnalysisUsage &AU) const {
6395+
void getAnalysisUsage(AnalysisUsage &AU) const override {
63966396
AU.addRequired<GenXModule>();
63976397
AU.addRequired<FunctionGroupAnalysis>();
63986398
AU.addRequired<TargetPassConfig>();
63996399
AU.addRequired<GenXBackendConfig>();
64006400
AU.setPreservesAll();
64016401
}
64026402

6403-
bool runOnModule(Module &M) {
6403+
bool runOnModule(Module &M) override {
64046404
Ctx = &M.getContext();
64056405

64066406
auto &FGA = getAnalysis<FunctionGroupAnalysis>();

IGC/VectorCompiler/lib/GenXCodeGen/GenXCoalescing.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,10 @@ namespace {
324324
public:
325325
static char ID;
326326
explicit GenXCoalescing() : FunctionGroupPass(ID) {}
327-
virtual StringRef getPassName() const { return "GenX coalescing and copy insertion"; }
328-
void getAnalysisUsage(AnalysisUsage &AU) const {
327+
StringRef getPassName() const override {
328+
return "GenX coalescing and copy insertion";
329+
}
330+
void getAnalysisUsage(AnalysisUsage &AU) const override {
329331
FunctionGroupPass::getAnalysisUsage(AU);
330332
AU.addRequired<GenXLiveness>();
331333
AU.addRequired<GenXGroupBaling>();
@@ -342,11 +344,13 @@ namespace {
342344
AU.addPreserved<FunctionGroupAnalysis>();
343345
AU.setPreservesCFG();
344346
}
345-
bool runOnFunctionGroup(FunctionGroup &FG);
347+
bool runOnFunctionGroup(FunctionGroup &FG) override;
346348
// createPrinterPass : get a pass to print the IR, together with the GenX
347349
// specific analyses
348-
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
349-
{ return createGenXGroupPrinterPass(O, Banner); }
350+
Pass *createPrinterPass(raw_ostream &O,
351+
const std::string &Banner) const override {
352+
return createGenXGroupPrinterPass(O, Banner);
353+
}
350354

351355
void visitPHINode(PHINode &Phi);
352356
void visitCallInst(CallInst &CI);

IGC/VectorCompiler/lib/GenXCodeGen/GenXDeadVectorRemoval.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,12 @@ class GenXDeadVectorRemoval : public FunctionPass {
165165
public:
166166
static char ID;
167167
explicit GenXDeadVectorRemoval() : FunctionPass(ID) { }
168-
virtual StringRef getPassName() const { return "GenX dead vector element removal pass"; }
169-
void getAnalysisUsage(AnalysisUsage &AU) const;
170-
bool runOnFunction(Function &F);
168+
StringRef getPassName() const override {
169+
return "GenX dead vector element removal pass";
170+
}
171+
void getAnalysisUsage(AnalysisUsage &AU) const override;
172+
bool runOnFunction(Function &F) override;
173+
171174
private:
172175
void clear() {
173176
InstMap.clear();

IGC/VectorCompiler/lib/GenXCodeGen/GenXEmulate.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ class GenXEmulate : public ModulePass {
280280
public:
281281
static char ID;
282282
explicit GenXEmulate() : ModulePass(ID) {}
283-
virtual StringRef getPassName() const { return "GenX emulation"; }
284-
void getAnalysisUsage(AnalysisUsage &AU) const;
285-
bool runOnModule(Module &M);
283+
StringRef getPassName() const override { return "GenX emulation"; }
284+
void getAnalysisUsage(AnalysisUsage &AU) const override;
285+
bool runOnModule(Module &M) override;
286286
void runOnFunction(Function &F);
287287

288288
private:
@@ -1858,12 +1858,12 @@ class GenXEmulationImport : public ModulePass {
18581858
static char ID;
18591859

18601860
explicit GenXEmulationImport() : ModulePass(ID) {}
1861-
virtual StringRef getPassName() const { return "GenX Emulation BiF Import"; }
1862-
void getAnalysisUsage(AnalysisUsage &AU) const {
1861+
StringRef getPassName() const override { return "GenX Emulation BiF Import"; }
1862+
void getAnalysisUsage(AnalysisUsage &AU) const override {
18631863
AU.addRequired<TargetPassConfig>();
18641864
AU.addRequired<GenXBackendConfig>();
18651865
}
1866-
bool runOnModule(Module &M) {
1866+
bool runOnModule(Module &M) override {
18671867
const GenXSubtarget &ST = getAnalysis<TargetPassConfig>()
18681868
.getTM<GenXTargetMachine>()
18691869
.getGenXSubtarget();

IGC/VectorCompiler/lib/GenXCodeGen/GenXExtractVectorizer.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,13 @@ class GenXExtractVectorizer : public FunctionPass {
7272
public:
7373
static char ID;
7474
explicit GenXExtractVectorizer() : FunctionPass(ID) { }
75-
virtual StringRef getPassName() const { return "GenX Extract Vectorizer"; }
76-
void getAnalysisUsage(AnalysisUsage &AU) const {
75+
StringRef getPassName() const override { return "GenX Extract Vectorizer"; }
76+
void getAnalysisUsage(AnalysisUsage &AU) const override {
7777
AU.addRequired<DominatorTreeWrapperPass>();
7878
AU.setPreservesCFG();
7979
}
80-
bool runOnFunction(Function &F);
80+
bool runOnFunction(Function &F) override;
81+
8182
private:
8283
void processExtracted(Value *V);
8384
void processBucket(const BucketIndex *BIdx, SmallVectorImpl<Extract> *B);

IGC/VectorCompiler/lib/GenXCodeGen/GenXGEPLowering.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ class GenXGEPLowering : public FunctionPass {
5050

5151
GenXGEPLowering() : FunctionPass(ID) {}
5252

53-
virtual StringRef getPassName() const override { return "GenX GEP Lowering"; }
53+
StringRef getPassName() const override { return "GenX GEP Lowering"; }
5454

55-
virtual bool runOnFunction(Function &F) override;
55+
bool runOnFunction(Function &F) override;
5656

57-
virtual void getAnalysisUsage(AnalysisUsage &AU) const override {
57+
void getAnalysisUsage(AnalysisUsage &AU) const override {
5858
AU.addRequired<LoopInfoWrapperPass>();
5959
AU.addRequired<TargetTransformInfoWrapperPass>();
6060
AU.setPreservesCFG();

IGC/VectorCompiler/lib/GenXCodeGen/GenXLegalization.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@ class GenXLegalization : public FunctionPass {
309309
public:
310310
static char ID;
311311
explicit GenXLegalization() : FunctionPass(ID) { clearBale(); }
312-
virtual StringRef getPassName() const {
312+
StringRef getPassName() const override {
313313
return "GenX execution width and GRF crossing legalization";
314314
}
315-
void getAnalysisUsage(AnalysisUsage &AU) const;
316-
bool runOnFunction(Function &F);
315+
void getAnalysisUsage(AnalysisUsage &AU) const override;
316+
bool runOnFunction(Function &F) override;
317317
// createPrinterPass : get a pass to print the IR, together with the GenX
318318
// specific analyses
319-
virtual Pass *createPrinterPass(raw_ostream &O,
320-
const std::string &Banner) const {
319+
Pass *createPrinterPass(raw_ostream &O,
320+
const std::string &Banner) const override {
321321
return createGenXPrinterPass(O, Banner);
322322
}
323323

IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveRanges.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ class GenXLiveRanges : public FunctionGroupPass {
4949
public:
5050
static char ID;
5151
explicit GenXLiveRanges() : FunctionGroupPass(ID) { }
52-
virtual StringRef getPassName() const { return "GenX live ranges analysis"; }
53-
void getAnalysisUsage(AnalysisUsage &AU) const;
54-
bool runOnFunctionGroup(FunctionGroup &FG);
52+
StringRef getPassName() const override { return "GenX live ranges analysis"; }
53+
void getAnalysisUsage(AnalysisUsage &AU) const override;
54+
bool runOnFunctionGroup(FunctionGroup &FG) override;
5555
// createPrinterPass : get a pass to print the IR, together with the GenX
5656
// specific analyses
57-
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
58-
{ return createGenXGroupPrinterPass(O, Banner); }
57+
Pass *createPrinterPass(raw_ostream &O,
58+
const std::string &Banner) const override {
59+
return createGenXGroupPrinterPass(O, Banner);
60+
}
5961

6062
private:
6163
void buildLiveRanges();

IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveness.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class GenXLiveness : public FunctionGroupPass {
496496
: FunctionGroupPass(ID), CG(nullptr), Baling(nullptr),
497497
Numbering(nullptr) {}
498498
~GenXLiveness() { clear(); }
499-
virtual StringRef getPassName() const override { return "GenX liveness analysis"; }
499+
StringRef getPassName() const override { return "GenX liveness analysis"; }
500500
void getAnalysisUsage(AnalysisUsage &AU) const override;
501501
bool runOnFunctionGroup(FunctionGroup &FG) override;
502502
// setBaling : tell GenXLiveness where GenXBaling is
@@ -605,13 +605,15 @@ class GenXLiveness : public FunctionGroupPass {
605605
bool isNoopCastCoalesced(CastInst *CI);
606606
// createPrinterPass : get a pass to print the IR, together with the GenX
607607
// specific analyses
608-
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const override
609-
{ return createGenXGroupPrinterPass(O, Banner); }
608+
Pass *createPrinterPass(raw_ostream &O,
609+
const std::string &Banner) const override {
610+
return createGenXGroupPrinterPass(O, Banner);
611+
}
610612
// Debug dump
611613
void dump();
612614
using Pass::print; // Indicates we aren't replacing base class version of print
613-
virtual void print(raw_ostream &OS) const;
614-
virtual void releaseMemory() override { clear(); }
615+
void print(raw_ostream &OS) const;
616+
void releaseMemory() override { clear(); }
615617

616618
private:
617619
void clear();

IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ class GenXLowering : public FunctionPass {
194194
public:
195195
static char ID;
196196
explicit GenXLowering() : FunctionPass(ID), DT(nullptr) {}
197-
virtual StringRef getPassName() const { return "GenX lowering"; }
198-
void getAnalysisUsage(AnalysisUsage &AU) const;
199-
bool runOnFunction(Function &F);
197+
StringRef getPassName() const override { return "GenX lowering"; }
198+
void getAnalysisUsage(AnalysisUsage &AU) const override;
199+
bool runOnFunction(Function &F) override;
200200

201201
private:
202202
bool translateSLMOWord(CallInst* CI, unsigned IID);

IGC/VectorCompiler/lib/GenXCodeGen/GenXNumbering.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class GenXNumbering : public FunctionGroupPass {
104104
static char ID;
105105
explicit GenXNumbering() : FunctionGroupPass(ID), Baling(0) { }
106106
~GenXNumbering() { clear(); }
107-
virtual StringRef getPassName() const { return "GenX numbering"; }
108-
void getAnalysisUsage(AnalysisUsage &AU) const;
109-
bool runOnFunctionGroup(FunctionGroup &FG);
107+
StringRef getPassName() const override { return "GenX numbering"; }
108+
void getAnalysisUsage(AnalysisUsage &AU) const override;
109+
bool runOnFunctionGroup(FunctionGroup &FG) override;
110110
// get BBNumber struct for a basic block
111111
const BBNumber *getBBNumber(BasicBlock *BB) { return &BBNumbers[BB]; }
112112
// get and set instruction number
@@ -132,15 +132,15 @@ class GenXNumbering : public FunctionGroupPass {
132132
getPhiIncomingFromNumber(unsigned Number);
133133
// createPrinterPass : get a pass to print the IR, together with the GenX
134134
// specific analyses
135-
virtual Pass *createPrinterPass(raw_ostream &O,
136-
const std::string &Banner) const {
135+
Pass *createPrinterPass(raw_ostream &O,
136+
const std::string &Banner) const override {
137137
return createGenXGroupPrinterPass(O, Banner);
138138
}
139139
// Debug dump
140140
void dump();
141141
using llvm::Pass::print; // enables overloading of print in this class rather
142142
// than override (and stops compiler warnings)
143-
virtual void print(raw_ostream &OS) const;
143+
void print(raw_ostream &OS) const;
144144

145145
private:
146146
void clear();

IGC/VectorCompiler/lib/GenXCodeGen/GenXPostLegalization.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ class GenXPostLegalization : public FunctionPass {
6666
public:
6767
static char ID;
6868
explicit GenXPostLegalization() : FunctionPass(ID) { }
69-
virtual StringRef getPassName() const { return "GenX post-legalization pass"; }
70-
void getAnalysisUsage(AnalysisUsage &AU) const;
71-
bool runOnFunction(Function &F);
69+
StringRef getPassName() const override {
70+
return "GenX post-legalization pass";
71+
}
72+
void getAnalysisUsage(AnalysisUsage &AU) const override;
73+
bool runOnFunction(Function &F) override;
7274
};
7375

7476
} // end namespace llvm

0 commit comments

Comments
 (0)