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

spirv-fuzz: Fix def-use update in PermutePhiOperands (#4309)

Browse Source 
The def-use manager was being incorrectly updated in
TransformationPermutePhiOperands, and this was causing future
transformations to go wrong during fuzzing. This change updates the
def-use manager in a correct manner, and adds a test exposing the
previous bug.

Fixes #4300.
This commit is contained in:
Alastair Donaldson 2021-06-01 08:37:45 +01:00 committed by GitHub
parent ec1bc3e2e5
commit 9646c733e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/fuzz/transformation_permute_phi_operands.cpp
View File

@ -81,8 +81,7 @@ void TransformationPermutePhiOperands::Apply(
inst->SetInOperands(std::move(permuted_operands));
// Update the def-use manager.
ir_context->get_def_use_mgr()->ClearInst(inst);
ir_context->get_def_use_mgr()->AnalyzeInstDefUse(inst);
ir_context->UpdateDefUse(inst);
}
protobufs::Transformation TransformationPermutePhiOperands::ToMessage() const {

26
test/fuzz/transformation_permute_phi_operands_test.cpp
View File

@ -60,6 +60,7 @@ TEST(TransformationPermutePhiOperandsTest, BasicTest) {
OpBranch %17
%17 = OpLabel
%25 = OpPhi %6 %20 %16 %24 %21
%30 = OpIAdd %6 %25 %25
OpStore %8 %25
OpReturn
OpFunctionEnd
@ -121,6 +122,30 @@ TEST(TransformationPermutePhiOperandsTest, BasicTest) {
return true;
});
}
bool found_use_in_store = false;
bool found_use_in_add_lhs = false;
bool found_use_in_add_rhs = false;
context->get_def_use_mgr()->ForEachUse(
25, [&found_use_in_store, &found_use_in_add_lhs, &found_use_in_add_rhs](
opt::Instruction* inst, uint32_t operand_index) {
if (inst->opcode() == SpvOpStore) {
ASSERT_FALSE(found_use_in_store);
found_use_in_store = true;
} else {
ASSERT_EQ(SpvOpIAdd, inst->opcode());
if (operand_index == 2) {
ASSERT_FALSE(found_use_in_add_lhs);
found_use_in_add_lhs = true;
} else {
ASSERT_EQ(3, operand_index);
ASSERT_FALSE(found_use_in_add_rhs);
found_use_in_add_rhs = true;
}
}
});
ASSERT_TRUE(found_use_in_store);
ASSERT_TRUE(found_use_in_add_lhs);
ASSERT_TRUE(found_use_in_add_rhs);
std::string after_transformation = R"(
OpCapability Shader
@ -159,6 +184,7 @@ TEST(TransformationPermutePhiOperandsTest, BasicTest) {
OpBranch %17
%17 = OpLabel
%25 = OpPhi %6 %24 %21 %20 %16
%30 = OpIAdd %6 %25 %25
OpStore %8 %25
OpReturn
OpFunctionEnd