mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-12-27 10:20:14 +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)").
106 lines
3.0 KiB
C++
106 lines
3.0 KiB
C++
// Copyright (c) 2018 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 PartialLinkage = spvtest::LinkerTest;
|
|
|
|
TEST_F(PartialLinkage, Allowed) {
|
|
const std::string body1 = R"(
|
|
OpCapability Linkage
|
|
OpCapability Addresses
|
|
OpCapability Kernel
|
|
OpMemoryModel Physical64 OpenCL
|
|
OpDecorate %1 LinkageAttributes "foo" Import
|
|
OpDecorate %2 LinkageAttributes "bar" Import
|
|
%3 = OpTypeFloat 32
|
|
%1 = OpVariable %3 Uniform
|
|
%2 = OpVariable %3 Uniform
|
|
)";
|
|
const std::string body2 = R"(
|
|
OpCapability Linkage
|
|
OpCapability Addresses
|
|
OpCapability Kernel
|
|
OpMemoryModel Physical64 OpenCL
|
|
OpDecorate %1 LinkageAttributes "bar" Export
|
|
%2 = OpTypeFloat 32
|
|
%3 = OpConstant %2 3.1415
|
|
%1 = OpVariable %2 Uniform %3
|
|
)";
|
|
|
|
spvtest::Binary linked_binary;
|
|
LinkerOptions linker_options;
|
|
linker_options.SetAllowPartialLinkage(true);
|
|
ASSERT_EQ(SPV_SUCCESS,
|
|
AssembleAndLink({body1, body2}, &linked_binary, linker_options))
|
|
<< GetErrorMessage();
|
|
|
|
const std::string expected_res = R"(OpCapability Linkage
|
|
OpCapability Addresses
|
|
OpCapability Kernel
|
|
OpMemoryModel Physical64 OpenCL
|
|
OpModuleProcessed "Linked by SPIR-V Tools Linker"
|
|
OpDecorate %1 LinkageAttributes "foo" Import
|
|
%2 = OpTypeFloat 32
|
|
%1 = OpVariable %2 Uniform
|
|
%3 = OpConstant %2 3.1415
|
|
%4 = OpVariable %2 Uniform %3
|
|
)";
|
|
std::string res_body;
|
|
SetDisassembleOptions(SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
|
|
ASSERT_EQ(SPV_SUCCESS, Disassemble(linked_binary, &res_body))
|
|
<< GetErrorMessage();
|
|
EXPECT_EQ(expected_res, res_body);
|
|
}
|
|
|
|
TEST_F(PartialLinkage, Disallowed) {
|
|
const std::string body1 = R"(
|
|
OpCapability Linkage
|
|
OpCapability Addresses
|
|
OpCapability Kernel
|
|
OpMemoryModel Physical64 OpenCL
|
|
OpDecorate %1 LinkageAttributes "foo" Import
|
|
OpDecorate %2 LinkageAttributes "bar" Import
|
|
%3 = OpTypeFloat 32
|
|
%1 = OpVariable %3 Uniform
|
|
%2 = OpVariable %3 Uniform
|
|
)";
|
|
const std::string body2 = R"(
|
|
OpCapability Linkage
|
|
OpCapability Addresses
|
|
OpCapability Kernel
|
|
OpMemoryModel Physical64 OpenCL
|
|
OpDecorate %1 LinkageAttributes "bar" Export
|
|
%2 = OpTypeFloat 32
|
|
%3 = OpConstant %2 3.1415
|
|
%1 = OpVariable %2 Uniform %3
|
|
)";
|
|
|
|
spvtest::Binary linked_binary;
|
|
EXPECT_EQ(SPV_ERROR_INVALID_BINARY,
|
|
AssembleAndLink({body1, body2}, &linked_binary));
|
|
EXPECT_THAT(GetErrorMessage(),
|
|
HasSubstr("Unresolved external reference to \"foo\"."));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace spvtools
|