remove stride

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -130,8 +130,11 @@ CGHLSLRuntime::getOrCalculateStructSizeForBuffer(llvm::StructType *StructTy) {
   size_t StructSize = 0;
   LayoutItems.push_back(nullptr); // reserve one slot for the buffer size
 
-  for (llvm::Type *ElTy : StructTy->elements())
-    addLayoutInfoForBufferElement(StructSize, LayoutItems, ElTy);
+  for (llvm::Type *ElTy : StructTy->elements()) {
+    size_t Offset = calculateBufferElementOffset(ElTy, &StructSize);
+    // create metadata constant with the element start offset
+    LayoutItems.push_back(getConstIntMetadata(CGM.getLLVMContext(), Offset));
+  }
 
   // set the size of the buffer
   LayoutItems[1] = getConstIntMetadata(Ctx, StructSize);
@@ -147,16 +150,16 @@ CGHLSLRuntime::getOrCalculateStructSizeForBuffer(llvm::StructType *StructTy) {
   return StructSize;
 }
 
-void CGHLSLRuntime::addLayoutInfoForBufferElement(
-    size_t &EndOffset, SmallVector<llvm::Metadata *> &LayoutItems,
-    llvm::Type *LayoutTy, HLSLPackOffsetAttr *PackoffsetAttr) {
+size_t CGHLSLRuntime::calculateBufferElementOffset(
+    llvm::Type *LayoutTy, size_t *LayoutEndOffset,
+    HLSLPackOffsetAttr *PackoffsetAttr) {
 
-  // calculate element offset and size; for arrays also calculate array
-  // element count and stride
+  // calculate element offset and size
   size_t ElemOffset = 0;
   size_t ElemSize = 0;
   size_t ArrayCount = 1;
   size_t ArrayStride = 0;
+  size_t EndOffset = *LayoutEndOffset;
   size_t NextRowOffset = llvm::alignTo(EndOffset, 16U);
 
   if (LayoutTy->isArrayTy()) {
@@ -205,13 +208,9 @@ void CGHLSLRuntime::addLayoutInfoForBufferElement(
   // with packoffset annotations)
   unsigned NewEndOffset =
       ElemOffset + (ArrayCount - 1) * ArrayStride + ElemSize;
-  EndOffset = std::max<size_t>(EndOffset, NewEndOffset);
+  *LayoutEndOffset = std::max<size_t>(EndOffset, NewEndOffset);
 
-  // create metadata constan with the offset and stride and add to list
-  LayoutItems.push_back(getConstIntMetadata(CGM.getLLVMContext(), ElemOffset));
-  if (ArrayStride)
-    LayoutItems.push_back(
-        getConstIntMetadata(CGM.getLLVMContext(), ArrayStride));
+  return ElemOffset;
 }
 
 void CGHLSLRuntime::emitBufferGlobalsAndMetadata(const HLSLBufferDecl *BufDecl,
@@ -284,9 +283,12 @@ void CGHLSLRuntime::emitBufferGlobalsAndMetadata(const HLSLBufferDecl *BufDecl,
               !UsePackoffset) &&
              "expected packoffset attribute on every declaration");
 
-      addLayoutInfoForBufferElement(
-          BufferSize, LayoutItems, LayoutType,
+      size_t Offset = calculateBufferElementOffset(
+          LayoutType, &BufferSize,
           UsePackoffset ? VD->getAttr<HLSLPackOffsetAttr>() : nullptr);
+
+      // create metadata constant with the element start offset
+      LayoutItems.push_back(getConstIntMetadata(CGM.getLLVMContext(), Offset));
     }
   }
   assert(ElemIt == LayoutStruct->element_end() &&

clang/lib/CodeGen/CGHLSLRuntime.h

@@ -166,9 +166,10 @@ class CGHLSLRuntime {
                                    BufferResBinding &Binding);
   void emitBufferGlobalsAndMetadata(const HLSLBufferDecl *BufDecl,
                                     llvm::GlobalVariable *BufGV);
-  void addLayoutInfoForBufferElement(
-      size_t &EndOffset, SmallVector<llvm::Metadata *> &LayoutItems,
-      llvm::Type *LayoutTy, HLSLPackOffsetAttr *PackoffsetAttr = nullptr);
+
+  size_t
+  calculateBufferElementOffset(llvm::Type *LayoutTy, size_t *LayoutEndOffset,
+                               HLSLPackOffsetAttr *PackoffsetAttr = nullptr);
 
   size_t getOrCalculateStructSizeForBuffer(llvm::StructType *StructTy);
 

clang/test/CodeGenHLSL/cbuffer.hlsl

@@ -186,15 +186,14 @@ void main() {
 // CHECK: ![[CBSCALARS_LAYOUT]] = !{!"struct.__cblayout_CBScalars", i32 56, i32 0, i32 8, i32 16, i32 24, i32 32, i32 36, i32 40, i32 48}
 // CHECK: ![[CBVECTORS_LAYOUT]] = !{!"struct.__cblayout_CBVectors", i32 136, i32 0, i32 16, i32 40, i32 48, i32 80, i32 96, i32 112}
 
-// CHECK: ![[CBARRAYS_LAYOUT]] = !{!"struct.__cblayout_CBArrays", i32 708, i32 0, i32 16, i32 48, i32 32, i32 112, i32 16, i32 176, i32 16,
-// CHECK-SAME: i32 224, i32 16, i32 608, i32 16, i32 624, i32 16, i32 656, i32 16}
+// CHECK: ![[CBARRAYS_LAYOUT]] = !{!"struct.__cblayout_CBArrays", i32 708, i32 0, i32 48, i32 112, i32 176, i32 224, i32 608, i32 624, i32 656}
 
 // CHECK: ![[A_LAYOUT]] = !{!"struct.A", i32 8, i32 0}
 // CHECK: ![[B_LAYOUT]] = !{!"struct.B", i32 14, i32 0, i32 8}
 // CHECK: ![[C_LAYOUT]] = !{!"struct.C", i32 24, i32 0, i32 16}
-// CHECK: ![[D_LAYOUT]] = !{!"struct.__cblayout_D", i32 94, i32 0, i32 16}
-// CHECK: ![[CBSTRUCTS_LAYOUT]] = !{!"struct.__cblayout_CBStructs", i32 262, i32 0, i32 16, i32 32, i32 64, i32 16, i32 144, i32 238, i32 240, i32 256}
+// CHECK: ![[D_LAYOUT]] = !{!"struct.__cblayout_D", i32 94, i32 0}
+// CHECK: ![[CBSTRUCTS_LAYOUT]] = !{!"struct.__cblayout_CBStructs", i32 262, i32 0, i32 16, i32 32, i32 64, i32 144, i32 238, i32 240, i32 256}
 
 // CHECK: ![[TEST_LAYOUT]] = !{!"struct.Test", i32 8, i32 0, i32 4}
 // CHECK: ![[ANON_LAYOUT]] = !{!"struct.anon", i32 4, i32 0}
-// CHECK: ![[CBMIX_LAYOUT]] = !{!"struct.__cblayout_CBMix", i32 162, i32 0, i32 16, i32 24, i32 32, i32 16, i32 120, i32 128, i32 136, i32 144, i32 152, i32 160}
+// CHECK: ![[CBMIX_LAYOUT]] = !{!"struct.__cblayout_CBMix", i32 162, i32 0, i32 24, i32 32, i32 120, i32 128, i32 136, i32 144, i32 152, i32 160}