Assembler test for single-valued Memory Access flag.

CMakeLists.txt

@@ -189,6 +189,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.ControlFlow.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Debug.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Function.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Memory.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.Miscellaneous.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextToBinary.ModeSetting.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test/TextWordGet.cpp

readme.md

@@ -28,6 +28,7 @@ The validator is incomplete.  See the Future Work section for more information.
 ## CHANGES (for tools hackers)
 
 * Fixed spelling of Function Control "Inline" enumerated value.
+* Fixed: `Aligned` memory access flag takes a literal number operand.
 
 2015-09-11
 * Assembly format must be consistent across the entire source module.

source/operand.cpp

@@ -1102,7 +1102,7 @@ static const spv_operand_desc_t memoryAccessEntries[] = {
      MemoryAccessAlignedMask,
      SPV_OPCODE_FLAGS_NONE,
      0,
-     {SPV_OPERAND_TYPE_NONE},
+     {SPV_OPERAND_TYPE_LITERAL_NUMBER, SPV_OPERAND_TYPE_NONE},
     },
 };
 

test/TextToBinary.Memory.cpp

@@ -0,0 +1,90 @@
+// 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 "Memory Instructions" section of
+// the SPIR-V spec.
+
+#include "UnitSPIRV.h"
+
+#include <sstream>
+
+#include "gmock/gmock.h"
+#include "TestFixture.h"
+
+namespace {
+
+using spvtest::MakeInstruction;
+using ::testing::Eq;
+
+// An example case for an enumerated value.
+template <typename E>
+struct EnumCaseWithOperands {
+  E value;
+  std::string name;
+  std::vector<uint32_t> operands;
+};
+
+// Test assembly of Memory Access masks
+
+using MemoryAccessTest = test_fixture::TextToBinaryTestBase<
+    ::testing::TestWithParam<EnumCaseWithOperands<spv::MemoryAccessMask>>>;
+
+TEST_P(MemoryAccessTest, AnySingleMemoryAccessMask) {
+  std::stringstream input;
+  input << "OpStore %ptr %value " << GetParam().name;
+  for (auto operand : GetParam().operands) input << " " << operand;
+  std::vector<uint32_t> expected_operands{1, 2, GetParam().value};
+  expected_operands.insert(expected_operands.end(), GetParam().operands.begin(),
+                           GetParam().operands.end());
+  EXPECT_THAT(CompiledInstructions(input.str()),
+              Eq(MakeInstruction(spv::OpStore, expected_operands)));
+}
+
+// clang-format off
+INSTANTIATE_TEST_CASE_P(TextToBinaryMemoryAccessTest, MemoryAccessTest,
+                        ::testing::ValuesIn(std::vector<EnumCaseWithOperands<spv::MemoryAccessMask>>{
+                          {spv::MemoryAccessMaskNone, "None", {}},
+                          {spv::MemoryAccessVolatileMask, "Volatile", {}},
+                          {spv::MemoryAccessAlignedMask, "Aligned", {16}},
+                        }));
+#undef CASE
+// clang-format on
+
+// TODO(dneto): Combination of memory access masks.
+
+// TODO(dneto): OpVariable
+// TODO(dneto): OpImageTexelPointer
+// TODO(dneto): OpLoad
+// TODO(dneto): OpStore
+// TODO(dneto): OpCopyMemory
+// TODO(dneto): OpCopyMemorySized
+// TODO(dneto): OpAccessChain
+// TODO(dneto): OpInBoundsAccessChain
+// TODO(dneto): OpPtrAccessChain
+// TODO(dneto): OpArrayLength
+// TODO(dneto): OpGenercPtrMemSemantics
+
+}  // anonymous namespace