[llvm] r360243 - [MCA] Don't add a name to the default code region.

[Andrea Di Biagio via llvm-commits]

Author: adibiagio
Date: Wed May  8 04:00:43 2019
New Revision: 360243

URL: http://llvm.org/viewvc/llvm-project?rev=360243&view=rev
Log:
[MCA] Don't add a name to the default code region.

This is done in preparation for a patch that fixes PR41523.

Modified:
    llvm/trunk/test/tools/llvm-mca/X86/llvm-mca-markers-2.s
    llvm/trunk/tools/llvm-mca/CodeRegion.cpp
    llvm/trunk/tools/llvm-mca/CodeRegion.h
    llvm/trunk/tools/llvm-mca/CodeRegionGenerator.cpp

Modified: llvm/trunk/test/tools/llvm-mca/X86/llvm-mca-markers-2.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mca/X86/llvm-mca-markers-2.s?rev=360243&r1=360242&r2=360243&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-mca/X86/llvm-mca-markers-2.s (original)
+++ llvm/trunk/test/tools/llvm-mca/X86/llvm-mca-markers-2.s Wed May  8 04:00:43 2019
@@ -5,7 +5,7 @@
 # LLVM-MCA-END
   add %esi, %eax
 
-# CHECK:      [0] Code Region - Default
+# CHECK:      [0] Code Region
 
 # CHECK:      Iterations:        1
 # CHECK-NEXT: Instructions:      1

Modified: llvm/trunk/tools/llvm-mca/CodeRegion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/CodeRegion.cpp?rev=360243&r1=360242&r2=360243&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/CodeRegion.cpp (original)
+++ llvm/trunk/tools/llvm-mca/CodeRegion.cpp Wed May  8 04:00:43 2019
@@ -18,7 +18,7 @@ namespace mca {
 
 CodeRegions::CodeRegions(llvm::SourceMgr &S) : SM(S) {
   // Create a default region for the input code sequence.
-  Regions.emplace_back(make_unique<CodeRegion>("Default", SMLoc()));
+  Regions.emplace_back(make_unique<CodeRegion>("", SMLoc()));
 }
 
 bool CodeRegion::isLocInRange(SMLoc Loc) const {

Modified: llvm/trunk/tools/llvm-mca/CodeRegion.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/CodeRegion.h?rev=360243&r1=360242&r2=360243&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/CodeRegion.h (original)
+++ llvm/trunk/tools/llvm-mca/CodeRegion.h Wed May  8 04:00:43 2019
@@ -90,6 +90,8 @@ class CodeRegions {
   CodeRegions &operator=(const CodeRegions &) = delete;
 
 public:
+  CodeRegions(llvm::SourceMgr &S);
+
   typedef std::vector<UniqueCodeRegion>::iterator iterator;
   typedef std::vector<UniqueCodeRegion>::const_iterator const_iterator;
 
@@ -103,8 +105,6 @@ public:
   void addInstruction(const llvm::MCInst &Instruction);
   llvm::SourceMgr &getSourceMgr() const { return SM; }
 
-  CodeRegions(llvm::SourceMgr &S);
-
   llvm::ArrayRef<llvm::MCInst> getInstructionSequence(unsigned Idx) const {
     return Regions[Idx]->getInstructions();
   }

Modified: llvm/trunk/tools/llvm-mca/CodeRegionGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/CodeRegionGenerator.cpp?rev=360243&r1=360242&r2=360243&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/CodeRegionGenerator.cpp (original)
+++ llvm/trunk/tools/llvm-mca/CodeRegionGenerator.cpp Wed May  8 04:00:43 2019
@@ -115,7 +115,6 @@ Expected<const CodeRegions &> AsmCodeReg
   MCACommentConsumer CC(Regions);
   Lexer.setCommentConsumer(&CC);
 
-  // Create a target-specific parser and perform the parse.
   std::unique_ptr<MCTargetAsmParser> TAP(
       TheTarget.createMCAsmParser(STI, *Parser, MCII, Opts));
   if (!TAP)
@@ -125,7 +124,7 @@ Expected<const CodeRegions &> AsmCodeReg
   Parser->setTargetParser(*TAP);
   Parser->Run(false);
 
-  // Get the assembler dialect from the input.  llvm-mca will use this as the
+  // Set the assembler dialect from the input. llvm-mca will use this as the
   // default dialect when printing reports.
   AssemblerDialect = Parser->getAssemblerDialect();
   return Regions;