Merge pull request llvm#550 from AMD-Lightning-Internal/amd/dev/dsalinas/fix_llvm_objdump_option_mainline

[llvm-objdump] Fix the option for offloading from --offload-fatbin to…

Author: Salinas, David

llvm/docs/CommandGuide/llvm-objdump.rst

@@ -218,6 +218,7 @@ OPTIONS
 .. option:: --offloading
 
   Display the content of the LLVM offloading section.
+  Extract Clang offload binaries into code objects.
 
 .. option:: --prefix=<prefix>
 

llvm/test/tools/llvm-objdump/Offloading/fatbin.test

@@ -1,8 +1,8 @@
-## Test that --offload-fatbin works correctly
+## Test that --offloading works correctly
 
 # REQUIRES: target={{.*-linux.*}}
 # RUN: yaml2obj %s -o %t.elf
-# RUN: llvm-objdump --offload-fatbin %t.elf 
+# RUN: llvm-objdump --offloading %t.elf 
 # RUN: llvm-objdump -d %t.elf:0.hipv4-amdgcn-amd-amdhsa--gfx908 | FileCheck %s 
 
 

llvm/tools/llvm-objdump/OffloadDump.cpp

@@ -51,7 +51,7 @@ static void printBinary(const OffloadBinary &OB, uint64_t Index) {
 }
 
 /// Print the embedded offloading contents of an ObjectFile \p O.
-void llvm::dumpOffloadBinary(const ObjectFile &O) {
+void llvm::dumpOffloadBinary(const ObjectFile &O, std::string ArchName) {
   if (!O.isELF() && !O.isCOFF()) {
     reportWarning(
         "--offloading is currently only supported for COFF and ELF targets",
@@ -67,14 +67,15 @@ void llvm::dumpOffloadBinary(const ObjectFile &O) {
   // Print out all the binaries that are contained in this buffer.
   for (uint64_t I = 0, E = Binaries.size(); I != E; ++I)
     printBinary(*Binaries[I].getBinary(), I);
+
+  dumpOffloadBundleFatBinary(O, ArchName);
 }
 
 // Given an Object file, collect all Bundles of FatBin Binaries
 // and dump them into Code Object files
 // if -d is specified, disassemble the Code Object Files
 // if -arch=-name is specified, only dump the Entries that match the target arch
-void llvm::dumpOffloadBundleFatBinary(const ObjectFile &O, std::string ArchName,
-                                      bool Disassemble) {
+void llvm::dumpOffloadBundleFatBinary(const ObjectFile &O, std::string ArchName) {
   assert((O.isELF() || O.isCOFF()) && "Invalid file type");
   // Collect all Bundles and their Entries ....
   SmallVector<llvm::object::OffloadBundleFatBin> FoundBundles;

llvm/tools/llvm-objdump/OffloadDump.h

@@ -15,11 +15,10 @@
 namespace llvm {
 
 void dumpOffloadSections(const object::OffloadBinary &OB);
-void dumpOffloadBinary(const object::ObjectFile &O);
+void dumpOffloadBinary(const object::ObjectFile &O, std::string ArchName);
 
 /// Dump fat binary in binary clang-offload-bundler format
-void dumpOffloadBundleFatBinary(const object::ObjectFile &O,
-                                std::string ArchName, bool Disassemble);
+void dumpOffloadBundleFatBinary(const object::ObjectFile &O, std::string ArchName);
 } // namespace llvm
 
 #endif

llvm/tools/llvm-objdump/llvm-objdump.cpp

@@ -324,7 +324,6 @@ std::vector<std::string> objdump::MAttrs;
 bool objdump::ShowRawInsn;
 bool objdump::LeadingAddr;
 static bool Offloading;
-static bool OffloadFatBin;
 static bool RawClangAST;
 bool objdump::Relocations;
 bool objdump::PrintImmHex;
@@ -3313,8 +3312,6 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
     D.printDynamicRelocations();
   if (SectionContents)
     printSectionContents(O);
-  if (OffloadFatBin)
-    dumpOffloadBundleFatBinary(*O, ArchName, Disassemble);
   if (Disassemble)
     disassembleObject(O, Relocations);
   if (UnwindInfo)
@@ -3338,7 +3335,7 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
   if (FaultMapSection)
     printFaultMaps(O);
   if (Offloading)
-    dumpOffloadBinary(*O);
+    dumpOffloadBinary(*O, ArchName);
 }
 
 static void dumpObject(const COFFImportFile *I, const Archive *A,
@@ -3521,7 +3518,6 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
   DynamicRelocations = InputArgs.hasArg(OBJDUMP_dynamic_reloc);
   FaultMapSection = InputArgs.hasArg(OBJDUMP_fault_map_section);
   Offloading = InputArgs.hasArg(OBJDUMP_offloading);
-  OffloadFatBin = InputArgs.hasArg(OBJDUMP_offload_fatbin);
   FileHeaders = InputArgs.hasArg(OBJDUMP_file_headers);
   SectionContents = InputArgs.hasArg(OBJDUMP_full_contents);
   PrintLines = InputArgs.hasArg(OBJDUMP_line_numbers);
@@ -3733,7 +3729,6 @@ int llvm_objdump_main(int argc, char **argv, const llvm::ToolContext &) {
       !DynamicRelocations && !FileHeaders && !PrivateHeaders && !RawClangAST &&
       !Relocations && !SectionHeaders && !SectionContents && !SymbolTable &&
       !DynamicSymbolTable && !UnwindInfo && !FaultMapSection && !Offloading &&
-      !OffloadFatBin &&
       !(MachOOpt &&
         (Bind || DataInCode || ChainedFixups || DyldInfo || DylibId ||
          DylibsUsed || ExportsTrie || FirstPrivateHeader ||