encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Update SPIR-V Tools fuzzer" 

This reverts commit 5a53634764.

Reason for revert: This is making the Dawn -> Chromium roller fail.

https://github.com/KhronosGroup/SPIRV-Tools/pull/4407 introduces a new mandatory parameter to the spvtools::fuzz::Fuzzer constructor, which does not exist in Chromium's version of SPIRV-Tools (d9f89257855a2784323512cd9568b6610bcae581).

The roll of SPIRV-Tools into Chromium is currently blocked by another issue, and is a couple of weeks behind ToT. See https://autoroll.skia.org/r/vulkan-deps-chromium-autoroll.

Note, that https://github.com/KhronosGroup/SPIRV-Tools/pull/4407 is going to block the eventual roll of SPIRV-Tools in Chromium, as there's no way this code can compile for both pre and post roll.
I'll try and fix this after unblocking this roll

Original change's description:
> Update SPIR-V Tools fuzzer
>
> Updates spirv-tools DEPS to pull in some recent spirv-fuzz changes, and
> modifies the SPIR-V Tools fuzzer so that inapplicable transformations
> are ignored.
>
> Change-Id: Ibdea6e9bc35224efe148133eced341168f7ce7b7
> Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60209
> Auto-Submit: Alastair Donaldson <afdx@google.com>
> Kokoro: Kokoro <noreply+kokoro@google.com>
> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
> Commit-Queue: Ryan Harrison <rharrison@chromium.org>

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I4ebcfcfab16e760f64cb8dc622dfb6ef4f1eccf0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60560
Reviewed-by: Ben Clayton <bclayton@chromium.org>
Kokoro: Ben Clayton <bclayton@chromium.org>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
This commit is contained in:
Ben Clayton 2021-08-02 11:13:49 +00:00 committed by Tint LUCI CQ
parent b209c477db
commit 8ebff3dc85
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -13,7 +13,7 @@ vars = {
'gpuweb_cts_revision': '177a4faf0a7ce6f8c64b42a715c634e363912a74', 'gpuweb_cts_revision': '177a4faf0a7ce6f8c64b42a715c634e363912a74',
'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a', 'protobuf_revision': 'fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a',
'spirv_headers_revision': '1d4e3a7e3a04ba205ed8cb1485f7cb7369bec609', 'spirv_headers_revision': '1d4e3a7e3a04ba205ed8cb1485f7cb7369bec609',
'spirv_tools_revision': '9c4481419ec1710d1b098982ecffda6b7fad88a9', 'spirv_tools_revision': '640b17b5fbc65f2aed9106ad96ba40c51fa20195',
'testing_revision': '2691851e49de541c3fe42fa8692ddcdee938162f', 'testing_revision': '2691851e49de541c3fe42fa8692ddcdee938162f',
} }

5
fuzzers/tint_spirv_tools_fuzzer/spirv_fuzz_mutator.cc
View File

@ -49,9 +49,6 @@ SpirvFuzzMutator::SpirvFuzzMutator(
std::make_unique<spvtools::fuzz::FactManager>(ir_context.get()), std::make_unique<spvtools::fuzz::FactManager>(ir_context.get()),
validator_options_); validator_options_);
// The value 'true' is passed for ignore_inapplicable_transformations so that
// fuzzing continues even when transformations that should be applicable turn
// out to be inapplicable.
auto fuzzer_context = std::make_unique<spvtools::fuzz::FuzzerContext>( auto fuzzer_context = std::make_unique<spvtools::fuzz::FuzzerContext>(
std::make_unique<spvtools::fuzz::PseudoRandomGenerator>(seed), std::make_unique<spvtools::fuzz::PseudoRandomGenerator>(seed),
spvtools::fuzz::FuzzerContext::GetMinFreshId(ir_context.get()), false); spvtools::fuzz::FuzzerContext::GetMinFreshId(ir_context.get()), false);
@ -59,7 +56,7 @@ SpirvFuzzMutator::SpirvFuzzMutator(
std::move(ir_context), std::move(transformation_context), std::move(ir_context), std::move(transformation_context),
std::move(fuzzer_context), util::GetBufferMessageConsumer(errors_.get()), std::move(fuzzer_context), util::GetBufferMessageConsumer(errors_.get()),
donors, enable_all_passes, repeated_pass_strategy, donors, enable_all_passes, repeated_pass_strategy,
validate_after_each_pass, validator_options_, true); validate_after_each_pass, validator_options_);
} }
Mutator::Result SpirvFuzzMutator::Mutate() { Mutator::Result SpirvFuzzMutator::Mutate() {