From 9e64a4c152a0a0287b1d104bc175da33326da56c Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 31 Oct 2018 17:47:25 +0000 Subject: [llvm-mca] Remove the verb 'assemble' from a few options in help. NFC. * MCA does not assemble anything. * Ran clang-format. llvm-svn: 345750 --- llvm/tools/llvm-mca/llvm-mca.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'llvm/tools/llvm-mca/llvm-mca.cpp') diff --git a/llvm/tools/llvm-mca/llvm-mca.cpp b/llvm/tools/llvm-mca/llvm-mca.cpp index 8f4e0717bd2..b3a4c495d7e 100644 --- a/llvm/tools/llvm-mca/llvm-mca.cpp +++ b/llvm/tools/llvm-mca/llvm-mca.cpp @@ -69,15 +69,13 @@ static cl::opt OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename")); static cl::opt - ArchName("march", - cl::desc("Target arch to assemble for, " - "see -version for available targets"), + ArchName("march", cl::desc("Target architecture. " + "See -version for available targets"), cl::cat(ToolOptions)); static cl::opt TripleName("mtriple", - cl::desc("Target triple to assemble for, " - "see -version for available targets"), + cl::desc("Target triple. See -version for available targets"), cl::cat(ToolOptions)); static cl::opt @@ -503,17 +501,20 @@ int main(int argc, char **argv) { ArrayRef Insts = Region->getInstructions(); std::vector> LoweredSequence; for (const MCInst &MCI : Insts) { - llvm::Expected> Inst = IB.createInstruction(MCI); + llvm::Expected> Inst = + IB.createInstruction(MCI); if (!Inst) { - if (auto NewE = handleErrors(Inst.takeError(), - [&IP, &STI](const mca::InstructionError &IE) { - std::string InstructionStr; - raw_string_ostream SS(InstructionStr); - WithColor::error() << IE.Message << '\n'; - IP->printInst(&IE.Inst, SS, "", *STI); - SS.flush(); - WithColor::note() << "instruction: " << InstructionStr << '\n'; - })) { + if (auto NewE = handleErrors( + Inst.takeError(), + [&IP, &STI](const mca::InstructionError &IE) { + std::string InstructionStr; + raw_string_ostream SS(InstructionStr); + WithColor::error() << IE.Message << '\n'; + IP->printInst(&IE.Inst, SS, "", *STI); + SS.flush(); + WithColor::note() << "instruction: " << InstructionStr + << '\n'; + })) { // Default case. WithColor::error() << toString(std::move(NewE)); } @@ -523,8 +524,7 @@ int main(int argc, char **argv) { LoweredSequence.emplace_back(std::move(Inst.get())); } - mca::SourceMgr S(LoweredSequence, - PrintInstructionTables ? 1 : Iterations); + mca::SourceMgr S(LoweredSequence, PrintInstructionTables ? 1 : Iterations); if (PrintInstructionTables) { // Create a pipeline, stages, and a printer. -- cgit v1.2.3