maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-mca] Remove unneeded namespace qualifier. NFC. 

llvm-svn: 346417
This commit is contained in:
Matt Davis 2018-11-08 17:32:45 +00:00
parent 9ffd5eb081
commit 08b64d60fe
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
llvm/tools/llvm-mca/llvm-mca.cpp
View File

@ -202,8 +202,7 @@ ErrorOr<std::unique_ptr<ToolOutputFile>> getOutputStream() {
if (OutputFilename == "") if (OutputFilename == "")
OutputFilename = "-"; OutputFilename = "-";
std::error_code EC; std::error_code EC;
auto Out = auto Out = make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
if (!EC) if (!EC)
return std::move(Out); return std::move(Out);
return EC; return EC;
@ -251,9 +250,9 @@ int main(int argc, char **argv) {
InitLLVM X(argc, argv); InitLLVM X(argc, argv);
// Initialize targets and assembly parsers. // Initialize targets and assembly parsers.
llvm::InitializeAllTargetInfos(); InitializeAllTargetInfos();
llvm::InitializeAllTargetMCs(); InitializeAllTargetMCs();
llvm::InitializeAllAsmParsers(); InitializeAllAsmParsers();
// Enable printing of available targets when flag --version is specified. // Enable printing of available targets when flag --version is specified.
cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion); cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
@ -309,7 +308,7 @@ int main(int argc, char **argv) {
TheTarget->createMCInstrAnalysis(MCII.get())); TheTarget->createMCInstrAnalysis(MCII.get()));
if (!MCPU.compare("native")) if (!MCPU.compare("native"))
MCPU = llvm::sys::getHostCPUName(); MCPU = sys::getHostCPUName();
std::unique_ptr<MCSubtargetInfo> STI( std::unique_ptr<MCSubtargetInfo> STI(
TheTarget->createMCSubtargetInfo(TripleName, MCPU, /* FeaturesStr */ "")); TheTarget->createMCSubtargetInfo(TripleName, MCPU, /* FeaturesStr */ ""));
@ -368,7 +367,7 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
std::unique_ptr<llvm::ToolOutputFile> TOF = std::move(*OF); std::unique_ptr<ToolOutputFile> TOF = std::move(*OF);
const MCSchedModel &SM = STI->getSchedModel(); const MCSchedModel &SM = STI->getSchedModel();
@ -407,7 +406,7 @@ int main(int argc, char **argv) {
ArrayRef<MCInst> Insts = Region->getInstructions(); ArrayRef<MCInst> Insts = Region->getInstructions();
std::vector<std::unique_ptr<mca::Instruction>> LoweredSequence; std::vector<std::unique_ptr<mca::Instruction>> LoweredSequence;
for (const MCInst &MCI : Insts) { for (const MCInst &MCI : Insts) {
llvm::Expected<std::unique_ptr<mca::Instruction>> Inst = Expected<std::unique_ptr<mca::Instruction>> Inst =
IB.createInstruction(MCI); IB.createInstruction(MCI);
if (!Inst) { if (!Inst) {
if (auto NewE = handleErrors( if (auto NewE = handleErrors(
@ -434,18 +433,17 @@ int main(int argc, char **argv) {
if (PrintInstructionTables) { if (PrintInstructionTables) {
// Create a pipeline, stages, and a printer. // Create a pipeline, stages, and a printer.
auto P = llvm::make_unique<mca::Pipeline>(); auto P = make_unique<mca::Pipeline>();
P->appendStage(llvm::make_unique<mca::FetchStage>(S)); P->appendStage(make_unique<mca::FetchStage>(S));
P->appendStage(llvm::make_unique<mca::InstructionTables>(SM)); P->appendStage(make_unique<mca::InstructionTables>(SM));
mca::PipelinePrinter Printer(*P); mca::PipelinePrinter Printer(*P);
// Create the views for this pipeline, execute, and emit a report. // Create the views for this pipeline, execute, and emit a report.
if (PrintInstructionInfoView) { if (PrintInstructionInfoView) {
Printer.addView(llvm::make_unique<mca::InstructionInfoView>( Printer.addView(
*STI, *MCII, Insts, *IP)); make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
} }
Printer.addView( Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
if (!runPipeline(*P)) if (!runPipeline(*P))
return 1; return 1;
@ -459,32 +457,31 @@ int main(int argc, char **argv) {
mca::PipelinePrinter Printer(*P); mca::PipelinePrinter Printer(*P);
if (PrintSummaryView) if (PrintSummaryView)
Printer.addView(llvm::make_unique<mca::SummaryView>(SM, Insts, Width)); Printer.addView(make_unique<mca::SummaryView>(SM, Insts, Width));
if (PrintInstructionInfoView) if (PrintInstructionInfoView)
Printer.addView( Printer.addView(
llvm::make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP)); make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
if (PrintDispatchStats) if (PrintDispatchStats)
Printer.addView(llvm::make_unique<mca::DispatchStatistics>()); Printer.addView(make_unique<mca::DispatchStatistics>());
if (PrintSchedulerStats) if (PrintSchedulerStats)
Printer.addView(llvm::make_unique<mca::SchedulerStatistics>(*STI)); Printer.addView(make_unique<mca::SchedulerStatistics>(*STI));
if (PrintRetireStats) if (PrintRetireStats)
Printer.addView(llvm::make_unique<mca::RetireControlUnitStatistics>()); Printer.addView(make_unique<mca::RetireControlUnitStatistics>());
if (PrintRegisterFileStats) if (PrintRegisterFileStats)
Printer.addView(llvm::make_unique<mca::RegisterFileStatistics>(*STI)); Printer.addView(make_unique<mca::RegisterFileStatistics>(*STI));
if (PrintResourcePressureView) if (PrintResourcePressureView)
Printer.addView( Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
if (PrintTimelineView) { if (PrintTimelineView) {
unsigned TimelineIterations = unsigned TimelineIterations =
TimelineMaxIterations ? TimelineMaxIterations : 10; TimelineMaxIterations ? TimelineMaxIterations : 10;
Printer.addView(llvm::make_unique<mca::TimelineView>( Printer.addView(make_unique<mca::TimelineView>(
*STI, *IP, Insts, std::min(TimelineIterations, S.getNumIterations()), *STI, *IP, Insts, std::min(TimelineIterations, S.getNumIterations()),
TimelineMaxCycles)); TimelineMaxCycles));
} }