diff options
author | Pierre Moreau <dev@pmoreau.org> | 2018-04-17 21:11:51 +0200 |
---|---|---|
committer | Alexey Sotkin <alexey.sotkin@intel.com> | 2018-04-24 12:21:49 +0300 |
commit | b5346d8645a6a111eb07d26b53f3345636faef9c (patch) | |
tree | ef58ed808989e610102a9e5f5f6101a5e4375af3 /lib/SPIRV/libSPIRV/SPIRVModule.cpp | |
parent | a8d032140fe6deac00c37c6d069e4dee9f0bba3c (diff) |
Rename all variables and functions to match LLVM guidelines
The project version was also changed as the entrypoints to the library
have been modified.
Command used:
/usr/share/clang/run-clang-tidy.py -header-filter "(./include/SPIRV.h|./lib/SPIRV/Mangler/FunctionDescriptor.h|./lib/SPIRV/Mangler/ManglingUtils.h|./lib/SPIRV/Mangler/NameMangleAPI.h|./lib/SPIRV/Mangler/ParameterType.h|./lib/SPIRV/Mangler/Refcount.h|./lib/SPIRV/libSPIRV/libSPIRV.h|./lib/SPIRV/libSPIRV/SPIRVBasicBlock.h|./lib/SPIRV/libSPIRV/SPIRVDebug.h|./lib/SPIRV/libSPIRV/SPIRVDecorate.h|./lib/SPIRV/libSPIRV/SPIRVEntry.h|./lib/SPIRV/libSPIRV/SPIRVEnum.h|./lib/SPIRV/libSPIRV/SPIRVError.h|./lib/SPIRV/libSPIRV/SPIRVErrorEnum.h|./lib/SPIRV/libSPIRV/SPIRVExtInst.h|./lib/SPIRV/libSPIRV/SPIRVFunction.h|./lib/SPIRV/libSPIRV/SPIRVInstruction.h|./lib/SPIRV/libSPIRV/SPIRVIsValidEnum.h|./lib/SPIRV/libSPIRV/SPIRVModule.h|./lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h|./lib/SPIRV/libSPIRV/SPIRVOpCode.h|./lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h|./lib/SPIRV/libSPIRV/SPIRVStream.h|./lib/SPIRV/libSPIRV/SPIRVType.h|./lib/SPIRV/libSPIRV/SPIRVUtil.h|./lib/SPIRV/libSPIRV/SPIRVValue.h|./lib/SPIRV/runtime/OpenCL/inc/spirv.h|./lib/SPIRV/runtime/OpenCL/inc/spirv_convert.h|./lib/SPIRV/OCLUtil.h|./lib/SPIRV/OCLTypeToSPIRV.h|./lib/SPIRV/SPIRVInternal.h|./lib/SPIRV/SPIRVMDBuilder.h|./lib/SPIRV/SPIRVMDWalker.h|./lib/SPIRV/SPIRVWriterPass.h)" -checks="-*,readability-identifier-naming" `find . -iname "*.cpp"`
Manual edits:
* lib/SPIRV/Mangler/FunctionDescriptor.cpp
* lib/SPIRV/libSPIRV/SPIRVEntry.h
* lib/SPIRV/libSPIRV/SPIRVDecorate.h
* lib/SPIRV/libSPIRV/SPIRVValue.h
* lib/SPIRV/libSPIRV/SPIRVStream.h
* lib/SPIRV/libSPIRV/SPIRVInstruction.h
* lib/SPIRV/Mangler/ParameterType.cpp
* lib/SPIRV/Mangler/Mangler.cpp
* lib/SPIRV/OCL20ToSPIRV.cpp
* lib/SPIRV/Mangler/ParameterType.h
* lib/SPIRV/SPIRVLowerOCLBlocks.cpp
* lib/SPIRV/SPIRVUtil.cpp
* lib/SPIRV/Mangler/Refcount.h
Diffstat (limited to 'lib/SPIRV/libSPIRV/SPIRVModule.cpp')
-rw-r--r-- | lib/SPIRV/libSPIRV/SPIRVModule.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.cpp b/lib/SPIRV/libSPIRV/SPIRVModule.cpp index 0a24dbf..3be592c 100644 --- a/lib/SPIRV/libSPIRV/SPIRVModule.cpp +++ b/lib/SPIRV/libSPIRV/SPIRVModule.cpp @@ -608,12 +608,12 @@ bool SPIRVModuleImpl::exist(SPIRVId Id, SPIRVEntry **Entry) const { // If Id is invalid, returns the next available id. // Otherwise returns the given id and adjust the next available id by increment. -SPIRVId SPIRVModuleImpl::getId(SPIRVId Id, unsigned increment) { +SPIRVId SPIRVModuleImpl::getId(SPIRVId Id, unsigned Increment) { if (!isValidId(Id)) Id = NextId; else NextId = std::max(Id, NextId); - NextId += increment; + NextId += Increment; return Id; } @@ -809,8 +809,8 @@ void SPIRVModuleImpl::createForwardPointers() { auto ST = static_cast<SPIRVTypeStruct *>(T); - for (unsigned i = 0; i < ST->getStructMemberCount(); ++i) { - auto MemberTy = ST->getStructMemberType(i); + for (unsigned I = 0; I < ST->getStructMemberCount(); ++I) { + auto MemberTy = ST->getStructMemberType(I); if (!MemberTy->isTypePointer()) continue; auto Ptr = static_cast<SPIRVTypePointer *>(MemberTy); @@ -1311,20 +1311,20 @@ class TopologicalSort { } public: - TopologicalSort(const SPIRVTypeVec &_TypeVec, - const SPIRVConstantVector &_ConstVec, - const SPIRVVariableVec &_VariableVec, - const SPIRVForwardPointerVec &_ForwardPointerVec) - : ForwardPointerVec(_ForwardPointerVec), - EntryStateMap([](SPIRVEntry *a, SPIRVEntry *b) -> bool { - return a->getId() < b->getId(); + TopologicalSort(const SPIRVTypeVec &TypeVec, + const SPIRVConstantVector &ConstVec, + const SPIRVVariableVec &VariableVec, + const SPIRVForwardPointerVec &ForwardPointerVec) + : ForwardPointerVec(ForwardPointerVec), + EntryStateMap([](SPIRVEntry *A, SPIRVEntry *B) -> bool { + return A->getId() < B->getId(); }) { // Collect entries for sorting - for (auto *T : _TypeVec) + for (auto *T : TypeVec) EntryStateMap[T] = DFSState::Unvisited; - for (auto *C : _ConstVec) + for (auto *C : ConstVec) EntryStateMap[C] = DFSState::Unvisited; - for (auto *V : _VariableVec) + for (auto *V : VariableVec) EntryStateMap[V] = DFSState::Unvisited; // Run topoligical sort for (auto ES : EntryStateMap) @@ -1513,32 +1513,32 @@ SPIRVType *SPIRVModuleImpl::getValueType(SPIRVId TheId) const { std::vector<SPIRVValue *> SPIRVModuleImpl::getValues(const std::vector<SPIRVId> &IdVec) const { std::vector<SPIRVValue *> ValueVec; - for (auto i : IdVec) - ValueVec.push_back(getValue(i)); + for (auto I : IdVec) + ValueVec.push_back(getValue(I)); return ValueVec; } std::vector<SPIRVType *> SPIRVModuleImpl::getValueTypes(const std::vector<SPIRVId> &IdVec) const { std::vector<SPIRVType *> TypeVec; - for (auto i : IdVec) - TypeVec.push_back(getValue(i)->getType()); + for (auto I : IdVec) + TypeVec.push_back(getValue(I)->getType()); return TypeVec; } std::vector<SPIRVId> SPIRVModuleImpl::getIds(const std::vector<SPIRVEntry *> &ValueVec) const { std::vector<SPIRVId> IdVec; - for (auto i : ValueVec) - IdVec.push_back(i->getId()); + for (auto I : ValueVec) + IdVec.push_back(I->getId()); return IdVec; } std::vector<SPIRVId> SPIRVModuleImpl::getIds(const std::vector<SPIRVValue *> &ValueVec) const { std::vector<SPIRVId> IdVec; - for (auto i : ValueVec) - IdVec.push_back(i->getId()); + for (auto I : ValueVec) + IdVec.push_back(I->getId()); return IdVec; } @@ -1582,7 +1582,7 @@ unsigned SPIRVDbgInfo::getFunctionLineNo(SPIRVFunction *F) { return 0; } -bool IsSPIRVBinary(const std::string &Img) { +bool isSpirvBinary(const std::string &Img) { if (Img.size() < sizeof(unsigned)) return false; auto Magic = reinterpret_cast<const unsigned *>(Img.data()); @@ -1591,7 +1591,7 @@ bool IsSPIRVBinary(const std::string &Img) { #ifdef _SPIRV_SUPPORT_TEXT_FMT -bool ConvertSPIRV(std::istream &IS, spv_ostream &OS, std::string &ErrMsg, +bool convertSpirv(std::istream &IS, spv_ostream &OS, std::string &ErrMsg, bool FromText, bool ToText) { auto SaveOpt = SPIRVUseTextFormat; SPIRVUseTextFormat = FromText; @@ -1611,7 +1611,7 @@ bool ConvertSPIRV(std::istream &IS, spv_ostream &OS, std::string &ErrMsg, return true; } -bool IsSPIRVText(const std::string &Img) { +bool isSpirvText(const std::string &Img) { std::istringstream SS(Img); unsigned Magic = 0; SS >> Magic; @@ -1620,9 +1620,9 @@ bool IsSPIRVText(const std::string &Img) { return Magic == MagicNumber; } -bool ConvertSPIRV(std::string &Input, std::string &Out, std::string &ErrMsg, +bool convertSpirv(std::string &Input, std::string &Out, std::string &ErrMsg, bool ToText) { - auto FromText = IsSPIRVText(Input); + auto FromText = isSpirvText(Input); if (ToText == FromText) { Out = Input; return true; @@ -1633,7 +1633,7 @@ bool ConvertSPIRV(std::string &Input, std::string &Out, std::string &ErrMsg, #else std::ostringstream OS; #endif - if (!ConvertSPIRV(IS, OS, ErrMsg, FromText, ToText)) + if (!convertSpirv(IS, OS, ErrMsg, FromText, ToText)) return false; Out = OS.str(); return true; |