Address minor comments

Author: IgWod-IMG

mlir/include/mlir/Target/SPIRV/Serialization.h

@@ -38,10 +38,10 @@ struct SerializationOptions {
   std::string validationFilePrefix = "";
 };
 
-/// Serializes the given SPIR-V `module` and writes to `binary`. On failure,
+/// Serializes the given SPIR-V `moduleOp` and writes to `binary`. On failure,
 /// reports errors to the error handler registered with the MLIR context for
-/// `module`.
-LogicalResult serialize(ModuleOp module, SmallVectorImpl<uint32_t> &binary,
+/// `moduleOp`.
+LogicalResult serialize(ModuleOp moduleOp, SmallVectorImpl<uint32_t> &binary,
                         const SerializationOptions &options = {});
 
 } // namespace spirv

mlir/lib/Target/SPIRV/TranslateRegistration.cpp

@@ -84,11 +84,10 @@ void registerFromSPIRVTranslation() {
 static size_t validationFileCounter = 0;
 
 static LogicalResult
-serializeModule(spirv::ModuleOp module, raw_ostream &output,
+serializeModule(spirv::ModuleOp moduleOp, raw_ostream &output,
                 const spirv::SerializationOptions &options) {
-
   SmallVector<uint32_t, 0> binary;
-  if (failed(spirv::serialize(module, binary)))
+  if (failed(spirv::serialize(moduleOp, binary)))
     return failure();
 
   size_t sizeInBytes = binary.size() * sizeof(uint32_t);
@@ -110,7 +109,8 @@ serializeModule(spirv::ModuleOp module, raw_ostream &output,
     std::string errorMessage;
     std::string filename =
         options.validationFilePrefix + std::to_string(validationFileCounter++);
-    auto validationOutput = openOutputFile(filename, &errorMessage);
+    std::unique_ptr<llvm::ToolOutputFile> validationOutput =
+        openOutputFile(filename, &errorMessage);
     if (!validationOutput) {
       llvm::errs() << errorMessage << "\n";
       return failure();
@@ -132,14 +132,16 @@ void registerToSPIRVTranslation() {
           "saved to an additional file that starts with the given prefix. This "
           "is used to generate separate binaries for validation, where "
           "`--split-input-file` normally combines all outputs into one. The "
-          "one combined output (`-o`) is still written."),
+          "one combined output (`-o`) is still written. Created files need to "
+          "be "
+          "removed manually once processed."),
       llvm::cl::init(""));
 
   TranslateFromMLIRRegistration toBinary(
       "serialize-spirv", "serialize SPIR-V dialect",
-      [](spirv::ModuleOp module, raw_ostream &output) {
-        return serializeModule(module, output,
-                               {true, false, (validationFilesPrefix != ""),
+      [](spirv::ModuleOp moduleOp, raw_ostream &output) {
+        return serializeModule(moduleOp, output,
+                               {true, false, !validationFilesPrefix.empty(),
                                 validationFilesPrefix});
       },
       [](DialectRegistry &registry) {