@@ -90,8 +90,8 @@ static Type *getBlockStructType(Value *Parameter) {
9090// / for a demangled function name, or 0 if the function does not return an
9191// / integer type (e.g. read_imagef).
9292static unsigned getImageSignZeroExt (StringRef DemangledName) {
93- bool IsSigned = !DemangledName.endswith (" ui" back () == ' i'
94- bool IsUnsigned = DemangledName.endswith (" ui"
93+ bool IsSigned = !DemangledName.ends_with (" ui" back () == ' i'
94+ bool IsUnsigned = DemangledName.ends_with (" ui"
9595
9696 if (IsSigned)
9797 return ImageOperandsMask::ImageOperandsSignExtendMask;
@@ -327,8 +327,8 @@ void OCLToSPIRVBase::visitCallInst(CallInst &CI) {
327327 }
328328 if (DemangledName == kOCLBuiltinName ::Dot ||
329329 DemangledName == kOCLBuiltinName ::DotAccSat ||
330- DemangledName.startswith (kOCLBuiltinName ::Dot4x8PackedPrefix) ||
331- DemangledName.startswith (kOCLBuiltinName ::DotAccSat4x8PackedPrefix)) {
330+ DemangledName.starts_with (kOCLBuiltinName ::Dot4x8PackedPrefix) ||
331+ DemangledName.starts_with (kOCLBuiltinName ::DotAccSat4x8PackedPrefix)) {
332332 if (CI.getOperand (0 )->getType ()->isVectorTy ()) {
333333 auto *VT = (VectorType *)(CI.getOperand (0 )->getType ());
334334 if (!isa<llvm::IntegerType>(VT->getElementType ())) {
@@ -485,11 +485,12 @@ CallInst *OCLToSPIRVBase::visitCallAtomicCmpXchg(CallInst *CI) {
485485 Mutator.mapArg (1 , [=](IRBuilder<> &Builder, Value *V) {
486486 return Builder.CreateLoad (MemTy, V, " exp"
487487 });
488- Mutator.changeReturnType (MemTy, [&](IRBuilder<> &Builder, CallInst *NCI) {
489- NewCI = NCI;
490- Builder.CreateStore (NCI, Expected);
491- return Builder.CreateICmpEQ (NCI, NCI->getArgOperand (1 ));
492- });
488+ Mutator.changeReturnType (
489+ MemTy, [Expected, &NewCI](IRBuilder<> &Builder, CallInst *NCI) {
490+ NewCI = NCI;
491+ Builder.CreateStore (NCI, Expected);
492+ return Builder.CreateICmpEQ (NCI, NCI->getArgOperand (1 ));
493+ });
493494 }
494495 return NewCI;
495496}
@@ -553,9 +554,9 @@ void OCLToSPIRVBase::transMemoryBarrier(CallInst *CI,
553554void OCLToSPIRVBase::visitCallAtomicLegacy (CallInst *CI, StringRef MangledName,
554555 StringRef DemangledName) {
555556 StringRef Stem = DemangledName;
556- if (Stem.startswith (" atom_"
557+ if (Stem.starts_with (" atom_"
557558 Stem = Stem.drop_front (strlen (" atom_"
558- else if (Stem.startswith (" atomic_"
559+ else if (Stem.starts_with (" atomic_"
559560 Stem = Stem.drop_front (strlen (" atomic_"
560561 else
561562 return ;
@@ -585,7 +586,7 @@ void OCLToSPIRVBase::visitCallAtomicLegacy(CallInst *CI, StringRef MangledName,
585586 Info.UniqName = " atomic_" str () + Postfix;
586587 std::vector<int > PostOps;
587588 PostOps.push_back (OCLLegacyAtomicMemOrder);
588- if (Stem.startswith (" compare_exchange"
589+ if (Stem.starts_with (" compare_exchange"
589590 PostOps.push_back (OCLLegacyAtomicMemOrder);
590591 PostOps.push_back (OCLLegacyAtomicMemScope);
591592
@@ -600,24 +601,24 @@ void OCLToSPIRVBase::visitCallAtomicLegacy(CallInst *CI, StringRef MangledName,
600601void OCLToSPIRVBase::visitCallAtomicCpp11 (CallInst *CI, StringRef MangledName,
601602 StringRef DemangledName) {
602603 StringRef Stem = DemangledName;
603- if (Stem.startswith (" atomic_"
604+ if (Stem.starts_with (" atomic_"
604605 Stem = Stem.drop_front (strlen (" atomic_"
605606 else
606607 return ;
607608
608609 std::string NewStem (Stem);
609610 std::vector<int > PostOps;
610- if (Stem.startswith (" store" startswith (" load"
611- Stem.startswith (" exchange" startswith (" compare_exchange"
612- Stem.startswith (" fetch" startswith (" flag"
613- if ((Stem.startswith (" fetch_min" startswith (" fetch_max"
611+ if (Stem.starts_with (" store" starts_with (" load"
612+ Stem.starts_with (" exchange" starts_with (" compare_exchange"
613+ Stem.starts_with (" fetch" starts_with (" flag"
614+ if ((Stem.starts_with (" fetch_min" starts_with (" fetch_max"
614615 containsUnsignedAtomicType (MangledName))
615616 NewStem.insert (NewStem.begin () + strlen (" fetch_" ' u'
616617
617- if (!Stem.endswith (" _explicit"
618+ if (!Stem.ends_with (" _explicit"
618619 NewStem = NewStem + " _explicit"
619620 PostOps.push_back (OCLMO_seq_cst);
620- if (Stem.startswith (" compare_exchange"
621+ if (Stem.starts_with (" compare_exchange"
621622 PostOps.push_back (OCLMO_seq_cst);
622623 PostOps.push_back (OCLMS_device);
623624 } else {
@@ -792,7 +793,7 @@ void OCLToSPIRVBase::visitCallGroupBuiltin(CallInst *CI,
792793 FuncName = FuncName.drop_front (strlen (kSPIRVName ::GroupPrefix));
793794 SPIRSPIRVGroupOperationMap::foreachConditional (
794795 [&](const std::string &S, SPIRVGroupOperationKind G) {
795- if (!FuncName.startswith (S))
796+ if (!FuncName.starts_with (S))
796797 return true ; // continue
797798 PreOps.push_back (G);
798799 StringRef Op =
@@ -886,7 +887,7 @@ void OCLToSPIRVBase::transBuiltin(CallInst *CI, OCLBuiltinTransInfo &Info) {
886887 Op OC = OpNop;
887888 unsigned ExtOp = ~0U ;
888889 SPIRVBuiltinVariableKind BVKind = BuiltInMax;
889- if (StringRef (Info.UniqName ).startswith (kSPIRVName ::Prefix))
890+ if (StringRef (Info.UniqName ).starts_with (kSPIRVName ::Prefix))
890891 return ;
891892 if (OCLSPIRVBuiltinMap::find (Info.UniqName , &OC)) {
892893 if (OC == OpImageRead) {
@@ -912,16 +913,16 @@ void OCLToSPIRVBase::transBuiltin(CallInst *CI, OCLBuiltinTransInfo &Info) {
912913 Info.UniqName = getSPIRVFuncName (BVKind);
913914 } else
914915 return ;
915- auto Mutator = mutateCallInst (CI, Info.UniqName + Info.Postfix );
916+ BuiltinCallMutator Mutator = mutateCallInst (CI, Info.UniqName + Info.Postfix );
916917 Info.PostProc (Mutator);
917918 if (Info.RetTy ) {
918919 Type *OldRetTy = CI->getType ();
919920 Mutator.changeReturnType (
920- Info.RetTy , [& ](IRBuilder<> &Builder, CallInst *NewCI) {
921- if (Info.RetTy ->isIntegerTy () && OldRetTy->isIntegerTy ())
921+ Info.RetTy , [OldRetTy, &Info ](IRBuilder<> &Builder, CallInst *NewCI) {
922+ if (Info.RetTy ->isIntegerTy () && OldRetTy->isIntegerTy ()) {
922923 return Builder.CreateIntCast (NewCI, OldRetTy, Info.IsRetSigned );
923- else
924- return Builder.CreatePointerBitCastOrAddrSpaceCast (NewCI, OldRetTy);
924+ }
925+ return Builder.CreatePointerBitCastOrAddrSpaceCast (NewCI, OldRetTy);
925926 });
926927 }
927928}
@@ -1221,7 +1222,7 @@ void OCLToSPIRVBase::visitCallDot(CallInst *CI, StringRef MangledName,
12211222 // dot(short2, ushort2) _Z3dotDv2_sDv2_t
12221223 // dot(ushort2, short2) _Z3dotDv2_tDv2_s
12231224 // dot(ushort2, ushort2) _Z3dotDv2_tS_
1224- assert (MangledName.startswith (" _Z3dotDv"
1225+ assert (MangledName.starts_with (" _Z3dotDv"
12251226 if (MangledName[MangledName.size () - 1 ] == ' _'
12261227 IsFirstSigned = ((MangledName[MangledName.size () - 3 ] == ' c'
12271228 (MangledName[MangledName.size () - 3 ] == ' s'
@@ -1242,7 +1243,7 @@ void OCLToSPIRVBase::visitCallDot(CallInst *CI, StringRef MangledName,
12421243 // dot_acc_sat(short2, ushort2, int) _Z11dot_acc_satDv4_sDv4_ti
12431244 // dot_acc_sat(ushort2, short2, int) _Z11dot_acc_satDv4_tDv4_si
12441245 // dot_acc_sat(ushort2, ushort2, uint) _Z11dot_acc_satDv4_tS_j
1245- assert (MangledName.startswith (" _Z11dot_acc_satDv"
1246+ assert (MangledName.starts_with (" _Z11dot_acc_satDv"
12461247 IsFirstSigned = ((MangledName[19 ] == ' c' 19 ] == ' s'
12471248 IsSecondSigned = (MangledName[20 ] == ' S'
12481249 ? IsFirstSigned
@@ -1264,10 +1265,10 @@ void OCLToSPIRVBase::visitCallDot(CallInst *CI, StringRef MangledName,
12641265 // _Z28dot_acc_sat_4x8packed_us_intjji
12651266 // dot_acc_sat_4x8packed_uu_uint(uint, uint, uint)
12661267 // _Z29dot_acc_sat_4x8packed_uu_uintjjj
1267- assert (MangledName.startswith (" _Z20dot_4x8packed"
1268- MangledName.startswith (" _Z21dot_4x8packed"
1269- MangledName.startswith (" _Z28dot_acc_sat_4x8packed"
1270- MangledName.startswith (" _Z29dot_acc_sat_4x8packed"
1268+ assert (MangledName.starts_with (" _Z20dot_4x8packed"
1269+ MangledName.starts_with (" _Z21dot_4x8packed"
1270+ MangledName.starts_with (" _Z28dot_acc_sat_4x8packed"
1271+ MangledName.starts_with (" _Z29dot_acc_sat_4x8packed"
12711272 size_t SignIndex = IsAccSat
12721273 ? strlen (kOCLBuiltinName ::DotAccSat4x8PackedPrefix)
12731274 : strlen (kOCLBuiltinName ::Dot4x8PackedPrefix);
@@ -1581,7 +1582,7 @@ static const char *getSubgroupAVCIntelTyKind(StringRef MangledName) {
15811582 // We're looking for the type name of the last parameter, which will be at the
15821583 // very end of the mangled name. Since we only care about the ending of the
15831584 // name, we don't need to be any more clever than this.
1584- return MangledName.endswith (" _payload_t" " payload" " result"
1585+ return MangledName.ends_with (" _payload_t" " payload" " result"
15851586}
15861587
15871588static Type *getSubgroupAVCIntelMCEType (Module *M, std::string &TName) {
0 commit comments