mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-10-19 03:20:14 +00:00
e0890da603
Many instructions added and a few changed structure. Workarounds: - Some operands can be enabled by either one of two capabilities. The spv_operand_desc_t does not handle that now. For now just select the first one. Fixes to tests: - OpLoopMerge now takes a mandatory continue target. - OpTypePipe drops the type argument. Pipes are opaque. - OpLine no longer takes a target ID argument. The ID validator was fixed the OpLine and OpTypePipe changes. Those were the only ID validator tests affected. The patch to the spec doc generator was updated so it handles the two-capability case, even if in an hacky way.
115 lines
4.3 KiB
C++
115 lines
4.3 KiB
C++
// Copyright (c) 2015 The Khronos Group Inc.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
// copy of this software and/or associated documentation files (the
|
|
// "Materials"), to deal in the Materials without restriction, including
|
|
// without limitation the rights to use, copy, modify, merge, publish,
|
|
// distribute, sublicense, and/or sell copies of the Materials, and to
|
|
// permit persons to whom the Materials are furnished to do so, subject to
|
|
// the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included
|
|
// in all copies or substantial portions of the Materials.
|
|
//
|
|
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
|
|
// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
|
|
// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
|
|
// https://www.khronos.org/registry/
|
|
//
|
|
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
|
|
|
// Assembler tests for instructions in the "Control Flow" section of the
|
|
// SPIR-V spec.
|
|
|
|
#include "UnitSPIRV.h"
|
|
|
|
#include "gmock/gmock.h"
|
|
#include "TestFixture.h"
|
|
|
|
namespace {
|
|
|
|
using spvtest::MakeInstruction;
|
|
using ::testing::Eq;
|
|
|
|
// Test OpSelectionMerge
|
|
|
|
using OpSelectionMergeTest = spvtest::TextToBinaryTestBase<
|
|
::testing::TestWithParam<EnumCase<spv::SelectionControlMask>>>;
|
|
|
|
TEST_P(OpSelectionMergeTest, AnySingleSelectionControlMask) {
|
|
std::string input = "OpSelectionMerge %1 " + GetParam().name();
|
|
EXPECT_THAT(
|
|
CompiledInstructions(input),
|
|
Eq(MakeInstruction(spv::OpSelectionMerge, {1, GetParam().value()})));
|
|
}
|
|
|
|
// clang-format off
|
|
#define CASE(VALUE,NAME) { spv::SelectionControl##VALUE, NAME}
|
|
INSTANTIATE_TEST_CASE_P(TextToBinarySelectionMerge, OpSelectionMergeTest,
|
|
::testing::ValuesIn(std::vector<EnumCase<spv::SelectionControlMask>>{
|
|
CASE(MaskNone, "None"),
|
|
CASE(FlattenMask, "Flatten"),
|
|
CASE(DontFlattenMask, "DontFlatten"),
|
|
}));
|
|
#undef CASE
|
|
// clang-format on
|
|
|
|
TEST_F(OpSelectionMergeTest, CombinedSelectionControlMask) {
|
|
const std::string input = "OpSelectionMerge %1 Flatten|DontFlatten";
|
|
const uint32_t expected_mask =
|
|
spv::SelectionControlFlattenMask | spv::SelectionControlDontFlattenMask;
|
|
EXPECT_THAT(CompiledInstructions(input),
|
|
Eq(MakeInstruction(spv::OpSelectionMerge, {1, expected_mask})));
|
|
}
|
|
|
|
// Test OpLoopMerge
|
|
|
|
using OpLoopMergeTest = spvtest::TextToBinaryTestBase<
|
|
::testing::TestWithParam<EnumCase<spv::LoopControlMask>>>;
|
|
|
|
TEST_P(OpLoopMergeTest, AnySingleLoopControlMask) {
|
|
std::string input = "OpLoopMerge %merge %continue " + GetParam().name();
|
|
EXPECT_THAT(
|
|
CompiledInstructions(input),
|
|
Eq(MakeInstruction(spv::OpLoopMerge, {1, 2, GetParam().value()})));
|
|
}
|
|
|
|
// clang-format off
|
|
#define CASE(VALUE,NAME) { spv::LoopControl##VALUE, NAME}
|
|
INSTANTIATE_TEST_CASE_P(TextToBinaryLoopMerge, OpLoopMergeTest,
|
|
::testing::ValuesIn(std::vector<EnumCase<spv::LoopControlMask>>{
|
|
CASE(MaskNone, "None"),
|
|
CASE(UnrollMask, "Unroll"),
|
|
CASE(DontUnrollMask, "DontUnroll"),
|
|
}));
|
|
#undef CASE
|
|
// clang-format on
|
|
|
|
TEST_F(OpLoopMergeTest, CombinedLoopControlMask) {
|
|
const std::string input = "OpLoopMerge %merge %continue Unroll|DontUnroll";
|
|
const uint32_t expected_mask =
|
|
spv::LoopControlUnrollMask | spv::LoopControlDontUnrollMask;
|
|
EXPECT_THAT(CompiledInstructions(input),
|
|
Eq(MakeInstruction(spv::OpLoopMerge, {1, 2, expected_mask})));
|
|
}
|
|
|
|
// TODO(dneto): OpPhi
|
|
// TODO(dneto): OpLoopMerge
|
|
// TODO(dneto): OpLabel
|
|
// TODO(dneto): OpBranch
|
|
// TODO(dneto): OpSwitch
|
|
// TODO(dneto): OpKill
|
|
// TODO(dneto): OpReturn
|
|
// TODO(dneto): OpReturnValue
|
|
// TODO(dneto): OpUnreachable
|
|
// TODO(dneto): OpLifetimeStart
|
|
// TODO(dneto): OpLifetimeStop
|
|
|
|
} // anonymous namespace
|