From 0ec787d5b8b2d776a0195ece96b3f7351733f86d Mon Sep 17 00:00:00 2001
From: Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net>
Date: Wed, 8 May 2019 11:00:43 +0000
Subject: [PATCH] [MCA] Don't add a name to the default code region.

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


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360243 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-mca/X86/llvm-mca-markers-2.s | 2 +-
 tools/llvm-mca/CodeRegion.cpp                | 2 +-
 tools/llvm-mca/CodeRegion.h                  | 4 ++--
 tools/llvm-mca/CodeRegionGenerator.cpp       | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/tools/llvm-mca/X86/llvm-mca-markers-2.s b/test/tools/llvm-mca/X86/llvm-mca-markers-2.s
index 21d1030bd62..22ed29f74b0 100644
--- a/test/tools/llvm-mca/X86/llvm-mca-markers-2.s
+++ b/test/tools/llvm-mca/X86/llvm-mca-markers-2.s
@@ -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
diff --git a/tools/llvm-mca/CodeRegion.cpp b/tools/llvm-mca/CodeRegion.cpp
index 6d4192250aa..eb04ea3f0d8 100644
--- a/tools/llvm-mca/CodeRegion.cpp
+++ b/tools/llvm-mca/CodeRegion.cpp
@@ -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 {
diff --git a/tools/llvm-mca/CodeRegion.h b/tools/llvm-mca/CodeRegion.h
index cc474b78ca7..80532e311ed 100644
--- a/tools/llvm-mca/CodeRegion.h
+++ b/tools/llvm-mca/CodeRegion.h
@@ -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();
   }
diff --git a/tools/llvm-mca/CodeRegionGenerator.cpp b/tools/llvm-mca/CodeRegionGenerator.cpp
index 4660af2c40a..14b470a417c 100644
--- a/tools/llvm-mca/CodeRegionGenerator.cpp
+++ b/tools/llvm-mca/CodeRegionGenerator.cpp
@@ -115,7 +115,6 @@ Expected<const CodeRegions &> AsmCodeRegionGenerator::parseCodeRegions() {
   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 &> AsmCodeRegionGenerator::parseCodeRegions() {
   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;
-- 
2.11.0