Skip to content

Add --offoading option to llvm-readobj #143342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add --offoading option to llvm-readobj #143342

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82d085c
Add --offoading option to llvm-readobj
david-salinas Aug 28, 2024
e1d45de
PR comments addressed
Jul 15, 2025
a0929b5
Resolve PR comments.
Aug 19, 2025
674daab
Resolve PR comments.
david-salinas Aug 29, 2025
94911f8
Change error message to warning on invalid offload bundle
david-salinas Sep 2, 2025
69908e3
resolve build error
david-salinas Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions llvm/lib/Object/OffloadBundle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ Error OffloadBundleFatBin::readEntries(StringRef Buffer,
StringRef EntryID;

if (Error EC = Reader.readInteger(EntryOffset))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: since EC usually stands for "error code" and you're using an Error not std::error_code, I'd change the name to Err or similar.

return std::move(EC);
return EC;

if (Error EC = Reader.readInteger(EntrySize))
return std::move(EC);
return EC;

if (Error EC = Reader.readInteger(EntryIDSize))
return std::move(EC);
return EC;

if (Error EC = Reader.readFixedString(EntryID, EntryIDSize))
return std::move(EC);
return EC;

auto Entry = std::make_unique<OffloadBundleEntry>(
EntryOffset + SectionOffset, EntrySize, EntryIDSize, EntryID);
Expand Down
7 changes: 3 additions & 4 deletions ...m-readobj/ELF/AMDGPU/offloading_fail.test → ...m-readobj/ELF/AMDGPU/offloading-fail.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
## Test that --offloading with a fatbin works correctly.
# REQUIRES: target={{x86_64-.*-linux.*}}
# REQUIRES: amdgpu-registered-target
# UNSUPPORTED: system-windows

# RUN: yaml2obj %s -o %t.elf
# RUN: not llvm-readobj --offloading %t.elf 2>&1 | \
# RUN: FileCheck %s --check-prefix=ERR -DFILE_NAME=%t.elf
# RUN: llvm-readobj --offloading %t.elf 2>&1 | \
# RUN: FileCheck %s --check-prefix=WARN -DFILE_NAME=%t.elf

# ERR: error: '{{.*}}': Stream Error: The stream is too short to perform the requested operation.
# WARN: warning: '{{.*}}': Stream Error: The stream is too short to perform the requested operation.

--- !ELF
FileHeader:
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/tools/llvm-readobj/ELF/AMDGPU/offloading.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
## Test that --offloading with a fatbin works correctly.
# REQUIRES: target={{x86_64-.*-linux.*}}
# REQUIRES: amdgpu-registered-target
# UNSUPPORTED: system-windows

# RUN: yaml2obj %s -o %t.elf
# RUN: llvm-readobj --offloading %t.elf | \
# RUN: FileCheck %s -DFILE_NAME=%t.elf
# RUN: FileCheck %s -DFILE_NAME=%t.elf

# CHECK: host-x86_64-unknown-linux-- file://[[FILE_NAME]]#offset=8192&size=0
# CHECK-NEXT: hipv4-amdgcn-amd-amdhsa--gfx908 file://[[FILE_NAME]]#offset=8192&size=4048
Expand Down
2 changes: 1 addition & 1 deletion llvm/tools/llvm-readobj/ObjDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void ObjDumper::printSectionsAsHex(const object::ObjectFile &Obj,
void ObjDumper::printOffloading(const object::ObjectFile &Obj) {
SmallVector<llvm::object::OffloadBundleFatBin> Bundles;
if (Error Err = object::extractOffloadBundleFatBinary(Obj, Bundles))
reportError(std::move(Err), Obj.getFileName());
reportWarning(std::move(Err), Obj.getFileName());

// Print out all the FatBin Bundles that are contained in this buffer.
for (const auto &[Index, Bundle] : llvm::enumerate(Bundles))
Expand Down