Revert "[CGData] LLD for MachO (#90166)"

This reverts commit 00c0b1a.
llvm · Sep 15, 2024 · 9de2603 · 9de2603
1 parent 00c0b1a
commit 9de2603
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 135 deletions.
diff --git a/lld/MachO/Config.h b/lld/MachO/Config.h
@@ -210,7 +210,6 @@ struct Configuration {
   std::vector<SectionAlign> sectionAlignments;
   std::vector<SegmentProtection> segmentProtections;
   bool ltoDebugPassManager = false;
-  llvm::StringRef codegenDataGeneratePath;
   bool csProfileGenerate = false;
   llvm::StringRef csProfilePath;
   bool pgoWarnMismatch;

diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
@@ -36,7 +36,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/BinaryFormat/Magic.h"
-#include "llvm/CGData/CodeGenDataWriter.h"
 #include "llvm/Config/llvm-config.h"
 #include "llvm/LTO/LTO.h"
 #include "llvm/Object/Archive.h"
@@ -1323,37 +1322,6 @@ static void gatherInputSections() {
   }
 }
 
-static void codegenDataGenerate() {
-  TimeTraceScope timeScope("Generating codegen data");
-
-  OutlinedHashTreeRecord globalOutlineRecord;
-  for (ConcatInputSection *isec : inputSections)
-    if (isec->getSegName() == segment_names::data &&
-        isec->getName() == section_names::outlinedHashTree) {
-      // Read outlined hash tree from each section.
-      OutlinedHashTreeRecord localOutlineRecord;
-      auto *data = isec->data.data();
-      localOutlineRecord.deserialize(data);
-
-      // Merge it to the global hash tree.
-      globalOutlineRecord.merge(localOutlineRecord);
-    }
-
-  CodeGenDataWriter Writer;
-  if (!globalOutlineRecord.empty())
-    Writer.addRecord(globalOutlineRecord);
-
-  std::error_code EC;
-  auto fileName = config->codegenDataGeneratePath;
-  assert(!fileName.empty());
-  raw_fd_ostream Output(fileName, EC, sys::fs::OF_None);
-  if (EC)
-    error("fail to create " + fileName + ": " + EC.message());
-
-  if (auto E = Writer.write(Output))
-    error("fail to write CGData: " + toString(std::move(E)));
-}
-
 static void foldIdenticalLiterals() {
   TimeTraceScope timeScope("Fold identical literals");
   // We always create a cStringSection, regardless of whether dedupLiterals is
@@ -1791,8 +1759,6 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
     config->ignoreAutoLinkOptions.insert(arg->getValue());
   config->strictAutoLink = args.hasArg(OPT_strict_auto_link);
   config->ltoDebugPassManager = args.hasArg(OPT_lto_debug_pass_manager);
-  config->codegenDataGeneratePath =
-      args.getLastArgValue(OPT_codegen_data_generate_path);
   config->csProfileGenerate = args.hasArg(OPT_cs_profile_generate);
   config->csProfilePath = args.getLastArgValue(OPT_cs_profile_path);
   config->pgoWarnMismatch =
@@ -2137,10 +2103,6 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
     }
 
     gatherInputSections();
-
-    if (!config->codegenDataGeneratePath.empty())
-      codegenDataGenerate();
-
     if (config->callGraphProfileSort)
       priorityBuilder.extractCallGraphProfile();
 

diff --git a/lld/MachO/InputSection.h b/lld/MachO/InputSection.h
@@ -354,7 +354,6 @@ constexpr const char objcMethname[] = "__objc_methname";
 constexpr const char objcNonLazyCatList[] = "__objc_nlcatlist";
 constexpr const char objcNonLazyClassList[] = "__objc_nlclslist";
 constexpr const char objcProtoList[] = "__objc_protolist";
-constexpr const char outlinedHashTree[] = "__llvm_outline";
 constexpr const char pageZero[] = "__pagezero";
 constexpr const char pointers[] = "__pointers";
 constexpr const char rebase[] = "__rebase";

diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td
@@ -162,10 +162,6 @@ def no_objc_category_merging : Flag<["-"], "no_objc_category_merging">,
     Group<grp_lld>;
 def lto_debug_pass_manager: Flag<["--"], "lto-debug-pass-manager">,
     HelpText<"Debug new pass manager">, Group<grp_lld>;
-def codegen_data_generate_path : Separate<["--"], "codegen-data-generate-path">, Group<grp_lld>;
-def codegen_data_generate_path_eq : Joined<["--"], "codegen-data-generate-path=">,
-    Alias<!cast<Separate>(codegen_data_generate_path)>, MetaVarName<"<cgdata>">,
-    HelpText<"Write the CG data to the specified path <cgdata>.">, Group<grp_lld>;
 def cs_profile_generate: Flag<["--"], "cs-profile-generate">,
     HelpText<"Perform context sensitive PGO instrumentation">, Group<grp_lld>;
 def cs_profile_path: Joined<["--"], "cs-profile-path=">,

diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt
@@ -48,7 +48,6 @@ if (NOT LLD_BUILT_STANDALONE)
     llvm-ar
     llvm-as
     llvm-bcanalyzer
-    llvm-cgdata
     llvm-config
     llvm-cvtres
     llvm-dis

diff --git a/lld/test/MachO/cgdata-generate.s b/lld/test/MachO/cgdata-generate.s
diff --git a/lld/test/lit.cfg.py b/lld/test/lit.cfg.py
@@ -40,7 +40,6 @@
 tool_patterns = [
     "llc",
     "llvm-as",
-    "llvm-cgdata",
     "llvm-mc",
     "llvm-nm",
     "llvm-objdump",