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

Support OpPhi when replacing boolean constant operand (#3518)

Browse Source 
Fixes #2902.
This commit is contained in:
André Perez 2020-07-14 06:27:15 -03:00 committed by GitHub
parent 40c3c1cace
commit fe4dca5166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 98 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/fuzz/fuzzer_pass_obfuscate_constants.cpp
View File

@ -477,19 +477,10 @@ void FuzzerPassObfuscateConstants::Apply() {
skipped_opcode_count.clear();
}
switch (inst.opcode()) {
case SpvOpPhi:
// The instruction must not be an OpPhi, as we cannot insert
// instructions before an OpPhi.
// TODO(https://github.com/KhronosGroup/SPIRV-Tools/issues/2902):
// there is scope for being less conservative.
break;
case SpvOpVariable:
// The instruction must not be an OpVariable, the only id that an
// OpVariable uses is an initializer id, which has to remain
// constant.
break;
default:
if (inst.opcode() != SpvOpVariable) {
// Consider each operand of the instruction, and add a constant id
// use for the operand if relevant.
for (uint32_t in_operand_index = 0;
@ -498,7 +489,6 @@ void FuzzerPassObfuscateConstants::Apply() {
base_instruction_result_id,
skipped_opcode_count, &constant_uses);
}
break;
}
if (!inst.HasResultId()) {

27
source/fuzz/transformation_replace_boolean_constant_with_constant_binary.cpp
View File

@ -243,22 +243,15 @@ bool TransformationReplaceBooleanConstantWithConstantBinary::IsApplicable(
return false;
}
switch (instruction->opcode()) {
case SpvOpPhi:
// The instruction must not be an OpPhi, as we cannot insert a binary
// operator instruction before an OpPhi.
// TODO(https://github.com/KhronosGroup/SPIRV-Tools/issues/2902): there is
// scope for being less conservative.
return false;
case SpvOpVariable:
// The instruction must not be an OpVariable, because (a) we cannot insert
// a binary operator before an OpVariable, but in any case (b) the
// constant we would be replacing is the initializer constant of the
// OpVariable, and this cannot be the result of a binary operation.
if (instruction->opcode() == SpvOpVariable) {
return false;
default:
return true;
}
return true;
}
void TransformationReplaceBooleanConstantWithConstantBinary::Apply(
@ -281,11 +274,22 @@ TransformationReplaceBooleanConstantWithConstantBinary::ApplyWithResult(
opt::Instruction* result = binary_instruction.get();
auto instruction_containing_constant_use =
FindInstructionContainingUse(message_.id_use_descriptor(), ir_context);
auto instruction_before_which_to_insert = instruction_containing_constant_use;
// If |instruction_before_which_to_insert| is an OpPhi instruction,
// then |binary_instruction| will be inserted into the parent block associated
// with the OpPhi variable operand.
if (instruction_containing_constant_use->opcode() == SpvOpPhi) {
instruction_before_which_to_insert =
ir_context->cfg()
->block(instruction_containing_constant_use->GetSingleWordInOperand(
message_.id_use_descriptor().in_operand_index() + 1))
->terminator();
}
// We want to insert the new instruction before the instruction that contains
// the use of the boolean, but we need to go backwards one more instruction if
// the using instruction is preceded by a merge instruction.
auto instruction_before_which_to_insert = instruction_containing_constant_use;
{
opt::Instruction* previous_node =
instruction_before_which_to_insert->PreviousNode();
@ -294,6 +298,7 @@ TransformationReplaceBooleanConstantWithConstantBinary::ApplyWithResult(
instruction_before_which_to_insert = previous_node;
}
}
instruction_before_which_to_insert->InsertBefore(
std::move(binary_instruction));
instruction_containing_constant_use->SetInOperand(

93
test/fuzz/transformation_replace_boolean_constant_with_constant_binary_test.cpp
View File

@ -616,41 +616,41 @@ TEST(TransformationReplaceBooleanConstantWithConstantBinaryTest, OpPhi) {
// Hand-written SPIR-V to check applicability of the transformation on an
// OpPhi argument.
std::string shader = R"(
std::string reference_shader = R"(
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %4 "main"
OpExecutionMode %4 OriginUpperLeft
OpSource ESSL 310
OpName %4 "main"
OpEntryPoint Vertex %10 "main"
; Types
%2 = OpTypeVoid
%3 = OpTypeFunction %2
%6 = OpTypeBool
%7 = OpTypePointer Function %6
%9 = OpConstantTrue %6
%16 = OpConstantFalse %6
%10 = OpTypeInt 32 1
%11 = OpTypePointer Function %10
%13 = OpConstant %10 0
%15 = OpConstant %10 1
%4 = OpFunction %2 None %3
%5 = OpLabel
OpSelectionMerge %20 None
OpBranchConditional %9 %21 %22
%21 = OpLabel
OpBranch %20
%22 = OpLabel
OpBranch %20
%20 = OpLabel
%23 = OpPhi %6 %9 %21 %16 %22
%4 = OpTypeInt 32 0
%5 = OpTypeBool
; Constants
%6 = OpConstant %4 0
%7 = OpConstant %4 1
%8 = OpConstantTrue %5
%9 = OpConstantFalse %5
; main function
%10 = OpFunction %2 None %3
%11 = OpLabel
OpSelectionMerge %13 None
OpBranchConditional %8 %12 %13
%12 = OpLabel
OpBranch %13
%13 = OpLabel
%14 = OpPhi %5 %8 %11 %9 %12
OpReturn
OpFunctionEnd
)";
const auto env = SPV_ENV_UNIVERSAL_1_3;
const auto consumer = nullptr;
const auto context = BuildModule(env, consumer, shader, kFuzzAssembleOption);
const auto context =
BuildModule(env, consumer, reference_shader, kFuzzAssembleOption);
ASSERT_TRUE(IsValid(env, context.get()));
FactManager fact_manager;
@ -658,11 +658,48 @@ TEST(TransformationReplaceBooleanConstantWithConstantBinaryTest, OpPhi) {
TransformationContext transformation_context(&fact_manager,
validator_options);
auto replacement = TransformationReplaceBooleanConstantWithConstantBinary(
MakeIdUseDescriptor(9, MakeInstructionDescriptor(23, SpvOpPhi, 0), 0), 13,
15, SpvOpSLessThan, 100);
auto instruction_descriptor = MakeInstructionDescriptor(14, SpvOpPhi, 0);
auto id_use_descriptor = MakeIdUseDescriptor(8, instruction_descriptor, 0);
auto transformation = TransformationReplaceBooleanConstantWithConstantBinary(
id_use_descriptor, 6, 7, SpvOpULessThan, 15);
ASSERT_TRUE(
transformation.IsApplicable(context.get(), transformation_context));
transformation.Apply(context.get(), &transformation_context);
ASSERT_FALSE(replacement.IsApplicable(context.get(), transformation_context));
std::string variant_shader = R"(
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %10 "main"
; Types
%2 = OpTypeVoid
%3 = OpTypeFunction %2
%4 = OpTypeInt 32 0
%5 = OpTypeBool
; Constants
%6 = OpConstant %4 0
%7 = OpConstant %4 1
%8 = OpConstantTrue %5
%9 = OpConstantFalse %5
; main function
%10 = OpFunction %2 None %3
%11 = OpLabel
%15 = OpULessThan %5 %6 %7
OpSelectionMerge %13 None
OpBranchConditional %8 %12 %13
%12 = OpLabel
OpBranch %13
%13 = OpLabel
%14 = OpPhi %5 %15 %11 %9 %12
OpReturn
OpFunctionEnd
)";
ASSERT_TRUE(IsValid(env, context.get()));
ASSERT_TRUE(IsEqual(env, variant_shader, context.get()));
}
TEST(TransformationReplaceBooleanConstantWithConstantBinaryTest,