change getElementSize, replace array test with struct array

Author: kmpeng

include/Support/Pipeline.h

@@ -198,7 +198,10 @@ struct Resource {
     }
   }
 
-  uint32_t getElementSize() const { return BufferPtr->getElementSize(); }
+  uint32_t getElementSize() const {
+    // ByteAddressBuffer uses DXGI_FORMAT_R32_TYPELESS which has 4-byte elements
+    return isByteAddressBuffer() ? 4 : BufferPtr->getElementSize();
+  }
 
   uint32_t size() const { return BufferPtr->size(); }
 

lib/API/DX/Device.cpp

@@ -169,7 +169,7 @@ static D3D12_RESOURCE_DESC getResourceDescription(const Resource &R) {
 }
 
 static D3D12_SHADER_RESOURCE_VIEW_DESC getSRVDescription(const Resource &R) {
-  const uint32_t EltSize = R.isByteAddressBuffer() ? 4 : R.getElementSize();
+  const uint32_t EltSize = R.getElementSize();
   const uint32_t NumElts = R.size() / EltSize;
 
   llvm::outs() << "    EltSize = " << EltSize << " NumElts = " << NumElts
@@ -205,7 +205,7 @@ static D3D12_SHADER_RESOURCE_VIEW_DESC getSRVDescription(const Resource &R) {
 }
 
 static D3D12_UNORDERED_ACCESS_VIEW_DESC getUAVDescription(const Resource &R) {
-  const uint32_t EltSize = R.isByteAddressBuffer() ? 4 : R.getElementSize();
+  const uint32_t EltSize = R.getElementSize();
   const uint32_t NumElts = R.size() / EltSize;
   const uint32_t CounterOffset = getUAVBufferCounterOffset(R);
 

test/Feature/ByteAddressBuffer/ByteAddressBuffers.test

@@ -7,12 +7,16 @@
 // byte-offset, add them, and store the result at the respective offset in
 // `Out`.
 
-struct S0 {
+struct ArrayStruct {
+  int arr[4];
+};
+
+struct SmallStruct {
   int a;
   uint b;
 };
 
-struct S1 {
+struct LargeStruct {
   int4 a;
   int4 b;
   uint4 c;
@@ -59,25 +63,24 @@ void main() {
   bool4 V7 = In1.Load<bool4>(64);
   Out.Store<bool4>(112, U7 + V7);
 
-  // array
-  int U8[4] = In0.Load<int[4]>(0);
-  int V8[4] = In1.Load<int[4]>(0);
-  int TempArray[4];
+  // structs
+  ArrayStruct U8 = In0.Load<ArrayStruct>(0);
+  ArrayStruct V8 = In1.Load<ArrayStruct>(0);
+  ArrayStruct TempStruct0;
   for(int I = 0; I < 4; I++) {
-    TempArray[I] = U8[I] + V8[I];
+    TempStruct0.arr[I] = U8.arr[I] + V8.arr[I];
   }
-  Out.Store<int[4]>(128, TempArray);
+  Out.Store<ArrayStruct>(128, TempStruct0);
 
-  // structs
-  S0 U9 = In0.Load<S0>(0);
-  S0 V9 = In1.Load<S0>(0);
-  S0 TempStruct0 = {U9.a + V9.a, U9.b + V9.b};
-  Out.Store<S0>(144, TempStruct0);
-
-  S1 U10 = In0.Load<S1>(0);
-  S1 V10 = In1.Load<S1>(0);
-  S1 TempStruct1 = {U10.a + V10.a, U10.b + V10.b, U10.c + V10.c, U10.d + V10.d};
-  Out.Store<S1>(160, TempStruct1);
+  SmallStruct U9 = In0.Load<SmallStruct>(0);
+  SmallStruct V9 = In1.Load<SmallStruct>(0);
+  SmallStruct TempStruct1 = {U9.a + V9.a, U9.b + V9.b};
+  Out.Store<SmallStruct>(144, TempStruct1);
+
+  LargeStruct U10 = In0.Load<LargeStruct>(0);
+  LargeStruct V10 = In1.Load<LargeStruct>(0);
+  LargeStruct TempStruct2 = {U10.a + V10.a, U10.b + V10.b, U10.c + V10.c, U10.d + V10.d};
+  Out.Store<LargeStruct>(160, TempStruct2);
 }
 
 //--- pipeline.yaml