mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-30 06:50:06 +00:00
7183ad526e
Turn `Linker::Link()` into free functions As very little information was kept in the Linker class, we can get rid of the whole class and have the `Link()` as free functions instead; the environment target as well as the consumer are passed along through an `spv_context` object. The resulting linked_binary is passed as a pointer rather than a reference to follow the Google C++ Style guidelines. Addresses remaining comments from https://github.com/KhronosGroup/SPIRV-Tools/pull/693 about the SPIR-V linker. Fix variable naming in the linker Some of the variables were using mixed case, which did not follow the Google C++ Style guidelines. Linker: Use EXPECT_EQ when possible and update some test * Replace occurrences of ASSERT_EQ by EXPECT_EQ when possible; * Reformulated some of the error messages; * Added the symbol name in the error message when there is a type or decoration mismatch between the imported and exported declarations. Opt: List all duplicates removed by RemoveDuplicatePass in the header Opt: Make the const version of GetLabelInst() return a pointer For consistency with the non-const version, as well as other similar functions. Opt: Rename function_end to EndInst() As pointed out by dneto0 the previous name was quite confusing and could be mistaken with a function returning an end iterator. Also change the return type of the const version to a pointer rather than a reference, for consistency. Opt: Add performance comment to RemoveDuplicateTypes and decorations This comment was requested during the review of https://github.com/KhronosGroup/SPIRV-Tools/pull/693. Opt: Add comments and fix variable naming in RemoveDuplicatePass * Add missing comments to private functions; * Rename variables that were using mixed case; * Add TODO for moving AreTypesEqual out. Linker: Remove commented out code and add TODOs Linker: Merged together strings that were too much splitted Implement a C++ RAII wrapper around spv_context
125 lines
4.3 KiB
C++
125 lines
4.3 KiB
C++
// Copyright (c) 2017 Pierre Moreau
|
|
//
|
|
// 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.
|
|
|
|
#ifndef LIBSPIRV_TEST_LINK_LINK_TEST
|
|
#define LIBSPIRV_TEST_LINK_LINK_TEST
|
|
|
|
#include <iostream>
|
|
|
|
#include "source/spirv_constant.h"
|
|
#include "unit_spirv.h"
|
|
|
|
#include "spirv-tools/linker.hpp"
|
|
|
|
namespace spvtest {
|
|
|
|
using Binary = std::vector<uint32_t>;
|
|
using Binaries = std::vector<Binary>;
|
|
|
|
class LinkerTest : public ::testing::Test {
|
|
public:
|
|
LinkerTest()
|
|
: context_(SPV_ENV_UNIVERSAL_1_2),
|
|
tools_(SPV_ENV_UNIVERSAL_1_2),
|
|
assemble_options_(spvtools::SpirvTools::kDefaultAssembleOption),
|
|
disassemble_options_(spvtools::SpirvTools::kDefaultDisassembleOption) {
|
|
const auto consumer = [this](spv_message_level_t level, const char*,
|
|
const spv_position_t& position,
|
|
const char* message) {
|
|
if (!error_message_.empty()) error_message_ += "\n";
|
|
switch (level) {
|
|
case SPV_MSG_FATAL:
|
|
case SPV_MSG_INTERNAL_ERROR:
|
|
case SPV_MSG_ERROR:
|
|
error_message_ += "ERROR";
|
|
break;
|
|
case SPV_MSG_WARNING:
|
|
error_message_ += "WARNING";
|
|
break;
|
|
case SPV_MSG_INFO:
|
|
error_message_ += "INFO";
|
|
break;
|
|
case SPV_MSG_DEBUG:
|
|
error_message_ += "DEBUG";
|
|
break;
|
|
}
|
|
error_message_ += ": " + std::to_string(position.index) + ": " + message;
|
|
};
|
|
context_.SetMessageConsumer(consumer);
|
|
tools_.SetMessageConsumer(consumer);
|
|
}
|
|
|
|
virtual void TearDown() override { error_message_.clear(); }
|
|
|
|
// Assembles each of the given strings into SPIR-V binaries before linking
|
|
// them together. SPV_ERROR_INVALID_TEXT is returned if the assembling failed
|
|
// for any of the input strings, and SPV_ERROR_INVALID_POINTER if
|
|
// |linked_binary| is a null pointer.
|
|
spv_result_t AssembleAndLink(
|
|
const std::vector<std::string>& bodies, spvtest::Binary* linked_binary,
|
|
spvtools::LinkerOptions options = spvtools::LinkerOptions()) {
|
|
if (!linked_binary) return SPV_ERROR_INVALID_POINTER;
|
|
|
|
spvtest::Binaries binaries(bodies.size());
|
|
for (size_t i = 0u; i < bodies.size(); ++i)
|
|
if (!tools_.Assemble(bodies[i], binaries.data() + i, assemble_options_))
|
|
return SPV_ERROR_INVALID_TEXT;
|
|
|
|
return spvtools::Link(context_, binaries, linked_binary, options);
|
|
}
|
|
|
|
// Links the given SPIR-V binaries together; SPV_ERROR_INVALID_POINTER is
|
|
// returned if |linked_binary| is a null pointer.
|
|
spv_result_t Link(
|
|
const spvtest::Binaries& binaries, spvtest::Binary* linked_binary,
|
|
spvtools::LinkerOptions options = spvtools::LinkerOptions()) {
|
|
if (!linked_binary) return SPV_ERROR_INVALID_POINTER;
|
|
return spvtools::Link(context_, binaries, linked_binary, options);
|
|
}
|
|
|
|
// Disassembles |binary| and outputs the result in |text|. If |text| is a
|
|
// null pointer, SPV_ERROR_INVALID_POINTER is returned.
|
|
spv_result_t Disassemble(const spvtest::Binary& binary, std::string* text) {
|
|
if (!text) return SPV_ERROR_INVALID_POINTER;
|
|
return tools_.Disassemble(binary, text, disassemble_options_)
|
|
? SPV_SUCCESS
|
|
: SPV_ERROR_INVALID_BINARY;
|
|
}
|
|
|
|
// Sets the options for the assembler.
|
|
void SetAssembleOptions(uint32_t assemble_options) {
|
|
assemble_options_ = assemble_options;
|
|
}
|
|
|
|
// Sets the options used by the disassembler.
|
|
void SetDisassembleOptions(uint32_t disassemble_options) {
|
|
disassemble_options_ = disassemble_options;
|
|
}
|
|
|
|
// Returns the accumulated error messages for the test.
|
|
std::string GetErrorMessage() const { return error_message_; }
|
|
|
|
private:
|
|
spvtools::Context context_;
|
|
spvtools::SpirvTools
|
|
tools_; // An instance for calling SPIRV-Tools functionalities.
|
|
uint32_t assemble_options_;
|
|
uint32_t disassemble_options_;
|
|
std::string error_message_;
|
|
};
|
|
|
|
} // namespace spvtest
|
|
|
|
#endif // LIBSPIRV_TEST_LINK_LINK_TEST
|