Skip to content

Commit

Permalink
Remove unnecessary 'virtual'
Browse files Browse the repository at this point in the history
And add 'override'
  • Loading branch information
Anton Sidorenko authored and igcbot committed Sep 16, 2021
1 parent ac6d87c commit 3ba8dde
Show file tree
Hide file tree
Showing 32 changed files with 168 additions and 139 deletions.
12 changes: 6 additions & 6 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXAnalysisDumper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ class GenXAnalysisDumper : public FunctionPass {
static char ID;
explicit GenXAnalysisDumper(FunctionPass *P, const char *Suffix)
: FunctionPass(ID), P(P), Suffix(Suffix) { }
virtual StringRef getPassName() const { return "GenX analysis dumper pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override { return "GenX analysis dumper pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const override {
FunctionPass::getAnalysisUsage(AU);
AU.setPreservesAll();
}
bool runOnFunction(Function &F);
bool runOnFunction(Function &F) override;
};

// GenXGroupAnalysisDumper : a pass to dump an analysis to a file
Expand All @@ -49,12 +49,12 @@ class GenXGroupAnalysisDumper : public FunctionGroupPass {
static char ID;
explicit GenXGroupAnalysisDumper(FunctionGroupPass *P, const char *Suffix)
: FunctionGroupPass(ID), P(P), Suffix(Suffix) { }
virtual StringRef getPassName() const { return "GenX analysis dumper pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override { return "GenX analysis dumper pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const override {
FunctionGroupPass::getAnalysisUsage(AU);
AU.setPreservesAll();
}
bool runOnFunctionGroup(FunctionGroup &FG);
bool runOnFunctionGroup(FunctionGroup &FG) override;
};

} // end anonymous namespace
Expand Down
13 changes: 8 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXArgIndirection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ class GenXArgIndirection : public FunctionGroupPass {
public:
static char ID;
explicit GenXArgIndirection() : FunctionGroupPass(ID) { }
virtual StringRef getPassName() const { return "GenX arg indirection"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override { return "GenX arg indirection"; }
void getAnalysisUsage(AnalysisUsage &AU) const override {
FunctionGroupPass::getAnalysisUsage(AU);
AU.addRequired<FunctionGroupAnalysis>();
AU.addRequired<GenXNumbering>();
Expand All @@ -395,11 +395,14 @@ class GenXArgIndirection : public FunctionGroupPass {
AU.addPreserved<GenXModule>();
AU.addPreserved<FunctionGroupAnalysis>();
}
bool runOnFunctionGroup(FunctionGroup &FG);
bool runOnFunctionGroup(FunctionGroup &FG) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
{ return createGenXGroupPrinterPass(O, Banner); }
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}

private:
void gatherArgLRs();
bool processArgLR(LiveRange *ArgLR);
Expand Down
8 changes: 4 additions & 4 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXBaling.h
Original file line number Diff line number Diff line change
Expand Up @@ -519,15 +519,15 @@ class GenXGroupBaling : public FunctionGroupPass, public GenXBaling {
static char ID;
explicit GenXGroupBaling(BalingKind Kind = BalingKind::BK_Legalization, GenXSubtarget *ST = nullptr)
: FunctionGroupPass(ID), GenXBaling(Kind, ST) {}
virtual StringRef getPassName() const {
StringRef getPassName() const override {
return "GenX instruction baling analysis for a function group";
}
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG);
bool runOnFunctionGroup(FunctionGroup &FG) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const {
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}
// processFunctionGroup : process all the Functions in a FunctionGroup
Expand Down
9 changes: 6 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXCFSimplification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ class GenXCFSimplification : public FunctionPass {
public:
static char ID;
explicit GenXCFSimplification() : FunctionPass(ID) { }
virtual StringRef getPassName() const { return "GenX SIMD CF simplification"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunction(Function &F);
StringRef getPassName() const override {
return "GenX SIMD CF simplification";
}
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunction(Function &F) override;

private:
bool isBranchedOverBlock(BasicBlock *BB);
BasicBlock *processBranchedOverBlock(BasicBlock *BB);
Expand Down
14 changes: 9 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXCategory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,17 @@ namespace {
public:
static char ID;
explicit GenXCategory() : FunctionGroupPass(ID) { }
virtual StringRef getPassName() const { return "GenX category conversion"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunctionGroup(FunctionGroup &FG);
StringRef getPassName() const override {
return "GenX category conversion";
}
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
{ return createGenXGroupPrinterPass(O, Banner); }
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}
unsigned getCategoryForPhiIncomings(PHINode *Phi) const;
unsigned getCategoryForCallArg(Function *Callee, unsigned ArgNo) const;
unsigned getCategoryForInlasmConstraintedOp(CallInst *CI, unsigned ArgNo,
Expand Down
12 changes: 6 additions & 6 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -480,11 +480,11 @@ class GenXCisaBuilder : public FunctionGroupPass {
static char ID;
explicit GenXCisaBuilder() : FunctionGroupPass(ID) {}

virtual StringRef getPassName() const {
StringRef getPassName() const override {
return "GenX CISA construction pass";
}
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunctionGroup(FunctionGroup &FG);
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG) override;

LLVMContext &getContext() {
IGC_ASSERT(Ctx);
Expand Down Expand Up @@ -6385,22 +6385,22 @@ class GenXFinalizer : public ModulePass {
static char ID;
explicit GenXFinalizer(raw_pwrite_stream &o) : ModulePass(ID), Out(o) {}

virtual StringRef getPassName() const { return "GenX Finalizer"; }
StringRef getPassName() const override { return "GenX Finalizer"; }

LLVMContext &getContext() {
IGC_ASSERT(Ctx);
return *Ctx;
}

void getAnalysisUsage(AnalysisUsage &AU) const {
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<GenXModule>();
AU.addRequired<FunctionGroupAnalysis>();
AU.addRequired<TargetPassConfig>();
AU.addRequired<GenXBackendConfig>();
AU.setPreservesAll();
}

bool runOnModule(Module &M) {
bool runOnModule(Module &M) override {
Ctx = &M.getContext();

auto &FGA = getAnalysis<FunctionGroupAnalysis>();
Expand Down
14 changes: 9 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXCoalescing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,10 @@ namespace {
public:
static char ID;
explicit GenXCoalescing() : FunctionGroupPass(ID) {}
virtual StringRef getPassName() const { return "GenX coalescing and copy insertion"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override {
return "GenX coalescing and copy insertion";
}
void getAnalysisUsage(AnalysisUsage &AU) const override {
FunctionGroupPass::getAnalysisUsage(AU);
AU.addRequired<GenXLiveness>();
AU.addRequired<GenXGroupBaling>();
Expand All @@ -342,11 +344,13 @@ namespace {
AU.addPreserved<FunctionGroupAnalysis>();
AU.setPreservesCFG();
}
bool runOnFunctionGroup(FunctionGroup &FG);
bool runOnFunctionGroup(FunctionGroup &FG) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
{ return createGenXGroupPrinterPass(O, Banner); }
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}

void visitPHINode(PHINode &Phi);
void visitCallInst(CallInst &CI);
Expand Down
9 changes: 6 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXDeadVectorRemoval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,12 @@ class GenXDeadVectorRemoval : public FunctionPass {
public:
static char ID;
explicit GenXDeadVectorRemoval() : FunctionPass(ID) { }
virtual StringRef getPassName() const { return "GenX dead vector element removal pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunction(Function &F);
StringRef getPassName() const override {
return "GenX dead vector element removal pass";
}
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunction(Function &F) override;

private:
void clear() {
InstMap.clear();
Expand Down
12 changes: 6 additions & 6 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXEmulate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ class GenXEmulate : public ModulePass {
public:
static char ID;
explicit GenXEmulate() : ModulePass(ID) {}
virtual StringRef getPassName() const { return "GenX emulation"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnModule(Module &M);
StringRef getPassName() const override { return "GenX emulation"; }
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnModule(Module &M) override;
void runOnFunction(Function &F);

private:
Expand Down Expand Up @@ -1858,12 +1858,12 @@ class GenXEmulationImport : public ModulePass {
static char ID;

explicit GenXEmulationImport() : ModulePass(ID) {}
virtual StringRef getPassName() const { return "GenX Emulation BiF Import"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override { return "GenX Emulation BiF Import"; }
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<TargetPassConfig>();
AU.addRequired<GenXBackendConfig>();
}
bool runOnModule(Module &M) {
bool runOnModule(Module &M) override {
const GenXSubtarget &ST = getAnalysis<TargetPassConfig>()
.getTM<GenXTargetMachine>()
.getGenXSubtarget();
Expand Down
7 changes: 4 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXExtractVectorizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ class GenXExtractVectorizer : public FunctionPass {
public:
static char ID;
explicit GenXExtractVectorizer() : FunctionPass(ID) { }
virtual StringRef getPassName() const { return "GenX Extract Vectorizer"; }
void getAnalysisUsage(AnalysisUsage &AU) const {
StringRef getPassName() const override { return "GenX Extract Vectorizer"; }
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<DominatorTreeWrapperPass>();
AU.setPreservesCFG();
}
bool runOnFunction(Function &F);
bool runOnFunction(Function &F) override;

private:
void processExtracted(Value *V);
void processBucket(const BucketIndex *BIdx, SmallVectorImpl<Extract> *B);
Expand Down
6 changes: 3 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXGEPLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ class GenXGEPLowering : public FunctionPass {

GenXGEPLowering() : FunctionPass(ID) {}

virtual StringRef getPassName() const override { return "GenX GEP Lowering"; }
StringRef getPassName() const override { return "GenX GEP Lowering"; }

virtual bool runOnFunction(Function &F) override;
bool runOnFunction(Function &F) override;

virtual void getAnalysisUsage(AnalysisUsage &AU) const override {
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<LoopInfoWrapperPass>();
AU.addRequired<TargetTransformInfoWrapperPass>();
AU.setPreservesCFG();
Expand Down
10 changes: 5 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXLegalization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,15 @@ class GenXLegalization : public FunctionPass {
public:
static char ID;
explicit GenXLegalization() : FunctionPass(ID) { clearBale(); }
virtual StringRef getPassName() const {
StringRef getPassName() const override {
return "GenX execution width and GRF crossing legalization";
}
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunction(Function &F);
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunction(Function &F) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const {
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXPrinterPass(O, Banner);
}

Expand Down
12 changes: 7 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveRanges.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ class GenXLiveRanges : public FunctionGroupPass {
public:
static char ID;
explicit GenXLiveRanges() : FunctionGroupPass(ID) { }
virtual StringRef getPassName() const { return "GenX live ranges analysis"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunctionGroup(FunctionGroup &FG);
StringRef getPassName() const override { return "GenX live ranges analysis"; }
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG) override;
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const
{ return createGenXGroupPrinterPass(O, Banner); }
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}

private:
void buildLiveRanges();
Expand Down
12 changes: 7 additions & 5 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXLiveness.h
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ class GenXLiveness : public FunctionGroupPass {
: FunctionGroupPass(ID), CG(nullptr), Baling(nullptr),
Numbering(nullptr) {}
~GenXLiveness() { clear(); }
virtual StringRef getPassName() const override { return "GenX liveness analysis"; }
StringRef getPassName() const override { return "GenX liveness analysis"; }
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG) override;
// setBaling : tell GenXLiveness where GenXBaling is
Expand Down Expand Up @@ -605,13 +605,15 @@ class GenXLiveness : public FunctionGroupPass {
bool isNoopCastCoalesced(CastInst *CI);
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const override
{ return createGenXGroupPrinterPass(O, Banner); }
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}
// Debug dump
void dump();
using Pass::print; // Indicates we aren't replacing base class version of print
virtual void print(raw_ostream &OS) const;
virtual void releaseMemory() override { clear(); }
void print(raw_ostream &OS) const;
void releaseMemory() override { clear(); }

private:
void clear();
Expand Down
6 changes: 3 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ class GenXLowering : public FunctionPass {
public:
static char ID;
explicit GenXLowering() : FunctionPass(ID), DT(nullptr) {}
virtual StringRef getPassName() const { return "GenX lowering"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunction(Function &F);
StringRef getPassName() const override { return "GenX lowering"; }
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunction(Function &F) override;

private:
bool translateSLMOWord(CallInst* CI, unsigned IID);
Expand Down
12 changes: 6 additions & 6 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXNumbering.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ class GenXNumbering : public FunctionGroupPass {
static char ID;
explicit GenXNumbering() : FunctionGroupPass(ID), Baling(0) { }
~GenXNumbering() { clear(); }
virtual StringRef getPassName() const { return "GenX numbering"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunctionGroup(FunctionGroup &FG);
StringRef getPassName() const override { return "GenX numbering"; }
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunctionGroup(FunctionGroup &FG) override;
// get BBNumber struct for a basic block
const BBNumber *getBBNumber(BasicBlock *BB) { return &BBNumbers[BB]; }
// get and set instruction number
Expand All @@ -132,15 +132,15 @@ class GenXNumbering : public FunctionGroupPass {
getPhiIncomingFromNumber(unsigned Number);
// createPrinterPass : get a pass to print the IR, together with the GenX
// specific analyses
virtual Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const {
Pass *createPrinterPass(raw_ostream &O,
const std::string &Banner) const override {
return createGenXGroupPrinterPass(O, Banner);
}
// Debug dump
void dump();
using llvm::Pass::print; // enables overloading of print in this class rather
// than override (and stops compiler warnings)
virtual void print(raw_ostream &OS) const;
void print(raw_ostream &OS) const;

private:
void clear();
Expand Down
8 changes: 5 additions & 3 deletions IGC/VectorCompiler/lib/GenXCodeGen/GenXPostLegalization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ class GenXPostLegalization : public FunctionPass {
public:
static char ID;
explicit GenXPostLegalization() : FunctionPass(ID) { }
virtual StringRef getPassName() const { return "GenX post-legalization pass"; }
void getAnalysisUsage(AnalysisUsage &AU) const;
bool runOnFunction(Function &F);
StringRef getPassName() const override {
return "GenX post-legalization pass";
}
void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnFunction(Function &F) override;
};

} // end namespace llvm
Expand Down
Loading

0 comments on commit 3ba8dde

Please sign in to comment.