mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-23 05:26:11 +00:00
eda73e3c4e
The now-removed SPIRV-Cross path used to always do this, and the pure Tint-only path never actually validated the SPIRV. Tint does not run SPIRV-Tools validation on its output, so add in validation to ensure we don't pass invalid SPIRV to the driver. The validation can probably eventually be removed when we're more confident that Tint's SPIRV output is always correct. Also include various cleanups for old / unused code. Bug: dawn:1036 Change-Id: Iaab037518965e52edbd1829f6ab6ba2af0e70143 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/61589 Reviewed-by: Kai Ninomiya <kainino@chromium.org> Reviewed-by: Jiawei Shao <jiawei.shao@intel.com> Commit-Queue: Jiawei Shao <jiawei.shao@intel.com> Auto-Submit: Austin Eng <enga@chromium.org>
77 lines
2.8 KiB
C++
77 lines
2.8 KiB
C++
// Copyright 2021 The Dawn Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "dawn_native/SpirvValidation.h"
|
|
|
|
#include "dawn_native/Device.h"
|
|
|
|
#include <spirv-tools/libspirv.hpp>
|
|
#include <sstream>
|
|
|
|
namespace dawn_native {
|
|
|
|
MaybeError ValidateSpirv(DeviceBase* device,
|
|
const std::vector<uint32_t>& spirv,
|
|
bool dumpSpirv) {
|
|
spvtools::SpirvTools spirvTools(SPV_ENV_VULKAN_1_1);
|
|
spirvTools.SetMessageConsumer([device](spv_message_level_t level, const char*,
|
|
const spv_position_t& position,
|
|
const char* message) {
|
|
WGPULoggingType wgpuLogLevel;
|
|
switch (level) {
|
|
case SPV_MSG_FATAL:
|
|
case SPV_MSG_INTERNAL_ERROR:
|
|
case SPV_MSG_ERROR:
|
|
wgpuLogLevel = WGPULoggingType_Error;
|
|
break;
|
|
case SPV_MSG_WARNING:
|
|
wgpuLogLevel = WGPULoggingType_Warning;
|
|
break;
|
|
case SPV_MSG_INFO:
|
|
wgpuLogLevel = WGPULoggingType_Info;
|
|
break;
|
|
default:
|
|
wgpuLogLevel = WGPULoggingType_Error;
|
|
break;
|
|
}
|
|
|
|
std::ostringstream ss;
|
|
ss << "SPIRV line " << position.index << ": " << message << std::endl;
|
|
device->EmitLog(wgpuLogLevel, ss.str().c_str());
|
|
});
|
|
|
|
const bool valid = spirvTools.Validate(spirv);
|
|
if (dumpSpirv || !valid) {
|
|
std::ostringstream dumpedMsg;
|
|
std::string disassembly;
|
|
if (spirvTools.Disassemble(
|
|
spirv, &disassembly,
|
|
SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT)) {
|
|
dumpedMsg << "/* Dumped generated SPIRV disassembly */" << std::endl << disassembly;
|
|
} else {
|
|
dumpedMsg << "/* Failed to disassemble generated SPIRV */";
|
|
}
|
|
device->EmitLog(WGPULoggingType_Info, dumpedMsg.str().c_str());
|
|
}
|
|
|
|
if (!valid) {
|
|
return DAWN_VALIDATION_ERROR(
|
|
"Produced invalid SPIRV. Please file a bug at https://crbug.com/tint.");
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
} // namespace dawn_native
|