replace StringRef _lower methods

Replace StringRef *_lower methods with *_insensitive

Author: Anton Sidorenko

IGC/VectorCompiler/include/vc/GenXOpts/Utils/KernelInfo.h

@@ -19,6 +19,8 @@ SPDX-License-Identifier: MIT
 
 #include <unordered_map>
 
+#include "llvmWrapper/ADT/StringRef.h"
+
 namespace llvm {
 namespace genx {
 
@@ -85,8 +87,8 @@ using ArgToImplicitLinearization =
     std::unordered_map<Argument *, LinearizedArgInfo>;
 
 inline bool isDescBufferType(StringRef TypeDesc) {
-  return (TypeDesc.find_lower("buffer_t") != StringRef::npos &&
-          TypeDesc.find_lower("image1d_buffer_t") == StringRef::npos);
+  return (IGCLLVM::contains_insensitive(TypeDesc, "buffer_t") &&
+          !IGCLLVM::contains_insensitive(TypeDesc, "image1d_buffer_t"));
 }
 
 /// KernelMetadata : class to parse and update kernel metadata

IGC/VectorCompiler/lib/GenXCodeGen/GenXThreadPrivateMemory.cpp

@@ -26,6 +26,7 @@ SPDX-License-Identifier: MIT
 #include "vc/Utils/General/BreakConst.h"
 
 #include "Probe/Assertion.h"
+#include "llvmWrapper/ADT/StringRef.h"
 #include "llvmWrapper/IR/DerivedTypes.h"
 #include "llvmWrapper/IR/Function.h"
 #include "llvmWrapper/IR/InstrTypes.h"
@@ -1577,15 +1578,17 @@ void GenXThreadPrivateMemory::visitFunction(Function &F) {
   MDNode *ArgDescNode =
       cast<MDNode>(Node->getOperand(KernelMDOp::ArgTypeDescs));
 
-  for (auto &Arg : F.args())
-    if (ArgDescNode->getNumOperands() > Arg.getArgNo() &&
-        cast<MDString>(ArgDescNode->getOperand(Arg.getArgNo()))
-                ->getString()
-                .find_lower("svmptr_t") != StringRef::npos) {
-      if (!m_useGlobalMem)
-        switchStack(*F.getParent());
-      LLVM_DEBUG(dbgs() << "Adding svm arg " << Arg << " of " << F.getName()
-                        << "\n");
-      m_args.insert(&Arg);
-    }
+  for (auto &Arg : F.args()) {
+    if (ArgDescNode->getNumOperands() <= Arg.getArgNo())
+      continue;
+    StringRef SvmMD =
+        cast<MDString>(ArgDescNode->getOperand(Arg.getArgNo()))->getString();
+    if (!IGCLLVM::contains_insensitive(SvmMD, "svmptr_t"))
+      continue;
+    if (!m_useGlobalMem)
+      switchStack(*F.getParent());
+    LLVM_DEBUG(dbgs() << "Adding svm arg " << Arg << " of " << F.getName()
+                      << "\n");
+    m_args.insert(&Arg);
+  }
 }

IGC/VectorCompiler/lib/GenXOpts/CMTrans/GenXBTIAssignment.cpp

@@ -28,6 +28,8 @@ SPDX-License-Identifier: MIT
 
 #include "Probe/Assertion.h"
 
+#include "llvmWrapper/ADT/StringRef.h"
+
 #include <llvm/ADT/StringRef.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/IRBuilder.h>
@@ -114,18 +116,18 @@ static constexpr int MaxAvailableSurfaceIndex = 239;
 static constexpr int MaxAvailableSamplerIndex = 14;
 
 static bool isDescImageType(StringRef TypeDesc) {
-  return TypeDesc.find_lower("image1d_t") != StringRef::npos ||
-         TypeDesc.find_lower("image2d_t") != StringRef::npos ||
-         TypeDesc.find_lower("image3d_t") != StringRef::npos ||
-         TypeDesc.find_lower("image1d_buffer_t") != StringRef::npos;
+  return IGCLLVM::contains_insensitive(TypeDesc, "image1d_t") ||
+         IGCLLVM::contains_insensitive(TypeDesc, "image2d_t") ||
+         IGCLLVM::contains_insensitive(TypeDesc, "image3d_t") ||
+         IGCLLVM::contains_insensitive(TypeDesc, "image1d_buffer_t");
 }
 
 static bool isDescReadOnly(StringRef TypeDesc) {
-  return TypeDesc.find_lower("read_only") != StringRef::npos;
+  return IGCLLVM::contains_insensitive(TypeDesc, "read_only");
 }
 
 static bool isDescSvmPtr(StringRef TypeDesc) {
-  return TypeDesc.find_lower("svmptr_t") != StringRef::npos;
+  return IGCLLVM::contains_insensitive(TypeDesc, "svmptr_t");
 }
 
 template <typename ZipTy>

IGC/VectorCompiler/lib/Utils/GenX/Printf.cpp

@@ -27,6 +27,7 @@ SPDX-License-Identifier: MIT
 #include <string>
 
 #include "Probe/Assertion.h"
+#include "llvmWrapper/ADT/StringRef.h"
 #include "llvmWrapper/Support/Regex.h"
 
 using namespace llvm;
@@ -117,10 +118,12 @@ static PrintfArgInfo parseArgDesc(StringRef ArgDesc) {
   if (ArgDesc.endswith("d") || ArgDesc.endswith("i"))
     return parseIntLengthModifier(ArgDesc, /* IsSigned */ true);
   if (ArgDesc.endswith("o") || ArgDesc.endswith("u") ||
-      ArgDesc.endswith_lower("x"))
+      IGCLLVM::endswith_insensitive(ArgDesc, "x"))
     return parseIntLengthModifier(ArgDesc, /* IsSigned */ false);
-  if (ArgDesc.endswith_lower("f") || ArgDesc.endswith_lower("e") ||
-      ArgDesc.endswith_lower("a") || ArgDesc.endswith_lower("g"))
+  if (IGCLLVM::endswith_insensitive(ArgDesc, "f") ||
+      IGCLLVM::endswith_insensitive(ArgDesc, "e") ||
+      IGCLLVM::endswith_insensitive(ArgDesc, "a") ||
+      IGCLLVM::endswith_insensitive(ArgDesc, "g"))
     return {PrintfArgInfo::Double, /* IsSigned */ true};
   IGC_ASSERT_MESSAGE(ArgDesc.endswith("p"), "unexpected conversion specifier");
   return {PrintfArgInfo::Pointer, /* IsSigned */ false};

IGC/WrapperLLVM/include/llvmWrapper/ADT/StringRef.h

@@ -20,6 +20,22 @@ namespace IGCLLVM
         return LHS.equals_lower(RHS);
 #else
         return LHS.equals_insensitive(RHS);
+#endif
+  }
+
+  inline bool endswith_insensitive(llvm::StringRef LHS, llvm::StringRef RHS) {
+#if LLVM_VERSION_MAJOR < 13
+    return LHS.endswith_lower(RHS);
+#else
+    return LHS.endswith_insensitive(RHS);
+#endif
+  }
+
+  inline bool contains_insensitive(llvm::StringRef LHS, llvm::StringRef RHS) {
+#if LLVM_VERSION_MAJOR < 13
+    return LHS.contains_lower(RHS);
+#else
+    return LHS.contains_insensitive(RHS);
 #endif
     }
 }