[spirv] Fixes microsoft#7535 (vk::BufferPointer alignment issue). (microsoft#7571)

Author: danbrown-amd

tools/clang/lib/SPIRV/SpirvBuilder.cpp

@@ -205,10 +205,17 @@ SpirvInstruction *SpirvBuilder::createLoad(QualType resultType,
   instruction->setRValue(true);
 
   if (pointer->getStorageClass() == spv::StorageClass::PhysicalStorageBuffer) {
-    AlignmentSizeCalculator alignmentCalc(astContext, spirvOptions);
-    uint32_t align, size, stride;
-    std::tie(align, size) = alignmentCalc.getAlignmentAndSize(
-        resultType, pointer->getLayoutRule(), llvm::None, &stride);
+    QualType pointerType = pointer->getAstResultType();
+    uint32_t align = 0;
+    if (!pointerType.isNull() && hlsl::IsVKBufferPointerType(pointerType)) {
+      align = hlsl::GetVKBufferPointerAlignment(pointerType);
+    }
+    if (!align) {
+      AlignmentSizeCalculator alignmentCalc(astContext, spirvOptions);
+      uint32_t stride;
+      std::tie(align, std::ignore) = alignmentCalc.getAlignmentAndSize(
+          resultType, pointer->getLayoutRule(), llvm::None, &stride);
+    }
     instruction->setAlignment(align);
   }
 

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -11179,36 +11179,19 @@ SpirvEmitter::processIntrinsicPointerCast(const CallExpr *callExpr,
 
 SpirvInstruction *SpirvEmitter::processIntrinsicGetBufferContents(
     const CXXMemberCallExpr *callExpr) {
-  LowerTypeVisitor lowerTypeVisitor(astContext, spvContext, spirvOptions,
-                                    spvBuilder);
-  Expr *obj = callExpr->getImplicitObjectArgument();
-  SpirvInstruction *bufferPointer = doExpr(obj);
+  SpirvInstruction *bufferPointer =
+      doExpr(callExpr->getImplicitObjectArgument());
   if (!bufferPointer)
     return nullptr;
-  if (bufferPointer->isRValue()) {
-    bufferPointer->setRValue(false);
-    bufferPointer->setStorageClass(spv::StorageClass::PhysicalStorageBuffer);
-    bufferPointer->setLayoutRule(spirvOptions.sBufferLayoutRule);
-    return bufferPointer;
-  }
-
-  unsigned align = hlsl::GetVKBufferPointerAlignment(obj->getType());
-  lowerTypeVisitor.visitInstruction(bufferPointer);
-
-  const SpirvPointerType *bufferPointerType =
-      dyn_cast<SpirvPointerType>(bufferPointer->getResultType());
-  SpirvLoad *retVal =
-      spvBuilder.createLoad(bufferPointerType->getPointeeType(), bufferPointer,
-                            callExpr->getLocStart());
-  if (!align) {
-    QualType bufferType = hlsl::GetVKBufferPointerBufferType(obj->getType());
-    AlignmentSizeCalculator alignmentCalc(astContext, spirvOptions);
-    uint32_t stride;
-    std::tie(align, std::ignore) = alignmentCalc.getAlignmentAndSize(
-        bufferType, retVal->getLayoutRule(), llvm::None, &stride);
-  }
-  retVal->setAlignment(align);
+
+  SpirvInstruction *retVal =
+      bufferPointer->isRValue()
+          ? bufferPointer
+          : spvBuilder.createLoad(bufferPointer->getAstResultType(),
+                                  bufferPointer, callExpr->getLocStart());
   retVal->setRValue(false);
+  retVal->setStorageClass(spv::StorageClass::PhysicalStorageBuffer);
+  retVal->setLayoutRule(spirvOptions.sBufferLayoutRule);
   return retVal;
 }
 

tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.alias.cs.hlsl

@@ -20,7 +20,7 @@ void main() {
   foo(rwbuf[0].Get());
 }
 
-// CHECK: [[L0:%[_0-9A-Za-z]*]] = OpLoad %{{[_0-9A-Za-z]*}} %{{[_0-9A-Za-z]*}} Aligned 8
+// CHECK: [[L0:%[_0-9A-Za-z]*]] = OpLoad %{{[_0-9A-Za-z]*}} %{{[_0-9A-Za-z]*}}
 // CHECK: [[L1:%[_0-9A-Za-z]*]] = OpLoad %{{[_0-9A-Za-z]*}} [[L0]] Aligned 8
 // CHECK: [[L2:%[_0-9A-Za-z]*]] = OpAccessChain %{{[_0-9A-Za-z]*}} [[L1]] %int_0
 // CHECK: OpStore [[L2]] %int_1 Aligned 4

tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.alias.hlsl

@@ -62,10 +62,10 @@ float4 MainPs(void) : SV_Target0
 // CHECK: [[X4:%[_0-9A-Za-z]*]] = OpLoad [[PGS]] [[X3]]
 // CHECK: OpStore [[BP1]] [[X4]]
 // CHECK: [[X5:%[_0-9A-Za-z]*]] = OpLoad [[V4FLOAT]] [[VTEST]]
-// CHECK: [[X6:%[_0-9A-Za-z]*]] = OpLoad [[PGS]] [[BP0]] Aligned 16
+// CHECK: [[X6:%[_0-9A-Za-z]*]] = OpLoad [[PGS]] [[BP0]]
 // CHECK: [[X7:%[_0-9A-Za-z]*]] = OpAccessChain [[PBV4FLOAT]] [[X6]] [[I1]]
 // CHECK: OpStore [[X7]] [[X5]] Aligned 16
-// CHECK: [[X8:%[_0-9A-Za-z]*]] = OpLoad [[PGS]] [[BP1]] Aligned 16
+// CHECK: [[X8:%[_0-9A-Za-z]*]] = OpLoad [[PGS]] [[BP1]]
 // CHECK: [[X9:%[_0-9A-Za-z]*]] = OpAccessChain [[PBV4FLOAT]] [[X8]] [[I1]]
 // CHECK: [[X10:%[_0-9A-Za-z]*]] = OpLoad [[V4FLOAT]] [[X9]] Aligned 16
 // CHECK: OpReturnValue [[X10]]

tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.atomic.hlsl

@@ -29,7 +29,7 @@ void main()
   uint u0, u1;
 
 // CHECK: [[X1:%[_0-9]+]] = OpAccessChain %{{[_0-9A-Za-z]*}} [[PC]] [[I0]]
-// CHECK: [[X2:%[_0-9]+]] = OpLoad [[PS]] [[X1]] Aligned 4
+// CHECK: [[X2:%[_0-9]+]] = OpLoad [[PS]] [[X1]]
 // CHECK: [[X3:%[_0-9]+]] = OpAccessChain [[PU]] [[X2]] [[I0]]
 // CHECK: [[X4:%[_0-9]+]] = OpLoad [[UINT]] [[IN]]
 // CHECK: [[X5:%[_0-9]+]] = OpAtomicExchange [[UINT]] [[X3]] [[U1]] [[U0]] [[X4]]

tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.from-uint.hlsl

@@ -37,8 +37,8 @@ void main() {
 // CHECK: [[TEST:%[_0-9A-Za-z]*]] = OpVariable [[PFPPUINT]] Function
 // CHECK: [[X1:%[_0-9A-Za-z]*]] = OpConvertUToPtr [[PPUINT]]
 // CHECK: OpStore [[TEST]] [[X1]]
-// CHECK: [[X2:%[_0-9A-Za-z]*]] = OpLoad [[PPUINT]] [[TEST]] Aligned 32
-// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpLoad [[UINT]] [[X2]] Aligned 4
+// CHECK: [[X2:%[_0-9A-Za-z]*]] = OpLoad [[PPUINT]] [[TEST]]
+// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpLoad [[UINT]] [[X2]] Aligned 32
 // CHECK: [[X4:%[_0-9A-Za-z]*]] = OpAccessChain [[PUUINT]] [[OUTPUT]] [[I0]] [[U0]]
 // CHECK: OpStore [[X4]] [[X3]]
 // CHECK: OpReturn

tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.linked-list.hlsl

@@ -76,9 +76,9 @@ float4 MainPs(void) : SV_Target0
 // CHECK: [[X1:%[_0-9A-Za-z]*]] = OpAccessChain [[PPBLOCK1]] [[GPC]] [[S0]]
 // CHECK: [[X2:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[X1]]
 // CHECK: OpStore [[GP]] [[X2]]
-// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[GP]] Aligned 32
+// CHECK: [[X3:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[GP]]
 // CHECK: [[X4:%[_0-9A-Za-z]*]] = OpAccessChain [[PPBLOCK2]] [[X3]] [[S1]]
-// CHECK: [[X5:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[X4]] Aligned 8
+// CHECK: [[X5:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[X4]] Aligned 32
 // CHECK: OpStore [[GP]] [[X5]]
 // CHECK: [[X6:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[GP]]
 // CHECK: [[X7:%[_0-9A-Za-z]*]] = OpConvertPtrToU [[ULONG]] [[X6]]
@@ -94,7 +94,7 @@ float4 MainPs(void) : SV_Target0
 // CHECK: [[IF_TRUE]] = OpLabel
 // CHECK: OpReturnValue [[CV4FLOAT]]
 // CHECK: [[IF_MERGE]] = OpLabel
-// CHECK: [[X13:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[GP]] Aligned 32
+// CHECK: [[X13:%[_0-9A-Za-z]*]] = OpLoad [[PBLOCK]] [[GP]]
 // CHECK: [[X14:%[_0-9A-Za-z]*]] = OpAccessChain [[PV4FLOAT2]] [[X13]] [[S0]]
 // CHECK: [[X15:%[_0-9A-Za-z]*]] = OpLoad [[V4FLOAT]] [[X14]] Aligned 16
 // CHECK: OpReturnValue [[X15]]