cosmetic refactoring of platform handling by VCB

cosmetics. nothing intresting here.

Author: aparshin-intel

IGC/VectorCompiler/utils/vcb/UniqueCompilation.cpp

@@ -5,10 +5,10 @@ Copyright (C) 2022 Intel Corporation
 SPDX-License-Identifier: MIT
 
 ============================= end_copyright_notice ===========================*/
-#include <Probe/Assertion.h>
 #include <igc/Options/Options.h>
 
 #include <llvm/ADT/SmallVector.h>
+#include <llvm/ADT/StringExtras.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/ADT/Twine.h>
 #include <llvm/IR/LLVMContext.h>
@@ -23,6 +23,8 @@ SPDX-License-Identifier: MIT
 
 #include <llvm/Transforms/Utils/Cloning.h>
 
+#include <Probe/Assertion.h>
+
 using namespace llvm;
 
 static cl::opt<std::string>
@@ -78,6 +80,10 @@ std::unique_ptr<MemoryBuffer> vcbGetFile(StringRef fileName) {
 //        ...
 //      }
 // ```
+static std::string renderPlatformLiteral(StringRef Platform) {
+  return (Twine("\"") + Platform + "\"").str();
+};
+
 void generateBifSelectionProcedure(
     std::map<std::string, UniquePltf> &HashedUniquePltfs, std::string &Output) {
   int FD;
@@ -88,6 +94,10 @@ void generateBifSelectionProcedure(
 
   OS << "// This file is auto generated by vcb tool, DO NOT EDIT\n\n";
 
+  OS << "#include \"IGC/common/StringMacros.hpp\"\n";
+  OS << "#include \"llvm/ADT/StringRef.h\"\n";
+  OS << "\n";
+
   // For each unique bitcode generate a C array that contains binary data
   // representing the bitcode
   for (const auto &[ByteCode, UniPltf] : HashedUniquePltfs) {
@@ -105,24 +115,23 @@ void generateBifSelectionProcedure(
     OS << "\n    };\n\n"
        << "unsigned int " << Pltf << "_size = " << ByteCode.size() << ";\n\n";
   }
-  OS << "#include \"llvm/ADT/StringRef.h\"\n\n"
-     << "llvm::StringRef get" << SymbolPrefix
+  OS << "llvm::StringRef get" << SymbolPrefix
      << "Impl(llvm::StringRef CPUStr) {\n";
 
   // Generate a selection procedure that for each supported platform
   // (taken from configuration file) selects a BLOB that represents a
   // platform-specific emulation BiF corresponding to that platform.
   for (const auto &[ByteCode, UniPltf] : HashedUniquePltfs) {
     const auto &PltfList = UniPltf.Platforms;
-    bool FirstIn = true;
-    for (auto &Pltf : PltfList) {
-      if (FirstIn) {
-        OS << "  if (CPUStr.equals(\"" << Pltf << "\")";
-        FirstIn = false;
-      } else
-        OS << "\n      || CPUStr.equals(\"" << Pltf << "\")";
-    }
-    OS << ")\n"
+    std::vector<std::string> PlatformCompareExpressions;
+    llvm::transform(PltfList, std::back_inserter(PlatformCompareExpressions),
+                    [](const auto &Pltf) {
+                      return (Twine("CPUStr.equals(") +
+                              renderPlatformLiteral(Pltf) + ")")
+                          .str();
+                    });
+    OS << "  if (" << llvm::join(PlatformCompareExpressions, "\n    || ")
+       << ")\n"
        << "      return  {reinterpret_cast<const char*>(" << SymbolPrefix
        << "PLTF" << UniPltf.Num << "),\n"
        << "              " << SymbolPrefix << "PLTF" << UniPltf.Num