openharmony/third_party_spirv-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_spirv-tools synced 2024-11-27 09:32:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spirv-opt: Behave a bit better in the face of unknown instructions (#2487)

Browse Source 
* opt/ir_loader: Don't silently drop unknown instructions on the floor

Currently, if spirv-opt sees an instruction it does not know, it will
silently ignore it and move to the next one. This changes it
to be an error, as dropping it on the floor is likely to generate
invalid SPIR-V output.

* opt/optimizer: Complain a bit louder for unexpected binary changes

If a binary change happens despite a pass saying that the binaries
should be identical, this is indicative of a bug in the pass itself.

This does not change behavior for it to be an error, but simply emits a warning in this case.
This commit is contained in:
JasperNV 2019-04-05 10:36:42 -07:00 committed by Steven Perron
parent 3a0bc9e724
commit 9766b22b33
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/opt/ir_loader.cpp
View File

@ -116,8 +116,10 @@ bool IrLoader::AddInstruction(const spv_parsed_instruction_t* inst) {
opcode == SpvOpUndef) {
module_->AddGlobalValue(std::move(spv_inst));
} else {
SPIRV_UNIMPLEMENTED(consumer_,
"unhandled inst type outside function definition");
Errorf(consumer_, src, loc,
"Unhandled inst type (opcode: %d) found outside function definition.",
opcode);
return false;
}
} else {
if (block_ == nullptr) { // Inside function but outside blocks

18
source/opt/optimizer.cpp
View File

@ -518,10 +518,20 @@ bool Optimizer::Run(const uint32_t* original_binary,
impl_->pass_manager.SetValidatorOptions(&opt_options->val_options_);
impl_->pass_manager.SetTargetEnv(impl_->target_env);
auto status = impl_->pass_manager.Run(context.get());
if (status == opt::Pass::Status::SuccessWithChange ||
(status == opt::Pass::Status::SuccessWithoutChange &&
(optimized_binary->data() != original_binary ||
optimized_binary->size() != original_binary_size))) {
bool binary_changed = false;
if (status == opt::Pass::Status::SuccessWithChange) {
binary_changed = true;
} else if (status == opt::Pass::Status::SuccessWithoutChange) {
if (optimized_binary->size() != original_binary_size ||
(memcmp(optimized_binary->data(), original_binary, original_binary_size) != 0)) {
binary_changed = true;
Logf(consumer(), SPV_MSG_WARNING, nullptr, {},
"Binary unexpectedly changed despite optimizer saying there was no change");
}
}
if (binary_changed) {
optimized_binary->clear();
context->module()->ToBinary(optimized_binary, /* skip_nop = */ true);
}