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

Simplify tint API usage 

A whole lot of public API tint changes have been made to simplify usage of the library.
Big changes include:
* Type determination is now implicit
* Generators no longer take ownership of programs, so they don't need to be cloned.

Change-Id: Icac0956ae120ae4e6a9d0290b2478c0fbc3bcf22
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39341
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Ben Clayton 2021-02-02 15:38:39 +00:00 committed by Commit Bot service account
parent 199ba447c5
commit 401aad5878
2 changed files with 22 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/dawn_native/ShaderModule.cpp
View File

@ -183,28 +183,15 @@ namespace dawn_native {
std::ostringstream errorStream; std::ostringstream errorStream;
errorStream << "Tint WGSL reader failure:" << std::endl; errorStream << "Tint WGSL reader failure:" << std::endl;
tint::reader::wgsl::Parser parser(file); tint::Program program = tint::reader::wgsl::Parse(file);
if (!parser.Parse()) { if (!program.IsValid()) {
auto err = tint::diag::Formatter{}.format(parser.diagnostics()); auto err = tint::diag::Formatter{}.format(program.Diagnostics());
errorStream << "Parser: " << err << std::endl errorStream << "Parser: " << err << std::endl
<< "Shader: " << std::endl << "Shader: " << std::endl
<< file->content << std::endl; << file->content << std::endl;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
} }
tint::Program program = parser.program();
if (!program.IsValid()) {
errorStream << "Invalid program generated..." << std::endl;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
}
tint::diag::List diagnostics = tint::TypeDeterminer::Run(&program);
if (diagnostics.contains_errors()) {
std::string err = tint::diag::Formatter{}.format(diagnostics);
errorStream << "Type Determination: " << err;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
}
return std::move(program); return std::move(program);
} }
@ -212,22 +199,10 @@ namespace dawn_native {
std::ostringstream errorStream; std::ostringstream errorStream;
errorStream << "Tint SPIRV reader failure:" << std::endl; errorStream << "Tint SPIRV reader failure:" << std::endl;
tint::reader::spirv::Parser parser(spirv); tint::Program program = tint::reader::spirv::Parse(spirv);
if (!parser.Parse()) {
errorStream << "Parser: " << parser.error() << std::endl;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
}
tint::Program program = parser.program();
if (!program.IsValid()) { if (!program.IsValid()) {
errorStream << "Invalid program generated..." << std::endl; auto err = tint::diag::Formatter{}.format(program.Diagnostics());
return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); errorStream << "Parser: " << err << std::endl;
}
tint::diag::List diagnostics = tint::TypeDeterminer::Run(&program);
if (diagnostics.contains_errors()) {
std::string err = tint::diag::Formatter{}.format(diagnostics);
errorStream << "Type Determination: " << err;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
} }
@ -248,11 +223,11 @@ namespace dawn_native {
return {}; return {};
} }
ResultOrError<std::vector<uint32_t>> ModuleToSPIRV(tint::Program program) { ResultOrError<std::vector<uint32_t>> ModuleToSPIRV(const tint::Program* program) {
std::ostringstream errorStream; std::ostringstream errorStream;
errorStream << "Tint SPIR-V writer failure:" << std::endl; errorStream << "Tint SPIR-V writer failure:" << std::endl;
tint::writer::spirv::Generator generator(&program); tint::writer::spirv::Generator generator(program);
if (!generator.Generate()) { if (!generator.Generate()) {
errorStream << "Generator: " << generator.error() << std::endl; errorStream << "Generator: " << generator.error() << std::endl;
return DAWN_VALIDATION_ERROR(errorStream.str().c_str()); return DAWN_VALIDATION_ERROR(errorStream.str().c_str());
@ -884,17 +859,14 @@ namespace dawn_native {
tint::Source::File file("", wgslDesc->source); tint::Source::File file("", wgslDesc->source);
tint::Program program;
DAWN_TRY_ASSIGN(program, ParseWGSL(&file));
if (device->IsToggleEnabled(Toggle::UseTintGenerator)) { if (device->IsToggleEnabled(Toggle::UseTintGenerator)) {
tint::Program program;
DAWN_TRY_ASSIGN(program, ParseWGSL(&file));
if (device->IsValidationEnabled()) { if (device->IsValidationEnabled()) {
DAWN_TRY(ValidateModule(&program)); DAWN_TRY(ValidateModule(&program));
} }
parseResult.tintProgram = std::make_unique<tint::Program>(std::move(program));
} else { } else {
tint::Program program;
DAWN_TRY_ASSIGN(program, ParseWGSL(&file));
{ {
tint::transform::Manager transformManager; tint::transform::Manager transformManager;
transformManager.append( transformManager.append(
@ -906,18 +878,14 @@ namespace dawn_native {
DAWN_TRY(ValidateModule(&program)); DAWN_TRY(ValidateModule(&program));
} }
// Keep the Tint program around. The Metal backend will use it for vertex
// pulling since we can't go WGSL->point size transform->spirv->Tint.
// Tint's spirv reader doesn't understand point size. crbug.com/tint/412.
auto tintProgram = std::make_unique<tint::Program>(program.Clone());
std::vector<uint32_t> spirv; std::vector<uint32_t> spirv;
DAWN_TRY_ASSIGN(spirv, ModuleToSPIRV(std::move(program))); DAWN_TRY_ASSIGN(spirv, ModuleToSPIRV(&program));
DAWN_TRY(ValidateSpirv(spirv.data(), spirv.size())); DAWN_TRY(ValidateSpirv(spirv.data(), spirv.size()));
parseResult.tintProgram = std::move(tintProgram);
parseResult.spirv = std::move(spirv); parseResult.spirv = std::move(spirv);
} }
parseResult.tintProgram = std::make_unique<tint::Program>(std::move(program));
break; break;
#else #else
return DAWN_VALIDATION_ERROR("Using Tint is not enabled in this build."); return DAWN_VALIDATION_ERROR("Using Tint is not enabled in this build.");
@ -946,13 +914,17 @@ namespace dawn_native {
tint::Program* program) { tint::Program* program) {
tint::transform::Transform::Output output = manager->Run(program); tint::transform::Transform::Output output = manager->Run(program);
if (output.diagnostics.contains_errors()) { if (output.diagnostics.contains_errors()) {
// TODO(bclayton): Remove Transform::Output::diagnostics - just put diagnostics into
// output.program.
std::string err = std::string err =
"Tint transform failure: " + tint::diag::Formatter{}.format(output.diagnostics); "Tint transform failure: " + tint::diag::Formatter{}.format(output.diagnostics);
return DAWN_VALIDATION_ERROR(err.c_str()); return DAWN_VALIDATION_ERROR(err.c_str());
} }
if (!output.program.IsValid()) { if (!output.program.IsValid()) {
return DAWN_VALIDATION_ERROR("Tint transform did not produce valid program."); std::string err =
"Tint program failure: " + tint::diag::Formatter{}.format(program->Diagnostics());
return DAWN_VALIDATION_ERROR(err.c_str());
} }
return std::move(output.program); return std::move(output.program);
} }
@ -1145,14 +1117,8 @@ namespace dawn_native {
if (GetDevice()->IsToggleEnabled(Toggle::UseTintGenerator)) { if (GetDevice()->IsToggleEnabled(Toggle::UseTintGenerator)) {
#ifdef DAWN_ENABLE_WGSL #ifdef DAWN_ENABLE_WGSL
ASSERT(program != nullptr); ASSERT(program != nullptr);
tint::Program clonedProgram = program->Clone();
tint::diag::List diagnostics = tint::TypeDeterminer::Run(&clonedProgram); DAWN_TRY_ASSIGN(localSpirv, ModuleToSPIRV(program));
if (diagnostics.contains_errors()) {
std::string err = tint::diag::Formatter{}.format(diagnostics);
return DAWN_VALIDATION_ERROR(err.c_str());
}
DAWN_TRY_ASSIGN(localSpirv, ModuleToSPIRV(std::move(clonedProgram)));
DAWN_TRY(ValidateSpirv(localSpirv.data(), localSpirv.size())); DAWN_TRY(ValidateSpirv(localSpirv.data(), localSpirv.size()));
spirvPtr = &localSpirv; spirvPtr = &localSpirv;
#else #else

15
src/fuzzers/DawnSPIRVCrossFuzzer.cpp
View File

@ -73,23 +73,12 @@ namespace DawnSPIRVCrossFuzzer {
// Using Tint SPIRV->SPIRV to normalize inputs if supported. // Using Tint SPIRV->SPIRV to normalize inputs if supported.
#ifdef DAWN_ENABLE_WGSL #ifdef DAWN_ENABLE_WGSL
tint::reader::spirv::Parser parser(input); tint::Program program = tint::reader::wgsl::Parse(file);
if (!parser.Parse()) {
return 0;
}
tint::Program program = parser.program();
if (!program.IsValid()) { if (!program.IsValid()) {
return 0; return 0;
} }
tint::TypeDeterminer type_determiner(&program); tint::writer::spirv::Generator generator(&program);
if (!type_determiner.Determine()) {
return 0;
}
tint::writer::spirv::Generator generator(&program);
if (!generator.Generate()) { if (!generator.Generate()) {
return 0; return 0;
} }