mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-11-23 12:10:06 +00:00
1a18739650
The operands following the extended instruction literal number are determined by the extended instruction itself. So drop the zero-or-more IdRef pattern at the end of OpExtInst. It's arguable whether this should actually be a grammar fix. I've chosen to patch this in SPIRV-Tools instead of in the grammar file. Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/233 Also fix two test cases for OpenCL extended instructions. These errors of supplying too many operands are now detected.
102 lines
3.9 KiB
C++
102 lines
3.9 KiB
C++
// Copyright (c) 2015-2016 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 "Extension Instruction" section
|
|
// of the SPIR-V spec.
|
|
|
|
#include "UnitSPIRV.h"
|
|
|
|
#include "TestFixture.h"
|
|
#include "gmock/gmock.h"
|
|
#include "spirv/1.0/GLSL.std.450.h"
|
|
#include "spirv/1.0/OpenCL.std.h"
|
|
|
|
namespace {
|
|
|
|
using spvtest::Concatenate;
|
|
using spvtest::MakeInstruction;
|
|
using spvtest::MakeVector;
|
|
using spvtest::TextToBinaryTest;
|
|
using ::testing::Eq;
|
|
|
|
TEST_F(TextToBinaryTest, InvalidExtInstImportName) {
|
|
EXPECT_THAT(CompileFailure("%1 = OpExtInstImport \"Haskell.std\""),
|
|
Eq("Invalid extended instruction import 'Haskell.std'"));
|
|
}
|
|
|
|
TEST_F(TextToBinaryTest, InvalidImportId) {
|
|
EXPECT_THAT(CompileFailure("%1 = OpTypeVoid\n"
|
|
"%2 = OpExtInst %1 %1"),
|
|
Eq("Invalid extended instruction import Id 2"));
|
|
}
|
|
|
|
TEST_F(TextToBinaryTest, InvalidImportInstruction) {
|
|
const std::string input = R"(%1 = OpTypeVoid
|
|
%2 = OpExtInstImport "OpenCL.std"
|
|
%3 = OpExtInst %1 %2 not_in_the_opencl)";
|
|
EXPECT_THAT(CompileFailure(input),
|
|
Eq("Invalid extended instruction name 'not_in_the_opencl'."));
|
|
}
|
|
|
|
TEST_F(TextToBinaryTest, MultiImport) {
|
|
const std::string input = R"(%2 = OpExtInstImport "OpenCL.std"
|
|
%2 = OpExtInstImport "OpenCL.std")";
|
|
EXPECT_THAT(CompileFailure(input),
|
|
Eq("Import Id is being defined a second time"));
|
|
}
|
|
|
|
TEST_F(TextToBinaryTest, TooManyArguments) {
|
|
const std::string input = R"(%opencl = OpExtInstImport "OpenCL.std"
|
|
%2 = OpExtInst %float %opencl cos %x %oops")";
|
|
EXPECT_THAT(CompileFailure(input), Eq("Expected '=', found end of stream."));
|
|
}
|
|
|
|
TEST_F(TextToBinaryTest, ExtInstFromTwoDifferentImports) {
|
|
const std::string input = R"(%1 = OpExtInstImport "OpenCL.std"
|
|
%2 = OpExtInstImport "GLSL.std.450"
|
|
%4 = OpExtInst %3 %1 native_sqrt %5
|
|
%7 = OpExtInst %6 %2 MatrixInverse %8
|
|
)";
|
|
|
|
// Make sure it assembles correctly.
|
|
EXPECT_THAT(
|
|
CompiledInstructions(input),
|
|
Eq(Concatenate({
|
|
MakeInstruction(SpvOpExtInstImport, {1}, MakeVector("OpenCL.std")),
|
|
MakeInstruction(SpvOpExtInstImport, {2}, MakeVector("GLSL.std.450")),
|
|
MakeInstruction(
|
|
SpvOpExtInst,
|
|
{3, 4, 1, uint32_t(OpenCLLIB::Entrypoints::Native_sqrt), 5}),
|
|
MakeInstruction(SpvOpExtInst,
|
|
{6, 7, 2, uint32_t(GLSLstd450MatrixInverse), 8}),
|
|
})));
|
|
|
|
// Make sure it disassembles correctly.
|
|
EXPECT_THAT(EncodeAndDecodeSuccessfully(input), Eq(input));
|
|
}
|
|
|
|
} // anonymous namespace
|