Skip to content

Commit a8a33ba

Browse files
jurahuljurahul
authored
[NFC][SPIRV] Misc code cleanup in SPIRV Target (#133764)
- Use static instead of anonymous namespace for file local functions. - Enclose file-local classes in anonymous namespace. - Eliminate `llvm::` qualifier when file has `using namespace llvm`. - Eliminate namespace surrounding entire code in SPIRVConvergenceRegionAnalysis.cpp file. - Eliminate call to `initializeSPIRVStructurizerPass` from the pass constructor (#111767)
1 parent 4cb41d1 commit a8a33ba

11 files changed

+63
-86
lines changed

‎llvm/lib/Target/SPIRV/Analysis/SPIRVConvergenceRegionAnalysis.cpp‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===- ConvergenceRegionAnalysis.h -----------------------------*- C++ -*--===//
1+
//===----------------------------------------------------------------------===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -24,6 +24,7 @@
2424
#define DEBUG_TYPE "spirv-convergence-region-analysis"
2525

2626
using namespace llvm;
27+
using namespace SPIRV;
2728

2829
namespace llvm {
2930
void initializeSPIRVConvergenceRegionAnalysisWrapperPassPass(PassRegistry &);
@@ -39,8 +40,6 @@ INITIALIZE_PASS_END(SPIRVConvergenceRegionAnalysisWrapperPass,
3940
"convergence-region", "SPIRV convergence regions analysis",
4041
true, true)
4142

42-
namespace llvm {
43-
namespace SPIRV {
4443
namespace {
4544

4645
template <typename BasicBlockType, typename IntrinsicInstType>
@@ -74,12 +73,13 @@ getConvergenceTokenInternal(BasicBlockType *BB) {
7473

7574
return std::nullopt;
7675
}
76+
} // anonymous namespace
7777

7878
// Given a ConvergenceRegion tree with |Start| as its root, finds the smallest
7979
// region |Entry| belongs to. If |Entry| does not belong to the region defined
8080
// by |Start|, this function returns |nullptr|.
81-
ConvergenceRegion *findParentRegion(ConvergenceRegion *Start,
82-
BasicBlock *Entry) {
81+
static ConvergenceRegion *findParentRegion(ConvergenceRegion *Start,
82+
BasicBlock *Entry) {
8383
ConvergenceRegion *Candidate = nullptr;
8484
ConvergenceRegion *NextCandidate = Start;
8585

@@ -102,13 +102,13 @@ ConvergenceRegion *findParentRegion(ConvergenceRegion *Start,
102102
return Candidate;
103103
}
104104

105-
} // anonymous namespace
106-
107-
std::optional<IntrinsicInst *> getConvergenceToken(BasicBlock *BB) {
105+
std::optional<IntrinsicInst *>
106+
llvm::SPIRV::getConvergenceToken(BasicBlock *BB) {
108107
return getConvergenceTokenInternal<BasicBlock, IntrinsicInst>(BB);
109108
}
110109

111-
std::optional<const IntrinsicInst *> getConvergenceToken(const BasicBlock *BB) {
110+
std::optional<const IntrinsicInst *>
111+
llvm::SPIRV::getConvergenceToken(const BasicBlock *BB) {
112112
return getConvergenceTokenInternal<const BasicBlock, const IntrinsicInst>(BB);
113113
}
114114

@@ -187,8 +187,8 @@ void ConvergenceRegion::dump(const unsigned IndentSize) const {
187187
dbgs() << Indent << "}\n";
188188
}
189189

190+
namespace {
190191
class ConvergenceRegionAnalyzer {
191-
192192
public:
193193
ConvergenceRegionAnalyzer(Function &F, DominatorTree &DT, LoopInfo &LI)
194194
: DT(DT), LI(LI), F(F) {}
@@ -305,15 +305,15 @@ class ConvergenceRegionAnalyzer {
305305
LoopInfo &LI;
306306
Function &F;
307307
};
308+
} // anonymous namespace
308309

309-
ConvergenceRegionInfo getConvergenceRegions(Function &F, DominatorTree &DT,
310-
LoopInfo &LI) {
310+
ConvergenceRegionInfo llvm::SPIRV::getConvergenceRegions(Function &F,
311+
DominatorTree &DT,
312+
LoopInfo &LI) {
311313
ConvergenceRegionAnalyzer Analyzer(F, DT, LI);
312314
return Analyzer.analyze();
313315
}
314316

315-
} // namespace SPIRV
316-
317317
char SPIRVConvergenceRegionAnalysisWrapperPass::ID = 0;
318318

319319
SPIRVConvergenceRegionAnalysisWrapperPass::
@@ -339,5 +339,3 @@ SPIRVConvergenceRegionAnalysis::run(Function &F, FunctionAnalysisManager &AM) {
339339
}
340340

341341
AnalysisKey SPIRVConvergenceRegionAnalysis::Key;
342-
343-
} // namespace llvm

‎llvm/lib/Target/SPIRV/Analysis/SPIRVConvergenceRegionAnalysis.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
#include "llvm/Analysis/CFG.h"
2020
#include "llvm/Analysis/LoopInfo.h"
2121
#include "llvm/IR/Dominators.h"
22-
#include "llvm/IR/IntrinsicInst.h"
23-
#include <iostream>
2422
#include <optional>
2523
#include <unordered_set>
2624

2725
namespace llvm {
26+
class IntrinsicInst;
2827
class SPIRVSubtarget;
2928
class MachineFunction;
3029
class MachineModuleInfo;

‎llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3048,7 +3048,7 @@ static SPIRVType *getInlineSpirvType(const TargetExtType *ExtensionType,
30483048
auto Opcode = ExtensionType->getIntParameter(0);
30493049

30503050
SmallVector<MCOperand> Operands;
3051-
for (llvm::Type *Param : ExtensionType->type_params()) {
3051+
for (Type *Param : ExtensionType->type_params()) {
30523052
if (const TargetExtType *ParamEType = dyn_cast<TargetExtType>(Param)) {
30533053
if (ParamEType->getName() == "spirv.IntegralConstant") {
30543054
assert(ParamEType->getNumTypeParameters() == 1 &&

‎llvm/lib/Target/SPIRV/SPIRVCommandLine.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ static const std::map<std::string, SPIRV::Extension::Extension, std::less<>>
9494
{"SPV_INTEL_fp_max_error",
9595
SPIRV::Extension::Extension::SPV_INTEL_fp_max_error}};
9696

97-
bool SPIRVExtensionsParser::parse(cl::Option &O, llvm::StringRef ArgName,
98-
llvm::StringRef ArgValue,
97+
bool SPIRVExtensionsParser::parse(cl::Option &O, StringRef ArgName,
98+
StringRef ArgValue,
9999
std::set<SPIRV::Extension::Extension> &Vals) {
100-
llvm::SmallVector<llvm::StringRef, 10> Tokens;
100+
SmallVector<StringRef, 10> Tokens;
101101
ArgValue.split(Tokens, ",", -1, false);
102102
std::sort(Tokens.begin(), Tokens.end());
103103

@@ -114,7 +114,7 @@ bool SPIRVExtensionsParser::parse(cl::Option &O, llvm::StringRef ArgName,
114114
if (Token.empty() || (!Token.starts_with("+") && !Token.starts_with("-")))
115115
return O.error("Invalid extension list format: " + Token.str());
116116

117-
llvm::StringRef ExtensionName = Token.substr(1);
117+
StringRef ExtensionName = Token.substr(1);
118118
auto NameValuePair = SPIRVExtensionMap.find(ExtensionName);
119119

120120
if (NameValuePair == SPIRVExtensionMap.end())
@@ -137,7 +137,7 @@ bool SPIRVExtensionsParser::parse(cl::Option &O, llvm::StringRef ArgName,
137137
return false;
138138
}
139139

140-
llvm::StringRef SPIRVExtensionsParser::checkExtensions(
140+
StringRef SPIRVExtensionsParser::checkExtensions(
141141
const std::vector<std::string> &ExtNames,
142142
std::set<SPIRV::Extension::Extension> &AllowedExtensions) {
143143
for (const auto &Ext : ExtNames) {

‎llvm/lib/Target/SPIRV/SPIRVCommandLine.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct SPIRVExtensionsParser
3939
///
4040
/// \return Returns a reference to the unknown SPIR-V extension name from the
4141
/// list if present, or an empty StringRef on success.
42-
static llvm::StringRef
42+
static StringRef
4343
checkExtensions(const std::vector<std::string> &ExtNames,
4444
std::set<SPIRV::Extension::Extension> &AllowedExtensions);
4545
};

‎llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,7 @@ static void setInsertPointAfterDef(IRBuilder<> &B, Instruction *I) {
293293
}
294294

295295
static bool requireAssignType(Instruction *I) {
296-
IntrinsicInst *Intr = dyn_cast<IntrinsicInst>(I);
297-
if (Intr) {
296+
if (const auto *Intr = dyn_cast<IntrinsicInst>(I)) {
298297
switch (Intr->getIntrinsicID()) {
299298
case Intrinsic::invariant_start:
300299
case Intrinsic::invariant_end:
@@ -725,7 +724,7 @@ Type *SPIRVEmitIntrinsics::deduceNestedTypeHelper(
725724
if (!Visited.insert(U).second)
726725
return OrigTy;
727726

728-
if (dyn_cast<StructType>(OrigTy)) {
727+
if (isa<StructType>(OrigTy)) {
729728
SmallVector<Type *> Tys;
730729
bool Change = false;
731730
for (unsigned i = 0; i < U->getNumOperands(); ++i) {

‎llvm/lib/Target/SPIRV/SPIRVEmitNonSemanticDI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727

2828
#define DEBUG_TYPE "spirv-nonsemantic-debug-info"
2929

30-
namespace llvm {
30+
using namespace llvm;
31+
32+
namespace {
3133
struct SPIRVEmitNonSemanticDI : public MachineFunctionPass {
3234
static char ID;
3335
SPIRVTargetMachine *TM;
@@ -40,9 +42,7 @@ struct SPIRVEmitNonSemanticDI : public MachineFunctionPass {
4042
bool IsGlobalDIEmitted = false;
4143
bool emitGlobalDI(MachineFunction &MF);
4244
};
43-
} // namespace llvm
44-
45-
using namespace llvm;
45+
} // anonymous namespace
4646

4747
INITIALIZE_PASS(SPIRVEmitNonSemanticDI, DEBUG_TYPE,
4848
"SPIRV NonSemantic.Shader.DebugInfo.100 emitter", false, false)

‎llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,18 @@
3232

3333
using namespace llvm;
3434

35-
namespace {
36-
37-
bool allowEmitFakeUse(const Value *Arg) {
35+
static bool allowEmitFakeUse(const Value *Arg) {
3836
if (isSpvIntrinsic(Arg))
3937
return false;
40-
if (dyn_cast<AtomicCmpXchgInst>(Arg) || dyn_cast<InsertValueInst>(Arg) ||
41-
dyn_cast<UndefValue>(Arg))
38+
if (isa<AtomicCmpXchgInst, InsertValueInst, UndefValue>(Arg))
4239
return false;
4340
if (const auto *LI = dyn_cast<LoadInst>(Arg))
4441
if (LI->getType()->isAggregateType())
4542
return false;
4643
return true;
4744
}
4845

49-
inline unsigned typeToAddressSpace(const Type *Ty) {
46+
static unsigned typeToAddressSpace(const Type *Ty) {
5047
if (auto PType = dyn_cast<TypedPointerType>(Ty))
5148
return PType->getAddressSpace();
5249
if (auto PType = dyn_cast<PointerType>(Ty))
@@ -57,8 +54,6 @@ inline unsigned typeToAddressSpace(const Type *Ty) {
5754
report_fatal_error("Unable to convert LLVM type to SPIRVType", true);
5855
}
5956

60-
} // anonymous namespace
61-
6257
SPIRVGlobalRegistry::SPIRVGlobalRegistry(unsigned PointerSize)
6358
: PointerSize(PointerSize), Bound(0) {}
6459

0 commit comments

Comments
 (0)