[DX] Fix PSV resource serialization

[beanz]

Summary

When writing this initially I missed including the resource stride.
This change adds the resources stride to the serialized value.

I've also extended the testing and error reporting around parsing PSV
information. This adds tests to verify that the reader produces
meaningful error messages for malformed DXContainer files, and a test
that verifies the resource stride is respected in the reader even if
the stride isn't an expected or known value (as would happen if the
format changes in the future).

This is part of #59479.

[bob80905]

LGTM

llvm/include/llvm/Object/DXContainer.h

95–96

Just curious whether this should be revisited, or why these operators aren't defined in terms of the opposite of the other.

[beanz]

llvm/include/llvm/Object/DXContainer.h

95–96

This is some funny syntax, but the != operator is implemented in terms of the == operator, which only does the pointer compare on the Current pointer.

The other way the != operator could be written would be something like:

bool operator!=(const iterator I) { return !operator==(I); }

That should be equivalent to the code currently in there because it is just calling == on two iterator objects.

llvm/include/llvm/Object/DXContainer.h

 class PSVRuntimeInfo {
 
   // This class provides a view into the underlying resource array. The Resource
   // data is little-endian encoded and may not be properly aligned to read
   // directly from. The dereference operator creates a copy of the data and byte
   // swaps it as appropriate.
   struct ResourceArray {
     StringRef Data;
-    size_t Stride; // size of each element in the list.
+    uint32_t Stride; // size of each element in the list.
 
     ResourceArray() = default;
     ResourceArray(StringRef D, size_t S) : Data(D), Stride(S) {}
 
     using value_type = dxbc::PSV::v2::ResourceBindInfo;
+    static constexpr uint32_t MaxStride() {
+      return static_cast<uint32_t>(sizeof(value_type));
+    }
 
     struct iterator {
       StringRef Data;
-      size_t Stride; // size of each element in the list.
+      uint32_t Stride; // size of each element in the list.
       const char *Current;
 
       iterator(const ResourceArray &A, const char *C)
           : Data(A.Data), Stride(A.Stride), Current(C) {}
       iterator(const iterator &) = default;
 
       value_type operator*() {
         // Explicitly zero the structure so that unused fields are zeroed. It is
         // up to the user to know if the fields are used by verifying the PSV
         // version.
         value_type Val = {{0, 0, 0, 0}, 0, 0};
         if (Current >= Data.end())
           return Val;
-        memcpy(static_cast<void *>(&Val), Current, Stride);
+        memcpy(static_cast<void *>(&Val), Current,
+               std::min(Stride, MaxStride()));
         if (sys::IsBigEndianHost)
           Val.swapBytes();
         return Val;
       }
 
       iterator operator++() {
         if (Current < Data.end())
           Current += Stride;
struct iterator {
       }
 
       iterator operator--(int) {
         iterator Tmp = *this;
         --*this;
         return Tmp;
       }
 
       bool operator==(const iterator I) { return I.Current == Current; }
       bool operator!=(const iterator I) { return !(*this == I); }
     };
 
     iterator begin() const { return iterator(*this, Data.begin()); }
 
     iterator end() const { return iterator(*this, Data.end()); }
 
     size_t size() const { return Data.size() / Stride; }
   };
public:
   ResourceArray getResources() const { return Resources; }
 
   uint32_t getVersion() const {
     return Size >= sizeof(dxbc::PSV::v2::RuntimeInfo)
                ? 2
                : (Size >= sizeof(dxbc::PSV::v1::RuntimeInfo) ? 1 : 0);
   }
 
+  uint32_t getResourceStride() const { return Resources.Stride; }
+
   const InfoStruct &getInfo() const { return BasicInfo; }
 };
 
 } // namespace DirectX
 
 class DXContainer {
 public:
   using DXILData = std::pair<dxbc::ProgramHeader, const char *>;

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

 
 struct PSVInfo {
   // The version field isn't actually encoded in the file, but it is inferred by
   // the size of data regions. We include it in the yaml because it simplifies
   // the format.
   uint32_t Version;
 
   dxbc::PSV::v2::RuntimeInfo Info;
+  uint32_t ResourceStride;
   std::vector<ResourceBindInfo> Resources;
 
   void mapInfoForVersion(yaml::IO &IO);
 
   PSVInfo();
   PSVInfo(const dxbc::PSV::v0::RuntimeInfo *P, uint16_t Stage);
   PSVInfo(const dxbc::PSV::v1::RuntimeInfo *P);
   PSVInfo(const dxbc::PSV::v2::RuntimeInfo *P);

llvm/lib/MC/DXContainerPSVInfo.cpp

 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
 using namespace llvm::mcdxbc;
 using namespace llvm::dxbc::PSV;
 
 void PSVRuntimeInfo::write(raw_ostream &OS, uint32_t Version) const {
   uint32_t InfoSize;
+  uint32_t BindingSize;
   switch (Version) {
   case 0:
     InfoSize = sizeof(dxbc::PSV::v0::RuntimeInfo);
+    BindingSize = sizeof(dxbc::PSV::v0::ResourceBindInfo);
     break;
   case 1:
     InfoSize = sizeof(dxbc::PSV::v1::RuntimeInfo);
+    BindingSize = sizeof(dxbc::PSV::v0::ResourceBindInfo);
     break;
   case 2:
   default:
     InfoSize = sizeof(dxbc::PSV::v2::RuntimeInfo);
+    BindingSize = sizeof(dxbc::PSV::v2::ResourceBindInfo);
   }
   uint32_t InfoSizeSwapped = InfoSize;
   if (sys::IsBigEndianHost)
     sys::swapByteOrder(InfoSizeSwapped);
   // Write the size of the info.
   OS.write(reinterpret_cast<const char *>(&InfoSizeSwapped), sizeof(uint32_t));
   // Write the info itself.
   OS.write(reinterpret_cast<const char *>(&BaseData), InfoSize);
 
   uint32_t ResourceCount = static_cast<uint32_t>(Resources.size());
   if (sys::IsBigEndianHost)
     sys::swapByteOrder(ResourceCount);
   OS.write(reinterpret_cast<const char *>(&ResourceCount), sizeof(uint32_t));
 
-  size_t BindingSize = (Version < 2) ? sizeof(v0::ResourceBindInfo)
-                                     : sizeof(v2::ResourceBindInfo);
+  OS.write(reinterpret_cast<const char *>(&BindingSize), sizeof(uint32_t));
   for (const auto &Res : Resources)
     OS.write(reinterpret_cast<const char *>(&Res), BindingSize);
 }

llvm/lib/Object/DXContainer.cpp

Error DirectX::PSVRuntimeInfo::parse(uint16_t ShaderKind) {
 
   const char *Current = Data.begin();
   if (Error Err = readInteger(Data, Current, Size))
     return Err;
   Current += sizeof(uint32_t);
 
   StringRef PSVInfoData = Data.substr(sizeof(uint32_t), Size);
 
+  if (PSVInfoData.size() < Size)
+    return parseFailed(
+        "Pipeline state data extends beyond the bounds of the part");
+
   using namespace dxbc::PSV;
 
   const uint32_t PSVVersion = getVersion();
 
   // Detect the PSVVersion by looking at the size field.
   if (PSVVersion == 2) {
     v2::RuntimeInfo Info;
     if (Error Err = readStruct(PSVInfoData, Current, Info))
Error DirectX::PSVRuntimeInfo::parse(uint16_t ShaderKind) {
   }
   Current += Size;
 
   uint32_t ResourceCount = 0;
   if (Error Err = readInteger(Data, Current, ResourceCount))
     return Err;
   Current += sizeof(uint32_t);
 
-  Resources.Stride = (PSVVersion < 2) ? sizeof(v0::ResourceBindInfo)
-                                      : sizeof(v2::ResourceBindInfo);
+  if (ResourceCount > 0) {
+    if (Error Err = readInteger(Data, Current, Resources.Stride))
+      return Err;
+    Current += sizeof(uint32_t);
+
     size_t BindingDataSize = Resources.Stride * ResourceCount;
     Resources.Data = Data.substr(Current - Data.begin(), BindingDataSize);
 
+    if (Resources.Data.size() < BindingDataSize)
+      return parseFailed(
+          "Resource binding data extends beyond the bounds of the part");
+
     Current += BindingDataSize;
+  }
 
   return Error::success();
 }

llvm/lib/ObjectYAML/DXContainerYAML.cpp

void MappingTraits<DXContainerYAML::PSVInfo>::mapping(
   uint32_t Version = PSV.Version;
   IO.setContext(&Version);
 
   // Shader stage is only included in binaries for v1 and later, but we always
   // include it since it simplifies parsing and file construction.
   IO.mapRequired("ShaderStage", PSV.Info.ShaderStage);
   PSV.mapInfoForVersion(IO);
 
+  IO.mapRequired("ResourceStride", PSV.ResourceStride);
   IO.mapRequired("Resources", PSV.Resources);
 
   // Restore the YAML context.
   IO.setContext(OldContext);
 }
 
 void MappingTraits<DXContainerYAML::Part>::mapping(IO &IO,
                                                    DXContainerYAML::Part &P) {

llvm/test/ObjectYAML/DXContainer/PSVv0-amplification.yaml

Parts:
   - Name:            PSV0
     Size:            144
     PSVInfo:
       Version:         0
       ShaderStage:     14
       PayloadSizeInBytes: 4092
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 
 # CHECK: Name:            PSV0
 # CHECK: PSVInfo:
 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     14
 # CHECK-NEXT: PayloadSizeInBytes: 4092
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-compute.yaml

 Parts:
   - Name:            PSV0
     Size:            144
     PSVInfo:
       Version:         0
       ShaderStage:     5
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 ...
 
 # CHECK: Name:            PSV0
 # CHECK: PSVInfo:
 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     5
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-domain.yaml

- Name:            PSV0
     PSVInfo:
       Version:         0
       ShaderStage:     4
       InputControlPointCount: 1024
       OutputPositionPresent: 1
       TessellatorDomain: 2056
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK: PSVInfo:
 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     4
 # CHECK-NEXT: InputControlPointCount: 1024
 # CHECK-NEXT: OutputPositionPresent: 1
 # CHECK-NEXT: TessellatorDomain: 2056
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-geometry.yaml

PSVInfo:
       Version:         0
       ShaderStage:     2
       InputPrimitive: 1024
       OutputTopology: 4096
       OutputStreamMask: 2056
       OutputPositionPresent: 1
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     2
 # CHECK-NEXT: InputPrimitive: 1024
 # CHECK-NEXT: OutputTopology: 4096
 # CHECK-NEXT: OutputStreamMask: 2056
 # CHECK-NEXT: OutputPositionPresent: 1
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-hull.yaml

PSVInfo:
       Version:         0
       ShaderStage:     3
       InputControlPointCount: 1024
       OutputControlPointCount: 4096
       TessellatorDomain: 2056
       TessellatorOutputPrimitive: 8192
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     3
 # CHECK-NEXT: InputControlPointCount: 1024
 # CHECK-NEXT: OutputControlPointCount: 4096
 # CHECK-NEXT: TessellatorDomain: 2056
 # CHECK-NEXT: TessellatorOutputPrimitive: 8192
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-mesh.yaml

PSVInfo:
       ShaderStage:     13
       GroupSharedBytesUsed: 1024
       GroupSharedBytesDependentOnViewID: 2056
       PayloadSizeInBytes: 4092
       MaxOutputVertices: 8196
       MaxOutputPrimitives: 4092
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: ShaderStage:     13
 # CHECK-NEXT: GroupSharedBytesUsed: 1024
 # CHECK-NEXT: GroupSharedBytesDependentOnViewID: 2056
 # CHECK-NEXT: PayloadSizeInBytes: 4092
 # CHECK-NEXT: MaxOutputVertices: 8196
 # CHECK-NEXT: MaxOutputPrimitives: 4092
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-pixel.yaml

- Name:            PSV0
     Size:            144
     PSVInfo:
       Version:         0
       ShaderStage:     0
       DepthOutput:     7
       SampleFrequency: 96
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK: Name:            PSV0
 # CHECK: PSVInfo:
 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     0
 # CHECK-NEXT: DepthOutput:     7
 # CHECK-NEXT: SampleFrequency: 96
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv0-vertex.yaml

Parts:
   - Name:            PSV0
     Size:            144
     PSVInfo:
       Version:         0
       ShaderStage:     1
       OutputPositionPresent: 1
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 
 # CHECK: Name:            PSV0
 # CHECK: PSVInfo:
 # CHECK-NEXT: Version:         0
 # CHECK-NEXT: ShaderStage:     1
 # CHECK-NEXT: OutputPositionPresent: 1
 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-amplification.yaml

PSVInfo:
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-compute.yaml

PSVInfo:
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-domain.yaml

PSVInfo:
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigPatchConstOrPrimVectors:  128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigPatchConstOrPrimVectors:  128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-geometry.yaml

PSVInfo:
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       MaxVertexCount:  4096
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: MaxVertexCount:  4096
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-hull.yaml

PSVInfo:
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigPatchConstOrPrimVectors:  128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigPatchConstOrPrimVectors:  128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-mesh.yaml

PSVInfo:
       UsesViewID:      128
       SigPrimVectors:  128
       MeshOutputTopology: 16
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigPrimVectors:  128
 # CHECK-NEXT: MeshOutputTopology: 16
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-pixel.yaml

PSVInfo:
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv1-vertex.yaml

PSVInfo:
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
       UsesViewID:      128
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
+      ResourceStride:       16
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
         - Type:            128
           Space:           32768
           LowerBound:      8388608

 # CHECK-NEXT: MinimumWaveLaneCount: 0
 # CHECK-NEXT: MaximumWaveLaneCount: 4294967295
 # CHECK-NEXT: UsesViewID:      128
 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
+# CHECK-NEXT: ResourceStride: 16
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-amplification.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-compute.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-domain.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-geometry.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-hull.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-mesh.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-pixel.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/test/ObjectYAML/DXContainer/PSVv2-vertex.yaml

PSVInfo:
       SigInputElements: 8
       SigOutputElements: 16
       SigPatchConstOrPrimElements: 32
       SigInputVectors: 64
       SigOutputVectors: [ 8, 16, 32, 64 ]
       NumThreadsX:     512
       NumThreadsY:     1024
       NumThreadsZ:     2048
+      ResourceStride:       24
       Resources:
         - Type:            1
           Space:           2
           LowerBound:      3
           UpperBound:      4
           Kind:            5
           Flags:           6
         - Type:            128

 # CHECK-NEXT: SigInputElements: 8
 # CHECK-NEXT: SigOutputElements: 16
 # CHECK-NEXT: SigPatchConstOrPrimElements: 32
 # CHECK-NEXT: SigInputVectors: 64
 # CHECK-NEXT: SigOutputVectors: [ 8, 16, 32, 64 ]
 # CHECK-NEXT: NumThreadsX:     512
 # CHECK-NEXT: NumThreadsY:     1024
 # CHECK-NEXT: NumThreadsZ:     2048
+# CHECK-NEXT: ResourceStride: 24
 # CHECK-NEXT: Resources:
 # CHECK-NEXT: - Type:            1
 # CHECK-NEXT: Space:           2
 # CHECK-NEXT: LowerBound:      3
 # CHECK-NEXT: UpperBound:      4
 # CHECK-NEXT: Kind:            5
 # CHECK-NEXT: Flags:           6
 # CHECK-NEXT: - Type:            128
 # CHECK-NEXT: Space:           32768
 # CHECK-NEXT: LowerBound:      8388608
 # CHECK-NEXT: UpperBound:      2147483648
 # CHECK-NEXT: Kind:            65535
 # CHECK-NEXT: Flags:           16776960
 # CHECK-NEXT: Name

llvm/tools/obj2yaml/dxcontainer2yaml.cpp

case dxbc::PartType::PSV0: {
         NewPart.Info =
             DXContainerYAML::PSVInfo(P, Container.getDXIL()->first.ShaderKind);
       } else if (const auto *P = std::get_if<dxbc::PSV::v1::RuntimeInfo>(
                      &PSVInfo->getInfo()))
         NewPart.Info = DXContainerYAML::PSVInfo(P);
       else if (const auto *P =
                    std::get_if<dxbc::PSV::v2::RuntimeInfo>(&PSVInfo->getInfo()))
         NewPart.Info = DXContainerYAML::PSVInfo(P);
+      NewPart.Info->ResourceStride = PSVInfo->getResourceStride();
       for (auto Res : PSVInfo->getResources())
         NewPart.Info->Resources.push_back(Res);
       break;
     }
     case dxbc::PartType::Unknown:
       break;
     }
   }

llvm/unittests/Object/DXContainerTest.cpp

Parts:
   - Name:            PSV0
     Size:            144
     PSVInfo:
       Version:         0
       ShaderStage:     14
       PayloadSizeInBytes: 4092
       MinimumWaveLaneCount: 0
       MaximumWaveLaneCount: 4294967295
+      ResourceStride:  16
       Resources:
         - Type:            1
           Space:           1
           LowerBound:      1
           UpperBound:      1
         - Type:            2
           Space:           2
           LowerBound:      2
)";
   {
     auto Old = It--;
     Binding = *Old;
     EXPECT_TRUE(Old == PSVInfo->getResources().end());
 
     EXPECT_EQ(Binding.Type, 0u);
     EXPECT_EQ(Binding.Flags, 0u);
   }
-  
   Binding = *It;
 
   EXPECT_EQ(Binding.Type, 3u);
   EXPECT_EQ(Binding.Flags, 0u);
 }
+
+// The malicious file bits in these tests are mutations of the binary produced
+// by the following YAML:
+//
+// --- !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:       3
+// Parts:
+//   - Name:            DXIL
+//     Size:            24
+//     Program:
+//       MajorVersion:    6
+//       MinorVersion:    0
+//       ShaderKind:      14
+//       Size:            6
+//       DXILMajorVersion: 0
+//       DXILMinorVersion: 1
+//       DXILSize:        0
+//   - Name:            PSV0
+//     Size:            36
+//     PSVInfo:
+//       Version:         0
+//       ShaderStage:     5
+//       MinimumWaveLaneCount: 0
+//       MaximumWaveLaneCount: 0
+//       ResourceStride:       16
+//       Resources: []
+//   - Name: BLEH
+//     Size: 16
+// ...
+
+TEST(DXCFile, MaliciousFiles) {
+
+  // In this file blob, the file size is specified as 96 bytes (0x60), and the
+  // PSV0 data is specified as 24 bytes (0x18) which extends beyond the size of
+  // the file.
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x60, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00,
+        0x48, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C, 0x18, 0x00, 0x00, 0x00,
+        0x60, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C,
+        0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x50, 0x53, 0x56, 0x30, 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<96>(Buffer)),
+        FailedWithMessage(
+            "Pipeline state data extends beyond the bounds of the part"));
+  }
+
+  // PSV extends beyond part, but in file range. In this blob the file size is
+  // 144 bytes (0x90), and the PSV part is 36 bytes (0x24), and the PSV data is
+  // 40 bytes (0x40).
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00,
+        0x4C, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C,
+        0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00,
+        0x44, 0x58, 0x49, 0x4C, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x50, 0x53, 0x56, 0x30, 0x24, 0x00, 0x00, 0x00,
+        0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+        0x42, 0x4C, 0x45, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<144>(Buffer)),
+        FailedWithMessage(
+            "Pipeline state data extends beyond the bounds of the part"));
+  }
+
+  // In this file blob, the file is 116 bytes (0x74). The file structure is
+  // valid except that it specifies 1 16 byte resource binding which would
+  // extend beyond the range of the part and file.
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x74, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00,
+        0x48, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C, 0x18, 0x00, 0x00, 0x00,
+        0x60, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C,
+        0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x50, 0x53, 0x56, 0x30, 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+    };
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<116>(Buffer)),
+        FailedWithMessage(
+            "Resource binding data extends beyond the bounds of the part"));
+  }
+
+  // In this file blob, the file is 116 bytes (0x74). The file structure is
+  // valid except that it specifies 1 16 byte resource binding which would
+  // extend beyond the range of the part and into the `BLEH` part.
+  {
+    uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x90, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00,
+        0x4C, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C,
+        0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00,
+        0x44, 0x58, 0x49, 0x4C, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x50, 0x53, 0x56, 0x30, 0x24, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+        0x42, 0x4C, 0x45, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<144>(Buffer)),
+        FailedWithMessage(
+            "Resource binding data extends beyond the bounds of the part"));
+  }
+}
+
+// This test verifies that the resource iterator follows the stride even if the
+// stride doesn't match an expected or known value. In this test, the resource
+// data is structured validly, with 32 bytes per resource. This test is based on
+// editing the binary output constructed from this yaml.
+//
+// --- !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:       2
+// Parts:
+//   - Name:            DXIL
+//     Size:            24
+//     Program:
+//       MajorVersion:    6
+//       MinorVersion:    0
+//       ShaderKind:      14
+//       Size:            6
+//       DXILMajorVersion: 0
+//       DXILMinorVersion: 1
+//       DXILSize:        0
+//   - Name:            PSV0
+//     Size:            100
+//     PSVInfo:
+//       Version:         0
+//       ShaderStage:     5
+//       MinimumWaveLaneCount: 0
+//       MaximumWaveLaneCount: 0
+//       ResourceStride:       16
+//       Resources:
+//         - Type:            1
+//           Space:           2
+//           LowerBound:      3
+//           UpperBound:      4
+//         - Type:            5
+//           Space:           6
+//           LowerBound:      7
+//           UpperBound:      8
+// ...
+TEST(DXCFile, PSVResourceIteratorsStride) {
+  uint8_t Buffer[] = {
+        0x44, 0x58, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+        0x28, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C, 0x18, 0x00, 0x00, 0x00,
+        0x60, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4C, 0x00, 0x01, 0x00, 0x00,
+        0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x53, 0x56, 0x30, 0x64, 0x00, 0x00, 0x00,
+        0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+        0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+        0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+        0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,
+    }; 
+    DXContainer C =
+      llvm::cantFail(DXContainer::create(getMemoryBuffer<180>(Buffer)));
+
+  const auto &PSVInfo = C.getPSVInfo();
+  ASSERT_TRUE(PSVInfo.has_value());
+
+  ASSERT_EQ(PSVInfo->getResourceCount(), 2u);
+
+  auto It = PSVInfo->getResources().begin();
+
+  EXPECT_TRUE(It == PSVInfo->getResources().begin());
+
+  dxbc::PSV::v2::ResourceBindInfo Binding;
+
+  Binding = *It;
+  EXPECT_EQ(Binding.Type, 1u);
+  EXPECT_EQ(Binding.Space, 2u);
+  EXPECT_EQ(Binding.LowerBound, 3u);
+  EXPECT_EQ(Binding.UpperBound, 4u);
+
+  ++It;
+  Binding = *It;
+
+  EXPECT_EQ(Binding.Type, 5u);
+  EXPECT_EQ(Binding.Space, 6u);
+  EXPECT_EQ(Binding.LowerBound, 7u);
+  EXPECT_EQ(Binding.UpperBound, 8u);
+
+  --It;
+  Binding = *It;
+
+  EXPECT_TRUE(It == PSVInfo->getResources().begin());
+
+  EXPECT_EQ(Binding.Type, 1u);
+  EXPECT_EQ(Binding.Space, 2u);
+  EXPECT_EQ(Binding.LowerBound, 3u);
+  EXPECT_EQ(Binding.UpperBound, 4u);
+
+  --It;
+  Binding = *It;
+
+  EXPECT_EQ(Binding.Type, 1u);
+  EXPECT_EQ(Binding.Space, 2u);
+  EXPECT_EQ(Binding.LowerBound, 3u);
+  EXPECT_EQ(Binding.UpperBound, 4u);
+
+  ++It;
+  Binding = *It;
+
+  EXPECT_EQ(Binding.Type, 5u);
+  EXPECT_EQ(Binding.Space, 6u);
+  EXPECT_EQ(Binding.LowerBound, 7u);
+  EXPECT_EQ(Binding.UpperBound, 8u);;
+
+
+  EXPECT_FALSE(It == PSVInfo->getResources().end());
+
+  ++It;
+  Binding = *It;
+
+  EXPECT_TRUE(It == PSVInfo->getResources().end());
+  EXPECT_FALSE(It != PSVInfo->getResources().end());
+
+  EXPECT_EQ(Binding.Type, 0u);
+  EXPECT_EQ(Binding.Flags, 0u);
+}