Skip to content

Commit 025ca7b

Browse files
s-perrons-perron
authored
[SPIRV] Handle associated counters for RWStructuredBuffer in base classes (microsoft#7880)
This commit fixes an issue where the associated counters for RWStructuredBuffer were not correctly handled when the buffer was a member of a base class. The changes include: - Updating to recursively traverse base classes and nested structs to find associated counter variables. - Modifying to correctly generate instructions for accessing members of base classes. - Adding a new test case to verify the correct handling of counter variables in base classes. - Updating existing tests to reflect the changes in generation. Fixes microsoft#7787
1 parent 4f3dde0 commit 025ca7b

10 files changed

Lines changed: 137 additions & 65 deletions

‎tools/clang/lib/SPIRV/DeclResultIdMapper.cpp‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ void DeclResultIdMapper::createCounterVarForDecl(const DeclaratorDecl *decl) {
10891089

10901090
if (!counterVars.count(decl) && isRWAppendConsumeSBuffer(declType)) {
10911091
createCounterVar(decl, /*declId=*/0, /*isAlias=*/true);
1092-
} else if (!fieldCounterVars.count(decl) && declType->isStructureType() &&
1092+
} else if (!fieldCounterVars.count(decl) && declType->isRecordType() &&
10931093
// Exclude other resource types which are represented as structs
10941094
!hlsl::IsHLSLResourceType(declType)) {
10951095
createFieldCounterVars(decl);
@@ -1886,14 +1886,33 @@ void DeclResultIdMapper::createCounterVar(
18861886
counterVars[decl] = {counterInstr, isAlias};
18871887
}
18881888

1889+
void DeclResultIdMapper::createFieldCounterVars(const DeclaratorDecl *decl) {
1890+
llvm::SmallVector<uint32_t, 4> indices;
1891+
const QualType type = getTypeOrFnRetType(decl);
1892+
createFieldCounterVars(decl, type, &indices);
1893+
}
1894+
18891895
void DeclResultIdMapper::createFieldCounterVars(
1890-
const DeclaratorDecl *rootDecl, const DeclaratorDecl *decl,
1896+
const DeclaratorDecl *rootDecl, const QualType type,
18911897
llvm::SmallVector<uint32_t, 4> *indices) {
1892-
const QualType type = getTypeOrFnRetType(decl);
18931898
const auto *recordType = type->getAs<RecordType>();
18941899
assert(recordType);
18951900
const auto *recordDecl = recordType->getDecl();
18961901

1902+
// Handle base classes first
1903+
if (const auto *cxxRecordDecl = dyn_cast<CXXRecordDecl>(recordDecl)) {
1904+
// HLSL has at most one base class.
1905+
assert(cxxRecordDecl->getNumBases() <= 1 &&
1906+
"HLSL should have at most one base class.");
1907+
if (cxxRecordDecl->getNumBases() > 0) {
1908+
const auto &base = *cxxRecordDecl->bases().begin();
1909+
indices->push_back(0);
1910+
createFieldCounterVars(rootDecl, base.getType(), indices);
1911+
indices->pop_back();
1912+
}
1913+
}
1914+
1915+
// Now handle the fields of the current class (non-inherited fields)
18971916
for (const auto *field : recordDecl->fields()) {
18981917
// Build up the index chain
18991918
indices->push_back(getNumBaseClasses(type) + field->getFieldIndex());
@@ -1902,9 +1921,11 @@ void DeclResultIdMapper::createFieldCounterVars(
19021921
if (isRWAppendConsumeSBuffer(fieldType))
19031922
createCounterVar(rootDecl, /*declId=*/0, /*isAlias=*/true, indices);
19041923
else if (fieldType->isStructureType() &&
1905-
!hlsl::IsHLSLResourceType(fieldType))
1924+
!hlsl::IsHLSLResourceType(fieldType)) {
19061925
// Go recursively into all nested structs
1907-
createFieldCounterVars(rootDecl, field, indices);
1926+
const QualType type = getTypeOrFnRetType(field);
1927+
createFieldCounterVars(rootDecl, type, indices);
1928+
}
19081929

19091930
indices->pop_back();
19101931
}

‎tools/clang/lib/SPIRV/DeclResultIdMapper.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,9 @@ class DeclResultIdMapper {
912912
/// Creates all assoicated counter variables by recursively visiting decl's
913913
/// fields. Handles AssocCounter#3 and AssocCounter#4 (see the comment of
914914
/// CounterVarFields).
915-
inline void createFieldCounterVars(const DeclaratorDecl *decl);
915+
void createFieldCounterVars(const DeclaratorDecl *decl);
916916
void createFieldCounterVars(const DeclaratorDecl *rootDecl,
917-
const DeclaratorDecl *decl,
917+
const QualType type,
918918
llvm::SmallVector<uint32_t, 4> *indices);
919919

920920
/// Decorates varInstr of the given asType with proper interpolation modes
@@ -1197,11 +1197,6 @@ void DeclResultIdMapper::createFnParamCounterVar(const VarDecl *param) {
11971197
createCounterVarForDecl(param);
11981198
}
11991199

1200-
void DeclResultIdMapper::createFieldCounterVars(const DeclaratorDecl *decl) {
1201-
llvm::SmallVector<uint32_t, 4> indices;
1202-
createFieldCounterVars(decl, decl, &indices);
1203-
}
1204-
12051200
} // end namespace spirv
12061201
} // end namespace clang
12071202

‎tools/clang/lib/SPIRV/SpirvEmitter.cpp‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4957,10 +4957,6 @@ SpirvEmitter::incDecRWACSBufferCounter(const CXXMemberCallExpr *expr,
49574957

49584958
bool SpirvEmitter::tryToAssignCounterVar(const DeclaratorDecl *dstDecl,
49594959
const Expr *srcExpr) {
4960-
// We are handling associated counters here. Casts should not alter which
4961-
// associated counter to manipulate.
4962-
srcExpr = srcExpr->IgnoreParenCasts();
4963-
49644960
// For parameters of forward-declared functions. We must make sure the
49654961
// associated counter variable is created. But for forward-declared functions,
49664962
// the translation of the real definition may not be started yet.
@@ -5061,9 +5057,10 @@ SpirvEmitter::getFinalACSBufferCounterInstruction(const Expr *expr) {
50615057
llvm::SmallVector<SpirvInstruction *, 2> indexes;
50625058
if (const auto *arraySubscriptExpr = dyn_cast<ArraySubscriptExpr>(expr)) {
50635059
indexes.push_back(doExpr(arraySubscriptExpr->getIdx()));
5064-
} else if (isResourceDescriptorHeap(expr->getType())) {
5060+
} else if (isResourceDescriptorHeap(expr->IgnoreParenCasts()->getType())) {
50655061
const Expr *index = nullptr;
5066-
getDescriptorHeapOperands(expr, /* base= */ nullptr, &index);
5062+
getDescriptorHeapOperands(expr->IgnoreParenCasts(), /* base= */ nullptr,
5063+
&index);
50675064
assert(index != nullptr && "operator[] had no indices.");
50685065
indexes.push_back(doExpr(index));
50695066
}
@@ -5081,9 +5078,10 @@ SpirvEmitter::getFinalACSBufferCounter(const Expr *expr) {
50815078
if (const auto *decl = getReferencedDef(expr))
50825079
return declIdMapper.createOrGetCounterIdAliasPair(decl);
50835080

5084-
if (isResourceDescriptorHeap(expr->getType())) {
5081+
const Expr *expr_withoutcasts = expr->IgnoreParenCasts();
5082+
if (isResourceDescriptorHeap(expr_withoutcasts->getType())) {
50855083
const Expr *base = nullptr;
5086-
getDescriptorHeapOperands(expr, &base, /* index= */ nullptr);
5084+
getDescriptorHeapOperands(expr_withoutcasts, &base, /* index= */ nullptr);
50875085
return declIdMapper.createOrGetCounterIdAliasPair(getReferencedDef(base));
50885086
}
50895087

@@ -8860,7 +8858,23 @@ const Expr *SpirvEmitter::collectArrayStructIndices(
88608858
return collectArrayStructIndices(subExpr, rawIndex, rawIndices,
88618859
indices, isMSOutAttribute);
88628860
}
8861+
} else if (castExpr->getCastKind() == CK_UncheckedDerivedToBase ||
8862+
castExpr->getCastKind() == CK_HLSLDerivedToBase) {
8863+
llvm::SmallVector<uint32_t, 4> BaseIdx;
8864+
getBaseClassIndices(castExpr, &BaseIdx);
8865+
if (rawIndex) {
8866+
rawIndices->append(BaseIdx.begin(), BaseIdx.end());
8867+
} else {
8868+
for (uint32_t Idx : BaseIdx)
8869+
indices->push_back(spvBuilder.getConstantInt(astContext.IntTy,
8870+
llvm::APInt(32, Idx)));
8871+
}
8872+
8873+
return collectArrayStructIndices(castExpr->getSubExpr(), rawIndex,
8874+
rawIndices, indices, isMSOutAttribute);
88638875
}
8876+
return collectArrayStructIndices(castExpr->getSubExpr(), rawIndex,
8877+
rawIndices, indices, isMSOutAttribute);
88648878
}
88658879
}
88668880

‎tools/clang/test/CodeGenSPIRV/class-with-counter.hlsl‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// RUN: %dxc -T cs_6_8 -E main %s -spirv -fspv-target-env=vulkan1.3 | FileCheck %s
2+
3+
class A {
4+
RWStructuredBuffer<uint> a;
5+
};
6+
7+
class B : A {
8+
RWStructuredBuffer<uint> b;
9+
};
10+
11+
RWStructuredBuffer<uint> input;
12+
RWStructuredBuffer<uint> output;
13+
14+
[numthreads(1, 1, 1)]
15+
void main()
16+
{
17+
B x;
18+
19+
// CHECK: [[val1_ptr:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_StorageBuffer_uint %input %int_0 %uint_1
20+
// CHECK-NEXT: [[val1:%[a-zA-Z0-9_]+]] = OpLoad %uint [[val1_ptr]]
21+
// CHECK-NEXT: [[val2_ptr:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_StorageBuffer_uint %output %int_0 %uint_2
22+
// CHECK-NEXT: [[val2:%[a-zA-Z0-9_]+]] = OpLoad %uint [[val2_ptr]]
23+
// CHECK-NEXT: [[add_res:%[a-zA-Z0-9_]+]] = OpIAdd %uint [[val1]] [[val2]]
24+
// CHECK-NEXT: [[target_ptr:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_StorageBuffer_uint %output %int_0 %uint_0
25+
// CHECK-NEXT: OpStore [[target_ptr]] [[add_res]]
26+
x.a = input;
27+
x.b = output;
28+
output[0] = x.a[1] + x.b[2];
29+
}

‎tools/clang/test/CodeGenSPIRV/oo.inheritance.base-with-byte-address-buffer.hlsl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ struct Base {
1212

1313
struct Child : Base {
1414
float load(in uint offset) {
15-
// CHECK: %param_this = OpFunctionParameter %_ptr_Function_Child
16-
// CHECK: [[base:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_Function_Base %param_this %uint_0
17-
// CHECK: [[ptrToBuffer:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_Function__ptr_Uniform_type_ByteAddressBuffer [[base]] %int_0
15+
// CHECK: %param_this = OpFunctionParameter %_ptr_Function_Child
16+
// CHECK: [[ptrToBuffer:%[a-zA-Z0-9_]+]] = OpAccessChain %_ptr_Function__ptr_Uniform_type_ByteAddressBuffer %param_this %int_0 %int_0
1817

1918
// This test case is mainly intended to confirm that we emit the following instruction
2019
// CHECK: [[buffer:%[a-zA-Z0-9_]+]] = OpLoad %_ptr_Uniform_type_ByteAddressBuffer [[ptrToBuffer]]

‎tools/clang/test/CodeGenSPIRV/oo.inheritance.hlsl‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ float4 main() : SV_Target {
2828
Derived d;
2929

3030
// Accessing a field from the implicit base object
31-
// CHECK: [[base:%[0-9]+]] = OpAccessChain %_ptr_Function_Base %d %uint_0
32-
// CHECK-NEXT: [[base_a:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[base]] %int_0
31+
// CHECK: [[base_a:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %d %int_0 %int_0
3332
// CHECK-NEXT: OpStore [[base_a]] {{%[0-9]+}}
3433
d.a = 1.;
3534

@@ -54,13 +53,11 @@ float4 main() : SV_Target {
5453
DerivedAgain dd;
5554

5655
// Accessing a field from the deep implicit base object
57-
// CHECK-NEXT: [[base_0:%[0-9]+]] = OpAccessChain %_ptr_Function_Base %dd %uint_0 %uint_0
58-
// CHECK-NEXT: [[base_a_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[base_0]] %int_0
56+
// CHECK-NEXT: [[base_a_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %dd %int_0 %int_0 %int_0
5957
// CHECK-NEXT: OpStore [[base_a_0]] {{%[0-9]+}}
6058
dd.a = 6.;
6159
// Accessing a field from the immediate implicit base object
62-
// CHECK-NEXT: [[drv:%[0-9]+]] = OpAccessChain %_ptr_Function_Derived %dd %uint_0
63-
// CHECK-NEXT: [[drv_b:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[drv]] %int_1
60+
// CHECK-NEXT: [[drv_b:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %dd %int_0 %int_1
6461
// CHECK-NEXT: OpStore [[drv_b]] {{%[0-9]+}}
6562
dd.b = 7.;
6663
// Accessing fields from the derived object (shadowing)
@@ -87,18 +84,15 @@ float4 main() : SV_Target {
8784
(Base)dd2 = (Base)d;
8885

8986
// Make sure reads are good
90-
// CHECK: [[base_1:%[0-9]+]] = OpAccessChain %_ptr_Function_Base %d %uint_0
91-
// CHECK-NEXT: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float [[base_1]] %int_0
92-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_1
93-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_2
94-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_3 %int_0
95-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_3 %int_1
87+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_0 %int_0
88+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_1
89+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_2
90+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_3 %int_0
91+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %d %int_3 %int_1
9692
return d.a + d.b + d.c + d.x.a + d.x.b +
97-
// CHECK: [[base_2:%[0-9]+]] = OpAccessChain %_ptr_Function_Base %dd %uint_0 %uint_0
98-
// CHECK-NEXT: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float [[base_2]] %int_0
99-
// CHECK: [[drv_0:%[0-9]+]] = OpAccessChain %_ptr_Function_Derived %dd %uint_0
100-
// CHECK-NEXT: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float [[drv_0]] %int_1
101-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_1
102-
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_2
93+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_0 %int_0 %int_0
94+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_0 %int_1
95+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_1
96+
// CHECK: {{%[0-9]+}} = OpAccessChain %_ptr_Function_v4float %dd %int_2
10397
dd.a + dd.b + dd.c + dd.d;
10498
}

‎tools/clang/test/CodeGenSPIRV/oo.struct.derived.methods.override.hlsl‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ struct C : B {
2828

2929
float4 main() : SV_Target {
3030
B b;
31-
// CHECK: [[A_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_A %b %uint_0
32-
// CHECK: [[base_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr]] %int_0
31+
// CHECK: [[base_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %b %int_0 %int_0
3332
// CHECK: OpStore [[base_ptr]] {{%[0-9]+}}
3433
b.base = float4(1, 1, 0, 1);
3534
// CHECK: [[derived_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %b %int_1
@@ -42,12 +41,10 @@ float4 main() : SV_Target {
4241
b.SetDerived(float4(1, 0, 1, 1));
4342

4443
C c;
45-
// CHECK: [[A_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_A %c %uint_0 %uint_0
46-
// CHECK: [[base_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr_0]] %int_0
44+
// CHECK: [[base_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %c %int_0 %int_0 %int_0
4745
// CHECK: OpStore [[base_ptr_0]] {{%[0-9]+}}
4846
c.base = float4(0,0,0,0);
49-
// CHECK: [[B_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_B %c %uint_0
50-
// CHECK: [[derived_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[B_ptr]] %int_1
47+
// CHECK: [[derived_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %c %int_0 %int_1
5148
// CHECK: OpStore [[derived_ptr_0]] {{%[0-9]+}}
5249
c.derived = float4(0,0,0,0);
5350
// CHECK: [[c_value_ptr:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %c %int_1
@@ -76,8 +73,7 @@ float4 main() : SV_Target {
7673
// CHECK-NEXT: %v = OpFunctionParameter %_ptr_Function_v4float
7774
// CHECK-NEXT: %bb_entry_0 = OpLabel
7875
// CHECK-NEXT: [[v:%[0-9]+]] = OpLoad %v4float %v
79-
// CHECK-NEXT: [[A_ptr_1:%[0-9]+]] = OpAccessChain %_ptr_Function_A %param_this %uint_0
80-
// CHECK-NEXT: [[base_ptr_1:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr_1]] %int_0
76+
// CHECK-NEXT: [[base_ptr_1:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this %int_0 %int_0
8177
// CHECK-NEXT: OpStore [[base_ptr_1]] [[v]]
8278
// CHECK-NEXT: OpReturn
8379
// CHECK-NEXT: OpFunctionEnd
@@ -100,8 +96,7 @@ float4 main() : SV_Target {
10096
// CHECK-NEXT: %v_1 = OpFunctionParameter %_ptr_Function_v4float
10197
// CHECK-NEXT: %bb_entry_2 = OpLabel
10298
// CHECK-NEXT: [[v_1:%[0-9]+]] = OpLoad %v4float %v_1
103-
// CHECK-NEXT: [[A_ptr_2:%[0-9]+]] = OpAccessChain %_ptr_Function_A %param_this_1 %uint_0 %uint_0
104-
// CHECK-NEXT: [[base_ptr_2:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr_2]] %int_0
99+
// CHECK-NEXT: [[base_ptr_2:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this_1 %int_0 %int_0 %int_0
105100
// CHECK-NEXT: OpStore [[base_ptr_2]] [[v_1]]
106101
// CHECK-NEXT: OpReturn
107102
// CHECK-NEXT: OpFunctionEnd
@@ -112,8 +107,7 @@ float4 main() : SV_Target {
112107
// CHECK-NEXT: %v_2 = OpFunctionParameter %_ptr_Function_v4float
113108
// CHECK-NEXT: %bb_entry_3 = OpLabel
114109
// CHECK-NEXT: [[v_2:%[0-9]+]] = OpLoad %v4float %v_2
115-
// CHECK-NEXT: [[B_ptr_0:%[0-9]+]] = OpAccessChain %_ptr_Function_B %param_this_2 %uint_0
116-
// CHECK-NEXT: [[derived_ptr_2:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[B_ptr_0]] %int_1
110+
// CHECK-NEXT: [[derived_ptr_2:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this_2 %int_0 %int_1
117111
// CHECK-NEXT: OpStore [[derived_ptr_2]] [[v_2]]
118112
// CHECK-NEXT: OpReturn
119113
// CHECK-NEXT: OpFunctionEnd
@@ -133,8 +127,7 @@ float4 main() : SV_Target {
133127
// CHECK: %B_GetBase = OpFunction
134128
// CHECK-NEXT: %param_this_4 = OpFunctionParameter %_ptr_Function_B
135129
// CHECK-NEXT: %bb_entry_5 = OpLabel
136-
// CHECK-NEXT: [[A_ptr_3:%[0-9]+]] = OpAccessChain %_ptr_Function_A %param_this_4 %uint_0
137-
// CHECK-NEXT: [[base_ptr_3:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr_3]] %int_0
130+
// CHECK-NEXT: [[base_ptr_3:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this_4 %int_0 %int_0
138131
// CHECK-NEXT: [[base:%[0-9]+]] = OpLoad %v4float [[base_ptr_3]]
139132
// CHECK-NEXT: OpReturnValue [[base]]
140133
// CHECK-NEXT: OpFunctionEnd
@@ -152,8 +145,7 @@ float4 main() : SV_Target {
152145
// CHECK: %C_GetBase = OpFunction
153146
// CHECK-NEXT: %param_this_6 = OpFunctionParameter %_ptr_Function_C
154147
// CHECK-NEXT: %bb_entry_7 = OpLabel
155-
// CHECK-NEXT: [[A_ptr_4:%[0-9]+]] = OpAccessChain %_ptr_Function_A %param_this_6 %uint_0 %uint_0
156-
// CHECK-NEXT: [[base_ptr_4:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[A_ptr_4]] %int_0
148+
// CHECK-NEXT: [[base_ptr_4:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this_6 %int_0 %int_0 %int_0
157149
// CHECK-NEXT: [[base_0:%[0-9]+]] = OpLoad %v4float [[base_ptr_4]]
158150
// CHECK-NEXT: OpReturnValue [[base_0]]
159151
// CHECK-NEXT: OpFunctionEnd
@@ -162,8 +154,7 @@ float4 main() : SV_Target {
162154
// CHECK: %C_GetDerived = OpFunction
163155
// CHECK-NEXT: %param_this_7 = OpFunctionParameter %_ptr_Function_C
164156
// CHECK-NEXT: %bb_entry_8 = OpLabel
165-
// CHECK-NEXT: [[B_ptr_1:%[0-9]+]] = OpAccessChain %_ptr_Function_B %param_this_7 %uint_0
166-
// CHECK-NEXT: [[derived_ptr_4:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float [[B_ptr_1]] %int_1
157+
// CHECK-NEXT: [[derived_ptr_4:%[0-9]+]] = OpAccessChain %_ptr_Function_v4float %param_this_7 %int_0 %int_1
167158
// CHECK-NEXT: [[derived_0:%[0-9]+]] = OpLoad %v4float [[derived_ptr_4]]
168159
// CHECK-NEXT: OpReturnValue [[derived_0]]
169160
// CHECK-NEXT: OpFunctionEnd

‎tools/clang/test/CodeGenSPIRV/op.structured-buffer.reconstruct.bitfield.hlsl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ void main(uint3 dispatchThreadId : SV_DispatchThreadID) {
1919
// CHECK: [[p:%[a-zA-Z0-9_]+]] = OpVariable %_ptr_Function_Derived_0 Function
2020
Derived p;
2121

22-
// CHECK: [[tmp:%[0-9]+]] = OpAccessChain %_ptr_Function_Base_0 [[p]] %uint_0
23-
// CHECK: [[tmp_0:%[0-9]+]] = OpAccessChain %_ptr_Function_uint [[tmp]] %int_0
24-
// CHECK: OpStore [[tmp_0]] %uint_5
22+
// CHECK: [[tmp:%[0-9]+]] = OpAccessChain %_ptr_Function_uint [[p]] %int_0 %int_0
23+
// CHECK: OpStore [[tmp]] %uint_5
2524
p.base = 5;
2625

2726
// CHECK: [[tmp_1:%[0-9]+]] = OpAccessChain %_ptr_Function_uint [[p]] %int_1

‎tools/clang/test/CodeGenSPIRV/spirv.interface.ps.inheritance.sv_clipdistance.hlsl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ float main(PSInput input) : SV_TARGET
1616
// CHECK: [[input:%[0-9]+]] = OpCompositeConstruct %PSInput [[parent]]
1717

1818

19-
// CHECK: [[access0:%[0-9]+]] = OpAccessChain %_ptr_Function_Parent %input %uint_0
20-
// CHECK: [[access1:%[0-9]+]] = OpAccessChain %_ptr_Function_float [[access0]] %int_0
21-
// CHECK: [[load1:%[0-9]+]] = OpLoad %float [[access1]]
19+
// CHECK: [[access:%[0-9]+]] = OpAccessChain %_ptr_Function_float %input %int_0 %int_0
20+
// CHECK: [[load1:%[0-9]+]] = OpLoad %float [[access]]
2221
return input.clipDistance;
2322
}
2423

‎tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.baseclass.counter.hlsl‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// RUN: %dxc -T cs_6_6 -E main %s -spirv 2>&1 | FileCheck %s
2+
3+
RWStructuredBuffer<uint> Buf1;
4+
RWStructuredBuffer<uint> Buf2;
5+
6+
struct A
7+
{
8+
RWStructuredBuffer<uint> Buffer;
9+
void Increment() { Buffer.IncrementCounter(); }
10+
};
11+
12+
struct B : A {};
13+
struct C : B {};
14+
15+
[numthreads(64, 1, 1)]
16+
void main()
17+
{
18+
B b;
19+
b.Buffer = Buf1;
20+
21+
C c;
22+
c.Buffer = Buf2;
23+
24+
// CHECK: [[ac:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_Buf1 %uint_0
25+
// CHECK: OpAtomicIAdd %int [[ac]] %uint_1 %uint_0 %int_1
26+
b.Increment();
27+
28+
// CHECK: [[ac:%[0-9]+]] = OpAccessChain %_ptr_Uniform_int %counter_var_Buf2 %uint_0
29+
// CHECK: OpAtomicIAdd %int [[ac]] %uint_1 %uint_0 %int_1
30+
c.Increment();
31+
}

0 commit comments

Comments
 (0)