Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions llvm/docs/CommandGuide/llvm-objcopy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ multiple file formats.
operations will still be performed. No operations are performed on the sections
prior to dumping them.

For MachO objects, ``<section>`` must be formatted as
``<segment name>,<section name>``.

.. option:: --globalize-symbol <symbol>

Mark any defined symbols named ``<symbol>`` as global symbols in the output.
Expand Down
19 changes: 10 additions & 9 deletions llvm/lib/ObjCopy/DXContainer/DXContainerObjcopy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,7 @@ static Error extractPartAsObject(StringRef PartName, StringRef OutFilename,
}

static Error handleArgs(const CommonConfig &Config, Object &Obj) {
std::function<bool(const Part &)> RemovePred = [](const Part &) {
return false;
};

if (!Config.ToRemove.empty())
RemovePred = [&Config](const Part &P) {
return Config.ToRemove.matches(P.Name);
};

// Extract all sections before any modifications.
for (StringRef Flag : Config.ExtractSection) {
StringRef SectionName;
StringRef FileName;
Expand All @@ -61,6 +53,15 @@ static Error handleArgs(const CommonConfig &Config, Object &Obj) {
return E;
}

std::function<bool(const Part &)> RemovePred = [](const Part &) {
return false;
};

if (!Config.ToRemove.empty())
RemovePred = [&Config](const Part &P) {
return Config.ToRemove.matches(P.Name);
};

if (auto E = Obj.removeParts(RemovePred))
return E;

Expand Down
247 changes: 27 additions & 220 deletions llvm/test/tools/llvm-objcopy/DXContainer/extract-section-basic.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Tests that a separate DXContainer is created for the RTS0 (root signature)
## part, specified with --extract-section specified
## part, when--extract-section is specified.

# RUN: yaml2obj %s -o %t
# RUN: llvm-objcopy %t --extract-section=RTS0=%t.rts0.out
Expand All @@ -10,250 +10,57 @@
## `clang-dxc -T cs_6_7 test.hlsl /Fo temp.dxo`
## `obj2yaml temp.dxo`

## and has the DXIL section trimmed for readability.

## ``` test.hlsl
## [RootSignature("")]
## [numthreads(1,1,1)]
## void main() {}
## ```

# CHECK: Header:
# CHECK-NEXT: Hash:
# CHECK: Version:
# CHECK-NEXT: Major: 1
# CHECK-NEXT: Minor: 0
# CHECK-NEXT: FileSize: 68
# 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 Size: 24
# CHECK-NEXT RootSignature:
# CHECK-NEXT Version: 2
# CHECK-NEXT NumRootParameters: 0
# CHECK-NEXT RootParametersOffset: 24
# CHECK-NEXT NumStaticSamplers: 0
# CHECK-NEXT StaticSamplersOffset: 24
# CHECK-NEXT Parameters: []
# CHECK-NOT: - Name: {{DXIL|SFI0|HASH|ISG1|OSG1|PSV0}}

--- !dxcontainer
Header:
Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
Version:
Major: 1
Minor: 0
# CHECK: FileSize: 68
FileSize: 1984
# CHECK-NEXT: PartCount: 1
# CHECK-NEXT: PartOffsets: [ 36 ]
PartCount: 7
PartOffsets: [ 60, 1792, 1808, 1836, 1852, 1868, 1900 ]
# CHECK-NEXT: Parts:
Parts:
# CHECK-NOT: DXIL
# CHECK-NOT: SFI0
# CHECK-NOT: HASH
# CHECK-NOT: ISG1
# CHECK-NOT: OSG1
# CHECK: Name: RTS0
# CHECK-NOT: PSV0
- Name: DXIL
Size: 1724
Program:
MajorVersion: 6
MinorVersion: 7
ShaderKind: 5
Size: 431
Size: 28
DXILMajorVersion: 1
DXILMinorVersion: 7
DXILSize: 1700
DXIL: [ 0x42, 0x43, 0xC0, 0xDE, 0x21, 0xC, 0x0, 0x0, 0xA6,
0x1, 0x0, 0x0, 0xB, 0x82, 0x20, 0x0, 0x2, 0x0,
0x0, 0x0, 0x13, 0x0, 0x0, 0x0, 0x7, 0x81, 0x23,
0x91, 0x41, 0xC8, 0x4, 0x49, 0x6, 0x10, 0x32,
0x39, 0x92, 0x1, 0x84, 0xC, 0x25, 0x5, 0x8, 0x19,
0x1E, 0x4, 0x8B, 0x62, 0x80, 0x10, 0x45, 0x2,
0x42, 0x92, 0xB, 0x42, 0x84, 0x10, 0x32, 0x14,
0x38, 0x8, 0x18, 0x4B, 0xA, 0x32, 0x42, 0x88,
0x48, 0x90, 0x14, 0x20, 0x43, 0x46, 0x88, 0xA5,
0x0, 0x19, 0x32, 0x42, 0xE4, 0x48, 0xE, 0x90,
0x11, 0x22, 0xC4, 0x50, 0x41, 0x51, 0x81, 0x8C,
0xE1, 0x83, 0xE5, 0x8A, 0x4, 0x21, 0x46, 0x6,
0x51, 0x18, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x1B,
0x90, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0xC0,
0x1, 0x24, 0x80, 0x2, 0x0, 0x0, 0x0, 0x49, 0x18,
0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x13, 0x82, 0x0,
0x0, 0x89, 0x20, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0,
0x32, 0x22, 0x8, 0x9, 0x20, 0x64, 0x85, 0x4, 0x13,
0x22, 0xA4, 0x84, 0x4, 0x13, 0x22, 0xE3, 0x84,
0xA1, 0x90, 0x14, 0x12, 0x4C, 0x88, 0x8C, 0xB,
0x84, 0x84, 0x4C, 0x10, 0x20, 0x73, 0x4, 0x8,
0xC1, 0x65, 0xC3, 0x85, 0x2C, 0xE8, 0x3, 0x40,
0x14, 0x91, 0x4E, 0xD1, 0x4A, 0x48, 0x44, 0x54,
0x11, 0xC3, 0x9, 0x30, 0xC4, 0x18, 0x1, 0x30,
0x2, 0x50, 0x82, 0x21, 0x1A, 0x8, 0x98, 0x23,
0x0, 0x3, 0x0, 0x13, 0x14, 0x72, 0xC0, 0x87, 0x74,
0x60, 0x87, 0x36, 0x68, 0x87, 0x79, 0x68, 0x3,
0x72, 0xC0, 0x87, 0xD, 0xAE, 0x50, 0xE, 0x6D,
0xD0, 0xE, 0x7A, 0x50, 0xE, 0x6D, 0x0, 0xF, 0x7A,
0x30, 0x7, 0x72, 0xA0, 0x7, 0x73, 0x20, 0x7, 0x6D,
0x90, 0xE, 0x71, 0xA0, 0x7, 0x73, 0x20, 0x7, 0x6D,
0x90, 0xE, 0x78, 0xA0, 0x7, 0x78, 0xD0, 0x6, 0xE9,
0x10, 0x7, 0x76, 0xA0, 0x7, 0x71, 0x60, 0x7, 0x6D,
0x90, 0xE, 0x73, 0x20, 0x7, 0x7A, 0x30, 0x7, 0x72,
0xD0, 0x6, 0xE9, 0x60, 0x7, 0x74, 0xA0, 0x7, 0x76,
0x40, 0x7, 0x6D, 0x60, 0xE, 0x71, 0x60, 0x7, 0x7A,
0x10, 0x7, 0x76, 0xD0, 0x6, 0xE6, 0x30, 0x7, 0x72,
0xA0, 0x7, 0x73, 0x20, 0x7, 0x6D, 0x60, 0xE, 0x76,
0x40, 0x7, 0x7A, 0x60, 0x7, 0x74, 0xD0, 0x6, 0xEE,
0x80, 0x7, 0x7A, 0x10, 0x7, 0x76, 0xA0, 0x7, 0x73,
0x20, 0x7, 0x7A, 0x60, 0x7, 0x74, 0x30, 0xE4,
0x21, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x2, 0x0,
0x0, 0x0, 0x20, 0xB, 0x4, 0x7, 0x0, 0x0, 0x0,
0x32, 0x1E, 0x98, 0xC, 0x19, 0x11, 0x4C, 0x90,
0x8C, 0x9, 0x26, 0x47, 0xC6, 0x4, 0x43, 0xBA,
0x12, 0x28, 0x88, 0x62, 0x28, 0x87, 0x42, 0x28,
0x2, 0x0, 0x0, 0x0, 0x79, 0x18, 0x0, 0x0, 0xE2,
0x0, 0x0, 0x0, 0x33, 0x8, 0x80, 0x1C, 0xC4, 0xE1,
0x1C, 0x66, 0x14, 0x1, 0x3D, 0x88, 0x43, 0x38,
0x84, 0xC3, 0x8C, 0x42, 0x80, 0x7, 0x79, 0x78,
0x7, 0x73, 0x98, 0x71, 0xC, 0xE6, 0x0, 0xF, 0xED,
0x10, 0xE, 0xF4, 0x80, 0xE, 0x33, 0xC, 0x42, 0x1E,
0xC2, 0xC1, 0x1D, 0xCE, 0xA1, 0x1C, 0x66, 0x30,
0x5, 0x3D, 0x88, 0x43, 0x38, 0x84, 0x83, 0x1B,
0xCC, 0x3, 0x3D, 0xC8, 0x43, 0x3D, 0x8C, 0x3,
0x3D, 0xCC, 0x78, 0x8C, 0x74, 0x70, 0x7, 0x7B,
0x8, 0x7, 0x79, 0x48, 0x87, 0x70, 0x70, 0x7, 0x7A,
0x70, 0x3, 0x76, 0x78, 0x87, 0x70, 0x20, 0x87,
0x19, 0xCC, 0x11, 0xE, 0xEC, 0x90, 0xE, 0xE1,
0x30, 0xF, 0x6E, 0x30, 0xF, 0xE3, 0xF0, 0xE, 0xF0,
0x50, 0xE, 0x33, 0x10, 0xC4, 0x1D, 0xDE, 0x21,
0x1C, 0xD8, 0x21, 0x1D, 0xC2, 0x61, 0x1E, 0x66,
0x30, 0x89, 0x3B, 0xBC, 0x83, 0x3B, 0xD0, 0x43,
0x39, 0xB4, 0x3, 0x3C, 0xBC, 0x83, 0x3C, 0x84,
0x3, 0x3B, 0xCC, 0xF0, 0x14, 0x76, 0x60, 0x7,
0x7B, 0x68, 0x7, 0x37, 0x68, 0x87, 0x72, 0x68,
0x7, 0x37, 0x80, 0x87, 0x70, 0x90, 0x87, 0x70,
0x60, 0x7, 0x76, 0x28, 0x7, 0x76, 0xF8, 0x5, 0x76,
0x78, 0x87, 0x77, 0x80, 0x87, 0x5F, 0x8, 0x87,
0x71, 0x18, 0x87, 0x72, 0x98, 0x87, 0x79, 0x98,
0x81, 0x2C, 0xEE, 0xF0, 0xE, 0xEE, 0xE0, 0xE,
0xF5, 0xC0, 0xE, 0xEC, 0x30, 0x3, 0x62, 0xC8,
0xA1, 0x1C, 0xE4, 0xA1, 0x1C, 0xCC, 0xA1, 0x1C,
0xE4, 0xA1, 0x1C, 0xDC, 0x61, 0x1C, 0xCA, 0x21,
0x1C, 0xC4, 0x81, 0x1D, 0xCA, 0x61, 0x6, 0xD6,
0x90, 0x43, 0x39, 0xC8, 0x43, 0x39, 0x98, 0x43,
0x39, 0xC8, 0x43, 0x39, 0xB8, 0xC3, 0x38, 0x94,
0x43, 0x38, 0x88, 0x3, 0x3B, 0x94, 0xC3, 0x2F,
0xBC, 0x83, 0x3C, 0xFC, 0x82, 0x3B, 0xD4, 0x3,
0x3B, 0xB0, 0xC3, 0xC, 0xC7, 0x69, 0x87, 0x70,
0x58, 0x87, 0x72, 0x70, 0x83, 0x74, 0x68, 0x7,
0x78, 0x60, 0x87, 0x74, 0x18, 0x87, 0x74, 0xA0,
0x87, 0x19, 0xCE, 0x53, 0xF, 0xEE, 0x0, 0xF, 0xF2,
0x50, 0xE, 0xE4, 0x90, 0xE, 0xE3, 0x40, 0xF, 0xE1,
0x20, 0xE, 0xEC, 0x50, 0xE, 0x33, 0x20, 0x28,
0x1D, 0xDC, 0xC1, 0x1E, 0xC2, 0x41, 0x1E, 0xD2,
0x21, 0x1C, 0xDC, 0x81, 0x1E, 0xDC, 0xE0, 0x1C,
0xE4, 0xE1, 0x1D, 0xEA, 0x1, 0x1E, 0x66, 0x18,
0x51, 0x38, 0xB0, 0x43, 0x3A, 0x9C, 0x83, 0x3B,
0xCC, 0x50, 0x24, 0x76, 0x60, 0x7, 0x7B, 0x68,
0x7, 0x37, 0x60, 0x87, 0x77, 0x78, 0x7, 0x78,
0x98, 0x51, 0x4C, 0xF4, 0x90, 0xF, 0xF0, 0x50,
0xE, 0x33, 0x1E, 0x6A, 0x1E, 0xCA, 0x61, 0x1C,
0xE8, 0x21, 0x1D, 0xDE, 0xC1, 0x1D, 0x7E, 0x1,
0x1E, 0xE4, 0xA1, 0x1C, 0xCC, 0x21, 0x1D, 0xF0,
0x61, 0x6, 0x54, 0x85, 0x83, 0x38, 0xCC, 0xC3,
0x3B, 0xB0, 0x43, 0x3D, 0xD0, 0x43, 0x39, 0xFC,
0xC2, 0x3C, 0xE4, 0x43, 0x3B, 0x88, 0xC3, 0x3B,
0xB0, 0xC3, 0x8C, 0xC5, 0xA, 0x87, 0x79, 0x98,
0x87, 0x77, 0x18, 0x87, 0x74, 0x8, 0x7, 0x7A,
0x28, 0x7, 0x72, 0x98, 0x81, 0x5C, 0xE3, 0x10,
0xE, 0xEC, 0xC0, 0xE, 0xE5, 0x50, 0xE, 0xF3, 0x30,
0x23, 0xC1, 0xD2, 0x41, 0x1E, 0xE4, 0xE1, 0x17,
0xD8, 0xE1, 0x1D, 0xDE, 0x1, 0x1E, 0x66, 0x48,
0x19, 0x3B, 0xB0, 0x83, 0x3D, 0xB4, 0x83, 0x1B,
0x84, 0xC3, 0x38, 0x8C, 0x43, 0x39, 0xCC, 0xC3,
0x3C, 0xB8, 0xC1, 0x39, 0xC8, 0xC3, 0x3B, 0xD4,
0x3, 0x3C, 0xCC, 0x48, 0xB4, 0x71, 0x8, 0x7, 0x76,
0x60, 0x7, 0x71, 0x8, 0x87, 0x71, 0x58, 0x87,
0x19, 0xDB, 0xC6, 0xE, 0xEC, 0x60, 0xF, 0xED,
0xE0, 0x6, 0xF0, 0x20, 0xF, 0xE5, 0x30, 0xF, 0xE5,
0x20, 0xF, 0xF6, 0x50, 0xE, 0x6E, 0x10, 0xE, 0xE3,
0x30, 0xE, 0xE5, 0x30, 0xF, 0xF3, 0xE0, 0x6, 0xE9,
0xE0, 0xE, 0xE4, 0x50, 0xE, 0xF8, 0x30, 0x23,
0xE2, 0xEC, 0x61, 0x1C, 0xC2, 0x81, 0x1D, 0xD8,
0xE1, 0x17, 0xEC, 0x21, 0x1D, 0xE6, 0x21, 0x1D,
0xC4, 0x21, 0x1D, 0xD8, 0x21, 0x1D, 0xE8, 0x21,
0x1F, 0x66, 0x20, 0x9D, 0x3B, 0xBC, 0x43, 0x3D,
0xB8, 0x3, 0x39, 0x94, 0x83, 0x39, 0xCC, 0x58,
0xBC, 0x70, 0x70, 0x7, 0x77, 0x78, 0x7, 0x7A,
0x8, 0x7, 0x7A, 0x48, 0x87, 0x77, 0x70, 0x87,
0x19, 0xCB, 0xE7, 0xE, 0xEF, 0x30, 0xF, 0xE1,
0xE0, 0xE, 0xE9, 0x40, 0xF, 0xE9, 0xA0, 0xF, 0xE5,
0x30, 0xC3, 0x1, 0x3, 0x73, 0xA8, 0x7, 0x77, 0x18,
0x87, 0x5F, 0x98, 0x87, 0x70, 0x70, 0x87, 0x74,
0xA0, 0x87, 0x74, 0xD0, 0x87, 0x72, 0x98, 0x81,
0x84, 0x41, 0x39, 0xE0, 0xC3, 0x38, 0xB0, 0x43,
0x3D, 0x90, 0x43, 0x39, 0xCC, 0x40, 0xC4, 0xA0,
0x1D, 0xCA, 0xA1, 0x1D, 0xE0, 0x41, 0x1E, 0xDE,
0xC1, 0x1C, 0x66, 0x24, 0x63, 0x30, 0xE, 0xE1,
0xC0, 0xE, 0xEC, 0x30, 0xF, 0xE9, 0x40, 0xF, 0xE5,
0x30, 0x43, 0x21, 0x83, 0x75, 0x18, 0x7, 0x73,
0x48, 0x87, 0x5F, 0xA0, 0x87, 0x7C, 0x80, 0x87,
0x72, 0x98, 0xB1, 0x94, 0x1, 0x3C, 0x8C, 0xC3,
0x3C, 0x94, 0xC3, 0x38, 0xD0, 0x43, 0x3A, 0xBC,
0x83, 0x3B, 0xCC, 0xC3, 0x8C, 0xC5, 0xC, 0x48,
0x21, 0x15, 0x42, 0x61, 0x1E, 0xE6, 0x21, 0x1D,
0xCE, 0xC1, 0x1D, 0x52, 0x81, 0x14, 0x66, 0x4C,
0x67, 0x30, 0xE, 0xEF, 0x20, 0xF, 0xEF, 0xE0,
0x6, 0xEF, 0x50, 0xF, 0xF4, 0x30, 0xF, 0xE9, 0x40,
0xE, 0xE5, 0xE0, 0x6, 0xE6, 0x20, 0xF, 0xE1, 0xD0,
0xE, 0xE5, 0x30, 0xA3, 0x40, 0x83, 0x76, 0x68,
0x7, 0x79, 0x8, 0x87, 0x19, 0x52, 0x1A, 0xB8,
0xC3, 0x3B, 0x84, 0x3, 0x3B, 0xA4, 0x43, 0x38,
0xCC, 0x83, 0x1B, 0x84, 0x3, 0x39, 0x90, 0x83,
0x3C, 0xCC, 0x3, 0x3C, 0x84, 0xC3, 0x38, 0x94,
0xC3, 0xC, 0x46, 0xD, 0xC6, 0x21, 0x1C, 0xD8,
0x81, 0x1D, 0xCA, 0xA1, 0x1C, 0x7E, 0x81, 0x1E,
0xF2, 0x1, 0x1E, 0xCA, 0x61, 0x86, 0xB3, 0x6,
0xE4, 0x80, 0xF, 0x6E, 0xE0, 0xE, 0xEF, 0xE0,
0xE, 0xF5, 0xE0, 0xE, 0xE9, 0x60, 0xE, 0xEF, 0x20,
0xF, 0xED, 0x30, 0xA3, 0x62, 0x3, 0x72, 0xC0,
0x7, 0x37, 0x18, 0x87, 0x77, 0x70, 0x7, 0x7A,
0x90, 0x87, 0x77, 0x60, 0x7, 0x73, 0x60, 0x87,
0x77, 0xB8, 0x7, 0x37, 0x40, 0x87, 0x74, 0x70,
0x7, 0x7A, 0x98, 0x87, 0x19, 0x4B, 0x1B, 0x90,
0x3, 0x3E, 0xB8, 0x1, 0x3C, 0xC8, 0x43, 0x39,
0x8C, 0x43, 0x3A, 0xCC, 0x43, 0x39, 0x0, 0x0,
0x79, 0x28, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0xC2,
0x3C, 0x90, 0x40, 0x86, 0x10, 0x19, 0x32, 0xE2,
0x64, 0x90, 0x40, 0x46, 0x2, 0x19, 0x23, 0x23,
0x46, 0x2, 0x13, 0x24, 0xC6, 0x0, 0x13, 0x74,
0xD4, 0x61, 0x8C, 0x2D, 0xCC, 0xED, 0xC, 0xC4,
0xAE, 0x4C, 0x6E, 0x2E, 0xED, 0xCD, 0xD, 0x44,
0x46, 0xC6, 0x5, 0xC6, 0x5, 0xE6, 0x2C, 0x8D,
0xE, 0x4, 0xE5, 0x2C, 0x8D, 0xE, 0xE8, 0x2C, 0x8D,
0xE, 0xAD, 0x4E, 0xCC, 0x65, 0xEC, 0xAD, 0x4D,
0x27, 0xCD, 0x4D, 0xAC, 0x8C, 0x2D, 0x6D, 0xEC,
0x85, 0x8D, 0xCD, 0xAE, 0xAD, 0x5, 0x4E, 0xEE,
0x4D, 0xAD, 0x6C, 0x8C, 0xCE, 0xE5, 0x2C, 0x8D,
0xE, 0x84, 0x86, 0xC6, 0xCC, 0xC6, 0x86, 0x4C,
0xC, 0x87, 0x6C, 0xEC, 0x26, 0x67, 0x46, 0x26,
0x67, 0x6C, 0xA6, 0xCC, 0x66, 0x8C, 0xC6, 0x2C,
0xEC, 0x26, 0xC, 0x26, 0x2C, 0xEC, 0x26, 0xCC,
0xCC, 0x86, 0x6, 0xE6, 0x6, 0x26, 0xE7, 0x86,
0xE6, 0x26, 0xE5, 0x8, 0x63, 0x73, 0x87, 0x68,
0xB, 0x4B, 0x73, 0x3B, 0xCA, 0xDD, 0x18, 0x5A,
0x98, 0xDC, 0xD7, 0x5C, 0x9A, 0x5E, 0xD9, 0x69,
0xCC, 0xE4, 0xC2, 0xDA, 0xCA, 0x5A, 0xE0, 0xDE,
0xD2, 0xDC, 0xE8, 0xCA, 0xE4, 0x86, 0x20, 0x1C,
0xC1, 0x10, 0x84, 0x43, 0x18, 0x82, 0x70, 0xC,
0x43, 0x10, 0xE, 0x62, 0x8, 0x42, 0x1, 0xC, 0x41,
0x38, 0x8A, 0x21, 0x8, 0x87, 0x31, 0x6, 0xC1,
0x38, 0xC6, 0x10, 0x4, 0x63, 0x18, 0x4, 0x24,
0x19, 0x83, 0x60, 0x24, 0x63, 0x18, 0xC, 0xC3,
0x18, 0x83, 0xB0, 0x44, 0x63, 0x28, 0x94, 0x1,
0x0, 0xA4, 0x31, 0xC, 0x6, 0xB1, 0x8C, 0x61, 0x60,
0xA, 0xC6, 0x24, 0x64, 0x78, 0x2E, 0x76, 0x61,
0x6C, 0x76, 0x65, 0x72, 0x43, 0x9, 0x18, 0xA3,
0xB0, 0xB1, 0xD9, 0xB5, 0xB9, 0xA4, 0x91, 0x95,
0xB9, 0xD1, 0xD, 0x25, 0x68, 0x8C, 0x43, 0x86,
0xE7, 0x32, 0x87, 0x16, 0x46, 0x56, 0x26, 0xD7,
0xF4, 0x46, 0x56, 0xC6, 0x36, 0x94, 0xC0, 0x31,
0xA, 0x19, 0x9E, 0x8B, 0x5D, 0x99, 0xDC, 0x5C,
0xDA, 0x9B, 0xDB, 0x50, 0x82, 0xC7, 0x38, 0x64,
0x78, 0x2E, 0x65, 0x6E, 0x74, 0x72, 0x79, 0x50,
0x6F, 0x69, 0x6E, 0x74, 0x73, 0x43, 0x9, 0x24,
0x13, 0xB1, 0xB1, 0xD9, 0xB5, 0xB9, 0xB4, 0xBD,
0x91, 0xD5, 0xB1, 0x95, 0xB9, 0x98, 0xB1, 0x85,
0x9D, 0xCD, 0xD, 0x45, 0x98, 0x28, 0x0, 0x0, 0x71,
0x20, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x6, 0x40,
0x30, 0x0, 0xD2, 0x0, 0x0, 0x0, 0x61, 0x20, 0x0,
0x0, 0x6, 0x0, 0x0, 0x0, 0x13, 0x4, 0x1, 0x86,
0x3, 0x1, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x7, 0x50,
0x10, 0xCD, 0x14, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 ]
DXILSize: 4
DXIL: [ 0x42, 0x43, 0xC0, 0xDE, ]
- Name: SFI0
Size: 8
- Name: HASH
Expand Down
25 changes: 22 additions & 3 deletions llvm/test/tools/llvm-objcopy/DXContainer/extract-section-errs.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Check that llvm-objcopy reports a suitable error when it
## can't find the section to extract
## Check that llvm-objcopy reports a suitable error when it can't find the
## section to extract.

## We can't extract a part that doesn't exist
## We can't extract a part that doesn't exist.
# RUN: yaml2obj %s --docnum=1 -o %t1
# RUN: not llvm-objcopy %t1 --extract-section=UNKNOWN=%t.unknown.out 2>&1 | FileCheck %s -DFILE=%t1 --check-prefix=ERROR1

Expand All @@ -19,3 +19,22 @@ Parts:
- Name: FKE0
Size: 8
...

## We can't extract a part that is specified incorrectly.
# RUN: yaml2obj %s --docnum=2 -o %t2
# RUN: not llvm-objcopy %t2 --extract-section=FKE0,%t.fke0.out 2>&1 | FileCheck %s -DFILE=%t2 --check-prefix=ERROR2

# ERROR2: error: bad format for --extract-section, expected section=file

--- !dxcontainer
Header:
Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
Version:
Major: 1
Minor: 0
PartCount: 1
Parts:
- Name: FKE0
Size: 8
...
Loading