review: clean up test cases

- makes key value spacing uniform and minimal of yaml objects
- simplify the tests by using --implicit-check-not and CHECK-NEXT for
the valid parts

Author: inbelic

llvm/test/tools/llvm-objcopy/DXContainer/extract-section-basic.test

@@ -3,7 +3,7 @@
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-objcopy %t --extract-section=RTS0=%t.rts0.out
-# RUN: obj2yaml %t.rts0.out | FileCheck %s
+# RUN: obj2yaml %t.rts0.out | FileCheck %s --implicit-check-not=Name:
 
 ## The DXContainer described below was generated with:
 
@@ -27,8 +27,7 @@
 # CHECK-NEXT:   PartCount:     1
 # CHECK-NEXT:   PartOffsets:   [ 36 ]
 # CHECK-NEXT:   Parts:
-# CHECK-NOT:  - Name: {{DXIL|SFI0|HASH|ISG1|OSG1|PSV0}}
-# CHECK:        Name:            RTS0
+# CHECK-NEXT:   Name:            RTS0
 # CHECK-NEXT    Size:            24
 # CHECK-NEXT    RootSignature:
 # CHECK-NEXT      Version:         2
@@ -37,7 +36,6 @@
 # CHECK-NEXT      NumStaticSamplers: 0
 # CHECK-NEXT      StaticSamplersOffset: 24
 # CHECK-NEXT      Parameters:      []
-# CHECK-NOT:  - Name: {{DXIL|SFI0|HASH|ISG1|OSG1|PSV0}}
 
 --- !dxcontainer
 Header:

llvm/test/tools/llvm-objcopy/DXContainer/extract-section-errs.test

@@ -9,15 +9,15 @@
 
 --- !dxcontainer
 Header:
-  Hash:            [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                     0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
+  Hash:      [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+               0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
   Version:
-    Major:           1
-    Minor:           0
-  PartCount:       1
+    Major:   1
+    Minor:   0
+  PartCount: 1
 Parts:
-  - Name:            FKE0
-    Size:            8
+  - Name:    FKE0
+    Size:    8
 ...
 
 ## We can't extract a part that is specified incorrectly.
@@ -28,13 +28,13 @@ Parts:
 
 --- !dxcontainer
 Header:
-  Hash:            [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                     0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
+  Hash:      [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+               0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
   Version:
-    Major:           1
-    Minor:           0
-  PartCount:       1
+    Major:   1
+    Minor:   0
+  PartCount: 1
 Parts:
-  - Name:            FKE0
-    Size:            8
+  - Name:    FKE0
+    Size:    8
 ...

llvm/test/tools/llvm-objcopy/DXContainer/extract-section-headers.test

@@ -3,57 +3,51 @@
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-objcopy %t --extract-section=FKE1=%t.fke1.out --extract-section=FKE4=%t.fke4.out
-# RUN: obj2yaml %t.fke1.out | FileCheck %s --check-prefixes=CHECK,FKE1
-# RUN: obj2yaml %t.fke4.out | FileCheck %s --check-prefixes=CHECK,FKE4
+# RUN: obj2yaml %t.fke1.out | FileCheck %s --check-prefixes=CHECK,FKE1 --implicit-check-not=Name:
+# RUN: obj2yaml %t.fke4.out | FileCheck %s --check-prefixes=CHECK,FKE4 --implicit-check-not=Name:
 
 # FKE1:       FileSize:       52
 # FKE4:       FileSize:       1732
 # CHECK-NEXT: PartCount:     1
 # CHECK-NEXT: PartOffsets:   [ 36 ]
 # CHECK-NEXT: Parts:
-
-# CHECK-NOT: FKE0
-# FKE1:      Name: FKE1
-# FKE4-NOT:  FKE1
-# CHECK-NOT: FKE2
-# CHECK-NOT: FKE3
-# FKE1-NOT:  FKE4
-# FKE4:      Name: FKE4
-# CHECK-NOT: FKE5
-# CHECK-NOT: DXIL
+# FKE1-NEXT:    Name: FKE1
+# FKE1-NEXT:    Size: 8
+# FKE4-NEXT:    Name: FKE4
+# FKE4-NEXT:    Size: 1688
 
 --- !dxcontainer
 Header:
-  Hash:            [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                     0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
+  Hash:        [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
   Version:
-    Major:           1
-    Minor:           0
-  FileSize:        1996
-  PartCount:       7
-  PartOffsets:     [ 60, 76, 92, 108, 236, 1932, 1960 ]
+    Major:     1
+    Minor:     0
+  FileSize:    1996
+  PartCount:   7
+  PartOffsets: [ 60, 76, 92, 108, 236, 1932, 1960 ]
 Parts:
-  - Name:            FKE0
-    Size:            8
-  - Name:            FKE1
-    Size:            8
-  - Name:            FKE2
-    Size:            8
-  - Name:            FKE3
-    Size:            120
-  - Name:            FKE4
-    Size:            1688
-  - Name:            FKE5
-    Size:            20
-  - Name:            DXIL
-    Size:            28
+  - Name: FKE0
+    Size: 8
+  - Name: FKE1
+    Size: 8
+  - Name: FKE2
+    Size: 8
+  - Name: FKE3
+    Size: 120
+  - Name: FKE4
+    Size: 1688
+  - Name: FKE5
+    Size: 20
+  - Name: DXIL
+    Size: 28
     Program:
-      MajorVersion:    6
-      MinorVersion:    5
-      ShaderKind:      5
-      Size:            8
+      MajorVersion:     6
+      MinorVersion:     5
+      ShaderKind:       5
+      Size:             8
       DXILMajorVersion: 1
       DXILMinorVersion: 5
-      DXILSize:        4
-      DXIL:            [ 0x42, 0x43, 0xC0, 0xDE, ]
+      DXILSize:         4
+      DXIL:             [ 0x42, 0x43, 0xC0, 0xDE, ]
 ...