Author: Alexey Bader Date: 2026-06-09T17:55:30-07:00 New Revision: 3c21c3d6095821e78690fc056522f9857c178ad3
URL: https://github.com/llvm/llvm-project/commit/3c21c3d6095821e78690fc056522f9857c178ad3 DIFF: https://github.com/llvm/llvm-project/commit/3c21c3d6095821e78690fc056522f9857c178ad3.diff LOG: [NFC][clang-sycl-linker] Standardize error messages to LLVM coding style (#202767) Follow LLVM coding standards for error messages: use lowercase first letter and no trailing period. This matches the style used throughout LLVM tools (llvm-objcopy, lld, etc.) and aligns with the official guidance in llvm/docs/CodingStandards.rst. Updated corresponding test assertions in basic.ll and triple.ll. Added: Modified: clang/test/OffloadTools/clang-sycl-linker/basic.ll clang/test/OffloadTools/clang-sycl-linker/triple.ll clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp Removed: ################################################################################ diff --git a/clang/test/OffloadTools/clang-sycl-linker/basic.ll b/clang/test/OffloadTools/clang-sycl-linker/basic.ll index bd65a35bd8384..e906d23b90be9 100644 --- a/clang/test/OffloadTools/clang-sycl-linker/basic.ll +++ b/clang/test/OffloadTools/clang-sycl-linker/basic.ll @@ -18,11 +18,11 @@ ; ; Test missing input files ; RUN: not clang-sycl-linker -o %t.out 2>&1 | FileCheck %s --check-prefix=NO-INPUT -; NO-INPUT: No input files provided +; NO-INPUT: no input files provided ; ; Test non-existent input file ; RUN: not clang-sycl-linker %t-missing.bc -o %t.out 2>&1 | FileCheck %s --check-prefix=MISSING -; MISSING: Input file '{{.*}}-missing.bc' does not exist +; MISSING: input file '{{.*}}-missing.bc' does not exist ; ; Test the dry run of a simple case to link two input files. ; Test that IMG_SPIRV image kind is set for non-AOT compilation. @@ -66,7 +66,7 @@ ; RUN: touch %t/dummy.o ; RUN: not clang-sycl-linker %t/dummy.o -o a.spv 2>&1 \ ; RUN: | FileCheck %s --check-prefix=FILETYPEERROR -; FILETYPEERROR: Unsupported file type +; FILETYPEERROR: unsupported file type ; ; Test to see if device library related errors are emitted. ; RUN: not clang-sycl-linker --dry-run %t/input1.bc %t/input2.bc --library-path=%t/libs --bc-library lib1.bc --bc-library lib2.bc --bc-library lib3.bc -o a.spv 2>&1 \ @@ -111,7 +111,7 @@ ; Check that the output file must be specified. ; RUN: not clang-sycl-linker --dry-run %t/input1.bc %t/input2.bc 2>&1 \ ; RUN: | FileCheck %s --check-prefix=NOOUTPUT -; NOOUTPUT: Output file must be specified +; NOOUTPUT: output file must be specified ; ; Check parser error reporting for unknown options. ; RUN: not clang-sycl-linker --dry-run --not-a-real-flag -triple=spirv64 %t/input1.bc -o a.out 2>&1 \ diff --git a/clang/test/OffloadTools/clang-sycl-linker/triple.ll b/clang/test/OffloadTools/clang-sycl-linker/triple.ll index 222930987ce16..c0e35b8fc9d36 100644 --- a/clang/test/OffloadTools/clang-sycl-linker/triple.ll +++ b/clang/test/OffloadTools/clang-sycl-linker/triple.ll @@ -31,7 +31,7 @@ ; Test error when neither -triple= nor any input supplies a triple. ; RUN: not clang-sycl-linker --dry-run %t/no-triple.bc -o a.out 2>&1 \ ; RUN: | FileCheck %s --check-prefix=NO-TRIPLE -; NO-TRIPLE: Target triple must be specified or inferable from inputs +; NO-TRIPLE: target triple must be specified or inferable from inputs ;--- input1.ll target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1" diff --git a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp index e5e092c4737ec..8a563b69f6949 100644 --- a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp +++ b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp @@ -159,7 +159,7 @@ static Expected<std::string> findProgram(const ArgList &Args, StringRef Name, Path = sys::findProgramByName(Name); if (!Path) return createStringError(Path.getError(), - "Unable to find '" + Name + "' in path"); + "unable to find '" + Name + "' in path"); return *Path; } @@ -192,18 +192,18 @@ static Expected<SmallVector<std::string>> getInput(const ArgList &Args) { SmallVector<std::string> BitcodeFiles; auto Inputs = Args.filtered(OPT_INPUT); if (Inputs.empty()) - return createStringError("No input files provided"); + return createStringError("no input files provided"); for (const opt::Arg *Arg : Inputs) { StringRef Filename = Arg->getValue(); if (!sys::fs::exists(Filename) || sys::fs::is_directory(Filename)) - return createStringError("Input file '" + Filename + "' does not exist"); + return createStringError("input file '" + Filename + "' does not exist"); file_magic Magic; if (auto EC = identify_magic(Filename, Magic)) - return createStringError("Failed to open file " + Filename); + return createStringError("failed to open file '" + Filename + "'"); // TODO: Current use case involves LLVM IR bitcode files as input. // This will be extended to support SPIR-V IR files. if (Magic != file_magic::bitcode) - return createStringError("Unsupported file type for '" + Filename + "'"); + return createStringError("unsupported file type for '" + Filename + "'"); BitcodeFiles.push_back(std::string(Filename)); } return BitcodeFiles; @@ -332,12 +332,12 @@ static Expected<LinkResult> linkInputs(ArrayRef<std::string> InputFiles, } if (L.linkInModule(std::move(*ModOrErr))) - return createStringError("Could not link IR"); + return createStringError("could not link IR"); } if (TargetTriple.empty()) return createStringError( - "Target triple must be specified or inferable from inputs"); + "target triple must be specified or inferable from inputs"); // Link in library files. for (auto &File : *BCLibFiles) { @@ -347,7 +347,7 @@ static Expected<LinkResult> linkInputs(ArrayRef<std::string> InputFiles, if ((*LibMod)->getTargetTriple() == TargetTriple) { unsigned Flags = Linker::Flags::LinkOnlyNeeded; if (L.linkInModule(std::move(*LibMod), Flags)) - return createStringError("Could not link IR"); + return createStringError("could not link IR"); } } @@ -412,7 +412,7 @@ static Error runCodeGen(StringRef File, const llvm::Triple &TargetTriple, T->createTargetMachine(M->getTargetTriple(), /*CPU=*/"", /*Features=*/"", Options, RM, CM)); if (!TM) - return createStringError("Could not allocate target machine!"); + return createStringError("could not allocate target machine"); // Set data layout if needed. if (M->getDataLayout().isDefault()) @@ -429,7 +429,7 @@ static Error runCodeGen(StringRef File, const llvm::Triple &TargetTriple, CodeGenPasses.add(new TargetLibraryInfoWrapperPass(TLII)); if (TM->addPassesToEmitFile(CodeGenPasses, *OS, nullptr, CodeGenFileType::ObjectFile)) - return createStringError("Failed to execute LLVM backend"); + return createStringError("failed to execute LLVM backend"); CodeGenPasses.run(*M); return Error::success(); @@ -797,7 +797,7 @@ static Error runSYCLLink(ArrayRef<std::string> Files, const ArgList &Args) { llvm::SmallString<0> Buffer = OffloadBinary::write(Images); if (Buffer.size() % OffloadBinary::getAlignment() != 0) - return createStringError("Offload binary has invalid size alignment"); + return createStringError("offload binary has invalid size alignment"); if (DryRun) return Error::success(); @@ -846,7 +846,7 @@ int main(int argc, char **argv) { DryRun = Args.hasArg(OPT_dry_run); if (!Args.hasArg(OPT_o)) - reportError(createStringError("Output file must be specified")); + reportError(createStringError("output file must be specified")); OutputFile = Args.getLastArgValue(OPT_o); // Get the input files to pass to the linking stage. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
