<div dir="ltr">llvm::make_unique sometimes needs/benefits from being qualified because it can be ambiguous with std::make_unique on a build that includes that (specifically MSVC includes std::make_unique even when it's building in C++11 mode (MSVC doesn't have a versioned standard library, as far as I understand it) - just something to keep in mind if you're tidying up things like that. I'd generally leave them qualified (in this case, if you've removed them & didn't break the build, no need to add them back in - just wouldn't go trying to remove more of them across the codebase)</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Nov 8, 2018 at 9:35 AM Matt Davis via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mattd<br>
Date: Thu Nov 8 09:32:45 2018<br>
New Revision: 346417<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=346417&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=346417&view=rev</a><br>
Log:<br>
[llvm-mca] Remove unneeded namespace qualifier. NFC.<br>
<br>
Modified:<br>
llvm/trunk/tools/llvm-mca/llvm-mca.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-mca/llvm-mca.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/llvm-mca.cpp?rev=346417&r1=346416&r2=346417&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/llvm-mca.cpp?rev=346417&r1=346416&r2=346417&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-mca/llvm-mca.cpp (original)<br>
+++ llvm/trunk/tools/llvm-mca/llvm-mca.cpp Thu Nov 8 09:32:45 2018<br>
@@ -202,8 +202,7 @@ ErrorOr<std::unique_ptr<ToolOutputFile>><br>
if (OutputFilename == "")<br>
OutputFilename = "-";<br>
std::error_code EC;<br>
- auto Out =<br>
- llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);<br>
+ auto Out = make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);<br>
if (!EC)<br>
return std::move(Out);<br>
return EC;<br>
@@ -251,9 +250,9 @@ int main(int argc, char **argv) {<br>
InitLLVM X(argc, argv);<br>
<br>
// Initialize targets and assembly parsers.<br>
- llvm::InitializeAllTargetInfos();<br>
- llvm::InitializeAllTargetMCs();<br>
- llvm::InitializeAllAsmParsers();<br>
+ InitializeAllTargetInfos();<br>
+ InitializeAllTargetMCs();<br>
+ InitializeAllAsmParsers();<br>
<br>
// Enable printing of available targets when flag --version is specified.<br>
cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);<br>
@@ -309,7 +308,7 @@ int main(int argc, char **argv) {<br>
TheTarget->createMCInstrAnalysis(MCII.get()));<br>
<br>
if (!MCPU.compare("native"))<br>
- MCPU = llvm::sys::getHostCPUName();<br>
+ MCPU = sys::getHostCPUName();<br>
<br>
std::unique_ptr<MCSubtargetInfo> STI(<br>
TheTarget->createMCSubtargetInfo(TripleName, MCPU, /* FeaturesStr */ ""));<br>
@@ -368,7 +367,7 @@ int main(int argc, char **argv) {<br>
return 1;<br>
}<br>
<br>
- std::unique_ptr<llvm::ToolOutputFile> TOF = std::move(*OF);<br>
+ std::unique_ptr<ToolOutputFile> TOF = std::move(*OF);<br>
<br>
const MCSchedModel &SM = STI->getSchedModel();<br>
<br>
@@ -407,7 +406,7 @@ int main(int argc, char **argv) {<br>
ArrayRef<MCInst> Insts = Region->getInstructions();<br>
std::vector<std::unique_ptr<mca::Instruction>> LoweredSequence;<br>
for (const MCInst &MCI : Insts) {<br>
- llvm::Expected<std::unique_ptr<mca::Instruction>> Inst =<br>
+ Expected<std::unique_ptr<mca::Instruction>> Inst =<br>
IB.createInstruction(MCI);<br>
if (!Inst) {<br>
if (auto NewE = handleErrors(<br>
@@ -434,18 +433,17 @@ int main(int argc, char **argv) {<br>
<br>
if (PrintInstructionTables) {<br>
// Create a pipeline, stages, and a printer.<br>
- auto P = llvm::make_unique<mca::Pipeline>();<br>
- P->appendStage(llvm::make_unique<mca::FetchStage>(S));<br>
- P->appendStage(llvm::make_unique<mca::InstructionTables>(SM));<br>
+ auto P = make_unique<mca::Pipeline>();<br>
+ P->appendStage(make_unique<mca::FetchStage>(S));<br>
+ P->appendStage(make_unique<mca::InstructionTables>(SM));<br>
mca::PipelinePrinter Printer(*P);<br>
<br>
// Create the views for this pipeline, execute, and emit a report.<br>
if (PrintInstructionInfoView) {<br>
- Printer.addView(llvm::make_unique<mca::InstructionInfoView>(<br>
- *STI, *MCII, Insts, *IP));<br>
+ Printer.addView(<br>
+ make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));<br>
}<br>
- Printer.addView(<br>
- llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));<br>
+ Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));<br>
<br>
if (!runPipeline(*P))<br>
return 1;<br>
@@ -459,32 +457,31 @@ int main(int argc, char **argv) {<br>
mca::PipelinePrinter Printer(*P);<br>
<br>
if (PrintSummaryView)<br>
- Printer.addView(llvm::make_unique<mca::SummaryView>(SM, Insts, Width));<br>
+ Printer.addView(make_unique<mca::SummaryView>(SM, Insts, Width));<br>
<br>
if (PrintInstructionInfoView)<br>
Printer.addView(<br>
- llvm::make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));<br>
+ make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));<br>
<br>
if (PrintDispatchStats)<br>
- Printer.addView(llvm::make_unique<mca::DispatchStatistics>());<br>
+ Printer.addView(make_unique<mca::DispatchStatistics>());<br>
<br>
if (PrintSchedulerStats)<br>
- Printer.addView(llvm::make_unique<mca::SchedulerStatistics>(*STI));<br>
+ Printer.addView(make_unique<mca::SchedulerStatistics>(*STI));<br>
<br>
if (PrintRetireStats)<br>
- Printer.addView(llvm::make_unique<mca::RetireControlUnitStatistics>());<br>
+ Printer.addView(make_unique<mca::RetireControlUnitStatistics>());<br>
<br>
if (PrintRegisterFileStats)<br>
- Printer.addView(llvm::make_unique<mca::RegisterFileStatistics>(*STI));<br>
+ Printer.addView(make_unique<mca::RegisterFileStatistics>(*STI));<br>
<br>
if (PrintResourcePressureView)<br>
- Printer.addView(<br>
- llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));<br>
+ Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));<br>
<br>
if (PrintTimelineView) {<br>
unsigned TimelineIterations =<br>
TimelineMaxIterations ? TimelineMaxIterations : 10;<br>
- Printer.addView(llvm::make_unique<mca::TimelineView>(<br>
+ Printer.addView(make_unique<mca::TimelineView>(<br>
*STI, *IP, Insts, std::min(TimelineIterations, S.getNumIterations()),<br>
TimelineMaxCycles));<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>