encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spirv-reader] Add signed integer inequalities 

Bug: tint:3
Change-Id: Ic73491c2a00e5b9fd1aa70c385341ae79666cd1c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/20245
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
David Neto 2020-04-23 20:15:33 +00:00
parent 1c6164363e
commit ce84ac5023
2 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/reader/spirv/function.cc
View File

@ -110,12 +110,16 @@ ast::BinaryOp ConvertBinaryOp(SpvOp opcode) {
case SpvOpLogicalOr: case SpvOpLogicalOr:
return ast::BinaryOp::kLogicalOr; return ast::BinaryOp::kLogicalOr;
case SpvOpUGreaterThan: case SpvOpUGreaterThan:
case SpvOpSGreaterThan:
return ast::BinaryOp::kGreaterThan; return ast::BinaryOp::kGreaterThan;
case SpvOpUGreaterThanEqual: case SpvOpUGreaterThanEqual:
case SpvOpSGreaterThanEqual:
return ast::BinaryOp::kGreaterThanEqual; return ast::BinaryOp::kGreaterThanEqual;
case SpvOpULessThan: case SpvOpULessThan:
case SpvOpSLessThan:
return ast::BinaryOp::kLessThan; return ast::BinaryOp::kLessThan;
case SpvOpULessThanEqual: case SpvOpULessThanEqual:
case SpvOpSLessThanEqual:
return ast::BinaryOp::kLessThanEqual; return ast::BinaryOp::kLessThanEqual;
default: default:
break; break;

148
src/reader/spirv/function_logical_test.cc
View File

@ -91,6 +91,25 @@ std::string AstFor(std::string assembly) {
ScalarConstructor{20} ScalarConstructor{20}
})"; })";
} }
if (assembly == "cast_uint_10") {
return R"(As<__i32>{
ScalarConstructor{10}
})";
}
if (assembly == "cast_uint_20") {
return R"(As<__i32>{
ScalarConstructor{20}
})";
}
if (assembly == "cast_v2uint_10_20") {
return R"(As<__vec_2__i32>{
TypeConstructor{
__vec_2__u32
ScalarConstructor{10}
ScalarConstructor{20}
}
})";
}
if (assembly == "v2uint_20_10") { if (assembly == "v2uint_20_10") {
return R"(TypeConstructor{ return R"(TypeConstructor{
__vec_2__u32 __vec_2__u32
@ -98,6 +117,15 @@ std::string AstFor(std::string assembly) {
ScalarConstructor{10} ScalarConstructor{10}
})"; })";
} }
if (assembly == "cast_v2uint_20_10") {
return R"(As<__vec_2__i32>{
TypeConstructor{
__vec_2__u32
ScalarConstructor{20}
ScalarConstructor{10}
}
})";
}
if (assembly == "cast_int_30") { if (assembly == "cast_int_30") {
return R"(As<__u32>{ return R"(As<__u32>{
ScalarConstructor{30} ScalarConstructor{30}
@ -492,16 +520,128 @@ INSTANTIATE_TEST_SUITE_P(
"__vec_2__bool", AstFor("v2uint_10_20"), "less_than_equal", "__vec_2__bool", AstFor("v2uint_10_20"), "less_than_equal",
AstFor("cast_v2int_40_30")})); AstFor("cast_v2int_40_30")}));
INSTANTIATE_TEST_SUITE_P(
SpvParserTest_SGreaterThan,
SpvBinaryLogicalTest,
::testing::Values(
// Both signed
BinaryData{"bool", "int_30", "OpSGreaterThan", "int_40", "__bool",
"ScalarConstructor{30}", "greater_than",
"ScalarConstructor{40}"},
// First arg unsigned
BinaryData{"bool", "uint_10", "OpSGreaterThan", "int_40", "__bool",
AstFor("cast_uint_10"), "greater_than",
"ScalarConstructor{40}"},
// Second arg unsigned
BinaryData{"bool", "int_30", "OpSGreaterThan", "uint_20", "__bool",
"ScalarConstructor{30}", "greater_than",
AstFor("cast_uint_20")},
// Vector, both signed
BinaryData{"v2bool", "v2int_30_40", "OpSGreaterThan", "v2int_40_30",
"__vec_2__bool", AstFor("v2int_30_40"), "greater_than",
AstFor("v2int_40_30")},
// First arg unsigned
BinaryData{"v2bool", "v2uint_10_20", "OpSGreaterThan", "v2int_40_30",
"__vec_2__bool", AstFor("cast_v2uint_10_20"), "greater_than",
AstFor("v2int_40_30")},
// Second arg unsigned
BinaryData{"v2bool", "v2int_30_40", "OpSGreaterThan", "v2uint_20_10",
"__vec_2__bool", AstFor("v2int_30_40"), "greater_than",
AstFor("cast_v2uint_20_10")}));
INSTANTIATE_TEST_SUITE_P(
SpvParserTest_SGreaterThanEqual,
SpvBinaryLogicalTest,
::testing::Values(
// Both signed
BinaryData{"bool", "int_30", "OpSGreaterThanEqual", "int_40", "__bool",
"ScalarConstructor{30}", "greater_than_equal",
"ScalarConstructor{40}"},
// First arg unsigned
BinaryData{"bool", "uint_10", "OpSGreaterThanEqual", "int_40", "__bool",
AstFor("cast_uint_10"), "greater_than_equal",
"ScalarConstructor{40}"},
// Second arg unsigned
BinaryData{"bool", "int_30", "OpSGreaterThanEqual", "uint_20", "__bool",
"ScalarConstructor{30}", "greater_than_equal",
AstFor("cast_uint_20")},
// Vector, both signed
BinaryData{"v2bool", "v2int_30_40", "OpSGreaterThanEqual",
"v2int_40_30", "__vec_2__bool", AstFor("v2int_30_40"),
"greater_than_equal", AstFor("v2int_40_30")},
// First arg unsigned
BinaryData{"v2bool", "v2uint_10_20", "OpSGreaterThanEqual",
"v2int_40_30", "__vec_2__bool", AstFor("cast_v2uint_10_20"),
"greater_than_equal", AstFor("v2int_40_30")},
// Second arg unsigned
BinaryData{"v2bool", "v2int_30_40", "OpSGreaterThanEqual",
"v2uint_20_10", "__vec_2__bool", AstFor("v2int_30_40"),
"greater_than_equal", AstFor("cast_v2uint_20_10")}));
INSTANTIATE_TEST_SUITE_P(
SpvParserTest_SLessThan,
SpvBinaryLogicalTest,
::testing::Values(
// Both signed
BinaryData{"bool", "int_30", "OpSLessThan", "int_40", "__bool",
"ScalarConstructor{30}", "less_than",
"ScalarConstructor{40}"},
// First arg unsigned
BinaryData{"bool", "uint_10", "OpSLessThan", "int_40", "__bool",
AstFor("cast_uint_10"), "less_than",
"ScalarConstructor{40}"},
// Second arg unsigned
BinaryData{"bool", "int_30", "OpSLessThan", "uint_20", "__bool",
"ScalarConstructor{30}", "less_than",
AstFor("cast_uint_20")},
// Vector, both signed
BinaryData{"v2bool", "v2int_30_40", "OpSLessThan", "v2int_40_30",
"__vec_2__bool", AstFor("v2int_30_40"), "less_than",
AstFor("v2int_40_30")},
// First arg unsigned
BinaryData{"v2bool", "v2uint_10_20", "OpSLessThan", "v2int_40_30",
"__vec_2__bool", AstFor("cast_v2uint_10_20"), "less_than",
AstFor("v2int_40_30")},
// Second arg unsigned
BinaryData{"v2bool", "v2int_30_40", "OpSLessThan", "v2uint_20_10",
"__vec_2__bool", AstFor("v2int_30_40"), "less_than",
AstFor("cast_v2uint_20_10")}));
INSTANTIATE_TEST_SUITE_P(
SpvParserTest_SLessThanEqual,
SpvBinaryLogicalTest,
::testing::Values(
// Both signed
BinaryData{"bool", "int_30", "OpSLessThanEqual", "int_40", "__bool",
"ScalarConstructor{30}", "less_than_equal",
"ScalarConstructor{40}"},
// First arg unsigned
BinaryData{"bool", "uint_10", "OpSLessThanEqual", "int_40", "__bool",
AstFor("cast_uint_10"), "less_than_equal",
"ScalarConstructor{40}"},
// Second arg unsigned
BinaryData{"bool", "int_30", "OpSLessThanEqual", "uint_20", "__bool",
"ScalarConstructor{30}", "less_than_equal",
AstFor("cast_uint_20")},
// Vector, both signed
BinaryData{"v2bool", "v2int_30_40", "OpSLessThanEqual", "v2int_40_30",
"__vec_2__bool", AstFor("v2int_30_40"), "less_than_equal",
AstFor("v2int_40_30")},
// First arg unsigned
BinaryData{"v2bool", "v2uint_10_20", "OpSLessThanEqual", "v2int_40_30",
"__vec_2__bool", AstFor("cast_v2uint_10_20"),
"less_than_equal", AstFor("v2int_40_30")},
// Second arg unsigned
BinaryData{"v2bool", "v2int_30_40", "OpSLessThanEqual", "v2uint_20_10",
"__vec_2__bool", AstFor("v2int_30_40"), "less_than_equal",
AstFor("cast_v2uint_20_10")}));
// TODO(dneto): OpAny - likely builtin function TBD // TODO(dneto): OpAny - likely builtin function TBD
// TODO(dneto): OpAll - likely builtin function TBD // TODO(dneto): OpAll - likely builtin function TBD
// TODO(dneto): OpIsNan - likely builtin function TBD // TODO(dneto): OpIsNan - likely builtin function TBD
// TODO(dneto): OpIsInf - likely builtin function TBD // TODO(dneto): OpIsInf - likely builtin function TBD
// TODO(dneto): Kernel-guarded instructions. // TODO(dneto): Kernel-guarded instructions.
// TODO(dneto): OpSelect - likely builtin function TBD // TODO(dneto): OpSelect - likely builtin function TBD
// TODO(dneto): OpSGreaterThan
// TODO(dneto): OpSGreaterThanEqual
// TODO(dneto): OpSLessThan
// TODO(dneto): OpSLessThanEqual
// TODO(dneto): OpFUnordEqual // TODO(dneto): OpFUnordEqual
// TODO(dneto): OpFOrdNotEqual // TODO(dneto): OpFOrdNotEqual
// TODO(dneto): OpFUnordNotEqual // TODO(dneto): OpFUnordNotEqual