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

via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 12 10:18:31 PST 2018


Thanks David!  I did restore the qualifiers, a few build bots got cranky, so I sprinkled the qualifiers back on:
https://llvm.org/viewvc/llvm-project?view=revision&revision=346424

-Matt

From: David Blaikie <dblaikie at gmail.com>
Sent: Monday, November 12, 2018 10:14 AM
To: Davis, Matthew <Matthew.Davis at sony.com>
Cc: llvm-commits at lists.llvm.org
Subject: Re: [llvm] r346417 - [llvm-mca] Remove unneeded namespace qualifier. NFC.

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)

On Thu, Nov 8, 2018 at 9:35 AM Matt Davis via llvm-commits <llvm-commits at lists.llvm.org<mailto:llvm-commits at lists.llvm.org>> wrote:
Author: mattd
Date: Thu Nov  8 09:32:45 2018
New Revision: 346417

URL: http://llvm.org/viewvc/llvm-project?rev=346417&view=rev
Log:
[llvm-mca] Remove unneeded namespace qualifier. NFC.

Modified:
    llvm/trunk/tools/llvm-mca/llvm-mca.cpp

Modified: llvm/trunk/tools/llvm-mca/llvm-mca.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/llvm-mca.cpp?rev=346417&r1=346416&r2=346417&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/llvm-mca.cpp (original)
+++ llvm/trunk/tools/llvm-mca/llvm-mca.cpp Thu Nov  8 09:32:45 2018
@@ -202,8 +202,7 @@ ErrorOr<std::unique_ptr<ToolOutputFile>>
   if (OutputFilename == "")
     OutputFilename = "-";
   std::error_code EC;
-  auto Out =
-      llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
+  auto Out = make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
   if (!EC)
     return std::move(Out);
   return EC;
@@ -251,9 +250,9 @@ int main(int argc, char **argv) {
   InitLLVM X(argc, argv);

   // Initialize targets and assembly parsers.
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllAsmParsers();
+  InitializeAllTargetInfos();
+  InitializeAllTargetMCs();
+  InitializeAllAsmParsers();

   // Enable printing of available targets when flag --version is specified.
   cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
@@ -309,7 +308,7 @@ int main(int argc, char **argv) {
       TheTarget->createMCInstrAnalysis(MCII.get()));

   if (!MCPU.compare("native"))
-    MCPU = llvm::sys::getHostCPUName();
+    MCPU = sys::getHostCPUName();

   std::unique_ptr<MCSubtargetInfo> STI(
       TheTarget->createMCSubtargetInfo(TripleName, MCPU, /* FeaturesStr */ ""));
@@ -368,7 +367,7 @@ int main(int argc, char **argv) {
     return 1;
   }

-  std::unique_ptr<llvm::ToolOutputFile> TOF = std::move(*OF);
+  std::unique_ptr<ToolOutputFile> TOF = std::move(*OF);

   const MCSchedModel &SM = STI->getSchedModel();

@@ -407,7 +406,7 @@ int main(int argc, char **argv) {
     ArrayRef<MCInst> Insts = Region->getInstructions();
     std::vector<std::unique_ptr<mca::Instruction>> LoweredSequence;
     for (const MCInst &MCI : Insts) {
-      llvm::Expected<std::unique_ptr<mca::Instruction>> Inst =
+      Expected<std::unique_ptr<mca::Instruction>> Inst =
           IB.createInstruction(MCI);
       if (!Inst) {
         if (auto NewE = handleErrors(
@@ -434,18 +433,17 @@ int main(int argc, char **argv) {

     if (PrintInstructionTables) {
       //  Create a pipeline, stages, and a printer.
-      auto P = llvm::make_unique<mca::Pipeline>();
-      P->appendStage(llvm::make_unique<mca::FetchStage>(S));
-      P->appendStage(llvm::make_unique<mca::InstructionTables>(SM));
+      auto P = make_unique<mca::Pipeline>();
+      P->appendStage(make_unique<mca::FetchStage>(S));
+      P->appendStage(make_unique<mca::InstructionTables>(SM));
       mca::PipelinePrinter Printer(*P);

       // Create the views for this pipeline, execute, and emit a report.
       if (PrintInstructionInfoView) {
-        Printer.addView(llvm::make_unique<mca::InstructionInfoView>(
-            *STI, *MCII, Insts, *IP));
+        Printer.addView(
+            make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
       }
-      Printer.addView(
-          llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
+      Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));

       if (!runPipeline(*P))
         return 1;
@@ -459,32 +457,31 @@ int main(int argc, char **argv) {
     mca::PipelinePrinter Printer(*P);

     if (PrintSummaryView)
-      Printer.addView(llvm::make_unique<mca::SummaryView>(SM, Insts, Width));
+      Printer.addView(make_unique<mca::SummaryView>(SM, Insts, Width));

     if (PrintInstructionInfoView)
       Printer.addView(
-          llvm::make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));
+          make_unique<mca::InstructionInfoView>(*STI, *MCII, Insts, *IP));

     if (PrintDispatchStats)
-      Printer.addView(llvm::make_unique<mca::DispatchStatistics>());
+      Printer.addView(make_unique<mca::DispatchStatistics>());

     if (PrintSchedulerStats)
-      Printer.addView(llvm::make_unique<mca::SchedulerStatistics>(*STI));
+      Printer.addView(make_unique<mca::SchedulerStatistics>(*STI));

     if (PrintRetireStats)
-      Printer.addView(llvm::make_unique<mca::RetireControlUnitStatistics>());
+      Printer.addView(make_unique<mca::RetireControlUnitStatistics>());

     if (PrintRegisterFileStats)
-      Printer.addView(llvm::make_unique<mca::RegisterFileStatistics>(*STI));
+      Printer.addView(make_unique<mca::RegisterFileStatistics>(*STI));

     if (PrintResourcePressureView)
-      Printer.addView(
-          llvm::make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));
+      Printer.addView(make_unique<mca::ResourcePressureView>(*STI, *IP, Insts));

     if (PrintTimelineView) {
       unsigned TimelineIterations =
           TimelineMaxIterations ? TimelineMaxIterations : 10;
-      Printer.addView(llvm::make_unique<mca::TimelineView>(
+      Printer.addView(make_unique<mca::TimelineView>(
           *STI, *IP, Insts, std::min(TimelineIterations, S.getNumIterations()),
           TimelineMaxCycles));
     }


_______________________________________________
llvm-commits mailing list
llvm-commits at lists.llvm.org<mailto:llvm-commits at lists.llvm.org>
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181112/11d67c0c/attachment-0001.html>


More information about the llvm-commits mailing list