Skip to content

Commit 5e8c5df

Browse files
svenvhsvenvh
authored
[NFC] Use StringRef::operator== instead of StringRef::equals (#2574)
The llvm project plans to deprecate `StringRef::equals` in favor of `StringRef::operator==`. Most of these changes were done using sed -i -e 's/\.equals("\([a-z0-9_\-]*\)")/ == "\1"/g'
1 parent 50c6c3e commit 5e8c5df

File tree

3 files changed

+30
-35
lines changed

3 files changed

+30
-35
lines changed

‎lib/SPIRV/OCLUtil.cpp

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,12 +1035,11 @@ class OCLBuiltinFuncMangleInfo : public SPIRV::BuiltinFuncMangleInfo {
10351035
setVarArg(1);
10361036
else if (NameRef.starts_with("write_imageui"))
10371037
addUnsignedArg(2);
1038-
else if (NameRef.equals("prefetch")) {
1038+
else if (NameRef == "prefetch") {
10391039
addUnsignedArg(1);
10401040
setArgAttr(0, SPIR::ATTR_CONST);
1041-
} else if (NameRef.equals("get_kernel_work_group_size") ||
1042-
NameRef.equals(
1043-
"get_kernel_preferred_work_group_size_multiple")) {
1041+
} else if (NameRef == "get_kernel_work_group_size" ||
1042+
NameRef == "get_kernel_preferred_work_group_size_multiple") {
10441043
assert(F && "lack of necessary information");
10451044
const size_t BlockArgIdx = 0;
10461045
FunctionType *InvokeTy = getBlockInvokeTy(F, BlockArgIdx);
@@ -1049,19 +1048,18 @@ class OCLBuiltinFuncMangleInfo : public SPIRV::BuiltinFuncMangleInfo {
10491048
} else if (NameRef.starts_with("__enqueue_kernel")) {
10501049
// clang doesn't mangle enqueue_kernel builtins
10511050
setAsDontMangle();
1052-
} else if (NameRef.starts_with("get_") || NameRef.equals("nan") ||
1053-
NameRef.equals("mem_fence") || NameRef.starts_with("shuffle")) {
1051+
} else if (NameRef.starts_with("get_") || NameRef == "nan" ||
1052+
NameRef == "mem_fence" || NameRef.starts_with("shuffle")) {
10541053
addUnsignedArg(-1);
10551054
if (NameRef.starts_with(kOCLBuiltinName::GetFence)) {
10561055
setArgAttr(0, SPIR::ATTR_CONST);
10571056
addVoidPtrArg(0);
10581057
}
10591058
} else if (NameRef.contains("barrier")) {
10601059
addUnsignedArg(0);
1061-
if (NameRef.equals("work_group_barrier") ||
1062-
NameRef.equals("sub_group_barrier") ||
1063-
NameRef.equals("intel_work_group_barrier_arrive") ||
1064-
NameRef.equals("intel_work_group_barrier_wait"))
1060+
if (NameRef == "work_group_barrier" || NameRef == "sub_group_barrier" ||
1061+
NameRef == "intel_work_group_barrier_arrive" ||
1062+
NameRef == "intel_work_group_barrier_wait")
10651063
setEnumArg(1, SPIR::PRIMITIVE_MEMORY_SCOPE);
10661064
} else if (NameRef.starts_with("atomic_work_item_fence")) {
10671065
addUnsignedArg(0);
@@ -1117,35 +1115,33 @@ class OCLBuiltinFuncMangleInfo : public SPIRV::BuiltinFuncMangleInfo {
11171115
NameRef = NameRef.drop_front(1);
11181116
UnmangledName.erase(0, 1);
11191117
} else if (NameRef.starts_with("s_")) {
1120-
if (NameRef.equals("s_upsample"))
1118+
if (NameRef == "s_upsample")
11211119
addUnsignedArg(1);
11221120
NameRef = NameRef.drop_front(2);
11231121
} else if (NameRef.starts_with("u_")) {
11241122
addUnsignedArg(-1);
11251123
NameRef = NameRef.drop_front(2);
1126-
} else if (NameRef.equals("fclamp")) {
1124+
} else if (NameRef == "fclamp") {
11271125
NameRef = NameRef.drop_front(1);
11281126
}
11291127
// handle [read|write]pipe builtins (plus two i32 literal args
11301128
// required by SPIR 2.0 provisional specification):
1131-
else if (NameRef.equals("read_pipe_2") || NameRef.equals("write_pipe_2")) {
1129+
else if (NameRef == "read_pipe_2" || NameRef == "write_pipe_2") {
11321130
// with 2 arguments (plus two i32 literals):
11331131
// int read_pipe (read_only pipe gentype p, gentype *ptr)
11341132
// int write_pipe (write_only pipe gentype p, const gentype *ptr)
11351133
addVoidPtrArg(1);
11361134
addUnsignedArg(2);
11371135
addUnsignedArg(3);
11381136
// OpenCL-like representation of blocking pipes
1139-
} else if (NameRef.equals("read_pipe_2_bl") ||
1140-
NameRef.equals("write_pipe_2_bl")) {
1137+
} else if (NameRef == "read_pipe_2_bl" || NameRef == "write_pipe_2_bl") {
11411138
// with 2 arguments (plus two i32 literals):
11421139
// int read_pipe_bl (read_only pipe gentype p, gentype *ptr)
11431140
// int write_pipe_bl (write_only pipe gentype p, const gentype *ptr)
11441141
addVoidPtrArg(1);
11451142
addUnsignedArg(2);
11461143
addUnsignedArg(3);
1147-
} else if (NameRef.equals("read_pipe_4") ||
1148-
NameRef.equals("write_pipe_4")) {
1144+
} else if (NameRef == "read_pipe_4" || NameRef == "write_pipe_4") {
11491145
// with 4 arguments (plus two i32 literals):
11501146
// int read_pipe (read_only pipe gentype p, reserve_id_t reserve_id, uint
11511147
// index, gentype *ptr) int write_pipe (write_only pipe gentype p,
@@ -1165,10 +1161,10 @@ class OCLBuiltinFuncMangleInfo : public SPIRV::BuiltinFuncMangleInfo {
11651161
// process [|work_group|sub_group]commit[read|write]pipe builtins
11661162
addUnsignedArg(2);
11671163
addUnsignedArg(3);
1168-
} else if (NameRef.equals("capture_event_profiling_info")) {
1164+
} else if (NameRef == "capture_event_profiling_info") {
11691165
addVoidPtrArg(2);
11701166
setEnumArg(1, SPIR::PRIMITIVE_CLK_PROFILING_INFO);
1171-
} else if (NameRef.equals("enqueue_marker")) {
1167+
} else if (NameRef == "enqueue_marker") {
11721168
setArgAttr(2, SPIR::ATTR_CONST);
11731169
addUnsignedArg(1);
11741170
} else if (NameRef.starts_with("vload")) {
@@ -1529,7 +1525,7 @@ SPIRV::transSPIRVMemoryScopeIntoOCLMemoryScope(Value *MemScope,
15291525

15301526
if (auto *CI = dyn_cast<CallInst>(MemScope)) {
15311527
Function *F = CI->getCalledFunction();
1532-
if (F && F->getName().equals(kSPIRVName::TranslateOCLMemScope)) {
1528+
if (F && F->getName() == kSPIRVName::TranslateOCLMemScope) {
15331529
// In case the SPIR-V module was created from an OpenCL program by
15341530
// *this* SPIR-V generator, we know that the value passed to
15351531
// __translate_ocl_memory_scope is what we should pass to the
@@ -1553,7 +1549,7 @@ SPIRV::transSPIRVMemorySemanticsIntoOCLMemoryOrder(Value *MemorySemantics,
15531549

15541550
if (auto *CI = dyn_cast<CallInst>(MemorySemantics)) {
15551551
Function *F = CI->getCalledFunction();
1556-
if (F && F->getName().equals(kSPIRVName::TranslateOCLMemOrder)) {
1552+
if (F && F->getName() == kSPIRVName::TranslateOCLMemOrder) {
15571553
// In case the SPIR-V module was created from an OpenCL program by
15581554
// *this* SPIR-V generator, we know that the value passed to
15591555
// __translate_ocl_memory_order is what we should pass to the

‎lib/SPIRV/PassPlugin.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PassPluginLibraryInfo getSPIRVPluginInfo() {
6565
PB.registerPipelineParsingCallback(
6666
[](StringRef Name, FunctionPassManager &PM,
6767
ArrayRef<PassBuilder::PipelineElement>) {
68-
if (Name.equals("spirv-lower-bitcast")) {
68+
if (Name == "spirv-lower-bitcast") {
6969
PM.addPass(
7070
SPIRVLowerBitCastToNonStandardTypePass(TranslatorOpts{}));
7171
return true;
@@ -75,50 +75,50 @@ PassPluginLibraryInfo getSPIRVPluginInfo() {
7575
PB.registerPipelineParsingCallback(
7676
[](StringRef Name, ModulePassManager &PM,
7777
ArrayRef<PassBuilder::PipelineElement>) {
78-
if (Name.equals("ocl-to-spirv")) {
78+
if (Name == "ocl-to-spirv") {
7979
PM.addPass(OCLToSPIRVPass());
8080
return true;
8181
}
82-
if (Name.equals("llvm-to-spirv")) {
82+
if (Name == "llvm-to-spirv") {
8383
SPIRV::TranslatorOpts DefaultOpts;
8484
DefaultOpts.enableAllExtensions();
8585
SPIRVModule *BM = SPIRVModule::createSPIRVModule(DefaultOpts);
8686
PM.addPass(LLVMToSPIRVPass(BM));
8787
return true;
8888
}
89-
if (Name.equals("process-metadata")) {
89+
if (Name == "process-metadata") {
9090
PM.addPass(PreprocessMetadataPass());
9191
return true;
9292
}
93-
if (Name.equals("spirv-lower-bool")) {
93+
if (Name == "spirv-lower-bool") {
9494
PM.addPass(SPIRVLowerBoolPass());
9595
return true;
9696
}
97-
if (Name.equals("spirv-lower-constexpr")) {
97+
if (Name == "spirv-lower-constexpr") {
9898
PM.addPass(SPIRVLowerConstExprPass());
9999
return true;
100100
}
101-
if (Name.equals("spirv-lower-memmove")) {
101+
if (Name == "spirv-lower-memmove") {
102102
PM.addPass(SPIRVLowerMemmovePass());
103103
return true;
104104
}
105-
if (Name.equals("spirv-lower-ocl-blocks")) {
105+
if (Name == "spirv-lower-ocl-blocks") {
106106
PM.addPass(SPIRVLowerOCLBlocksPass());
107107
return true;
108108
}
109-
if (Name.equals("spirv-lower-llvm-intrinsic")) {
109+
if (Name == "spirv-lower-llvm-intrinsic") {
110110
PM.addPass(SPIRVLowerLLVMIntrinsicPass(TranslatorOpts{}));
111111
return true;
112112
}
113-
if (Name.equals("spirv-regularize-llvm")) {
113+
if (Name == "spirv-regularize-llvm") {
114114
PM.addPass(SPIRVRegularizeLLVMPass());
115115
return true;
116116
}
117-
if (Name.equals("spirv-to-ocl12")) {
117+
if (Name == "spirv-to-ocl12") {
118118
PM.addPass(SPIRVToOCL12Pass());
119119
return true;
120120
}
121-
if (Name.equals("spirv-to-ocl20")) {
121+
if (Name == "spirv-to-ocl20") {
122122
PM.addPass(SPIRVToOCL20Pass());
123123
return true;
124124
}

‎lib/SPIRV/SPIRVUtil.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,7 @@ bool getRetParamSignedness(Function *F, ParamSignedness &RetSignedness,
913913
StringRef Arg(stringify(Name));
914914
if (Arg.starts_with("unsigned"))
915915
return ParamSignedness::Unsigned;
916-
if (Arg.equals("char") || Arg.equals("short") || Arg.equals("int") ||
917-
Arg.equals("long"))
916+
if (Arg == "char" || Arg == "short" || Arg == "int" || Arg == "long")
918917
return ParamSignedness::Signed;
919918
}
920919
return ParamSignedness::Unknown;

0 commit comments

Comments
 (0)