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

fuzzers: Don't pointlessly format diagnostics 

Fuzzers like to generate silly long source, and formatting large spans of these can take considerable time.
Only format the diagnostic if it is going to be displayed.

Significantly speeds up some fuzzing tests, fixing some timeouts.

Also add a minor optimization to the formatter repeat() implementation.

Fixed: chromium:1230313
Change-Id: Ib1f6ac0b31010f86cb7f4e1432dc703ecbe52cb0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/58841
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
Ben Clayton 2021-07-20 14:39:50 +00:00 committed by Tint LUCI CQ
parent efceb83536
commit b29396e472
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuzzers/tint_ast_fuzzer/fuzzer.cc
View File

@ -106,9 +106,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
fuzzer.EnableInspector();
fuzzer.Run(data, size);
if (fuzzer.HasErrors()) {
std::cout << "Fuzzing " << target.name
<< " produced an error:" << std::endl
<< fuzzer.GetErrors() << std::endl;
std::cout << "Fuzzing " << target.name << " produced an error"
<< std::endl;
auto printer = tint::diag::Printer::create(stderr, true);
tint::diag::Formatter{}.format(fuzzer.Diagnostics(), printer.get());
}
}

31
fuzzers/tint_common_fuzzer.cc
View File

@ -217,7 +217,7 @@ int CommonFuzzer::Run(const uint8_t* data, size_t size) {
}
if (!program.IsValid()) {
errors_ = diag::Formatter().format(program.Diagnostics());
diagnostics_ = program.Diagnostics();
return 0;
}
@ -234,68 +234,77 @@ int CommonFuzzer::Run(const uint8_t* data, size_t size) {
auto entry_points = inspector.GetEntryPoints();
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector, inspector.error());
return 0;
}
for (auto& ep : entry_points) {
auto remapped_name = inspector.GetRemappedNameForEntryPoint(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto constant_ids = inspector.GetConstantIDs();
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto uniform_bindings =
inspector.GetUniformBufferResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto storage_bindings =
inspector.GetStorageBufferResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto readonly_bindings =
inspector.GetReadOnlyStorageBufferResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto sampler_bindings = inspector.GetSamplerResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto comparison_sampler_bindings =
inspector.GetComparisonSamplerResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto sampled_texture_bindings =
inspector.GetSampledTextureResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
auto multisampled_texture_bindings =
inspector.GetMultisampledTextureResourceBindings(ep.name);
if (inspector.has_error()) {
errors_ = inspector.error();
diagnostics_.add_error(tint::diag::System::Inspector,
inspector.error());
return 0;
}
}

8
fuzzers/tint_common_fuzzer.h
View File

@ -110,8 +110,6 @@ class CommonFuzzer {
int Run(const uint8_t* data, size_t size);
const std::string& GetErrors() const { return errors_; }
const std::vector<uint32_t>& GetGeneratedSpirv() const {
return generated_spirv_;
}
@ -122,7 +120,9 @@ class CommonFuzzer {
const std::string& GetGeneratedMsl() const { return generated_msl_; }
bool HasErrors() const { return !errors_.empty(); }
const tint::diag::List& Diagnostics() const { return diagnostics_; }
bool HasErrors() const { return diagnostics_.contains_errors(); }
private:
InputFormat input_;
@ -130,7 +130,7 @@ class CommonFuzzer {
transform::Manager* transform_manager_;
transform::DataMap transform_inputs_;
bool inspector_enabled_;
std::string errors_;
tint::diag::List diagnostics_;
std::vector<uint32_t> generated_spirv_;
std::string generated_wgsl_;

5
src/diagnostic/formatter.cc
View File

@ -15,6 +15,7 @@
#include "src/diagnostic/formatter.h"
#include <algorithm>
#include <iterator>
#include <vector>
#include "src/diagnostic/diagnostic.h"
@ -96,9 +97,7 @@ struct Formatter::State {
/// @param c the character to print `n` times
/// @param n the number of times to print character `c`
void repeat(char c, size_t n) {
while (n-- > 0) {
stream << c;
}
std::fill_n(std::ostream_iterator<char>(stream), n, c);
}
private: