[LoongArch] Parse LoongArch base ABI in ObjectYAML and llvm-readobj

[SixWeining]

Summary

LoongArch e_flags definition:
https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html#_e_flags_identifies_abi_type_and_version

[xry111]

Is https://github.com/loongson/LoongArch-Documentation/pull/47 (using 0x1, 0x2, 0x3 for ILP32S/F/D and use EI_CLASS to distinguish LP64 and ILP32) dead?

[jhenderson]

Where you've added the contents to different files, you seeme to have added them at differenet relative places. For ease of reading, it would be better to keep platform-specific code in the same order in each file (I acknowledge it isn't perfect as it stands anyway, but we should avoid making it worse). Specifically, in same places, you've made your changes before the corresponding AVR block, and in others you've made them after. It don't care about the exact ordering, as long as it's consistent across the files.

llvm/test/Object/LoongArch/elf-flags.yaml

1

I don't think the Object library is the place for this testing, as the test tests functionality in ObjectYAML and llvm-readobj code, not in the Object library. I think you should split the test into two tests as follows:

1. In test/ObjectYAML, have a test that uses yaml2obj to generate object files that are converted back to YAML using obj2yaml. Check the resultant YAML contains the appropriate flags.
2. In test/tools/llvm-readobj, use yaml2obj to generate object files, and use llvm-readobj (and llvm-readelf) to inspect them.

62–67

As you're only testing the flags, you don't need most of these lines. Just the Flags line would be enough.

[SixWeining]

Add referenced documentation in comment.

[SixWeining]

In D130238#3667996, @xry111 wrote:

Is https://github.com/loongson/LoongArch-Documentation/pull/47 (using 0x1, 0x2, 0x3 for ILP32S/F/D and use EI_CLASS to distinguish LP64 and ILP32) dead?

Thanks.
I add some comments in the e_flags definition just now. If that PR get merged, let me update the definition.

[SixWeining]

Remove unnecessary check lines.

llvm/test/Object/LoongArch/elf-flags.yaml

1

Thanks. But seems other archs also put the test in the same place. And I saw no platform-specific test in test/ObjectYAML. What should I do?

62–67

Sounds good. Thanks.

[jhenderson]

llvm/test/Object/LoongArch/elf-flags.yaml

1

I might look into fixing the other testing at some point to be in the right place. A quick look shows testing of MIPS e_flags in tools/obj2yaml, so perhaps the ob2yaml aspect can go there? The test would be named something like loong-arch-eflags.yaml, for similarity.

However, I don't feel strongly about this, so if you prefer to stick with existing precedent, that's fine.

63–68

We don't need strict whitespace testing here, so let's neaten this all up.

[SixWeining]

Place the test to tools/llvm-readobj and tools/obj2yaml.

[SixWeining]

llvm/test/Object/LoongArch/elf-flags.yaml

1

Thanks. I think the MIPS approach makes sense.

63–68

Yes. Thanks.

[jhenderson]

llvm/test/tools/llvm-readobj/ELF/loongarch-eflags.test

3 ↗

(On Diff #446686)

Minor nit: we're tending to move away from piping to a file in favour of using -o to write the output to that file. The logic is that it's easier to copy and paste the command from the test output to reproduce the test run.

64 ↗

(On Diff #446686)

Didn't see this earlier, sorry, but yaml2obj has an option (which might not have been available when existing tests were written) to allow text substitution within the YAML, a bit like FileCheck's -D option. Approximate example (not tested, but should be enough of an idea to get it to work):

# RUN: yaml2obj %s -o %t-lp64s -DFLAG=LP64S

...

--- !ELF
FileHeader:
  Class:           ELFCLASS64
  Data:            ELFDATA2LSB
  Type:            ET_EXEC
  Machine:         EM_LOONGARCH
  Flags:           [ EF_LOONGARCH_BASE_ABI_[[FLAG]] ]

This will allow you to only have one YAML block.

64 ↗

(On Diff #446686)

Missed that there was different Class values in some of the YAML blocks, but that can be solved in the same manner with a different variable.

llvm/test/tools/obj2yaml/ELF/loongarch-eflags.yaml

3 ↗

(On Diff #446686)

Same comments as the other test re. -D and -o options.

[SixWeining]

Use -D and -o options for yaml2obj.

llvm/test/tools/llvm-readobj/ELF/loongarch-eflags.test

3 ↗

(On Diff #446686)

OK. Thanks.

64 ↗

(On Diff #446686)

Thanks. Yes, this can reduce many lines.

[jhenderson]

LGTM.

[MaskRay]

Looks great!

llvm/include/llvm/BinaryFormat/ELF.h

920

Add a comma for the last element so that when a new one is added, the contributor doesn't have to touch the mask line.

llvm/test/tools/llvm-readobj/ELF/loongarch-eflags.test

27 ↗

(On Diff #446734)

Align Flags with ] 2 lines below. For readability, indent EF_LOONGARCH_BASE_ABI_LP64S by 2 spaces

llvm/test/tools/obj2yaml/ELF/loongarch-eflags.yaml

30 ↗

(On Diff #446734)

You can delete ...

[SixWeining]

indent

llvm/test/tools/obj2yaml/ELF/loongarch-eflags.yaml

30 ↗

(On Diff #446734)

Yes. And the same as llvm/test/tools/llvm-readobj/ELF/loongarch-eflags.test. Thanks.

llvm/include/llvm/BinaryFormat/ELF.h

enum : unsigned {
   EF_CSKY_EFV3 = 0x3000000
 };
 
 // ELF Relocation types for CSKY
 enum {
 #include "ELFRelocs/CSKY.def"
 };
 
+// LoongArch Specific e_flags
+enum : unsigned {
+  // Base ABI Types.
+  EF_LOONGARCH_BASE_ABI_LP64S = 0x1,  // LP64 soft-float ABI
+  EF_LOONGARCH_BASE_ABI_LP64F = 0x2,  // LP64 single-float ABI
+  EF_LOONGARCH_BASE_ABI_LP64D = 0x3,  // LP64 double-float ABI
+  EF_LOONGARCH_BASE_ABI_ILP32S = 0x5, // ILP32 soft-float ABI
+  EF_LOONGARCH_BASE_ABI_ILP32F = 0x6, // ILP32 single-float ABI
+  EF_LOONGARCH_BASE_ABI_ILP32D = 0x7, // ILP32 double-float ABI
+  EF_LOONGARCH_BASE_ABI_MASK = 0x7    // Mask for selecting base ABI
+};
+
 // ELF Relocation types for LoongArch
 enum {
 #include "ELFRelocs/LoongArch.def"
 };
 
 #undef ELF_RELOC
 
 // Section header.
 struct Elf32_Shdr {
   Elf32_Word sh_name;      // Section name (index into string table)
   Elf32_Word sh_type;      // Section type (SHT_*)
   Elf32_Word sh_flags;     // Section flags (SHF_*)
   Elf32_Addr sh_addr;      // Address where section is to be loaded
   Elf32_Off sh_offset;     // File offset of section data, in bytes

llvm/lib/ObjectYAML/ELFYAML.cpp

case ELF::EM_AVR:
     BCaseMask(EF_AVR_ARCH_XMEGA2, EF_AVR_ARCH_MASK);
     BCaseMask(EF_AVR_ARCH_XMEGA3, EF_AVR_ARCH_MASK);
     BCaseMask(EF_AVR_ARCH_XMEGA4, EF_AVR_ARCH_MASK);
     BCaseMask(EF_AVR_ARCH_XMEGA5, EF_AVR_ARCH_MASK);
     BCaseMask(EF_AVR_ARCH_XMEGA6, EF_AVR_ARCH_MASK);
     BCaseMask(EF_AVR_ARCH_XMEGA7, EF_AVR_ARCH_MASK);
     BCase(EF_AVR_LINKRELAX_PREPARED);
     break;
+  case ELF::EM_LOONGARCH:
+    BCaseMask(EF_LOONGARCH_BASE_ABI_ILP32S, EF_LOONGARCH_BASE_ABI_MASK);
+    BCaseMask(EF_LOONGARCH_BASE_ABI_ILP32F, EF_LOONGARCH_BASE_ABI_MASK);
+    BCaseMask(EF_LOONGARCH_BASE_ABI_ILP32D, EF_LOONGARCH_BASE_ABI_MASK);
+    BCaseMask(EF_LOONGARCH_BASE_ABI_LP64S, EF_LOONGARCH_BASE_ABI_MASK);
+    BCaseMask(EF_LOONGARCH_BASE_ABI_LP64F, EF_LOONGARCH_BASE_ABI_MASK);
+    BCaseMask(EF_LOONGARCH_BASE_ABI_LP64D, EF_LOONGARCH_BASE_ABI_MASK);
+    break;
   case ELF::EM_RISCV:
     BCase(EF_RISCV_RVC);
     BCaseMask(EF_RISCV_FLOAT_ABI_SOFT, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_SINGLE, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_DOUBLE, EF_RISCV_FLOAT_ABI);
     BCaseMask(EF_RISCV_FLOAT_ABI_QUAD, EF_RISCV_FLOAT_ABI);
     BCase(EF_RISCV_RVE);
     BCase(EF_RISCV_TSO);

llvm/test/Object/LoongArch/elf-flags.yaml

+# RUN: yaml2obj --docnum=1 %s > %t-lp64s
+# RUN: llvm-readobj -h %t-lp64s | FileCheck --check-prefix=READOBJ-LP64S %s
+# RUN: llvm-readelf -h %t-lp64s | FileCheck --check-prefix=READELF-LP64S --match-full-lines %s
+# RUN: obj2yaml %t-lp64s | FileCheck --check-prefix=YAML-LP64S %s
+
+# RUN: yaml2obj --docnum=2 %s > %t-lp64f
+# RUN: llvm-readobj -h %t-lp64f | FileCheck --check-prefix=READOBJ-LP64F %s
+# RUN: llvm-readelf -h %t-lp64f | FileCheck --check-prefix=READELF-LP64F --match-full-lines %s
+# RUN: obj2yaml %t-lp64f | FileCheck --check-prefix=YAML-LP64F %s
+
+# RUN: yaml2obj --docnum=3 %s > %t-lp64d
+# RUN: llvm-readobj -h %t-lp64d | FileCheck --check-prefix=READOBJ-LP64D %s
+# RUN: llvm-readelf -h %t-lp64d | FileCheck --check-prefix=READELF-LP64D --match-full-lines %s
+# RUN: obj2yaml %t-lp64d | FileCheck --check-prefix=YAML-LP64D %s
+
+# RUN: yaml2obj --docnum=4 %s > %t-ilp32s
+# RUN: llvm-readobj -h %t-ilp32s | FileCheck --check-prefix=READOBJ-ILP32S %s
+# RUN: llvm-readelf -h %t-ilp32s | FileCheck --check-prefix=READELF-ILP32S --match-full-lines %s
+# RUN: obj2yaml %t-ilp32s | FileCheck --check-prefix=YAML-ILP32S %s
+
+# RUN: yaml2obj --docnum=5 %s > %t-ilp32f
+# RUN: llvm-readobj -h %t-ilp32f | FileCheck --check-prefix=READOBJ-ILP32F %s
+# RUN: llvm-readelf -h %t-ilp32f | FileCheck --check-prefix=READELF-ILP32F --match-full-lines %s
+# RUN: obj2yaml %t-ilp32f | FileCheck --check-prefix=YAML-ILP32F %s
+
+# RUN: yaml2obj --docnum=6 %s > %t-ilp32d
+# RUN: llvm-readobj -h %t-ilp32d | FileCheck --check-prefix=READOBJ-ILP32D %s
+# RUN: llvm-readelf -h %t-ilp32d | FileCheck --check-prefix=READELF-ILP32D --match-full-lines %s
+# RUN: obj2yaml %t-ilp32d | FileCheck --check-prefix=YAML-ILP32D %s
+
+# READOBJ-LP64S: Flags [ (0x1)
+# READOBJ-LP64S-NEXT:   EF_LOONGARCH_BASE_ABI_LP64S (0x1)
+# READOBJ-LP64S-NEXT: ]
+
+# READOBJ-LP64F: Flags [ (0x2)
+# READOBJ-LP64F-NEXT:   EF_LOONGARCH_BASE_ABI_LP64F (0x2)
+# READOBJ-LP64F-NEXT: ]
+
+# READOBJ-LP64D: Flags [ (0x3)
+# READOBJ-LP64D-NEXT:   EF_LOONGARCH_BASE_ABI_LP64D (0x3)
+# READOBJ-LP64D-NEXT: ]
+
+# READOBJ-ILP32S: Flags [ (0x5)
+# READOBJ-ILP32S-NEXT:   EF_LOONGARCH_BASE_ABI_ILP32S (0x5)
+# READOBJ-ILP32S-NEXT: ]
+
+# READOBJ-ILP32F: Flags [ (0x6)
+# READOBJ-ILP32F-NEXT:   EF_LOONGARCH_BASE_ABI_ILP32F (0x6)
+# READOBJ-ILP32F-NEXT: ]
+
+# READOBJ-ILP32D: Flags [ (0x7)
+# READOBJ-ILP32D-NEXT:   EF_LOONGARCH_BASE_ABI_ILP32D (0x7)
+# READOBJ-ILP32D-NEXT: ]
+
+# READELF-LP64S: Flags: 0x1, LP64, SOFT-FLOAT
+# READELF-LP64F: Flags: 0x2, LP64, SINGLE-FLOAT
+# READELF-LP64D: Flags: 0x3, LP64, DOUBLE-FLOAT
+# READELF-ILP32S: Flags: 0x5, ILP32, SOFT-FLOAT
+# READELF-ILP32F: Flags: 0x6, ILP32, SINGLE-FLOAT
+# READELF-ILP32D: Flags: 0x7, ILP32, DOUBLE-FLOAT
+
+# YAML-LP64S:      FileHeader:
+# YAML-LP64S-NEXT:   Class:           ELFCLASS64
+# YAML-LP64S-NEXT:   Data:            ELFDATA2LSB
+# YAML-LP64S-NEXT:   Type:            ET_EXEC
+# YAML-LP64S-NEXT:   Machine:         EM_LOONGARCH
+# YAML-LP64S-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_LP64S ]
+
+# YAML-LP64F:      FileHeader:
+# YAML-LP64F-NEXT:   Class:           ELFCLASS64
+# YAML-LP64F-NEXT:   Data:            ELFDATA2LSB
+# YAML-LP64F-NEXT:   Type:            ET_EXEC
+# YAML-LP64F-NEXT:   Machine:         EM_LOONGARCH
+# YAML-LP64F-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_LP64F ]
+
+# YAML-LP64D:      FileHeader:
+# YAML-LP64D-NEXT:   Class:           ELFCLASS64
+# YAML-LP64D-NEXT:   Data:            ELFDATA2LSB
+# YAML-LP64D-NEXT:   Type:            ET_EXEC
+# YAML-LP64D-NEXT:   Machine:         EM_LOONGARCH
+# YAML-LP64D-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_LP64D ]
+
+# YAML-ILP32S:      FileHeader:
+# YAML-ILP32S-NEXT:   Class:           ELFCLASS32
+# YAML-ILP32S-NEXT:   Data:            ELFDATA2LSB
+# YAML-ILP32S-NEXT:   Type:            ET_EXEC
+# YAML-ILP32S-NEXT:   Machine:         EM_LOONGARCH
+# YAML-ILP32S-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32S ]
+
+# YAML-ILP32F:      FileHeader:
+# YAML-ILP32F-NEXT:   Class:           ELFCLASS32
+# YAML-ILP32F-NEXT:   Data:            ELFDATA2LSB
+# YAML-ILP32F-NEXT:   Type:            ET_EXEC
+# YAML-ILP32F-NEXT:   Machine:         EM_LOONGARCH
+# YAML-ILP32F-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32F ]
+
+# YAML-ILP32D:      FileHeader:
+# YAML-ILP32D-NEXT:   Class:           ELFCLASS32
+# YAML-ILP32D-NEXT:   Data:            ELFDATA2LSB
+# YAML-ILP32D-NEXT:   Type:            ET_EXEC
+# YAML-ILP32D-NEXT:   Machine:         EM_LOONGARCH
+# YAML-ILP32D-NEXT:   Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32D ]
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_LP64S ]
+...
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_LP64F ]
+...
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_LP64D ]
+...
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32S ]
+...
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32F ]
+...
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_EXEC
+  Machine:         EM_LOONGARCH
+  Flags:           [ EF_LOONGARCH_BASE_ABI_ILP32D ]
+...

llvm/tools/llvm-readobj/ELFDumper.cpp

const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
   ENUM_ENT(EF_RISCV_RVC, "RVC"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
   ENUM_ENT(EF_RISCV_FLOAT_ABI_QUAD, "quad-float ABI"),
   ENUM_ENT(EF_RISCV_RVE, "RVE"),
   ENUM_ENT(EF_RISCV_TSO, "TSO"),
 };
 
+static const EnumEntry<unsigned> ElfHeaderLoongArchFlags[] = {
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_ILP32S, "ILP32, SOFT-FLOAT"),
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_ILP32F, "ILP32, SINGLE-FLOAT"),
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_ILP32D, "ILP32, DOUBLE-FLOAT"),
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_LP64S, "LP64, SOFT-FLOAT"),
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_LP64F, "LP64, SINGLE-FLOAT"),
+    ENUM_ENT(EF_LOONGARCH_BASE_ABI_LP64D, "LP64, DOUBLE-FLOAT"),
+};
+
 const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR1),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR2),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR25),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR3),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR31),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR35),
   LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR4),
ElfFlags =
         printFlags(e.e_flags, makeArrayRef(ElfHeaderMipsFlags),
                    unsigned(ELF::EF_MIPS_ARCH), unsigned(ELF::EF_MIPS_ABI),
                    unsigned(ELF::EF_MIPS_MACH));
   else if (e.e_machine == EM_RISCV)
     ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderRISCVFlags));
   else if (e.e_machine == EM_AVR)
     ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderAVRFlags),
                           unsigned(ELF::EF_AVR_ARCH_MASK));
+  else if (e.e_machine == EM_LOONGARCH)
+    ElfFlags = printFlags(e.e_flags, makeArrayRef(ElfHeaderLoongArchFlags),
+                          unsigned(ELF::EF_LOONGARCH_BASE_ABI_MASK));
   Str = "0x" + utohexstr(e.e_flags);
   if (!ElfFlags.empty())
     Str = Str + ", " + ElfFlags;
   printFields(OS, "Flags:", Str);
   Str = to_string(e.e_ehsize) + " (bytes)";
   printFields(OS, "Size of this header:", Str);
   Str = to_string(e.e_phentsize) + " (bytes)";
   printFields(OS, "Size of program headers:", Str);
else if (E.e_machine == EM_AMDGPU) {
                      makeArrayRef(ElfHeaderAMDGPUFlagsABIVersion4),
                      unsigned(ELF::EF_AMDGPU_MACH),
                      unsigned(ELF::EF_AMDGPU_FEATURE_XNACK_V4),
                      unsigned(ELF::EF_AMDGPU_FEATURE_SRAMECC_V4));
         break;
       }
     } else if (E.e_machine == EM_RISCV)
       W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderRISCVFlags));
+    else if (E.e_machine == EM_LOONGARCH)
+      W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderLoongArchFlags),
+                   unsigned(ELF::EF_LOONGARCH_BASE_ABI_MASK));
     else if (E.e_machine == EM_AVR)
       W.printFlags("Flags", E.e_flags, makeArrayRef(ElfHeaderAVRFlags),
                    unsigned(ELF::EF_AVR_ARCH_MASK));
     else
       W.printFlags("Flags", E.e_flags);
     W.printNumber("HeaderSize", E.e_ehsize);
     W.printNumber("ProgramHeaderEntrySize", E.e_phentsize);
     W.printNumber("ProgramHeaderCount", E.e_phnum);