Resolve recent CR nits

Author: maksimsab

llvm/lib/Transforms/Utils/SYCLSplitModule.cpp

@@ -106,7 +106,7 @@ class ModuleDesc {
   ModuleDesc(std::unique_ptr<Module> M,
              EntryPointGroup EntryPoints = EntryPointGroup())
       : M(std::move(M)), EntryPoints(std::move(EntryPoints)) {
-    assert(this->M && "Module should be non-empty");
+    assert(this->M && "Module should be non-null");
   }
 
   const EntryPointSet &entries() const { return EntryPoints.Functions; }
@@ -344,13 +344,6 @@ class ModuleSplitter {
 
 } // namespace
 
-/// Gets attached attribute value if it is present. Otherwise returns empty
-/// stirng.
-static StringRef computeFunctionCategoryFromStringMetadata(const Function &F,
-                                                           StringRef AttrName) {
-  return F.getFnAttribute(AttrName).getValueAsString();
-}
-
 static EntryPointGroupVec selectEntryPointGroups(const Module &M,
                                                  IRSplitMode Mode) {
   // std::map is used here to ensure stable ordering of entry point groups,
@@ -368,7 +361,7 @@ static EntryPointGroupVec selectEntryPointGroups(const Module &M,
       Key = F.getName();
       break;
     case IRSplitMode::IRSM_PER_TU:
-      Key = computeFunctionCategoryFromStringMetadata(F, ATTR_SYCL_MODULE_ID);
+      Key = F.getFnAttribute(ATTR_SYCL_MODULE_ID).getValueAsString();
       break;
     case IRSplitMode::IRSM_NONE:
       llvm_unreachable("");

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

@@ -76,17 +76,19 @@ static cl::opt<std::string>
     MCPU("mcpu", cl::desc("Target CPU, ignored if --mtriple is not used"),
          cl::value_desc("cpu"), cl::cat(SplitCategory));
 
-cl::opt<IRSplitMode> SYCLSplitMode(
-    "sycl-split", cl::desc("module split mode"), cl::Optional,
-    cl::init(IRSplitMode::IRSM_NONE),
+static cl::opt<IRSplitMode> SYCLSplitMode(
+    "sycl-split",
+    cl::desc("SYCL Split Mode. If present, SYCL splitting algorithm is used "
+             "with the specified mode."),
+    cl::Optional, cl::init(IRSplitMode::IRSM_NONE),
     cl::values(clEnumValN(IRSplitMode::IRSM_PER_TU, "source",
                           "1 ouptput module per translation unit"),
                clEnumValN(IRSplitMode::IRSM_PER_KERNEL, "kernel",
                           "1 output module per kernel")),
     cl::cat(SplitCategory));
 
-cl::opt<bool> OutputAssembly{"S", cl::desc("Write output as LLVM assembly"),
-                             cl::cat(SplitCategory)};
+static cl::opt<bool> OutputAssembly{
+    "S", cl::desc("Write output as LLVM assembly"), cl::cat(SplitCategory)};
 
 void writeStringToFile(std::string_view Content, StringRef Path) {
   std::error_code EC;