[yaml2obj][test] Simplify some e_machine EI_CLASS EI_DATA tests

[MaskRay]

Summary

When both little-endian and big-endian are tested, or both 32-bit and 64-bit are tested, use a template like the following with -D BITS=32 -D ENCODE=LSB

--- !ELF
FileHeader:
 Class:   ELFCLASS[[BITS]]
 Data:    ELFDATA2[[ENCODE]]
 Type:    ET_DYN
 Machine: EM_X86_64

[merge_guards_bot]

Unit tests: pass. 62380 tests passed, 0 failed and 839 were skipped.

clang-tidy: fail. clang-tidy found 0 errors and 5 warnings. 0 of them are added as review comments below (why?).

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[MaskRay]

Update

[MaskRay]

Simplify more

[merge_guards_bot]

Unit tests: fail. 62428 tests passed, 1 failed and 845 were skipped.

failed: LLVM.tools/obj2yaml/relr-section.yaml

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[merge_guards_bot]

Unit tests: fail. 62428 tests passed, 1 failed and 845 were skipped.

failed: LLVM.tools/obj2yaml/relr-section.yaml

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[grimar]

This LGTM.

[jhenderson]

llvm/test/tools/obj2yaml/relr-section.yaml

12 ↗

(On Diff #242175)

Copy-paste error? %t.32be

llvm/test/tools/yaml2obj/ELF/class-endianness.yaml

4–7

It might be worth breaking these lines up into 2 each.

Also, it's not a big deal, but to reduce differences it might be worth keeping the LE64/BE64/LE32/BE32 ordering as it was before.

[MaskRay]

Move a machine clean-up from D73821 to here

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: unknown.

clang-format: unknown.

Build artifacts: diff.json, console-log.txt

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[MaskRay]

Fix typo

[merge_guards_bot]

Unit tests: unknown.

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[jhenderson]

LGTM.

llvm/include/llvm/ObjectYAML/ELFYAML.h

 };
 
 template <>
 struct ScalarEnumerationContextTraits<ELFYAML::ELF_EM, ELFYAML::Object> {
   static void enumeration(IO &IO, ELFYAML::ELF_EM &Value, ELFYAML::Object &Ctx);
 };
 
 template <>
-struct ScalarEnumerationTraits<ELFYAML::ELF_ELFCLASS> {
-  static void enumeration(IO &IO, ELFYAML::ELF_ELFCLASS &Value);
+struct ScalarEnumerationContextTraits<ELFYAML::ELF_ELFCLASS, ELFYAML::Object> {
+  static void enumeration(IO &IO, ELFYAML::ELF_ELFCLASS &Value,
+                          ELFYAML::Object &Ctx);
 };
 
 template <>
 struct ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA> {
   static void enumeration(IO &IO, ELFYAML::ELF_ELFDATA &Value);
 };
 
 template <>

llvm/lib/ObjectYAML/ELFYAML.cpp

 #undef ECase
 
   if (!Output && OverriddenStr)
     io.enumFallbackWithOverridden<Hex16>(*OverriddenStr, Value);
   else
     io.enumFallback<Hex16>(Value);
 }
 
-void ScalarEnumerationTraits<ELFYAML::ELF_ELFCLASS>::enumeration(
-    IO &IO, ELFYAML::ELF_ELFCLASS &Value) {
-#define ECase(X) IO.enumCase(Value, #X, ELF::X)
+void ScalarEnumerationContextTraits<ELFYAML::ELF_ELFCLASS, ELFYAML::Object>::
+    enumeration(IO &io, ELFYAML::ELF_ELFCLASS &Value, ELFYAML::Object &Ctx) {
+  Optional<StringRef> OverriddenStr;
+  auto It = Ctx.Overridden.find("EI_CLASS");
+  if (It != Ctx.Overridden.end() && !io.outputting()) {
+    OverriddenStr = It->second;
+    Ctx.SeenOverridden.insert("EI_CLASS");
+  }
+
+#define ECase(X)                                                               \
+  if (!OverriddenStr)                                                          \
+    io.enumCase(Value, #X, ELF::X);                                            \
+  else if (*OverriddenStr == #X) {                                             \
+    Value = ELF::X;                                                            \
+    io.matchEnumFallback();                                                    \
+    return;                                                                    \
+  }
+
   // Since the semantics of ELFCLASSNONE is "invalid", just don't accept it
   // here.
   ECase(ELFCLASS32);
   ECase(ELFCLASS64);
 #undef ECase
 }
 
 void ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA>::enumeration(

 #define BCase(X) IO.bitSetCase(Value, #X, Mips::AFL_FLAGS1_##X)
   BCase(ODDSPREG);
 #undef BCase
 }
 
 void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO,
                                                  ELFYAML::FileHeader &FileHdr) {
   auto &Ctx = *static_cast<ELFYAML::Object *>(IO.getContext());
-  IO.mapRequired("Class", FileHdr.Class);
+  IO.mapRequired("Class", FileHdr.Class, Ctx);
   IO.mapRequired("Data", FileHdr.Data);
   IO.mapOptional("OSABI", FileHdr.OSABI, ELFYAML::ELF_ELFOSABI(0));
   IO.mapOptional("ABIVersion", FileHdr.ABIVersion, Hex8(0));
   IO.mapRequired("Type", FileHdr.Type);
   IO.mapRequired("Machine", FileHdr.Machine, Ctx);
   IO.mapOptional("Flags", FileHdr.Flags, ELFYAML::ELF_EF(0));
   IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
 

llvm/test/tools/yaml2obj/ELF/class-endianness.yaml

 ## Check we can produce 32/64 bits outputs with a different endianness.
 
 # RUN: yaml2obj %s --docnum=1 | llvm-readobj --file-headers - | FileCheck %s --check-prefix LE64
-# RUN: yaml2obj %s --docnum=2 | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE64
-# RUN: yaml2obj %s --docnum=3 | llvm-readobj --file-headers - | FileCheck %s --check-prefix LE32
-# RUN: yaml2obj %s --docnum=4 | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE32
+# RUN: yaml2obj %s --docnum=2 -D EI_CLASS=ELFCLASS64 | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE64
+# RUN: yaml2obj %s --docnum=1 -D EI_CLASS=ELFCLASS32 | llvm-readobj --file-headers - | FileCheck %s --check-prefix LE32
+# RUN: yaml2obj %s --docnum=2 | llvm-readobj --file-headers - | FileCheck %s --check-prefix BE32
 
 # LE64:      Class: 64-bit (0x2)
 # LE64-NEXT: DataEncoding: LittleEndian (0x1)
 
 # BE64:      Class: 64-bit (0x2)
 # BE64-NEXT: DataEncoding: BigEndian (0x2)
 
 # LE32:      Class: 32-bit (0x1)
 # LE32-NEXT: DataEncoding: LittleEndian (0x1)
 
 # BE32:      Class: 32-bit (0x1)
 # BE32-NEXT: DataEncoding: BigEndian (0x2)
 
---- !ELF
-FileHeader: !FileHeader
-  Class: ELFCLASS64
-  Data: ELFDATA2LSB
-  Type: ET_EXEC
-  Machine: EM_X86_64
+# RUN: not yaml2obj --docnum=1 -D EI_CLASS=invalid %s 2>&1 | FileCheck --check-prefix=BAD %s
 
---- !ELF
-FileHeader: !FileHeader
-  Class: ELFCLASS64
-  Data: ELFDATA2MSB
-  Type: ET_EXEC
-  Machine: EM_PPC64
+# BAD: error: unknown enumerated scalar
 
 --- !ELF
 FileHeader: !FileHeader
-  Class: ELFCLASS32
+  Class: ELFCLASS64
   Data: ELFDATA2LSB
   Type: ET_EXEC
-  Machine: EM_386
+  Machine: EM_X86_64
 
 --- !ELF
 FileHeader: !FileHeader
   Class: ELFCLASS32
   Data: ELFDATA2MSB
   Type: ET_EXEC
   Machine: EM_PPC

llvm/test/tools/yaml2obj/ELF/reloc-sec-entry-size.yaml

 ## Test how yaml2obj sets values for sh_entsize fields of relocation sections.
 
-# RUN: yaml2obj --docnum=1 %s -o %t64
+# RUN: yaml2obj %s -o %t64
 # RUN: llvm-readelf --sections %t64 | FileCheck %s --check-prefix=ELF64
 
-# RUN: yaml2obj --docnum=2 %s -o %t32
+# RUN: yaml2obj -D EI_CLASS=ELFCLASS32 %s -o %t32
 # RUN: llvm-readelf --sections %t32 | FileCheck %s --check-prefix=ELF32
 
 # ELF64: Name          Type Address          Off    Size   ES
 # ELF64: .rela.default RELA 0000000000000000 000040 000000 18
 # ELF64: .rel.default  REL  0000000000000000 000040 000000 10
 # ELF64: .relr.default RELR 0000000000000000 000040 000000 08
 # ELF64: .rela.custom  RELA 0000000000000000 000040 000000 ff
 # ELF64: .rel.custom   REL  0000000000000000 000040 000000 ff
- Name:    .rela.custom
     Type:    SHT_RELA
     EntSize: 0xFF
   - Name:    .rel.custom
     Type:    SHT_REL
     EntSize: 0xFF
   - Name:    .relr.custom
     Type:    SHT_RELR
     EntSize: 0xFF
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS32
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_386
-Sections:
-## Check default sh_entsizes field values.
-  - Name: .rela.default
-    Type: SHT_RELA
-  - Name: .rel.default
-    Type: SHT_REL
-  - Name: .relr.default
-    Type: SHT_RELR
-## Check we can set sh_entsize fields to arbitrary values.
-  - Name:    .rela.custom
-    Type:    SHT_RELA
-    EntSize: 0xFF
-  - Name:    .rel.custom
-    Type:    SHT_REL
-    EntSize: 0xFF
-  - Name:    .relr.custom
-    Type:    SHT_RELR
-    EntSize: 0xFF