diff options
Diffstat (limited to 'source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp')
| -rw-r--r-- | source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp b/source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp index efae7d66..d2ff40e6 100644 --- a/source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp +++ b/source/fuzz/fuzzer_pass_adjust_memory_operands_masks.cpp @@ -47,8 +47,8 @@ void FuzzerPassAdjustMemoryOperandsMasks::Apply() { // From SPIR-V 1.4 onwards, OpCopyMemory and OpCopyMemorySized have a // second mask. switch (inst_it->opcode()) { - case spv::Op::OpCopyMemory: - case spv::Op::OpCopyMemorySized: + case SpvOpCopyMemory: + case SpvOpCopyMemorySized: if (TransformationSetMemoryOperandsMask:: MultipleMemoryOperandMasksAreSupported(GetIRContext())) { indices_of_available_masks_to_adjust.push_back(1); @@ -75,26 +75,24 @@ void FuzzerPassAdjustMemoryOperandsMasks::Apply() { existing_mask_in_operand_index < inst_it->NumInOperands() ? inst_it->GetSingleWordInOperand( existing_mask_in_operand_index) - : static_cast<uint32_t>(spv::MemoryAccessMask::MaskNone); + : static_cast<uint32_t>(SpvMemoryAccessMaskNone); // There are two things we can do to a mask: // - add Volatile if not already present // - toggle Nontemporal // The following ensures that we do at least one of these - bool add_volatile = - !(existing_mask & uint32_t(spv::MemoryAccessMask::Volatile)) && - GetFuzzerContext()->ChooseEven(); + bool add_volatile = !(existing_mask & SpvMemoryAccessVolatileMask) && + GetFuzzerContext()->ChooseEven(); bool toggle_nontemporal = !add_volatile || GetFuzzerContext()->ChooseEven(); // These bitwise operations use '|' to add Volatile if desired, and // '^' to toggle Nontemporal if desired. uint32_t new_mask = - (existing_mask | - (add_volatile ? uint32_t(spv::MemoryAccessMask::Volatile) - : uint32_t(spv::MemoryAccessMask::MaskNone))) ^ - (toggle_nontemporal ? uint32_t(spv::MemoryAccessMask::Nontemporal) - : uint32_t(spv::MemoryAccessMask::MaskNone)); + (existing_mask | (add_volatile ? SpvMemoryAccessVolatileMask + : SpvMemoryAccessMaskNone)) ^ + (toggle_nontemporal ? SpvMemoryAccessNontemporalMask + : SpvMemoryAccessMaskNone); TransformationSetMemoryOperandsMask transformation( MakeInstructionDescriptor(block, inst_it), new_mask, mask_index); |