mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-12-26 17:51:02 +00:00
c38495656d
* test/linker: Code factorisation and small tweaks
* linker: Do not fail when going over limits
The limits are minima and implementations or APIs might support higher
limits, so just warn the user about it. And only check for the limits
right before emitting the binary, as limits might change earlier when
removing duplicate instructions, function prototypes, etc.
The only check performed right before merging, is making sure the ID
bound will not overflow the 32 bits following the merge.
Also, use the defines for the limits instead of hard-coding them.
* linker: Require a memory model in each input module
The existing code could run into weird situation. For example, if the
first module had no memory model, it would not emit any memory model
(sort of reasonable) and would accept without complains all possible mix
from later modules as it would not verify them.
* linker: Replace hex version with SPV_SPIRV_VERSION_WORD
* linker: Error out when linking together different versions
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/4135
* tools/linker: Do not write to disk if linking failed
Also, do not consider warnings as errors.
* tools/linker: Fix formatting in help message
* tools/linker: Further clarify the use of --target-env
Also update the text for the default version to reflect the change made
in 7d768812 ("Basic support for SPIR-V 1.6 (#4663)").
78 lines
2.3 KiB
C++
78 lines
2.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.
|
|
|
|
#include <string>
|
|
|
|
#include "gmock/gmock.h"
|
|
#include "test/link/linker_fixture.h"
|
|
|
|
namespace spvtools {
|
|
namespace {
|
|
|
|
using ::testing::HasSubstr;
|
|
using BinaryVersion = spvtest::LinkerTest;
|
|
|
|
spvtest::Binary CreateBinary(uint32_t version) {
|
|
return {
|
|
// clang-format off
|
|
// Header
|
|
SpvMagicNumber,
|
|
version,
|
|
SPV_GENERATOR_WORD(SPV_GENERATOR_KHRONOS, 0),
|
|
1u, // NOTE: Bound
|
|
0u, // NOTE: Schema; reserved
|
|
|
|
// OpCapability Shader
|
|
SpvOpCapability | 2u << SpvWordCountShift,
|
|
SpvCapabilityShader,
|
|
|
|
// OpMemoryModel Logical Simple
|
|
SpvOpMemoryModel | 3u << SpvWordCountShift,
|
|
SpvAddressingModelLogical,
|
|
SpvMemoryModelSimple
|
|
// clang-format on
|
|
};
|
|
}
|
|
|
|
TEST_F(BinaryVersion, Match) {
|
|
// clang-format off
|
|
spvtest::Binaries binaries = {
|
|
CreateBinary(SPV_SPIRV_VERSION_WORD(1, 3)),
|
|
CreateBinary(SPV_SPIRV_VERSION_WORD(1, 3)),
|
|
};
|
|
// clang-format on
|
|
spvtest::Binary linked_binary;
|
|
ASSERT_EQ(SPV_SUCCESS, Link(binaries, &linked_binary)) << GetErrorMessage();
|
|
EXPECT_THAT(GetErrorMessage(), std::string());
|
|
EXPECT_EQ(SPV_SPIRV_VERSION_WORD(1, 3), linked_binary[1]);
|
|
}
|
|
|
|
TEST_F(BinaryVersion, Mismatch) {
|
|
// clang-format off
|
|
spvtest::Binaries binaries = {
|
|
CreateBinary(SPV_SPIRV_VERSION_WORD(1, 3)),
|
|
CreateBinary(SPV_SPIRV_VERSION_WORD(1, 5)),
|
|
};
|
|
// clang-format on
|
|
spvtest::Binary linked_binary;
|
|
ASSERT_EQ(SPV_ERROR_INTERNAL, Link(binaries, &linked_binary))
|
|
<< GetErrorMessage();
|
|
EXPECT_THAT(GetErrorMessage(),
|
|
HasSubstr("Conflicting SPIR-V versions: 1.3 (input modules 1 "
|
|
"through 1) vs 1.5 (input module 2)."));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace spvtools
|