@@ -202,7 +202,8 @@ ErrorOr<std::unique_ptr<ToolOutputFile>> getOutputStream() {
202
202
if (OutputFilename == " " )
203
203
OutputFilename = " -" ;
204
204
std::error_code EC;
205
- auto Out = make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
205
+ auto Out =
206
+ llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
206
207
if (!EC)
207
208
return std::move (Out);
208
209
return EC;
@@ -308,7 +309,7 @@ int main(int argc, char **argv) {
308
309
TheTarget->createMCInstrAnalysis (MCII.get ()));
309
310
310
311
if (!MCPU.compare (" native" ))
311
- MCPU = sys::getHostCPUName ();
312
+ MCPU = llvm:: sys::getHostCPUName ();
312
313
313
314
std::unique_ptr<MCSubtargetInfo> STI (
314
315
TheTarget->createMCSubtargetInfo (TripleName, MCPU, /* FeaturesStr */ " " ));
@@ -433,17 +434,18 @@ int main(int argc, char **argv) {
433
434
434
435
if (PrintInstructionTables) {
435
436
// Create a pipeline, stages, and a printer.
436
- auto P = make_unique<mca::Pipeline>();
437
- P->appendStage (make_unique<mca::EntryStage>(S));
438
- P->appendStage (make_unique<mca::InstructionTables>(SM));
437
+ auto P = llvm:: make_unique<mca::Pipeline>();
438
+ P->appendStage (llvm:: make_unique<mca::EntryStage>(S));
439
+ P->appendStage (llvm:: make_unique<mca::InstructionTables>(SM));
439
440
mca::PipelinePrinter Printer (*P);
440
441
441
442
// Create the views for this pipeline, execute, and emit a report.
442
443
if (PrintInstructionInfoView) {
443
- Printer.addView (
444
- make_unique<mca::InstructionInfoView>( *STI, *MCII, Insts, *IP));
444
+ Printer.addView (llvm::make_unique<mca::InstructionInfoView>(
445
+ *STI, *MCII, Insts, *IP));
445
446
}
446
- Printer.addView (make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
447
+ Printer.addView (
448
+ llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
447
449
448
450
if (!runPipeline (*P))
449
451
return 1 ;
@@ -457,31 +459,32 @@ int main(int argc, char **argv) {
457
459
mca::PipelinePrinter Printer (*P);
458
460
459
461
if (PrintSummaryView)
460
- Printer.addView (make_unique<mca::SummaryView>(SM, Insts, Width));
462
+ Printer.addView (llvm:: make_unique<mca::SummaryView>(SM, Insts, Width));
461
463
462
464
if (PrintInstructionInfoView)
463
465
Printer.addView (
464
- make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
466
+ llvm:: make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
465
467
466
468
if (PrintDispatchStats)
467
- Printer.addView (make_unique<mca::DispatchStatistics>());
469
+ Printer.addView (llvm:: make_unique<mca::DispatchStatistics>());
468
470
469
471
if (PrintSchedulerStats)
470
- Printer.addView (make_unique<mca::SchedulerStatistics>(*STI));
472
+ Printer.addView (llvm:: make_unique<mca::SchedulerStatistics>(*STI));
471
473
472
474
if (PrintRetireStats)
473
- Printer.addView (make_unique<mca::RetireControlUnitStatistics>());
475
+ Printer.addView (llvm:: make_unique<mca::RetireControlUnitStatistics>());
474
476
475
477
if (PrintRegisterFileStats)
476
- Printer.addView (make_unique<mca::RegisterFileStatistics>(*STI));
478
+ Printer.addView (llvm:: make_unique<mca::RegisterFileStatistics>(*STI));
477
479
478
480
if (PrintResourcePressureView)
479
- Printer.addView (make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
481
+ Printer.addView (
482
+ llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
480
483
481
484
if (PrintTimelineView) {
482
485
unsigned TimelineIterations =
483
486
TimelineMaxIterations ? TimelineMaxIterations : 10 ;
484
- Printer.addView (make_unique<mca::TimelineView>(
487
+ Printer.addView (llvm:: make_unique<mca::TimelineView>(
485
488
*STI, *IP, Insts, std::min (TimelineIterations, S.getNumIterations ()),
486
489
TimelineMaxCycles));
487
490
}
0 commit comments