Add --dump-offload-bundle option to llvm-objcopy

llvm/docs/CommandGuide/llvm-objcopy.rst

@@ -62,6 +62,11 @@ multiple file formats.
  example, file and section symbols in ELF objects will not be discarded.
  Additionally, remove all debug sections.
 
+.. option:: --dump-offload-bundle=<URI>
+
+ Dump the HIP Offload Bundle entry specified by the URI syntax given, into a 
+ code object file.
+
 .. option:: --dump-section <section>=<file>
 
  Dump the contents of section ``<section>`` into the file ``<file>``. Can be
@@ -74,12 +79,6 @@ multiple file formats.
  For MachO objects, ``<section>`` must be formatted as
  ``<segment name>,<section name>``.
 
-.. option:: --dump-offload-bundle=<URI>
-
- Dump the HIP Offload Bundle entry specified by the URI syntax given, into a 
- code object file.
-
-
 .. option:: --enable-deterministic-archives, -D
 
  Enable deterministic mode when copying archives, i.e. use 0 for archive member

llvm/include/llvm/Object/OffloadBundle.h

@@ -132,6 +132,8 @@ struct OffloadBundleURI {
     switch (Type) {
     case FILE_URI:
       return createFileURI(Str);
+  //    if (Expected<std::unique_ptr<OffloadBundleURI>> URIOrErr = createFileURI(Str))
+//	      return URIOrErr.takeError();
       break;
     case MEMORY_URI:
       return createMemoryURI(Str);

llvm/lib/Object/OffloadBundle.cpp

@@ -229,7 +229,6 @@ Error object::extractOffloadBundleByURI(StringRef URIstr) {
       OffloadBundleURI::createOffloadBundleURI(URIstr, FILE_URI));
   if (!UriOrErr)
     return UriOrErr.takeError();
-
   OffloadBundleURI &Uri = **UriOrErr;
   std::string OutputFile = Uri.FileName.str();
   OutputFile +=

llvm/tools/llvm-objcopy/ObjcopyOptions.cpp

@@ -286,9 +286,13 @@ static Expected<uint8_t> parseVisibilityType(StringRef VisType) {
   return type;
 }
 
-static void llvm::objcopy::parseDumpOffloadBundle(StringRef URI) {
+//static void llvm::objcopy::parseDumpOffloadBundle(StringRef URI) {
+static Expected<StringRef> llvm::objcopy::parseDumpOffloadBundle(StringRef URI) {
   if (Error Err = object::extractOffloadBundleByURI(URI))
-    outs() << "Failed to extract from URI.";
+    //errs() << "Failed to extract from URI.";
+    return createStringError(errc::invalid_argument,"Failed to extract from URI");
+
+   return URI;
 }
 
 namespace {
@@ -759,7 +763,9 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> ArgsArr,
 
   if (Arg *A = InputArgs.getLastArg(OBJCOPY_dump_offload_bundle)) {
     for (StringRef URIStr : llvm::split(A->getValue(), ",")) {
-      llvm::objcopy::parseDumpOffloadBundle(URIStr);
+      Expected<StringRef> res = llvm::objcopy::parseDumpOffloadBundle(URIStr);
+      if (!res)
+        return res.takeError();
     }
   }
 
@@ -1441,20 +1447,19 @@ objcopy::parseInstallNameToolOptions(ArrayRef<const char *> ArgsArr) {
     return createStringError(
         errc::invalid_argument,
         "llvm-install-name-tool expects a single input file");
-  if (Config.NeedPositional) {
-    Config.InputFilename = Positional[0];
-    Config.OutputFilename = Positional[0];
-
-    Expected<OwningBinary<Binary>> BinaryOrErr =
-        createBinary(Config.InputFilename);
-    if (!BinaryOrErr)
-      return createFileError(Config.InputFilename, BinaryOrErr.takeError());
-    auto *Binary = (*BinaryOrErr).getBinary();
-    if (!Binary->isMachO() && !Binary->isMachOUniversalBinary())
-      return createStringError(errc::invalid_argument,
-                               "input file: %s is not a Mach-O file",
-                               Config.InputFilename.str().c_str());
-  }
+
+  Config.InputFilename = Positional[0];
+  Config.OutputFilename = Positional[0];
+
+  Expected<OwningBinary<Binary>> BinaryOrErr =
+      createBinary(Config.InputFilename);
+  if (!BinaryOrErr)
+    return createFileError(Config.InputFilename, BinaryOrErr.takeError());
+  auto *Binary = (*BinaryOrErr).getBinary();
+  if (!Binary->isMachO() && !Binary->isMachOUniversalBinary())
+    return createStringError(errc::invalid_argument,
+                             "input file: %s is not a Mach-O file",
+                             Config.InputFilename.str().c_str());
   DC.CopyConfigs.push_back(std::move(ConfigMgr));
   return std::move(DC);
 }
@@ -1493,16 +1498,14 @@ objcopy::parseBitcodeStripOptions(ArrayRef<const char *> ArgsArr,
                              Arg->getAsString(InputArgs).c_str());
 
   SmallVector<StringRef, 2> Positional;
-  if (Config.NeedPositional) {
-    for (auto *Arg : InputArgs.filtered(BITCODE_STRIP_INPUT))
-      Positional.push_back(Arg->getValue());
-    if (Positional.size() > 1)
-      return createStringError(
-          errc::invalid_argument,
-          "llvm-bitcode-strip expects a single input file");
-    assert(!Positional.empty());
-    Config.InputFilename = Positional[0];
-  }
+  for (auto *Arg : InputArgs.filtered(BITCODE_STRIP_INPUT))
+    Positional.push_back(Arg->getValue());
+  if (Positional.size() > 1)
+    return createStringError(
+        errc::invalid_argument,
+        "llvm-bitcode-strip expects a single input file");
+  assert(!Positional.empty());
+  Config.InputFilename = Positional[0];
 
   if (!InputArgs.hasArg(BITCODE_STRIP_output)) {
     return createStringError(errc::invalid_argument,
@@ -1570,23 +1573,21 @@ objcopy::parseStripOptions(ArrayRef<const char *> RawArgsArr,
   MachOConfig &MachOConfig = ConfigMgr.MachO;
 
   SmallVector<StringRef, 2> Positional;
-  if (Config.NeedPositional) {
-    for (auto *Arg : InputArgs.filtered(STRIP_UNKNOWN))
-      return createStringError(errc::invalid_argument, "unknown argument '%s'",
-                               Arg->getAsString(InputArgs).c_str());
-    for (auto *Arg : InputArgs.filtered(STRIP_INPUT))
-      Positional.push_back(Arg->getValue());
-    std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
-
-    if (Positional.empty())
-      return createStringError(errc::invalid_argument,
-                               "no input file specified");
+  for (auto *Arg : InputArgs.filtered(STRIP_UNKNOWN))
+    return createStringError(errc::invalid_argument, "unknown argument '%s'",
+                             Arg->getAsString(InputArgs).c_str());
+  for (auto *Arg : InputArgs.filtered(STRIP_INPUT))
+    Positional.push_back(Arg->getValue());
+  std::copy(DashDash, RawArgsArr.end(), std::back_inserter(Positional));
 
-    if (Positional.size() > 1 && InputArgs.hasArg(STRIP_output)) {
-      return createStringError(
-          errc::invalid_argument,
-          "multiple input files cannot be used in combination with -o");
-    }
+  if (Positional.empty())
+    return createStringError(errc::invalid_argument,
+                             "no input file specified");
+
+  if (Positional.size() > 1 && InputArgs.hasArg(STRIP_output)) {
+    return createStringError(
+        errc::invalid_argument,
+        "multiple input files cannot be used in combination with -o");
   }
 
   if (InputArgs.hasArg(STRIP_regex) && InputArgs.hasArg(STRIP_wildcard))

llvm/tools/llvm-objcopy/ObjcopyOptions.h

@@ -52,9 +52,9 @@ Expected<DriverConfig>
 parseStripOptions(ArrayRef<const char *> ArgsArr,
                   llvm::function_ref<Error(Error)> ErrorCallback);
 
-// parseDumpURI reads a URI as a string, and extracts the raw memory into a
-// code object file named from the URI string given
-static void parseDumpOffloadBundle(StringRef URI);
+// parseDumpOffloadBundle reads a URI as a string and extracts the raw memory into a
+// code object file named from the URI string given.
+static Expected<StringRef> parseDumpOffloadBundle(StringRef URI);
 
 } // namespace objcopy
 } // namespace llvm

llvm/tools/llvm-objcopy/ObjcopyOpts.td

@@ -235,13 +235,13 @@ defm skip_symbols
          "be repeated to read symbols from many files">,
       MetaVarName<"filename">;
 
+defm dump_offload_bundle : Eq<"dump-offload-bundle", "Dump the contents specified by URI">;
+
 defm dump_section
     : Eq<"dump-section",
          "Dump contents of section named <section> into file <file>">,
       MetaVarName<"section=file">;
 
-defm dump_offload_bundle : Eq<"dump-offload-bundle", "Dump the contents specified by URI">;
-
 defm prefix_symbols
     : Eq<"prefix-symbols", "Add <prefix> to the start of every symbol name">,
       MetaVarName<"prefix">;