mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-27 13:50:07 +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
68 lines
2.4 KiB
C++
68 lines
2.4 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_OPT_REMOVE_DUPLICATES_PASS_H_
|
|
#define LIBSPIRV_OPT_REMOVE_DUPLICATES_PASS_H_
|
|
|
|
#include <unordered_map>
|
|
|
|
#include "decoration_manager.h"
|
|
#include "def_use_manager.h"
|
|
#include "ir_context.h"
|
|
#include "module.h"
|
|
#include "pass.h"
|
|
|
|
namespace spvtools {
|
|
namespace opt {
|
|
|
|
using IdDecorationsList =
|
|
std::unordered_map<uint32_t, std::vector<ir::Instruction*>>;
|
|
|
|
// See optimizer.hpp for documentation.
|
|
class RemoveDuplicatesPass : public Pass {
|
|
public:
|
|
const char* name() const override { return "remove-duplicates"; }
|
|
Status Process(ir::IRContext*) override;
|
|
// TODO(pierremoreau): Move this function somewhere else (e.g. pass.h or
|
|
// within the type manager)
|
|
// Returns whether two types are equal, and have the same decorations.
|
|
static bool AreTypesEqual(const ir::Instruction& inst1,
|
|
const ir::Instruction& inst2,
|
|
ir::IRContext* context);
|
|
|
|
private:
|
|
// Remove duplicate capabilities from the module attached to |ir_context|.
|
|
//
|
|
// Returns true if the module was modified, false otherwise.
|
|
bool RemoveDuplicateCapabilities(ir::IRContext* ir_context) const;
|
|
// Remove duplicate extended instruction imports from the module attached to
|
|
// |ir_context|.
|
|
//
|
|
// Returns true if the module was modified, false otherwise.
|
|
bool RemoveDuplicatesExtInstImports(ir::IRContext* ir_context) const;
|
|
// Remove duplicate types from the module attached to |ir_context|.
|
|
//
|
|
// Returns true if the module was modified, false otherwise.
|
|
bool RemoveDuplicateTypes(ir::IRContext* ir_context) const;
|
|
// Remove duplicate decorations from the module attached to |ir_context|.
|
|
//
|
|
// Returns true if the module was modified, false otherwise.
|
|
bool RemoveDuplicateDecorations(ir::IRContext* ir_context) const;
|
|
};
|
|
|
|
} // namespace opt
|
|
} // namespace spvtools
|
|
|
|
#endif // LIBSPIRV_OPT_REMOVE_DUPLICATES_PASS_H_
|