mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-10-18 11:10:05 +00:00
Assembler test for Memory Semantics enum
Enables mask expression parsing for Memory Semantics arguments, e.g. on OpMemoryBarrier.
This commit is contained in:
parent
13804e5d63
commit
16df562ad3
@ -186,6 +186,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextStartsNewInst.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextStartsNewInst.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Annotation.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Annotation.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Barrier.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Constant.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Constant.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.ControlFlow.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.ControlFlow.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Debug.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Debug.cpp
|
||||||
|
@ -559,6 +559,7 @@ spv_result_t spvTextEncodeOperand(
|
|||||||
case SPV_OPERAND_TYPE_FP_FAST_MATH_MODE:
|
case SPV_OPERAND_TYPE_FP_FAST_MATH_MODE:
|
||||||
case SPV_OPERAND_TYPE_FUNCTION_CONTROL:
|
case SPV_OPERAND_TYPE_FUNCTION_CONTROL:
|
||||||
case SPV_OPERAND_TYPE_LOOP_CONTROL:
|
case SPV_OPERAND_TYPE_LOOP_CONTROL:
|
||||||
|
case SPV_OPERAND_TYPE_MEMORY_SEMANTICS:
|
||||||
case SPV_OPERAND_TYPE_OPTIONAL_IMAGE:
|
case SPV_OPERAND_TYPE_OPTIONAL_IMAGE:
|
||||||
case SPV_OPERAND_TYPE_OPTIONAL_MEMORY_ACCESS:
|
case SPV_OPERAND_TYPE_OPTIONAL_MEMORY_ACCESS:
|
||||||
case SPV_OPERAND_TYPE_SELECTION_CONTROL: {
|
case SPV_OPERAND_TYPE_SELECTION_CONTROL: {
|
||||||
|
98
test/TextToBinary.Barrier.cpp
Executable file
98
test/TextToBinary.Barrier.cpp
Executable file
@ -0,0 +1,98 @@
|
|||||||
|
// 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 "Barrier Instructions" section
|
||||||
|
// of the SPIR-V spec.
|
||||||
|
|
||||||
|
#include "UnitSPIRV.h"
|
||||||
|
|
||||||
|
#include "gmock/gmock.h"
|
||||||
|
#include "TestFixture.h"
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
using spvtest::MakeInstruction;
|
||||||
|
using spvtest::TextToBinaryTest;
|
||||||
|
using ::testing::Eq;
|
||||||
|
|
||||||
|
// Test OpMemoryBarrier
|
||||||
|
|
||||||
|
using MemorySemanticsTest = spvtest::TextToBinaryTestBase<
|
||||||
|
::testing::TestWithParam<EnumCase<spv::MemorySemanticsMask>>>;
|
||||||
|
|
||||||
|
TEST_P(MemorySemanticsTest, AnySingleMemorySemanticsMask) {
|
||||||
|
std::string input = "OpMemoryBarrier %1 " + GetParam().name();
|
||||||
|
EXPECT_THAT(
|
||||||
|
CompiledInstructions(input),
|
||||||
|
Eq(MakeInstruction(spv::OpMemoryBarrier, {1, GetParam().value()})));
|
||||||
|
}
|
||||||
|
|
||||||
|
#define CASE(NAME) \
|
||||||
|
{ \
|
||||||
|
spv::MemorySemantics##NAME##Mask, #NAME, {} \
|
||||||
|
}
|
||||||
|
INSTANTIATE_TEST_CASE_P(
|
||||||
|
TextToBinaryMemorySemanticsTest, MemorySemanticsTest,
|
||||||
|
::testing::ValuesIn(std::vector<EnumCase<spv::MemorySemanticsMask>>{
|
||||||
|
{spv::MemorySemanticsMaskNone, "None", {}},
|
||||||
|
CASE(Acquire),
|
||||||
|
CASE(Release),
|
||||||
|
CASE(SequentiallyConsistent),
|
||||||
|
CASE(UniformMemory),
|
||||||
|
CASE(SubgroupMemory),
|
||||||
|
CASE(WorkgroupLocalMemory),
|
||||||
|
CASE(WorkgroupGlobalMemory),
|
||||||
|
CASE(AtomicCounterMemory),
|
||||||
|
CASE(ImageMemory),
|
||||||
|
}));
|
||||||
|
#undef CASE
|
||||||
|
|
||||||
|
TEST_F(TextToBinaryTest, CombinedMemorySemanticsMask) {
|
||||||
|
// Sample a single combination. This ensures we've integrated
|
||||||
|
// the instruction parsing logic with spvTextParseMask.
|
||||||
|
const std::string input = "OpMemoryBarrier %1 Acquire|WorkgroupLocalMemory";
|
||||||
|
const uint32_t expected_mask = spv::MemorySemanticsAcquireMask |
|
||||||
|
spv::MemorySemanticsWorkgroupLocalMemoryMask;
|
||||||
|
EXPECT_THAT(CompiledInstructions(input),
|
||||||
|
Eq(MakeInstruction(spv::OpMemoryBarrier, {1, expected_mask})));
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO(dneto): OpControlBarrier
|
||||||
|
// TODO(dneto): OpAsyncGroupCopy
|
||||||
|
// TODO(dneto): OpWaitGroupEvents
|
||||||
|
// TODO(dneto): OpGroupAll
|
||||||
|
// TODO(dneto): OpGroupAny
|
||||||
|
// TODO(dneto): OpGroupBroadcast
|
||||||
|
// TODO(dneto): OpGroupIAdd
|
||||||
|
// TODO(dneto): OpGroupFAdd
|
||||||
|
// TODO(dneto): OpGroupFMin
|
||||||
|
// TODO(dneto): OpGroupUMin
|
||||||
|
// TODO(dneto): OpGroupSMin
|
||||||
|
// TODO(dneto): OpGroupFMax
|
||||||
|
// TODO(dneto): OpGroupUMax
|
||||||
|
// TODO(dneto): OpGroupSMax
|
||||||
|
|
||||||
|
} // anonymous namespace
|
Loading…
Reference in New Issue
Block a user