Hash :
9620d4d3
Author :
Date :
2024-05-23T16:12:52
Vulkan: Emit SPIR-V 1.4 where available In preparation for optimizations possible for SPIR-V 1.4. This change makes ANGLE output SPIR-V 1.4 if supported, and SPIR-V 1.3 otherwise. It handles the following differences between the two versions: - OpEntryPoint in SPIR-V 1.4 includes all global variables, as opposed to SPIR-V 1.3 where only the Input and Output variables are listed - Storage buffers use a dedicated storage class in SPIR-V 1.4 Bug: angleproject:342316794 Change-Id: I157ed46449ff2d0f14d284b883b4ddc1b4b46fd1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5565224 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
// Copyright 2021 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// spirv_types.cpp:
// Helper SPIR-V functions.
#include "spirv_types.h"
// SPIR-V tools include for AST validation.
#include <spirv-tools/libspirv.hpp>
namespace angle
{
namespace spirv
{
#if defined(ANGLE_ENABLE_ASSERTS)
namespace
{
void ValidateSpirvMessage(spv_message_level_t level,
const char *source,
const spv_position_t &position,
const char *message)
{
WARN() << "Level" << level << ": " << message;
}
spv_target_env GetEnv(const Blob &blob)
{
switch (blob[kHeaderIndexVersion])
{
case kVersion_1_4:
return SPV_ENV_VULKAN_1_1_SPIRV_1_4;
default:
return SPV_ENV_VULKAN_1_1;
}
}
} // anonymous namespace
bool Validate(const Blob &blob)
{
spvtools::SpirvTools spirvTools(GetEnv(blob));
spvtools::ValidatorOptions options;
options.SetFriendlyNames(false);
spirvTools.SetMessageConsumer(ValidateSpirvMessage);
const bool result = spirvTools.Validate(blob.data(), blob.size(), options);
if (!result)
{
std::string readableSpirv;
spirvTools.Disassemble(blob, &readableSpirv, 0);
WARN() << "Invalid SPIR-V:\n" << readableSpirv;
}
return result;
}
void Print(const Blob &blob)
{
spvtools::SpirvTools spirvTools(GetEnv(blob));
std::string readableSpirv;
spirvTools.Disassemble(blob, &readableSpirv, 0);
INFO() << "Dissembly SPIRV: " << readableSpirv.c_str();
}
#else // ANGLE_ENABLE_ASSERTS
bool Validate(const Blob &blob)
{
// Placeholder implementation since this is only used inside an ASSERT().
// Return false to indicate an error in case this is ever accidentally used somewhere else.
return false;
}
#endif // ANGLE_ENABLE_ASSERTS
} // namespace spirv
} // namespace angle