[llvm] [llvm-objdump] Fix inverted --arch-name filter for offload bundles (PR #216161)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-llvm-binary-utilities

Author: Larry Meadows (lfmeadow)

<details>
<summary>Changes</summary>

`--offloading` extracts clang-offload-bundler fatbin entries to files, and `--arch-name` is meant to restrict that to a single architecture. The filter is inverted: it skips the entries whose ID contains the requested architecture. On an object built for gfx906 and gfx908, `--offloading --arch-name=gfx908` extracts the host entry and gfx906 and drops gfx908.

Extract the matching entries instead. The filter had no test coverage, so this adds a test for both the unfiltered and the filtered case.

Made with [Cursor](https://cursor.com)

---
Full diff: https://github.com/llvm/llvm-project/pull/216161.diff


2 Files Affected:

- (added) llvm/test/tools/llvm-objdump/Offloading/fatbin-arch-name.test (+35) 
- (modified) llvm/tools/llvm-objdump/OffloadDump.cpp (+1-1) 


``````````diff
diff --git a/llvm/test/tools/llvm-objdump/Offloading/fatbin-arch-name.test b/llvm/test/tools/llvm-objdump/Offloading/fatbin-arch-name.test
new file mode 100644
index 0000000000000..333f27631b8cb
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/Offloading/fatbin-arch-name.test
@@ -0,0 +1,35 @@
+## Test that --offloading extracts every bundle entry by default, and that
+## --arch-name restricts extraction to the entries whose ID contains the
+## requested architecture.
+
+# RUN: yaml2obj %s -o %t.elf
+
+# RUN: llvm-objdump --offloading %t.elf | FileCheck %s --check-prefix=ALL
+# RUN: FileCheck %s --check-prefix=DEV908 \
+# RUN:   --input-file=%t.elf.0.hip-amdgcn-amd-amdhsa--gfx908
+
+# ALL: Extracting offload bundle: {{.*}}.elf.0.host-x86_64-unknown-linux-gnu-
+# ALL: Extracting offload bundle: {{.*}}.elf.0.hip-amdgcn-amd-amdhsa--gfx906
+# ALL: Extracting offload bundle: {{.*}}.elf.0.hip-amdgcn-amd-amdhsa--gfx908
+# DEV908: Content of device file 908
+
+# RUN: llvm-objdump --offloading --arch-name=gfx908 %t.elf \
+# RUN:   | FileCheck %s --check-prefix=FILTER
+
+# FILTER-NOT: Extracting offload bundle:
+# FILTER: Extracting offload bundle: {{.*}}.elf.0.hip-amdgcn-amd-amdhsa--gfx908
+# FILTER-NOT: Extracting offload bundle:
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .hip_fatbin
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC ]
+    AddressAlign:    0x1000
+    Content:         5F5F434C414E475F4F46464C4F41445F42554E444C455F5F0300000000000000C0000000000000000D000000000000001E00000000000000686F73742D7838365F36342D756E6B6E6F776E2D6C696E75782D676E752DCD000000000000001B000000000000001D000000000000006869702D616D6467636E2D616D642D616D646873612D2D676678393036E8000000000000001B000000000000001D000000000000006869702D616D6467636E2D616D642D616D646873612D2D676678393038686F737420636F6E74656E740A436F6E74656E74206F66206465766963652066696C65203930360A436F6E74656E74206F66206465766963652066696C65203930380A
+...
diff --git a/llvm/tools/llvm-objdump/OffloadDump.cpp b/llvm/tools/llvm-objdump/OffloadDump.cpp
index c0ba4d86d9209..ae3cda778363a 100644
--- a/llvm/tools/llvm-objdump/OffloadDump.cpp
+++ b/llvm/tools/llvm-objdump/OffloadDump.cpp
@@ -133,7 +133,7 @@ void llvm::dumpOffloadBundleFatBinary(const ObjectFile &O, StringRef ArchName) {
                                      toString(std::move(Err)));
   for (const auto &[BundleNum, Bundle] : llvm::enumerate(FoundBundles)) {
     for (OffloadBundleEntry &Entry : Bundle.getEntries()) {
-      if (!ArchName.empty() && Entry.ID.find(ArchName) != std::string::npos)
+      if (!ArchName.empty() && !StringRef(Entry.ID).contains(ArchName))
         continue;
 
       // create file name for this object file:  <source-filename>.<Bundle

``````````

</details>


https://github.com/llvm/llvm-project/pull/216161