[Object] Add ELF section type for offloading objects

[jhuber6]

Summary

Currently we use the .llvm.offloading section to store device-side
objects inside the host, creating a fat binary. The contents of these
sections is currently determined by the name of the section while it
should ideally be determined by its type. This patch adds the new
SHT_LLVM_OFFLOADING section type to the ELF section types. Which
should make it easier to identify this specific data format.

[jhuber6]

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

504–506

I'm not sure about just checking the name here. The way these are generated by clang is just dumping the contents of a file to a constant string global in LLVM-IR like so:

@llvm.embedded.object = private constant [0 x i8] zeroinitializer, section ".llvm.offloading", align 8

I could probably add some metadata node to indicate this instead like this, but I wasn't sure if it was worth introducing yet more attributes for something that's somewhat niche like this.

@llvm.embedded.object = private constant [0 x i8] zeroinitializer, section ".llvm.offloading", align 8 !offloading

Also, I may want to distinguish between "offloading" data intended for linking or execution. The former should get the SHF_EXCLUDE flag while the latter should not. It would be nice to be able to pass this to the backend somehow. Let me know what you think.

[jhenderson]

We probably need a test case showing that the assembler understands "@llvm_offloading" when reading it (and produces an SHT_LLVM_OFFLOADING section).

llvm/docs/Extensions.rst

456

I'm not all too familiar with this area, but should "fat-binary" be hyphenated? I'd have thought it would have been two separate words (since the adjective "fat" isn't tied to the noun "binary"). OTOH, if that's how it's always referred to, I guess it's fine.

461

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

504–506

Unfortunately, I don't really know CodeGen personally, so I can't advise - someone else needs to comment here.

Unrelated to that discussion, but is this line tested? (It might be, but I'd somewhat expect to see a test case which checks the section type of an IR-produced section which doesn't go via asm or something like that - (this may all be nonsense due to lack of familiarity).

[jhuber6]

Adding test and fixing grammar.

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

504–506

it should be tested by the offload_sections test, showing that the @llvm_offloading type shows up on the global for ELF. We have some similar code above that does something similar for adding the SHF_EXCLUDE flag.

[jhenderson]

I'm just trying to understand the test coverage, because I'm not too familiar with the touched areas of code:

1. CodeGen/TargetLoweringObjectFileImpl.cpp is covered by CodeGen/X86/offload_sections.ll? (CodeGen converts named section type to ELF type)
2. MCParser/ELFAsmParser.cpp is covered by MC/AsmParser/llvm_section_types.s (llvm-mc can understand the section directive)
3. MCSectionELF.cpp is covered by CodeGen/X86/offload_sections.ll? (Code converts ELF type for section directive)
4. Object/ELF.cpp is covered by MC/AsmParser/llvm_section_types.s (llvm-readobj recognises the section type)
5. ObjectYAML/ELFYAML.cpp is covered by ObjectYAML/ELF/sht-offloading.yaml

Does this line up with your expectation? If so, LGTM. (If not, please could you explain where it doesn't!)

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

504–506

Thanks, pulling this discussion out-of-line.

[jhenderson]

Addendum: it might be worth getting somebody else to chime in on the CodeGen change before landing this.

[jhuber6]

In D129052#3628182, @jhenderson wrote:

I'm just trying to understand the test coverage, because I'm not too familiar with the touched areas of code:

1. CodeGen/TargetLoweringObjectFileImpl.cpp is covered by CodeGen/X86/offload_sections.ll? (CodeGen converts named section type to ELF type)
2. MCParser/ELFAsmParser.cpp is covered by MC/AsmParser/llvm_section_types.s (llvm-mc can understand the section directive)
3. MCSectionELF.cpp is covered by CodeGen/X86/offload_sections.ll? (Code converts ELF type for section directive)
4. Object/ELF.cpp is covered by MC/AsmParser/llvm_section_types.s (llvm-readobj recognises the section type)
5. ObjectYAML/ELFYAML.cpp is covered by ObjectYAML/ELF/sht-offloading.yaml

Does this line up with your expectation? If so, LGTM. (If not, please could you explain where it doesn't!)

Yes, that sounds right. Thanks for the reviews

In D129052#3628186, @jhenderson wrote:

Addendum: it might be worth getting somebody else to chime in on the CodeGen change before landing this.

Yes, I would like to get some feedback on if I should go with some metadata attached to the generated global to determine if it should be at this section. I mainly want this so I can decide whether or not this section should have SHF_EXCLUDE or not.

llvm/docs/Extensions.rst

.. code-block:: gas
    .uleb128  .Lfunc_beign0-.Lfunc_begin0  # BB_0 offset relative to the function entry (always zero)
    .uleb128  .LBB_END0_0-.Lfunc_begin0    # BB_0 size
    .byte     x                            # BB_0 metadata
   # BB record for BB_1
    .uleb128  .LBB0_1-.Lfunc_begin0        # BB_1 offset relative to the function entry
    .uleb128  .LBB_END0_1-.LBB0_1          # BB_1 size
    .byte     y                            # BB_1 metadata
 
+``SHT_LLVM_OFFLOADING`` Section (offloading data)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+This section stores the binary data used to perform offloading device linking
+and execution, creating a fat binary. This section is emitted during compilation
+of offloading languages such as OpenMP or CUDA. If the data is intended to be
+used by the device linker only, it should use the ``SHF_EXCLUDE`` flag so it is
+automatically stripped from the final executable or shared library.
+
+The binary data stored in this section conforms to a custom binary format used
+for storing offloading metadata. This format is effectively a string table
+containing metadata accompanied by a device image.
+
 CodeView-Dependent
 ------------------
 
 ``.cv_file`` Directive
 ^^^^^^^^^^^^^^^^^^^^^^
 Syntax:
   ``.cv_file`` *FileNumber FileName* [ *checksum* ] [ *checksumkind* ]
 

llvm/include/llvm/BinaryFormat/ELF.h

enum : unsigned {
   SHT_LLVM_SYMPART = 0x6fff4c05,   // Symbol partition specification.
   SHT_LLVM_PART_EHDR = 0x6fff4c06, // ELF header for loadable partition.
   SHT_LLVM_PART_PHDR = 0x6fff4c07, // Phdrs for loadable partition.
   SHT_LLVM_BB_ADDR_MAP_V0 =
       0x6fff4c08, // LLVM Basic Block Address Map (old version kept for
                   // backward-compatibility).
   SHT_LLVM_CALL_GRAPH_PROFILE = 0x6fff4c09, // LLVM Call Graph Profile.
   SHT_LLVM_BB_ADDR_MAP = 0x6fff4c0a,        // LLVM Basic Block Address Map.
+  SHT_LLVM_OFFLOADING = 0x6fff4c0b,         // LLVM device offloading data.
   // Android's experimental support for SHT_RELR sections.
   // https://android.googlesource.com/platform/bionic/+/b7feec74547f84559a1467aca02708ff61346d2a/libc/include/elf.h#512
   SHT_ANDROID_RELR = 0x6fffff00,   // Relocation entries; only offsets.
   SHT_GNU_ATTRIBUTES = 0x6ffffff5, // Object attributes.
   SHT_GNU_HASH = 0x6ffffff6,       // GNU-style hash table.
   SHT_GNU_verdef = 0x6ffffffd,     // GNU version definitions.
   SHT_GNU_verneed = 0x6ffffffe,    // GNU version references.
   SHT_GNU_versym = 0x6fffffff,     // GNU symbol versions table.

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

if (hasPrefix(Name, ".init_array"))
     return ELF::SHT_INIT_ARRAY;
 
   if (hasPrefix(Name, ".fini_array"))
     return ELF::SHT_FINI_ARRAY;
 
   if (hasPrefix(Name, ".preinit_array"))
     return ELF::SHT_PREINIT_ARRAY;
 
+  if (hasPrefix(Name, ".llvm.offloading"))
+    return ELF::SHT_LLVM_OFFLOADING;
+
   if (K.isBSS() || K.isThreadBSS())
     return ELF::SHT_NOBITS;
 
   return ELF::SHT_PROGBITS;
 }
 
 static unsigned getELFSectionFlags(SectionKind K) {
   unsigned Flags = 0;

llvm/lib/MC/MCParser/ELFAsmParser.cpp

if (TypeName.empty()) {
     else if (TypeName == "llvm_call_graph_profile")
       Type = ELF::SHT_LLVM_CALL_GRAPH_PROFILE;
     else if (TypeName == "llvm_dependent_libraries")
       Type = ELF::SHT_LLVM_DEPENDENT_LIBRARIES;
     else if (TypeName == "llvm_sympart")
       Type = ELF::SHT_LLVM_SYMPART;
     else if (TypeName == "llvm_bb_addr_map")
       Type = ELF::SHT_LLVM_BB_ADDR_MAP;
+    else if (TypeName == "llvm_offloading")
+      Type = ELF::SHT_LLVM_OFFLOADING;
     else if (TypeName.getAsInteger(0, Type))
       return TokError("unknown section type");
   }
 
   if (UseLastGroup) {
     MCSectionSubPair CurrentSection = getStreamer().getCurrentSection();
     if (const MCSectionELF *Section =
             cast_or_null<MCSectionELF>(CurrentSection.first))

llvm/lib/MC/MCSectionELF.cpp

void MCSectionELF::printSwitchToSection(const MCAsmInfo &MAI, const Triple &T,
   else if (Type == ELF::SHT_LLVM_DEPENDENT_LIBRARIES)
     OS << "llvm_dependent_libraries";
   else if (Type == ELF::SHT_LLVM_SYMPART)
     OS << "llvm_sympart";
   else if (Type == ELF::SHT_LLVM_BB_ADDR_MAP)
     OS << "llvm_bb_addr_map";
   else if (Type == ELF::SHT_LLVM_BB_ADDR_MAP_V0)
     OS << "llvm_bb_addr_map_v0";
+  else if (Type == ELF::SHT_LLVM_OFFLOADING)
+    OS << "llvm_offloading";
   else
     report_fatal_error("unsupported type 0x" + Twine::utohexstr(Type) +
                        " for section " + getName());
 
   if (EntrySize) {
     assert(Flags & ELF::SHF_MERGE);
     OS << "," << EntrySize;
   }

llvm/lib/Object/ELF.cpp

switch (Type) {
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_CALL_GRAPH_PROFILE);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_ADDRSIG);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_DEPENDENT_LIBRARIES);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_SYMPART);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_PART_EHDR);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_PART_PHDR);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_BB_ADDR_MAP_V0);
     STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_BB_ADDR_MAP);
+    STRINGIFY_ENUM_CASE(ELF, SHT_LLVM_OFFLOADING);
     STRINGIFY_ENUM_CASE(ELF, SHT_GNU_ATTRIBUTES);
     STRINGIFY_ENUM_CASE(ELF, SHT_GNU_HASH);
     STRINGIFY_ENUM_CASE(ELF, SHT_GNU_verdef);
     STRINGIFY_ENUM_CASE(ELF, SHT_GNU_verneed);
     STRINGIFY_ENUM_CASE(ELF, SHT_GNU_versym);
   default:
     return "Unknown";
   }

llvm/lib/ObjectYAML/ELFYAML.cpp

#define ECase(X) IO.enumCase(Value, #X, ELF::X)
   ECase(SHT_LLVM_CALL_GRAPH_PROFILE);
   ECase(SHT_LLVM_ADDRSIG);
   ECase(SHT_LLVM_DEPENDENT_LIBRARIES);
   ECase(SHT_LLVM_SYMPART);
   ECase(SHT_LLVM_PART_EHDR);
   ECase(SHT_LLVM_PART_PHDR);
   ECase(SHT_LLVM_BB_ADDR_MAP_V0);
   ECase(SHT_LLVM_BB_ADDR_MAP);
+  ECase(SHT_LLVM_OFFLOADING);
   ECase(SHT_GNU_ATTRIBUTES);
   ECase(SHT_GNU_HASH);
   ECase(SHT_GNU_verdef);
   ECase(SHT_GNU_verneed);
   ECase(SHT_GNU_versym);
   switch (Object->getMachine()) {
   case ELF::EM_ARM:
     ECase(SHT_ARM_EXIDX);

llvm/test/CodeGen/X86/offload_sections.ll

 ; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu | FileCheck %s --check-prefix=CHECK-ELF
 ; RUN: llc < %s -mtriple=x86_64-win32-gnu | FileCheck %s --check-prefix=CHECK-COFF
 
 @llvm.embedded.object = private constant [1 x i8] c"\00", section ".llvm.offloading"
 @llvm.compiler.used = appending global [1 x ptr] [ptr @llvm.embedded.object], section "llvm.metadata"
 
-; CHECK-ELF: .section .llvm.offloading,"e"
+; CHECK-ELF: .section .llvm.offloading,"e",@llvm_offloading
 ; CHECK-COFF: .section  .llvm.offloading,"dr"

llvm/test/MC/AsmParser/llvm_section_types.s

 ## Verify that LLVM-specific section types are correctly inferred from assembly input.
 # RUN: llvm-mc -triple i386-pc-linux -filetype=obj -o %t %s
 # RUN: llvm-readobj -S %t | FileCheck %s
 .section    .section1,"",@llvm_bb_addr_map
 .byte 1
 .section    .section2,"",@llvm_call_graph_profile
 .byte 1
 .section    .section3,"",@llvm_odrtab
 .byte 1
 .section    .section4,"",@llvm_linker_options
 .byte 1
 .section    .section5,"",@llvm_sympart
 .byte 1
 .section    .section6,"",@llvm_dependent_libraries
 .byte 1
+.section    .section7,"",@llvm_offloading
+.byte 1
 
 # CHECK:        Name: .section1
 # CHECK-NEXT:   Type: SHT_LLVM_BB_ADDR_MAP
 # CHECK:        Name: .section2
 # CHECK-NEXT:   Type: SHT_LLVM_CALL_GRAPH_PROFILE
 # CHECK:        Name: .section3
 # CHECK-NEXT:   Type: SHT_LLVM_ODRTAB
 # CHECK:        Name: .section4
 # CHECK-NEXT:   Type: SHT_LLVM_LINKER_OPTIONS
 # CHECK:        Name: .section5
 # CHECK-NEXT:   Type: SHT_LLVM_SYMPART
 # CHECK:        Name: .section6
 # CHECK-NEXT:   Type: SHT_LLVM_DEPENDENT_LIBRARIES
+# CHECK:        Name: .section7
+# CHECK-NEXT:   Type: SHT_LLVM_OFFLOADING

llvm/test/ObjectYAML/ELF/sht-offloading.yaml

+# RUN: yaml2obj %s -o %t
+# RUN: llvm-readobj --sections %t | FileCheck -check-prefix=OBJ %s
+# RUN: obj2yaml %t | FileCheck -check-prefix=YAML %s
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+Sections:
+  - Name:            .llvm.offloading
+    Type:            SHT_LLVM_OFFLOADING
+    Flags:           [ SHF_EXCLUDE ]
+
+#      OBJ: Sections [
+#      OBJ:   Section {
+#      OBJ:     Index: 1
+# OBJ-NEXT:     Name: .llvm.offloading (1)
+# OBJ-NEXT:     Type: SHT_LLVM_OFFLOADING (0x6FFF4C0B)
+# OBJ-NEXT:     Flags [ (0x80000000)
+# OBJ-NEXT:       SHF_EXCLUDE (0x80000000)
+# OBJ-NEXT:     ]
+
+
+#      YAML: Sections:
+# YAML-NEXT:   - Name:            .llvm.offloading
+# YAML-NEXT:     Type:            SHT_LLVM_OFFLOADING
+# YAML-NEXT:     Flags:           [ SHF_EXCLUDE ]