rename splitSYCLModule to SYCLSplitModule

Author: maksimsab

llvm/include/llvm/Transforms/Utils/SYCLModuleSplit.h renamed to llvm/include/llvm/Transforms/Utils/SYCLSplitModule.h

@@ -1,4 +1,4 @@
-//===-------- SYCLModuleSplit.h - module split ------------------*- C++ -*-===//
+//===-------- SYCLSplitModule.h - module split ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 // of the split is new modules containing corresponding callgraph.
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SYCL_MODULE_SPLIT_H
-#define LLVM_SYCL_MODULE_SPLIT_H
+#ifndef LLVM_SYCL_SPLIT_MODULE_H
+#define LLVM_SYCL_SPLIT_MODULE_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
@@ -38,17 +38,17 @@ std::optional<IRSplitMode> convertStringToSplitMode(StringRef S);
 /// The structure represents a split LLVM Module accompanied by additional
 /// information. Split Modules are being stored at disk due to the high RAM
 /// consumption during the whole splitting process.
-struct SYCLSplitModule {
+struct ModuleAndSYCLMetadata {
   std::string ModuleFilePath;
   std::string Symbols;
 
-  SYCLSplitModule() = default;
-  SYCLSplitModule(const SYCLSplitModule &) = default;
-  SYCLSplitModule &operator=(const SYCLSplitModule &) = default;
-  SYCLSplitModule(SYCLSplitModule &&) = default;
-  SYCLSplitModule &operator=(SYCLSplitModule &&) = default;
+  ModuleAndSYCLMetadata() = default;
+  ModuleAndSYCLMetadata(const ModuleAndSYCLMetadata &) = default;
+  ModuleAndSYCLMetadata &operator=(const ModuleAndSYCLMetadata &) = default;
+  ModuleAndSYCLMetadata(ModuleAndSYCLMetadata &&) = default;
+  ModuleAndSYCLMetadata &operator=(ModuleAndSYCLMetadata &&) = default;
 
-  SYCLSplitModule(std::string_view File, std::string Symbols)
+  ModuleAndSYCLMetadata(std::string_view File, std::string Symbols)
       : ModuleFilePath(File), Symbols(std::move(Symbols)) {}
 };
 
@@ -59,13 +59,13 @@ struct ModuleSplitterSettings {
 };
 
 /// Parses the string table.
-Expected<SmallVector<SYCLSplitModule, 0>>
-parseSYCLSplitModulesFromFile(StringRef File);
+Expected<SmallVector<ModuleAndSYCLMetadata, 0>>
+parseModuleAndSYCLMetadataFromFile(StringRef File);
 
 /// Splits the given module \p M according to the given \p Settings.
-Expected<SmallVector<SYCLSplitModule, 0>>
-splitSYCLModule(std::unique_ptr<Module> M, ModuleSplitterSettings Settings);
+Expected<SmallVector<ModuleAndSYCLMetadata, 0>>
+SYCLSplitModule(std::unique_ptr<Module> M, ModuleSplitterSettings Settings);
 
 } // namespace llvm
 
-#endif // LLVM_SYCL_MODULE_SPLIT_H
+#endif // LLVM_SYCL_SPLIT_MODULE_H

llvm/lib/Transforms/Utils/CMakeLists.txt

@@ -83,7 +83,7 @@ add_llvm_component_library(LLVMTransformUtils
   SizeOpts.cpp
   SplitModule.cpp
   StripNonLineTableDebugInfo.cpp
-  SYCLModuleSplit.cpp
+  SYCLSplitModule.cpp
   SYCLUtils.cpp
   SymbolRewriter.cpp
   UnifyFunctionExitNodes.cpp

llvm/lib/Transforms/Utils/SYCLModuleSplit.cpp renamed to llvm/lib/Transforms/Utils/SYCLSplitModule.cpp

@@ -1,4 +1,4 @@
-//===-------- SYCLModuleSplitter.cpp - split a module into callgraphs -----===//
+//===-------- SYCLSplitModule.cpp - split a module into callgraphs --------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -8,7 +8,7 @@
 // See comments in the header.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/SYCLModuleSplit.h"
+#include "llvm/Transforms/Utils/SYCLSplitModule.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/StringExtras.h"
@@ -38,7 +38,7 @@
 
 using namespace llvm;
 
-#define DEBUG_TYPE "sycl-module-split"
+#define DEBUG_TYPE "sycl-split-module"
 
 static bool isKernel(const Function &F) {
   return F.getCallingConv() == CallingConv::SPIR_KERNEL ||
@@ -410,22 +410,22 @@ static Error saveModuleIRInFile(Module &M, StringRef FilePath,
   return Error::success();
 }
 
-static Expected<SYCLSplitModule>
+static Expected<ModuleAndSYCLMetadata>
 saveModuleDesc(ModuleDesc &MD, std::string Prefix, bool OutputAssembly) {
   Prefix += OutputAssembly ? ".ll" : ".bc";
   if (Error E = saveModuleIRInFile(MD.getModule(), Prefix, OutputAssembly))
     return E;
 
-  SYCLSplitModule SM;
+  ModuleAndSYCLMetadata SM;
   SM.ModuleFilePath = Prefix;
   SM.Symbols = MD.makeSymbolTable();
   return SM;
 }
 
 namespace llvm {
 
-Expected<SmallVector<SYCLSplitModule, 0>>
-parseSYCLSplitModulesFromFile(StringRef File) {
+Expected<SmallVector<ModuleAndSYCLMetadata, 0>>
+parseModuleAndSYCLMetadataFromFile(StringRef File) {
   auto EntriesMBOrErr = llvm::MemoryBuffer::getFile(File);
   if (!EntriesMBOrErr)
     return createFileError(File, EntriesMBOrErr.getError());
@@ -438,7 +438,7 @@ parseSYCLSplitModulesFromFile(StringRef File) {
   // "Code" and "Symbols" at the moment.
   static constexpr int NUMBER_COLUMNS = 2;
   ++LI;
-  SmallVector<SYCLSplitModule, 0> Modules;
+  SmallVector<ModuleAndSYCLMetadata, 0> Modules;
   while (!LI.is_at_eof()) {
     StringRef Line = *LI;
     if (Line.empty())
@@ -480,9 +480,9 @@ std::optional<IRSplitMode> convertStringToSplitMode(StringRef S) {
   return It->second;
 }
 
-Expected<SmallVector<SYCLSplitModule, 0>>
-splitSYCLModule(std::unique_ptr<Module> M, ModuleSplitterSettings Settings) {
-  SmallVector<SYCLSplitModule, 0> OutputImages;
+Expected<SmallVector<ModuleAndSYCLMetadata, 0>>
+SYCLSplitModule(std::unique_ptr<Module> M, ModuleSplitterSettings Settings) {
+  SmallVector<ModuleAndSYCLMetadata, 0> OutputImages;
   if (Settings.Mode == IRSplitMode::IRSM_NONE) {
     ModuleDesc MD = std::move(M);
     std::string OutIRFileName = (Settings.OutputPrefix + Twine("_0")).str();

llvm/tools/llvm-split/llvm-split.cpp

@@ -28,7 +28,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/TargetParser/Triple.h"
-#include "llvm/Transforms/Utils/SYCLModuleSplit.h"
+#include "llvm/Transforms/Utils/SYCLSplitModule.h"
 #include "llvm/Transforms/Utils/SYCLUtils.h"
 #include "llvm/Transforms/Utils/SplitModule.h"
 
@@ -99,12 +99,12 @@ void writeStringToFile(std::string_view Content, StringRef Path) {
   OS << Content << "\n";
 }
 
-void writeSplitModulesAsTable(ArrayRef<SYCLSplitModule> SplitModules,
+void writeSplitModulesAsTable(ArrayRef<ModuleAndSYCLMetadata> Modules,
                               StringRef Path) {
   std::vector<std::string> Columns = {"Code", "Symbols"};
   SYCLStringTable Table;
   Table.emplace_back(std::move(Columns));
-  for (const auto &[I, SM] : enumerate(SplitModules)) {
+  for (const auto &[I, SM] : enumerate(Modules)) {
     std::string SymbolsFile = (Twine(Path) + "_" + Twine(I) + ".sym").str();
     writeStringToFile(SM.Symbols, SymbolsFile);
     std::vector<std::string> Row = {SM.ModuleFilePath, SymbolsFile};
@@ -126,11 +126,11 @@ Error runSYCLSplitModule(std::unique_ptr<Module> M) {
   Settings.Mode = SYCLSplitMode;
   Settings.OutputAssembly = OutputAssembly;
   Settings.OutputPrefix = OutputFilename;
-  auto SplitModulesOrErr = splitSYCLModule(std::move(M), Settings);
-  if (!SplitModulesOrErr)
-    return SplitModulesOrErr.takeError();
+  auto ModulesOrErr = SYCLSplitModule(std::move(M), Settings);
+  if (!ModulesOrErr)
+    return ModulesOrErr.takeError();
 
-  writeSplitModulesAsTable(*SplitModulesOrErr, OutputFilename);
+  writeSplitModulesAsTable(*ModulesOrErr, OutputFilename);
   return Error::success();
 }