SPIRV-Tools/source/libspirv.cpp
Pierre Moreau 7183ad526e Linker code cleanups
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
2018-01-05 13:28:44 -05:00

119 lines
4.0 KiB
C++

// Copyright (c) 2016 Google Inc.
//
// 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 "spirv-tools/libspirv.hpp"
#include "table.h"
namespace spvtools {
Context::Context(spv_target_env env) : context_(spvContextCreate(env)) {}
Context::Context(Context&& other) : context_(other.context_) {
other.context_ = nullptr;
}
Context& Context::operator=(Context&& other) {
spvContextDestroy(context_);
context_ = other.context_;
other.context_ = nullptr;
return *this;
}
Context::~Context() { spvContextDestroy(context_); }
void Context::SetMessageConsumer(MessageConsumer consumer) {
libspirv::SetContextMessageConsumer(context_, std::move(consumer));
}
spv_context& Context::CContext() { return context_; }
const spv_context& Context::CContext() const { return context_; }
// Structs for holding the data members for SpvTools.
struct SpirvTools::Impl {
explicit Impl(spv_target_env env) : context(spvContextCreate(env)) {
// The default consumer in spv_context_t is a null consumer, which provides
// equivalent functionality (from the user's perspective) as a real consumer
// does nothing.
}
~Impl() { spvContextDestroy(context); }
spv_context context; // C interface context object.
};
SpirvTools::SpirvTools(spv_target_env env) : impl_(new Impl(env)) {}
SpirvTools::~SpirvTools() {}
void SpirvTools::SetMessageConsumer(MessageConsumer consumer) {
libspirv::SetContextMessageConsumer(impl_->context, std::move(consumer));
}
bool SpirvTools::Assemble(const std::string& text,
std::vector<uint32_t>* binary,
uint32_t options) const {
return Assemble(text.data(), text.size(), binary, options);
}
bool SpirvTools::Assemble(const char* text, const size_t text_size,
std::vector<uint32_t>* binary,
uint32_t options) const {
spv_binary spvbinary = nullptr;
spv_result_t status = spvTextToBinaryWithOptions(
impl_->context, text, text_size, options, &spvbinary, nullptr);
if (status == SPV_SUCCESS) {
binary->assign(spvbinary->code, spvbinary->code + spvbinary->wordCount);
}
spvBinaryDestroy(spvbinary);
return status == SPV_SUCCESS;
}
bool SpirvTools::Disassemble(const std::vector<uint32_t>& binary,
std::string* text, uint32_t options) const {
return Disassemble(binary.data(), binary.size(), text, options);
}
bool SpirvTools::Disassemble(const uint32_t* binary, const size_t binary_size,
std::string* text, uint32_t options) const {
spv_text spvtext = nullptr;
spv_result_t status = spvBinaryToText(impl_->context, binary, binary_size,
options, &spvtext, nullptr);
if (status == SPV_SUCCESS) {
text->assign(spvtext->str, spvtext->str + spvtext->length);
}
spvTextDestroy(spvtext);
return status == SPV_SUCCESS;
}
bool SpirvTools::Validate(const std::vector<uint32_t>& binary) const {
return Validate(binary.data(), binary.size());
}
bool SpirvTools::Validate(const uint32_t* binary,
const size_t binary_size) const {
return spvValidateBinary(impl_->context, binary, binary_size, nullptr) ==
SPV_SUCCESS;
}
bool SpirvTools::Validate(const uint32_t* binary, const size_t binary_size,
const spvtools::ValidatorOptions& options) const {
spv_const_binary_t the_binary{binary, binary_size};
return spvValidateWithOptions(impl_->context, options, &the_binary,
nullptr) == SPV_SUCCESS;
}
} // namespace spvtools