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

[spirv-writer] Add binary not equal. 

This CL adds support for the not equal comparison.

Bug: tint:5
Change-Id: Idb91a02b546e49d67d6dc8570c754e611643a1f2
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19403
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
dan sinclair 2020-04-14 15:03:24 +00:00 committed by dan sinclair
parent 07aead8570
commit 0d0d0b290d
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/writer/spirv/builder.cc
View File

@ -559,31 +559,25 @@ uint32_t Builder::GenerateBinaryExpression(ast::BinaryExpression* expr) {
auto result = result_op(); auto result = result_op();
auto result_id = result.to_i(); auto result_id = result.to_i();
auto lhs_type = expr->lhs()->result_type(); auto type_id = GenerateTypeIfNeeded(expr->result_type());
auto expr_type = expr->result_type();
auto type_id = GenerateTypeIfNeeded(expr_type);
if (type_id == 0) { if (type_id == 0) {
return 0; return 0;
} }
// Handle int and float and the vectors of those types. Other types
// should have been rejected by validation.
auto lhs_type = expr->lhs()->result_type();
bool lhs_is_float_or_vec =
lhs_type->IsF32() ||
(lhs_type->IsVector() && lhs_type->AsVector()->type()->IsF32());
spv::Op op = spv::Op::OpNop; spv::Op op = spv::Op::OpNop;
if (expr->IsAdd()) { if (expr->IsAdd()) {
// This handles int and float and the vectors of those types. Other types op = lhs_is_float_or_vec ? spv::Op::OpFAdd : spv::Op::OpIAdd;
// should have been rejected by validation.
op = spv::Op::OpIAdd;
if (expr_type->IsF32() ||
(expr_type->IsVector() && expr_type->AsVector()->type()->IsF32())) {
op = spv::Op::OpFAdd;
}
} else if (expr->IsEqual()) { } else if (expr->IsEqual()) {
// This handles int and float and the vectors of those types. Other types op = lhs_is_float_or_vec ? spv::Op::OpFOrdEqual : spv::Op::OpIEqual;
// should have been rejected by validation. } else if (expr->IsNotEqual()) {
op = spv::Op::OpIEqual; op = lhs_is_float_or_vec ? spv::Op::OpFOrdNotEqual : spv::Op::OpINotEqual;
if (lhs_type->IsF32() ||
(lhs_type->IsVector() && lhs_type->AsVector()->type()->IsF32())) {
op = spv::Op::OpFOrdEqual;
}
} else { } else {
return 0; return 0;
} }

18
src/writer/spirv/builder_binary_expression_test.cc
View File

@ -276,10 +276,11 @@ TEST_P(BinaryCompareIntegerTest, Vector) {
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
"%5 = " + param.name + " %6 %4 %4\n"); "%5 = " + param.name + " %6 %4 %4\n");
} }
INSTANTIATE_TEST_SUITE_P(BuilderTest, INSTANTIATE_TEST_SUITE_P(
BinaryCompareIntegerTest, BuilderTest,
testing::Values(BinaryData{ast::BinaryOp::kEqual, BinaryCompareIntegerTest,
"OpIEqual"})); testing::Values(BinaryData{ast::BinaryOp::kEqual, "OpIEqual"},
BinaryData{ast::BinaryOp::kNotEqual, "OpINotEqual"}));
using BinaryCompareFloatTest = testing::TestWithParam<BinaryData>; using BinaryCompareFloatTest = testing::TestWithParam<BinaryData>;
TEST_P(BinaryCompareFloatTest, Scalar) { TEST_P(BinaryCompareFloatTest, Scalar) {
@ -357,10 +358,11 @@ TEST_P(BinaryCompareFloatTest, Vector) {
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
"%5 = " + param.name + " %6 %4 %4\n"); "%5 = " + param.name + " %6 %4 %4\n");
} }
INSTANTIATE_TEST_SUITE_P(BuilderTest, INSTANTIATE_TEST_SUITE_P(
BinaryCompareFloatTest, BuilderTest,
testing::Values(BinaryData{ast::BinaryOp::kEqual, BinaryCompareFloatTest,
"OpFOrdEqual"})); testing::Values(BinaryData{ast::BinaryOp::kEqual, "OpFOrdEqual"},
BinaryData{ast::BinaryOp::kNotEqual, "OpFOrdNotEqual"}));
} // namespace } // namespace
} // namespace spirv } // namespace spirv