AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2025-01-12 01:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix operand access of composite in upgrade memory model (#3021)

Browse Source 
Fixes #2992

* Accessing aggregate subtype used the wrong operand
* Added a test
This commit is contained in:
alan-baker 2019-11-12 13:41:38 -05:00 committed by David Neto
parent 1a18d491f2
commit ab3cdcaef5
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/opt/upgrade_memory_model.cpp
View File

@ -429,7 +429,7 @@ std::pair<bool, bool> UpgradeMemoryModel::CheckType(
} else { } else {
assert(spvOpcodeIsComposite(element_inst->opcode())); assert(spvOpcodeIsComposite(element_inst->opcode()));
element_inst = context()->get_def_use_mgr()->GetDef( element_inst = context()->get_def_use_mgr()->GetDef(
element_inst->GetSingleWordInOperand(1u)); element_inst->GetSingleWordInOperand(0u));
} }
} }

33
test/opt/upgrade_memory_model_test.cpp
View File

@ -2236,4 +2236,37 @@ OpFunctionEnd
SinglePassRunAndMatch<opt::UpgradeMemoryModel>(text, true); SinglePassRunAndMatch<opt::UpgradeMemoryModel>(text, true);
} }
TEST_F(UpgradeMemoryModelTest, CoherentStructMemberInArray) {
const std::string text = R"(
; CHECK-NOT: OpMemberDecorate
; CHECK: [[int:%[a-zA-Z0-9_]+]] = OpTypeInt 32 0
; CHECK: [[device:%[a-zA-Z0-9_]+]] = OpConstant [[int]] 1
; CHECK: OpLoad [[int]] {{.*}} MakePointerVisible|NonPrivatePointer
OpCapability Shader
OpCapability Linkage
OpMemoryModel Logical GLSL450
OpMemberDecorate %inner 1 Coherent
%void = OpTypeVoid
%int = OpTypeInt 32 0
%int_0 = OpConstant %int 0
%int_1 = OpConstant %int 1
%int_4 = OpConstant %int 4
%inner = OpTypeStruct %int %int
%array = OpTypeArray %inner %int_4
%struct = OpTypeStruct %array
%ptr_ssbo_struct = OpTypePointer StorageBuffer %struct
%ptr_ssbo_int = OpTypePointer StorageBuffer %int
%ssbo_var = OpVariable %ptr_ssbo_struct StorageBuffer
%void_fn = OpTypeFunction %void
%func = OpFunction %void None %void_fn
%entry = OpLabel
%gep = OpAccessChain %ptr_ssbo_int %ssbo_var %int_0 %int_0 %int_1
%ld = OpLoad %int %gep
OpReturn
OpFunctionEnd
)";
SinglePassRunAndMatch<opt::UpgradeMemoryModel>(text, true);
}
} // namespace } // namespace