Add GLSL std450 instructions 35-48.

This commit is contained in:
Lei Zhang 2015-08-26 10:28:42 -04:00 committed by David Neto
parent 0e149d7cc4
commit e5ae7f677f
2 changed files with 189 additions and 47 deletions

View File

@ -39,6 +39,20 @@ static const spv_ext_inst_desc_t glslStd450Entries[] = {
{ "Inversesqrt", GLSLstd450::GLSLstd450InverseSqrt, {SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(Determinant), {SPV_OPERAND_TYPE_ID}, },
{ "Inverse", GLSLstd450::GLSLstd450MatrixInverse, {SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(Modf), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(ModfStruct), {SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(FMin), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(UMin), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(SMin), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(FMax), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(UMax), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(SMax), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(FClamp), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(UClamp), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(SClamp), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(Mix), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(Step), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
{ GL450Inst(SmoothStep), {SPV_OPERAND_TYPE_ID, SPV_OPERAND_TYPE_ID}, },
// TODO: Add remaining GLSL.std.450 instructions
};

View File

@ -29,28 +29,56 @@
#include <algorithm>
#include <vector>
struct InstValue {
const char* inst;
uint32_t value;
/// Context for an extended instruction.
///
/// Information about a GLSL extended instruction (including its opname, return
/// type, etc.) and related instructions used to generate the return type and
/// constant as the operands. Used in generating extended instruction tests.
struct ExtInstContext {
const char* typeGenInst;
const char* constGenInst;
const char* extInstRetType;
const char* extInstOpName;
const char* extInstOperandVars;
uint32_t extInstOpcode;
};
class GLExtSingleFloatTextToBinTest
: public TextToBinaryTestBase<::testing::TestWithParam<InstValue>> {};
/// Context for an extended instruction with corresponding binary code for some
/// fields.
///
/// Information about a GLSL extended instruction (including its opname, return
/// type, etc.) and related instructions used to generate the return type and
/// constant as the operands. Also includes the corresponding binary code for
/// some fields. Used in generating extended instruction tests.
struct ExtInstBinContext {
const char* typeGenInst;
const char* constGenInst;
const char* extInstRetType;
const char* extInstOpName;
const char* extInstOperandVars;
uint32_t extInstOpcode;
uint32_t extInstLength;
std::vector<uint32_t> extInstOperandIds;
};
TEST_P(GLExtSingleFloatTextToBinTest, GLSLExtSingleFloatParamTest) {
using ExtInstGLSLstd450TextToBinTest =
TextToBinaryTestBase<::testing::TestWithParam<ExtInstBinContext>>;
TEST_P(ExtInstGLSLstd450TextToBinTest, ParamterizedExtInst) {
const std::string spirv = R"(
OpCapability Shader
%glsl450 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical Simple
OpEntryPoint Vertex %main "main"
%void = OpTypeVoid
%float = OpTypeFloat 32
%const1.5 = OpConstant %float 1.5
)" + std::string(GetParam().typeGenInst) +
"\n" + std::string(GetParam().constGenInst) + R"(
%fnMain = OpTypeFunction %void
%main = OpFunction %void None %fnMain
%lbMain = OpLabel
%result = OpExtInst %float %glsl450 )" +
std::string(GetParam().inst) + R"( %const1.5
%result = OpExtInst )" + GetParam().extInstRetType +
" %glsl450 " + GetParam().extInstOpName + " " +
GetParam().extInstOperandVars + R"(
OpReturn
OpFunctionEnd
)";
@ -62,14 +90,18 @@ TEST_P(GLExtSingleFloatTextToBinTest, GLSLExtSingleFloatParamTest) {
&this->binary, &this->diagnostic))
<< "Source was: " << std::endl
<< spirv << std::endl
<< "Test case for : " << GetParam().inst << std::endl;
<< "Test case for : " << GetParam().extInstOpName << std::endl;
std::vector<uint32_t> expected_contains(
{12 /*OpExtInst*/ | 6 << 16, 4 /*%float*/, 8 /*%result*/, 1 /*%glsl450*/,
GetParam().value, 5 /*const1.5*/});
{12 /*OpExtInst*/ | GetParam().extInstLength << 16, 4 /*%flt*/,
8 /*%result*/, 1 /*%glsl450*/, GetParam().extInstOpcode});
for (uint32_t operand : GetParam().extInstOperandIds) {
expected_contains.push_back(operand);
}
EXPECT_TRUE(std::search(this->binary->code,
this->binary->code + this->binary->wordCount,
expected_contains.begin(), expected_contains.end()) !=
this->binary->code + this->binary->wordCount);
this->binary->code + this->binary->wordCount)
<< "Cannot find\n" << expected_contains << "in\n" << *this->binary;
if (this->binary) {
spvBinaryDestroy(this->binary);
}
@ -78,23 +110,69 @@ TEST_P(GLExtSingleFloatTextToBinTest, GLSLExtSingleFloatParamTest) {
}
}
static const char* kF32TypeSym = R"(%flt = OpTypeFloat 32)";
static const char* kF32ConstSym = R"(%c1.5 = OpConstant %flt 1.5)";
static const char* kU32TypeSym = R"(%int = OpTypeInt 32 0)";
static const char* kS32TypeSym = R"(%int = OpTypeInt 32 1)";
static const char* kI32ConstSym = R"(%c1 = OpConstant %int 1)";
INSTANTIATE_TEST_CASE_P(
SingleElementFloatingParams, GLExtSingleFloatTextToBinTest,
::testing::ValuesIn(std::vector<InstValue>({
{"Round", 1}, {"RoundEven", 2}, {"Trunc", 3}, {"FAbs", 4}, {"SAbs", 5},
{"FSign", 6}, {"SSign", 7}, {"Floor", 8}, {"Ceil", 9}, {"Fract", 10},
{"Radians", 11}, {"Degrees", 12}, {"Sin", 13}, {"Cos", 14}, {"Tan", 15},
{"Asin", 16}, {"Acos", 17}, {"Atan", 18}, {"Sinh", 19}, {"Cosh", 20},
{"Tanh", 21}, {"Asinh", 22}, {"Acosh", 23}, {"Atanh", 24},
// TODO(deki): tests for two-argument functions.
/*{"Atan2", 25}, {"Pow", 26},*/ {"Exp", 27}, {"Log", 28},
{"Exp2", 29}, {"Log2", 30}, {"Sqrt", 31}, {"Inversesqrt", 32},
{"Determinant", 33}, {"Inverse", 34}})));
ExtInstParameters, ExtInstGLSLstd450TextToBinTest,
::testing::ValuesIn(std::vector<ExtInstBinContext>({
// clang-format off
{kF32TypeSym, kF32ConstSym, "%flt", "Round", "%c1.5", 1, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "RoundEven", "%c1.5", 2, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Trunc", "%c1.5", 3, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "FAbs", "%c1.5", 4, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "SAbs", "%c1.5", 5, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "FSign", "%c1.5", 6, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "SSign", "%c1.5", 7, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Floor", "%c1.5", 8, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Ceil", "%c1.5", 9, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Fract", "%c1.5", 10, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Radians", "%c1.5", 11, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Degrees", "%c1.5", 12, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Sin", "%c1.5", 13, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Cos", "%c1.5", 14, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Tan", "%c1.5", 15, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Asin", "%c1.5", 16, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Acos", "%c1.5", 17, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Atan", "%c1.5", 18, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Sinh", "%c1.5", 19, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Cosh", "%c1.5", 20, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Tanh", "%c1.5", 21, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Asinh", "%c1.5", 22, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Acosh", "%c1.5", 23, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Atanh", "%c1.5", 24, 6, {5}},
/* {"Atan2", 25}, {"Pow", 26} */
{kF32TypeSym, kF32ConstSym, "%flt", "Exp", "%c1.5", 27, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Log", "%c1.5", 28, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Exp2", "%c1.5", 29, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Log2", "%c1.5", 30, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Sqrt", "%c1.5", 31, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Inversesqrt", "%c1.5", 32, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Determinant", "%c1.5", 33, 6, {5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Inverse", "%c1.5", 34, 6, {5}},
/* Modf */
/* ModfStruct */
{kF32TypeSym, kF32ConstSym, "%flt", "FMin", "%c1.5 %c1.5", 37, 7, {5, 5}},
{kU32TypeSym, kI32ConstSym, "%int", "UMin", "%c1 %c1", 38, 7, {5, 5}},
{kS32TypeSym, kI32ConstSym, "%int", "SMin", "%c1 %c1", 39, 7, {5, 5}},
{kF32TypeSym, kF32ConstSym, "%flt", "FMax", "%c1.5 %c1.5", 40, 7, {5, 5}},
{kU32TypeSym, kI32ConstSym, "%int", "UMax", "%c1 %c1", 41, 7, {5, 5}},
{kS32TypeSym, kI32ConstSym, "%int", "SMax", "%c1 %c1", 42, 7, {5, 5}},
{kF32TypeSym, kF32ConstSym, "%flt", "FClamp", "%c1.5 %c1.5 %c1.5", 43, 8, {5, 5, 5}},
{kU32TypeSym, kI32ConstSym, "%int", "UClamp", "%c1 %c1 %c1", 44, 8, {5, 5, 5}},
{kS32TypeSym, kI32ConstSym, "%int", "SClamp", "%c1 %c1 %c1", 45, 8, {5, 5, 5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Mix", "%c1.5 %c1.5 %c1.5", 46, 8, {5, 5, 5}},
{kF32TypeSym, kF32ConstSym, "%flt", "Step", "%c1.5 %c1.5", 47, 7, {5, 5}},
/* SmoothStep */
// clang-format on
})));
class GLExtSingleFloatRoundTripTest
: public ::testing::TestWithParam<InstValue> {};
using ExtInstGLSLstd450RoundTripTest = ::testing::TestWithParam<ExtInstContext>;
TEST_P(GLExtSingleFloatRoundTripTest, Default) {
TEST_P(ExtInstGLSLstd450RoundTripTest, ParamterizedExtInst) {
spv_opcode_table opcodeTable;
ASSERT_EQ(SPV_SUCCESS, spvOpcodeTableGet(&opcodeTable));
spv_operand_table operandTable;
@ -107,13 +185,14 @@ OpCapability Shader
OpMemoryModel Logical Simple
OpEntryPoint Vertex %2 "main"
%3 = OpTypeVoid
%4 = OpTypeFloat 32
%5 = OpConstant %4 1
)" + std::string(GetParam().typeGenInst) +
"\n" + std::string(GetParam().constGenInst) + R"(
%6 = OpTypeFunction %3
%2 = OpFunction %3 None %6
%8 = OpLabel
%9 = OpExtInst %4 %1 )" + std::string(GetParam().inst) +
R"( %5
%9 = OpExtInst )" + GetParam().extInstRetType +
" %1 " + GetParam().extInstOpName + " " +
GetParam().extInstOperandVars + R"(
OpReturn
OpFunctionEnd
)";
@ -131,10 +210,10 @@ OpFunctionEnd
if (error) {
spvDiagnosticPrint(diagnostic);
spvDiagnosticDestroy(diagnostic);
ASSERT_EQ(SPV_SUCCESS, error) << "Source was: " << std::endl
<< spirv << std::endl
<< "Test case for : " << GetParam().inst
<< std::endl;
ASSERT_EQ(SPV_SUCCESS, error)
<< "Source was: " << std::endl
<< spirv << std::endl
<< "Test case for : " << GetParam().extInstOpName << std::endl;
}
spv_text output_text;
@ -151,15 +230,64 @@ OpFunctionEnd
spvTextDestroy(output_text);
}
static const char* kF32TypeNum = R"(%4 = OpTypeFloat 32)";
static const char* kF32ConstNum = R"(%5 = OpConstant %4 1)";
static const char* kU32TypeNum = R"(%4 = OpTypeInt 32 0)";
static const char* kS32TypeNum = R"(%4 = OpTypeInt 32 1)";
static const char* kI32ConstNum = R"(%5 = OpConstant %4 1)";
INSTANTIATE_TEST_CASE_P(
SingleElementFloatingParams, GLExtSingleFloatRoundTripTest,
::testing::ValuesIn(std::vector<InstValue>({
{"Round", 1}, {"RoundEven", 2}, {"Trunc", 3}, {"FAbs", 4}, {"SAbs", 5},
{"FSign", 6}, {"SSign", 7}, {"Floor", 8}, {"Ceil", 9}, {"Fract", 10},
{"Radians", 11}, {"Degrees", 12}, {"Sin", 13}, {"Cos", 14}, {"Tan", 15},
{"Asin", 16}, {"Acos", 17}, {"Atan", 18}, {"Sinh", 19}, {"Cosh", 20},
{"Tanh", 21}, {"Asinh", 22}, {"Acosh", 23}, {"Atanh", 24},
// TODO(deki): tests for two-argument functions.
/*{"Atan2", 25}, {"Pow", 26},*/ {"Exp", 27}, {"Log", 28},
{"Exp2", 29}, {"Log2", 30}, {"Sqrt", 31}, {"Inversesqrt", 32},
{"Determinant", 33}, {"Inverse", 34}})));
ExtInstParameters, ExtInstGLSLstd450RoundTripTest,
::testing::ValuesIn(std::vector<ExtInstContext>({
{kF32TypeNum, kF32ConstNum, "%4", "Round", "%5", 1},
{kF32TypeNum, kF32ConstNum, "%4", "RoundEven", "%5", 2},
{kF32TypeNum, kF32ConstNum, "%4", "Trunc", "%5", 3},
{kF32TypeNum, kF32ConstNum, "%4", "FAbs", "%5", 4},
{kF32TypeNum, kF32ConstNum, "%4", "SAbs", "%5", 5},
{kF32TypeNum, kF32ConstNum, "%4", "FSign", "%5", 6},
{kF32TypeNum, kF32ConstNum, "%4", "SSign", "%5", 7},
{kF32TypeNum, kF32ConstNum, "%4", "Floor", "%5", 8},
{kF32TypeNum, kF32ConstNum, "%4", "Ceil", "%5", 9},
{kF32TypeNum, kF32ConstNum, "%4", "Fract", "%5", 10},
{kF32TypeNum, kF32ConstNum, "%4", "Radians", "%5", 11},
{kF32TypeNum, kF32ConstNum, "%4", "Degrees", "%5", 12},
{kF32TypeNum, kF32ConstNum, "%4", "Sin", "%5", 13},
{kF32TypeNum, kF32ConstNum, "%4", "Cos", "%5", 14},
{kF32TypeNum, kF32ConstNum, "%4", "Tan", "%5", 15},
{kF32TypeNum, kF32ConstNum, "%4", "Asin", "%5", 16},
{kF32TypeNum, kF32ConstNum, "%4", "Acos", "%5", 17},
{kF32TypeNum, kF32ConstNum, "%4", "Atan", "%5", 18},
{kF32TypeNum, kF32ConstNum, "%4", "Sinh", "%5", 19},
{kF32TypeNum, kF32ConstNum, "%4", "Cosh", "%5", 20},
{kF32TypeNum, kF32ConstNum, "%4", "Tanh", "%5", 21},
{kF32TypeNum, kF32ConstNum, "%4", "Asinh", "%5", 22},
{kF32TypeNum, kF32ConstNum, "%4", "Acosh", "%5", 23},
{kF32TypeNum, kF32ConstNum, "%4", "Atanh", "%5", 24},
{kU32TypeNum, kI32ConstNum, "%4", "UMin", "%5 %5", 38},
{kS32TypeNum, kI32ConstNum, "%4", "SMin", "%5 %5", 39},
{kU32TypeNum, kI32ConstNum, "%4", "UMax", "%5 %5", 41},
{kS32TypeNum, kI32ConstNum, "%4", "SMax", "%5 %5", 42},
/* {"Atan2", 25}, {"Pow", 26} */
{kF32TypeNum, kF32ConstNum, "%4", "Exp", "%5", 27},
{kF32TypeNum, kF32ConstNum, "%4", "Log", "%5", 28},
{kF32TypeNum, kF32ConstNum, "%4", "Exp2", "%5", 29},
{kF32TypeNum, kF32ConstNum, "%4", "Log2", "%5", 30},
{kF32TypeNum, kF32ConstNum, "%4", "Sqrt", "%5", 31},
{kF32TypeNum, kF32ConstNum, "%4", "Inversesqrt", "%5", 32},
{kF32TypeNum, kF32ConstNum, "%4", "Determinant", "%5", 33},
{kF32TypeNum, kF32ConstNum, "%4", "Inverse", "%5", 34},
/* Modf */
/* ModfStruct */
{kF32TypeNum, kF32ConstNum, "%4", "FMin", "%5 %5", 37},
{kU32TypeNum, kI32ConstNum, "%4", "UMin", "%5 %5", 38},
{kS32TypeNum, kI32ConstNum, "%4", "SMin", "%5 %5", 39},
{kF32TypeNum, kF32ConstNum, "%4", "FMax", "%5 %5", 40},
{kU32TypeNum, kI32ConstNum, "%4", "UMax", "%5 %5", 41},
{kS32TypeNum, kI32ConstNum, "%4", "SMax", "%5 %5", 42},
{kF32TypeNum, kF32ConstNum, "%4", "FClamp", "%5 %5 %5", 43},
{kU32TypeNum, kI32ConstNum, "%4", "UClamp", "%5 %5 %5", 44},
{kS32TypeNum, kI32ConstNum, "%4", "SClamp", "%5 %5 %5", 45},
{kF32TypeNum, kF32ConstNum, "%4", "Mix", "%5 %5 %5", 46},
{kF32TypeNum, kF32ConstNum, "%4", "Step", "%5 %5", 47},
/* SmoothStep */
})));