[llvm-readobj][test] - Deduplicate YAMLs in gnuhash.test and hash-table.test. NFCI.

[grimar]

Summary

We can use -D to generalize inputs. This patch does it.

[MaskRay]

LGTM.

[jhenderson]

LGTM. FWIW, I don't think it's necessary to use different MACHINE values in most cases, since I don't think llvm-readobj's behaviour should change based on the machine type, only on the ELF64/ELF32 nature.

[grimar]

In D80199#2046102, @jhenderson wrote:

FWIW, I don't think it's necessary to use different MACHINE values in most cases, since I don't think llvm-readobj's behaviour should change based on the machine type, only on the ELF64/ELF32 nature.

Yeah, but it looks a bit inaccurate to me..

llvm/test/tools/llvm-readobj/ELF/gnuhash.test

 ## Check how the GNU Hash section is dumped with --gnu-hash-table.
 
-# RUN: yaml2obj --docnum=1 -D MASKWORDS=2 -D NBUCKETS=3 %s -o %t.x64
-# RUN: yaml2obj --docnum=2 %s -o %t.x32
+# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 -D MASKWORDS=2 -D NBUCKETS=3 %s -o %t.x64
+# RUN: yaml2obj --docnum=1 -DBITS=32 -DMACHINE=EM_386 %s -D MASKWORDS=2 -D NBUCKETS=3 -o %t.x32
 
 # RUN: llvm-readobj --gnu-hash-table %t.x64 | FileCheck %s
 # RUN: llvm-readelf --gnu-hash-table %t.x64 | FileCheck %s
 
 # RUN: llvm-readobj --gnu-hash-table %t.x32 | FileCheck %s
 # RUN: llvm-readelf --gnu-hash-table %t.x32 | FileCheck %s
 
 # CHECK:      GnuHashTable {
 # CHECK-NEXT:   Num Buckets: 3
 # CHECK-NEXT:   First Hashed Symbol Index: 1
 # CHECK-NEXT:   Num Mask Words: 2
 # CHECK-NEXT:   Shift Count: 2
 # CHECK-NEXT:   Bloom Filter: [0x3, 0x4]
 # CHECK-NEXT:   Buckets: [5, 6, 7]
 # CHECK-NEXT:   Values: [0x8, 0x9, 0xA, 0xB]
 # CHECK-NEXT: }
 
 --- !ELF
 FileHeader:
-  Class:   ELFCLASS64
+  Class:   ELFCLASS[[BITS]]
   Data:    ELFDATA2LSB
   Type:    ET_DYN
-  Machine: EM_X86_64
+  Machine: [[MACHINE]]
 Sections:
   - Name:  .gnu.hash
     Type:  SHT_GNU_HASH
     Flags: [ SHF_ALLOC ]
     Header:
       SymNdx: 0x1
       Shift2: 0x2
 ## The number of words in the Bloom filter. The value of 2 is no-op.
- Name:    ddd
     Binding: STB_GLOBAL
 ProgramHeaders:
   - Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]
     Sections:
       - Section: .gnu.hash
       - Section: .dynamic
 
---- !ELF
-FileHeader:
-  Class:   ELFCLASS32
-  Data:    ELFDATA2LSB
-  Type:    ET_DYN
-  Machine: EM_386
-Sections:
-  - Name:  .gnu.hash
-    Type:  SHT_GNU_HASH
-    Flags: [ SHF_ALLOC ]
-    Header:
-      SymNdx: 0x1
-      Shift2: 0x2
-    BloomFilter: [0x3, 0x4]
-    HashBuckets: [0x5, 0x6, 0x7]
-    HashValues:  [0x8, 0x9, 0xA, 0xB]
-  - Name:  .dynamic
-    Type:  SHT_DYNAMIC
-    Flags: [ SHF_ALLOC ]
-    Link:  .dynstr
-    Entries:
-      - Tag:   DT_GNU_HASH
-        Value: 0x0
-      - Tag:   DT_NULL
-        Value: 0x0
-DynamicSymbols:
-  - Name:    aaa
-    Binding: STB_GLOBAL
-  - Name:    bbb
-    Binding: STB_GLOBAL
-  - Name:    ccc
-    Binding: STB_GLOBAL
-  - Name:    ddd
-    Binding: STB_GLOBAL
-ProgramHeaders:
-  - Type:  PT_LOAD
-    Flags: [ PF_R, PF_X ]
-    Sections:
-      - Section: .gnu.hash
-      - Section: .dynamic
-
 ## Check we report a warning if there is no dynamic symbol section in the object.
 
-# RUN: yaml2obj --docnum=3 %s -o %t.nodynsym
+# RUN: yaml2obj --docnum=2 %s -o %t.nodynsym
 # RUN: llvm-readobj --gnu-hash-table %t.nodynsym 2>&1 | FileCheck %s -DFILE=%t.nodynsym --check-prefix=NODYNSYM
 # RUN: llvm-readelf --gnu-hash-table %t.nodynsym 2>&1 | FileCheck %s -DFILE=%t.nodynsym --check-prefix=NODYNSYM
 
 # NODYNSYM:      GnuHashTable {
 # NODYNSYM-NEXT:   Num Buckets: 1
 # NODYNSYM-NEXT:   First Hashed Symbol Index: 0
 # NODYNSYM-NEXT:   Num Mask Words: 1
 # NODYNSYM-NEXT:   Shift Count: 0
- Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]
     Sections:
       - Section: .gnu.hash
       - Section: .dynamic
 
 ## Check what we do when the index of the first symbol in the dynamic symbol table
 ## included in the hash table is larger than the number of dynamic symbols.
 
-# RUN: yaml2obj --docnum=4 %s -o %t.brokensymndx
+# RUN: yaml2obj --docnum=3 %s -o %t.brokensymndx
 # RUN: llvm-readobj --gnu-hash-table %t.brokensymndx 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.brokensymndx --check-prefix=SYMNDX
 # RUN: llvm-readelf --gnu-hash-table %t.brokensymndx 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.brokensymndx --check-prefix=SYMNDX
 
 # SYMNDX:      GnuHashTable {
 # SYMNDX-NEXT:   Num Buckets: 1
 # SYMNDX-NEXT:   First Hashed Symbol Index: 2
- Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]
     Sections:
       - Section: .gnu.hash
       - Section: .dynamic
 
 ## Check we emit a warning when the dynamic symbol table is empty.
 ## A valid dynamic symbol table should have at least one symbol: the symbol with index 0.
 
-# RUN: yaml2obj --docnum=5 %s -o %t.emptydynsym
+# RUN: yaml2obj --docnum=4 %s -o %t.emptydynsym
 # RUN: llvm-readobj --gnu-hash-table %t.emptydynsym 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.emptydynsym --check-prefix=EMPTY-DYNSYM
 # RUN: llvm-readelf --gnu-hash-table %t.emptydynsym 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.emptydynsym --check-prefix=EMPTY-DYNSYM
 
 # EMPTY-DYNSYM:      GnuHashTable {
 # EMPTY-DYNSYM-NEXT:   Num Buckets: 1
 # EMPTY-DYNSYM-NEXT:   First Hashed Symbol Index: 0

 ## Such sections normally have a single zero entry in the bloom
 ## filter, a single zero entry in the hash bucket and no values.
 ##
 ## The index of the first symbol in the dynamic symbol table
 ## included in the hash table can be set to the number of dynamic symbols,
 ## which is one larger than the index of the last dynamic symbol.
 ## For empty tables however, this value is unimportant and can be ignored.
 
-# RUN: yaml2obj --docnum=6 %s -o %t.empty
+# RUN: yaml2obj --docnum=5 %s -o %t.empty
 # RUN: llvm-readobj --gnu-hash-table %t.empty 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.empty --check-prefix=EMPTY --implicit-check-not="warning:"
 # RUN: llvm-readelf --gnu-hash-table %t.empty 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.empty --check-prefix=EMPTY --implicit-check-not="warning:"
 
 # EMPTY:      GnuHashTable {
 # EMPTY-NEXT:   Num Buckets: 1
 # EMPTY-NEXT:   First Hashed Symbol Index: 1
- Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]
     Sections:
       - Section: .gnu.hash
       - Section: .dynamic
 
 ## Check we report a proper warning when a hash table goes past the end of the file.
 
 ## Case A: the 'nbuckets' field is set so that the table goes past the end of the file.
-# RUN: yaml2obj --docnum=1 -D MASKWORDS=4294967295 -D NBUCKETS=3 %s -o %t.err.maskwords
+# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 -D MASKWORDS=4294967295 -D NBUCKETS=3 %s -o %t.err.maskwords
 # RUN: llvm-readobj --gnu-hash-table %t.err.maskwords 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t.err.maskwords -DMASKWORDS=4294967295 -DNBUCKETS=3 --check-prefix=ERR
 # RUN: llvm-readelf --gnu-hash-table %t.err.maskwords 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t.err.maskwords -DMASKWORDS=4294967295 -DNBUCKETS=3 --check-prefix=ERR
 
 ## Case B: the 'maskwords' field is set so that the table goes past the end of the file.
-# RUN: yaml2obj --docnum=1 -D MASKWORDS=2 -D NBUCKETS=4294967295 %s -o %t.err.nbuckets
+# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 -D MASKWORDS=2 -D NBUCKETS=4294967295 %s -o %t.err.nbuckets
 # RUN: llvm-readobj --gnu-hash-table %t.err.nbuckets 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t.err.nbuckets -DMASKWORDS=2 -DNBUCKETS=4294967295 --check-prefix=ERR
 # RUN: llvm-readelf --gnu-hash-table %t.err.nbuckets 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t.err.nbuckets -DMASKWORDS=2 -DNBUCKETS=4294967295 --check-prefix=ERR
 
 # ERR:      GnuHashTable {
 # ERR-NEXT:   Num Buckets: [[NBUCKETS]]
 # ERR-NEXT:   First Hashed Symbol Index: 1
 # ERR-NEXT:   Num Mask Words: [[MASKWORDS]]
 # ERR-NEXT:   Shift Count: 2
 # ERR-NEXT: warning: '[[FILE]]': unable to dump the SHT_GNU_HASH section at 0x78: it goes past the end of the file
 # ERR-NEXT: }

llvm/test/tools/llvm-readobj/ELF/hash-table.test

 ## Check how the SHT_HASH section is dumped with --hash-table.
 
-# RUN: yaml2obj --docnum=1 %s -o %t.x64
-# RUN: yaml2obj --docnum=2 %s -o %t.x32
+# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 %s -o %t.x64
+# RUN: yaml2obj --docnum=1 -DBITS=32 -DMACHINE=EM_386 %s -o %t.x32
 
 # RUN: llvm-readobj --hash-table %t.x64 | FileCheck %s --check-prefix=HASH
 # RUN: llvm-readelf --hash-table %t.x64 | FileCheck %s --check-prefix=HASH
 
 # RUN: llvm-readobj --hash-table %t.x32 | FileCheck %s --check-prefix=HASH
 # RUN: llvm-readelf --hash-table %t.x32 | FileCheck %s --check-prefix=HASH
 
 # HASH:      HashTable {
 # HASH-NEXT:   Num Buckets: 2
 # HASH-NEXT:   Num Chains: 3
 # HASH-NEXT:   Buckets: [1, 2]
 # HASH-NEXT:   Chains: [3, 4, 5]
 # HASH-NEXT: }
 
 --- !ELF
 FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_DYN
-  Machine: EM_X86_64
-Sections:
-  - Name:   .hash
-    Type:   SHT_HASH
-    Flags:  [ SHF_ALLOC ]
-    Bucket: [ 1, 2 ]
-    Chain:  [ 3, 4, 5 ]
-  - Name:  .dynamic
-    Type:  SHT_DYNAMIC
-    Flags: [ SHF_ALLOC ]
-    Entries:
-      - Tag:   DT_HASH
-        Value: 0x0
-      - Tag:   DT_NULL
-        Value: 0x0
-ProgramHeaders:
-  - Type: PT_LOAD
-    Sections:
-      - Section: .hash
-      - Section: .dynamic
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS32
+  Class:   ELFCLASS[[BITS]]
   Data:    ELFDATA2LSB
   Type:    ET_DYN
-  Machine: EM_386
+  Machine: [[MACHINE]]
 Sections:
   - Name:   .hash
     Type:   SHT_HASH
     Flags:  [ SHF_ALLOC ]
     Bucket: [ 1, 2 ]
     Chain:  [ 3, 4, 5 ]
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Flags: [ SHF_ALLOC ]
     Entries:
       - Tag:   DT_HASH
         Value: 0x0
       - Tag:   DT_NULL
         Value: 0x0
 ProgramHeaders:
   - Type: PT_LOAD
     Sections:
       - Section: .hash
       - Section: .dynamic
 
 ## Check we can dump the SHT_HASH section even when an object
 ## does not have the section header table.
 
-# RUN: yaml2obj --docnum=3 %s -o %t.noshdr
+# RUN: yaml2obj --docnum=2 %s -o %t.noshdr
 # RUN: llvm-readobj --hash-table %t.noshdr | FileCheck %s --check-prefix=NOSHDR
 # RUN: llvm-readelf --hash-table %t.noshdr | FileCheck %s --check-prefix=NOSHDR
 
 # NOSHDR:      HashTable {
 # NOSHDR-NEXT:   Num Buckets: 1
 # NOSHDR-NEXT:   Num Chains: 1
 # NOSHDR-NEXT:   Buckets: [0]
 # NOSHDR-NEXT:   Chains: [1]
ProgramHeaders:
   - Type: PT_DYNAMIC
     VAddr: 0x1010
     Sections:
       - Section: .dynamic
 
 ## Each SHT_HASH section starts with two 32-bit fields: nbucket and nchain.
 ## Check we report an error when a DT_HASH value points to data that has size less than 8 bytes.
 
-# RUN: yaml2obj --docnum=4 %s -o %t4.o
+# RUN: yaml2obj --docnum=3 %s -o %t4.o
 # RUN: llvm-readelf --hash-table %t4.o 2>&1 | FileCheck %s --check-prefix=ERR1 -DFILE=%t4.o
 # RUN: llvm-readobj --hash-table %t4.o 2>&1 | FileCheck %s --check-prefix=ERR1 -DFILE=%t4.o
 
 # ERR1:      HashTable {
 # ERR1-NEXT:  warning: '[[FILE]]': the hash table at offset 0x2b1 goes past the end of the file (0x2b8){{$}}
 # ERR1-NEXT: }
 
 --- !ELF
- Type:     PT_LOAD
     Sections:
       - Section: .hash
       - Section: .dynamic
 
 ## Check we report a warning when the hash table goes past the end of the file.
 
 ## Case A.1: the hash table ends right before the EOF. We have a broken nbucket
 ##           field that has a value larger than the number of buckets.
-# RUN: yaml2obj --docnum=5 %s -o %t5.1.o -DNBUCKET=0x5d -DNCHAIN=0x1
+# RUN: yaml2obj --docnum=4 %s -o %t5.1.o -DNBUCKET=0x5d -DNCHAIN=0x1
 # RUN: llvm-readelf --hash-table %t5.1.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=NOERR1 --implicit-check-not="warning:"
 # RUN: llvm-readobj --hash-table %t5.1.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=NOERR1 --implicit-check-not="warning:"
 
 # NOERR1:      HashTable {
 # NOERR1-NEXT:  Num Buckets: 93
 # NOERR1-NEXT:  Num Chains: 1
 ## Here we would dump the rest of the file as buckets array because we have a broken nbucket field.
 ## No need to check what we dump, we only want to test that we have no unexpected warnings/crashes.
 # NOERR1-NEXT:  Buckets:
 # NOERR1-NEXT:  Chains: [0]
 # NOERR1-NEXT: }
 
 ## Case A.2: the hash table ends 1 byte past the EOF. We have a broken nbucket
 ##           field that has a value larger than the number of buckets.
-# RUN: yaml2obj --docnum=5 %s -o %t5.2.o -DNBUCKET=0x5e -DNCHAIN=0x1
+# RUN: yaml2obj --docnum=4 %s -o %t5.2.o -DNBUCKET=0x5e -DNCHAIN=0x1
 # RUN: llvm-readelf --hash-table %t5.2.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=ERR2 -DFILE=%t5.2.o --implicit-check-not="warning:"
 # RUN: llvm-readobj --hash-table %t5.2.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=ERR2 -DFILE=%t5.2.o --implicit-check-not="warning:"
 
 # ERR2:      HashTable {
 # ERR2-NEXT:  warning: '[[FILE]]': the hash table at offset 0x54 goes past the end of the file (0x1d4), nbucket = 94, nchain = 1{{$}}
 # ERR2-NEXT: }
 
 ## Case B.1: the hash table ends right before the EOF. We have a broken nchain
 ##           field that has a value larger than the number of chains.
-# RUN: yaml2obj --docnum=5 %s -o %t5.3.o -DNBUCKET=0x1 -DNCHAIN=0x5d
+# RUN: yaml2obj --docnum=4 %s -o %t5.3.o -DNBUCKET=0x1 -DNCHAIN=0x5d
 # RUN: llvm-readelf --hash-table %t5.3.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=NOERR2 -DFILE=%t5.3.o --implicit-check-not="warning:"
 # RUN: llvm-readobj --hash-table %t5.3.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=NOERR2 -DFILE=%t5.3.o --implicit-check-not="warning:"
 
 # NOERR2:      warning: '[[FILE]]': hash table nchain (93) differs from symbol count derived from SHT_DYNSYM section header (1)
 # NOERR2:      HashTable {
 # NOERR2-NEXT:   Num Buckets: 1
 # NOERR2-NEXT:   Num Chains: 93
 # NOERR2-NEXT:   Buckets: [0]
 ## Here we would dump the rest of the file as chain array because we have a broken nchain field.
 ## No need to check what we dump, we only want to test that we have no unexpected warnings/crashes.
 # NOERR2-NEXT:   Chains:
 # NOERR2-NEXT: }
 
 ## Case B.2: the hash table ends 1 byte past the EOF. We have a broken nchain
 ##           field that has a value larger than the number of chains.
-# RUN: yaml2obj --docnum=5 %s -o %t5.4.o -DNBUCKET=0x1 -DNCHAIN=0x5e
+# RUN: yaml2obj --docnum=4 %s -o %t5.4.o -DNBUCKET=0x1 -DNCHAIN=0x5e
 # RUN: llvm-readelf --hash-table %t5.4.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=ERR3 -DFILE=%t5.4.o --implicit-check-not="warning:"
 # RUN: llvm-readobj --hash-table %t5.4.o 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=ERR3 -DFILE=%t5.4.o --implicit-check-not="warning:"
 
 # ERR3:      warning: '[[FILE]]': hash table nchain (94) differs from symbol count derived from SHT_DYNSYM section header (1)
 # ERR3:      HashTable {
 # ERR3-NEXT:  warning: '[[FILE]]': the hash table at offset 0x54 goes past the end of the file (0x1d4), nbucket = 1, nchain = 94{{$}}