Revert "[llvm-exegesis] Add in snippet address annotation (llvm#74218)"

This reverts commit 3ab41f9.

Unit tests break after recent changes. Will investigate/reland.

Author: boomanaiden154

llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-unsupported.s

@@ -2,7 +2,7 @@
 
 # RUN: not llvm-exegesis -mtriple=x86_64-unknown-unknown -snippets-file=%s -mode=latency 2>&1 | FileCheck %s
 
-# CHECK: llvm-exegesis error: Memory and snippet address annotations are only supported in subprocess execution mode
+# CHECK: llvm-exegesis error: Memory annotations are only supported in subprocess execution mode
 
 # LLVM-EXEGESIS-MEM-DEF test1 4096 ff
 

llvm/test/tools/llvm-exegesis/X86/latency/snippet-address-annotations-unsupported.s

@@ -70,9 +70,6 @@ struct BenchmarkKey {
   // An opaque configuration, that can be used to separate several benchmarks of
   // the same instruction under different configurations.
   std::string Config;
-  // The address that the snippet should be loaded in at if the execution mode
-  // being used supports it.
-  intptr_t SnippetAddress = 0;
 };
 
 struct BenchmarkMeasure {

llvm/test/tools/llvm-exegesis/X86/latency/subprocess-address-annotation.s

@@ -416,17 +416,9 @@ class SubProcessFunctionExecutorImpl
 #endif // GLIBC_INITS_RSEQ
 
     size_t FunctionDataCopySize = this->Function.FunctionBytes.size();
-    void *MapAddress = NULL;
-    int MapFlags = MAP_PRIVATE | MAP_ANONYMOUS;
-
-    if (Key.SnippetAddress != 0) {
-      MapAddress = reinterpret_cast<void *>(Key.SnippetAddress);
-      MapFlags |= MAP_FIXED_NOREPLACE;
-    }
-
     char *FunctionDataCopy =
-        (char *)mmap(MapAddress, FunctionDataCopySize, PROT_READ | PROT_WRITE,
-                     MapFlags, 0, 0);
+        (char *)mmap(NULL, FunctionDataCopySize, PROT_READ | PROT_WRITE,
+                     MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
     if ((intptr_t)FunctionDataCopy == -1)
       exit(ChildProcessExitCodeE::FunctionDataMappingFailed);
 

llvm/tools/llvm-exegesis/lib/BenchmarkResult.h

@@ -131,19 +131,6 @@ class BenchmarkCodeStreamer : public MCStreamer, public AsmCommentConsumer {
       Result->Key.MemoryMappings.push_back(std::move(MemMap));
       return;
     }
-    if (CommentText.consume_front("SNIPPET-ADDRESS")) {
-      // LLVM-EXEGESIS-SNIPPET-ADDRESS <address>
-      if (!to_integer<intptr_t>(CommentText.trim(), Result->Key.SnippetAddress,
-                                16)) {
-        errs() << "invalid comment 'LLVM-EXEGESIS-SNIPPET-ADDRESS "
-               << CommentText
-               << "', expected <ADDRESS> to contain a valid integer in "
-                  "hexadecimal format";
-        ++InvalidComments;
-        return;
-      }
-      return;
-    }
   }
 
   unsigned numInvalidComments() const { return InvalidComments; }

llvm/tools/llvm-exegesis/lib/BenchmarkRunner.cpp

@@ -533,10 +533,8 @@ void benchmarkMain() {
     for (const auto &Configuration : Configurations) {
       if (ExecutionMode != BenchmarkRunner::ExecutionModeE::SubProcess &&
           (Configuration.Key.MemoryMappings.size() != 0 ||
-           Configuration.Key.MemoryValues.size() != 0 ||
-           Configuration.Key.SnippetAddress != 0))
-        ExitWithError("Memory and snippet address annotations are only "
-                      "supported in subprocess "
+           Configuration.Key.MemoryValues.size() != 0))
+        ExitWithError("Memory annotations are only supported in subprocess "
                       "execution mode");
     }
   }

llvm/tools/llvm-exegesis/lib/SnippetFile.cpp

@@ -209,16 +209,6 @@ TEST_F(X86SnippetFileTest, MemoryMappingNoDefinition) {
   consumeError(std::move(Error));
 }
 
-TEST_F(X86SnippetFileTest, SnippetAddress) {
-  auto Snippets = TestCommon(R"(
-    # LLVM-EXEGESIS-SNIPPET-ADDRESS 0x10000
-  )");
-  ASSERT_TRUE(static_cast<bool>(Snippets));
-  EXPECT_THAT(*Snippets, SizeIs(1));
-  const auto &Snippet = (*Snippets)[0];
-  EXPECT_EQ(Snippet.Key.SnippetAddress, 0x10000);
-}
-
 } // namespace
 } // namespace exegesis
 } // namespace llvm