Skip to content

Commit c4ebe56

Browse files
svenvhdwoodwor-intel
authored andcommitted
Remove 'using namespace llvm' from some headers
Original commit: KhronosGroup/SPIRV-LLVM-Translator@8546d99
1 parent 461f493 commit c4ebe56

File tree

6 files changed

+65
-74
lines changed

6 files changed

+65
-74
lines changed

llvm-spirv/lib/SPIRV/OCLTypeToSPIRV.h

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,39 @@
5151
#include <map>
5252
#include <set>
5353

54-
using namespace llvm;
55-
5654
namespace SPIRV {
5755

5856
class OCLTypeToSPIRVBase {
5957
public:
6058
OCLTypeToSPIRVBase();
6159

62-
bool runOCLTypeToSPIRV(Module &M);
60+
bool runOCLTypeToSPIRV(llvm::Module &M);
6361
/// \return Adapted type based on kernel argument metadata. If \p V is
6462
/// a function, returns function type.
6563
/// E.g. for a function with argument of read only opencl.image_2d_t* type
6664
/// returns a function with argument of type opencl.image2d_t.read_only*.
67-
Type *getAdaptedType(Value *V);
65+
llvm::Type *getAdaptedType(llvm::Value *V);
6866

6967
private:
70-
Module *M;
71-
LLVMContext *Ctx;
72-
std::map<Value *, Type *> AdaptedTy; // Adapted types for values
73-
std::set<Function *> WorkSet; // Functions to be adapted
68+
llvm::Module *M;
69+
llvm::LLVMContext *Ctx;
70+
std::map<llvm::Value *, llvm::Type *> AdaptedTy; // Adapted types for values
71+
std::set<llvm::Function *> WorkSet; // Functions to be adapted
7472

75-
void adaptFunctionArguments(Function *F);
76-
void adaptArgumentsByMetadata(Function *F);
77-
void adaptArgumentsBySamplerUse(Module &M);
78-
void adaptFunction(Function *F);
79-
void addAdaptedType(Value *V, Type *T);
80-
void addWork(Function *F);
73+
void adaptFunctionArguments(llvm::Function *F);
74+
void adaptArgumentsByMetadata(llvm::Function *F);
75+
void adaptArgumentsBySamplerUse(llvm::Module &M);
76+
void adaptFunction(llvm::Function *F);
77+
void addAdaptedType(llvm::Value *V, llvm::Type *T);
78+
void addWork(llvm::Function *F);
8179
};
8280

83-
class OCLTypeToSPIRVLegacy : public OCLTypeToSPIRVBase, public ModulePass {
81+
class OCLTypeToSPIRVLegacy : public OCLTypeToSPIRVBase,
82+
public llvm::ModulePass {
8483
public:
8584
OCLTypeToSPIRVLegacy();
86-
void getAnalysisUsage(AnalysisUsage &AU) const override;
87-
bool runOnModule(Module &M) override;
85+
void getAnalysisUsage(llvm::AnalysisUsage &AU) const override;
86+
bool runOnModule(llvm::Module &M) override;
8887
static char ID;
8988
};
9089

llvm-spirv/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
#include "llvm/IR/PassManager.h"
4141
#include "llvm/Pass.h"
4242

43-
using namespace llvm;
44-
4543
namespace SPIRV {
4644

4745
class SPIRVLowerBitCastToNonStandardTypePass
@@ -50,25 +48,26 @@ class SPIRVLowerBitCastToNonStandardTypePass
5048
SPIRVLowerBitCastToNonStandardTypePass(const SPIRV::TranslatorOpts &Opts)
5149
: Opts(Opts) {}
5250

53-
PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
51+
llvm::PreservedAnalyses run(llvm::Function &F,
52+
llvm::FunctionAnalysisManager &FAM);
5453

5554
private:
5655
SPIRV::TranslatorOpts Opts;
5756
};
5857

59-
class SPIRVLowerBitCastToNonStandardTypeLegacy : public FunctionPass {
58+
class SPIRVLowerBitCastToNonStandardTypeLegacy : public llvm::FunctionPass {
6059
public:
6160
static char ID;
6261
SPIRVLowerBitCastToNonStandardTypeLegacy(const SPIRV::TranslatorOpts &Opts)
6362
: FunctionPass(ID), Opts(Opts) {}
6463

6564
SPIRVLowerBitCastToNonStandardTypeLegacy() : FunctionPass(ID) {}
6665

67-
bool runOnFunction(Function &F) override;
66+
bool runOnFunction(llvm::Function &F) override;
6867

69-
bool doFinalization(Module &M) override;
68+
bool doFinalization(llvm::Module &M) override;
7069

71-
StringRef getPassName() const override;
70+
llvm::StringRef getPassName() const override;
7271

7372
private:
7473
SPIRV::TranslatorOpts Opts;

llvm-spirv/lib/SPIRV/SPIRVLowerBool.h

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,25 @@
4444
#include "llvm/IR/PassManager.h"
4545
#include "llvm/Pass.h"
4646

47-
using namespace llvm;
48-
4947
namespace SPIRV {
5048

51-
class SPIRVLowerBoolBase : public InstVisitor<SPIRVLowerBoolBase> {
49+
class SPIRVLowerBoolBase : public llvm::InstVisitor<SPIRVLowerBoolBase> {
5250
public:
5351
SPIRVLowerBoolBase() : Context(nullptr) {}
5452
virtual ~SPIRVLowerBoolBase() {}
55-
void replace(Instruction *I, Instruction *NewI);
56-
bool isBoolType(Type *Ty);
57-
virtual void visitTruncInst(TruncInst &I);
58-
void handleExtInstructions(Instruction &I);
59-
void handleCastInstructions(Instruction &I);
60-
virtual void visitZExtInst(ZExtInst &I);
61-
virtual void visitSExtInst(SExtInst &I);
62-
virtual void visitUIToFPInst(UIToFPInst &I);
63-
virtual void visitSIToFPInst(SIToFPInst &I);
64-
bool runLowerBool(Module &M);
53+
void replace(llvm::Instruction *I, llvm::Instruction *NewI);
54+
bool isBoolType(llvm::Type *Ty);
55+
virtual void visitTruncInst(llvm::TruncInst &I);
56+
void handleExtInstructions(llvm::Instruction &I);
57+
void handleCastInstructions(llvm::Instruction &I);
58+
virtual void visitZExtInst(llvm::ZExtInst &I);
59+
virtual void visitSExtInst(llvm::SExtInst &I);
60+
virtual void visitUIToFPInst(llvm::UIToFPInst &I);
61+
virtual void visitSIToFPInst(llvm::SIToFPInst &I);
62+
bool runLowerBool(llvm::Module &M);
6563

6664
private:
67-
LLVMContext *Context;
65+
llvm::LLVMContext *Context;
6866
};
6967

7068
class SPIRVLowerBoolPass : public llvm::PassInfoMixin<SPIRVLowerBoolPass>,
@@ -74,10 +72,11 @@ class SPIRVLowerBoolPass : public llvm::PassInfoMixin<SPIRVLowerBoolPass>,
7472
llvm::ModuleAnalysisManager &MAM);
7573
};
7674

77-
class SPIRVLowerBoolLegacy : public ModulePass, public SPIRVLowerBoolBase {
75+
class SPIRVLowerBoolLegacy : public llvm::ModulePass,
76+
public SPIRVLowerBoolBase {
7877
public:
7978
SPIRVLowerBoolLegacy();
80-
bool runOnModule(Module &M) override;
79+
bool runOnModule(llvm::Module &M) override;
8180

8281
static char ID;
8382
};

llvm-spirv/lib/SPIRV/SPIRVLowerMemmove.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,18 @@
4444
#include "llvm/IR/PassManager.h"
4545
#include "llvm/Pass.h"
4646

47-
using namespace llvm;
48-
4947
namespace SPIRV {
5048

5149
class SPIRVLowerMemmoveBase {
5250
public:
5351
SPIRVLowerMemmoveBase() : Context(nullptr) {}
5452

55-
void LowerMemMoveInst(MemMoveInst &I);
56-
bool expandMemMoveIntrinsicUses(Function &F);
57-
bool runLowerMemmove(Module &M);
53+
void LowerMemMoveInst(llvm::MemMoveInst &I);
54+
bool expandMemMoveIntrinsicUses(llvm::Function &F);
55+
bool runLowerMemmove(llvm::Module &M);
5856

5957
private:
60-
LLVMContext *Context;
58+
llvm::LLVMContext *Context;
6159
};
6260

6361
class SPIRVLowerMemmovePass : public llvm::PassInfoMixin<SPIRVLowerMemmovePass>,
@@ -67,11 +65,11 @@ class SPIRVLowerMemmovePass : public llvm::PassInfoMixin<SPIRVLowerMemmovePass>,
6765
llvm::ModuleAnalysisManager &MAM);
6866
};
6967

70-
class SPIRVLowerMemmoveLegacy : public ModulePass,
68+
class SPIRVLowerMemmoveLegacy : public llvm::ModulePass,
7169
public SPIRVLowerMemmoveBase {
7270
public:
7371
SPIRVLowerMemmoveLegacy();
74-
bool runOnModule(Module &M) override;
72+
bool runOnModule(llvm::Module &M) override;
7573

7674
static char ID;
7775
};

llvm-spirv/lib/SPIRV/SPIRVLowerSaddWithOverflow.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,20 @@
3939
#include "llvm/IR/PassManager.h"
4040
#include "llvm/Pass.h"
4141

42-
using namespace llvm;
43-
4442
namespace SPIRV {
4543

4644
class SPIRVLowerSaddWithOverflowBase
47-
: public InstVisitor<SPIRVLowerSaddWithOverflowBase> {
45+
: public llvm::InstVisitor<SPIRVLowerSaddWithOverflowBase> {
4846
public:
4947
SPIRVLowerSaddWithOverflowBase() : Context(nullptr) {}
5048
virtual ~SPIRVLowerSaddWithOverflowBase() {}
51-
virtual void visitIntrinsicInst(CallInst &I);
49+
virtual void visitIntrinsicInst(llvm::CallInst &I);
5250

53-
bool runLowerSaddWithOverflow(Module &M);
51+
bool runLowerSaddWithOverflow(llvm::Module &M);
5452

5553
private:
56-
LLVMContext *Context;
57-
Module *Mod;
54+
llvm::LLVMContext *Context;
55+
llvm::Module *Mod;
5856
bool TheModuleIsModified = false;
5957
};
6058

@@ -66,12 +64,12 @@ class SPIRVLowerSaddWithOverflowPass
6664
llvm::ModuleAnalysisManager &MAM);
6765
};
6866

69-
class SPIRVLowerSaddWithOverflowLegacy : public ModulePass,
67+
class SPIRVLowerSaddWithOverflowLegacy : public llvm::ModulePass,
7068
public SPIRVLowerSaddWithOverflowBase {
7169
public:
7270
SPIRVLowerSaddWithOverflowLegacy();
7371

74-
bool runOnModule(Module &M) override;
72+
bool runOnModule(llvm::Module &M) override;
7573

7674
static char ID;
7775
};

llvm-spirv/lib/SPIRV/SPIRVRegularizeLLVM.h

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,21 @@
4141
#include "llvm/IR/PassManager.h"
4242
#include "llvm/Pass.h"
4343

44-
using namespace llvm;
45-
4644
namespace SPIRV {
4745

4846
class SPIRVRegularizeLLVMBase {
4947
public:
5048
SPIRVRegularizeLLVMBase() : M(nullptr), Ctx(nullptr) {}
5149

52-
bool runRegularizeLLVM(Module &M);
50+
bool runRegularizeLLVM(llvm::Module &M);
5351
// Lower functions
5452
bool regularize();
5553

5654
/// Some LLVM intrinsics that have no SPIR-V counterpart may be wrapped in
5755
/// @spirv.llvm_intrinsic_* function. During reverse translation from SPIR-V
5856
/// to LLVM IR we can detect this @spirv.llvm_intrinsic_* function and
5957
/// replace it with @llvm.intrinsic.* back.
60-
void lowerIntrinsicToFunction(IntrinsicInst *Intrinsic);
58+
void lowerIntrinsicToFunction(llvm::IntrinsicInst *Intrinsic);
6159

6260
/// No SPIR-V counterpart for @llvm.fshl.*(@llvm.fshr.*) intrinsic. It will be
6361
/// lowered to a newly generated @spirv.llvm_fshl_*(@spirv.llvm_fshr_*)
@@ -74,10 +72,10 @@ class SPIRVRegularizeLLVMBase {
7472
///
7573
/// The actual implementation algorithm will be slightly different for
7674
/// simplification purposes.
77-
void lowerFunnelShift(IntrinsicInst *FSHIntrinsic);
75+
void lowerFunnelShift(llvm::IntrinsicInst *FSHIntrinsic);
7876

79-
void lowerUMulWithOverflow(IntrinsicInst *UMulIntrinsic);
80-
void buildUMulWithOverflowFunc(Function *UMulFunc);
77+
void lowerUMulWithOverflow(llvm::IntrinsicInst *UMulIntrinsic);
78+
void buildUMulWithOverflowFunc(llvm::Function *UMulFunc);
8179

8280
// For some cases Clang emits VectorExtractDynamic as:
8381
// void @_Z28__spirv_VectorExtractDynamic(<Ty>* sret(<Ty>), jointMatrix, idx);
@@ -89,25 +87,25 @@ class SPIRVRegularizeLLVMBase {
8987
// @_Z27__spirv_VectorInsertDynamic(jointMatrix, <Ty>, idx)
9088
// Need to add additional GEP, store and load instructions and mutate called
9189
// function to avoid translation failures
92-
void expandSYCLTypeUsing(Module *M);
93-
void expandVEDWithSYCLTypeSRetArg(Function *F);
94-
void expandVIDWithSYCLTypeByValComp(Function *F);
90+
void expandSYCLTypeUsing(llvm::Module *M);
91+
void expandVEDWithSYCLTypeSRetArg(llvm::Function *F);
92+
void expandVIDWithSYCLTypeByValComp(llvm::Function *F);
9593

9694
// According to the specification, the operands of a shift instruction must be
9795
// a scalar/vector of integer. When LLVM-IR contains a shift instruction with
9896
// i1 operands, they are treated as a bool. We need to extend them to i32 to
9997
// comply with the specification. For example: "%shift = lshr i1 0, 1";
10098
// The bit instruction should be changed to the extended version
10199
// "%shift = lshr i32 0, 1" so the args are treated as int operands.
102-
Value *extendBitInstBoolArg(Instruction *OldInst);
100+
Value *extendBitInstBoolArg(llvm::Instruction *OldInst);
103101

104-
static std::string lowerLLVMIntrinsicName(IntrinsicInst *II);
105-
void adaptStructTypes(StructType *ST);
102+
static std::string lowerLLVMIntrinsicName(llvm::IntrinsicInst *II);
103+
void adaptStructTypes(llvm::StructType *ST);
106104
static char ID;
107105

108106
private:
109-
Module *M;
110-
LLVMContext *Ctx;
107+
llvm::Module *M;
108+
llvm::LLVMContext *Ctx;
111109
};
112110

113111
class SPIRVRegularizeLLVMPass
@@ -121,14 +119,14 @@ class SPIRVRegularizeLLVMPass
121119
}
122120
};
123121

124-
class SPIRVRegularizeLLVMLegacy : public ModulePass,
122+
class SPIRVRegularizeLLVMLegacy : public llvm::ModulePass,
125123
public SPIRVRegularizeLLVMBase {
126124
public:
127125
SPIRVRegularizeLLVMLegacy() : ModulePass(ID) {
128126
initializeSPIRVRegularizeLLVMLegacyPass(*PassRegistry::getPassRegistry());
129127
}
130128

131-
bool runOnModule(Module &M) override;
129+
bool runOnModule(llvm::Module &M) override;
132130

133131
static char ID;
134132
};

0 commit comments

Comments
 (0)