commit 87a3f86155f6b4a03bb59235e52ed57936f0d9eb
author dan sinclair <dsinclair@chromium.org> Tue Apr 14 20:32:20 2020 +0000
committer dan sinclair <dsinclair@google.com> Tue Apr 14 20:32:20 2020 +0000
tree 96ec7ed7adcd9c45ca0ebd2be31b785dcc9a01fd
parent e7c23721b91ea1a7845c181315cd51580fe9ff1f

[spirv-writer] Add divide generation.

This CL adds generation for the OpFDiv, OpSDiv and OpUDiv SPIR-V
instructions.

Bug: tint:5
Change-Id: I9fd875f453dd71857b192a2dad56149bae52caf5
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19507
Reviewed-by: David Neto <dneto@google.com>

src/writer/spirv/builder.cc

diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc
index 2acb35a..400415f 100644
--- a/src/writer/spirv/builder.cc
+++ b/src/writer/spirv/builder.cc
@@ -581,6 +581,14 @@
     op = spv::Op::OpBitwiseAnd;
   } else if (expr->IsAdd()) {
     op = lhs_is_float_or_vec ? spv::Op::OpFAdd : spv::Op::OpIAdd;
+  } else if (expr->IsDivide()) {
+    if (lhs_is_float_or_vec) {
+      op = spv::Op::OpFDiv;
+    } else if (lhs_is_unsigned) {
+      op = spv::Op::OpUDiv;
+    } else {
+      op = spv::Op::OpSDiv;
+    }
   } else if (expr->IsEqual()) {
     op = lhs_is_float_or_vec ? spv::Op::OpFOrdEqual : spv::Op::OpIEqual;
   } else if (expr->IsGreaterThan()) {

src/writer/spirv/builder_binary_expression_test.cc

diff --git a/src/writer/spirv/builder_binary_expression_test.cc b/src/writer/spirv/builder_binary_expression_test.cc
index 3a3c7b3..b2c0d38 100644
--- a/src/writer/spirv/builder_binary_expression_test.cc
+++ b/src/writer/spirv/builder_binary_expression_test.cc
@@ -122,6 +122,7 @@
     BinaryArithSignedIntegerTest,
     testing::Values(BinaryData{ast::BinaryOp::kAdd, "OpIAdd"},
                     BinaryData{ast::BinaryOp::kAnd, "OpBitwiseAnd"},
+                    BinaryData{ast::BinaryOp::kDivide, "OpSDiv"},
                     BinaryData{ast::BinaryOp::kModulo, "OpSMod"},
                     BinaryData{ast::BinaryOp::kOr, "OpBitwiseOr"},
                     BinaryData{ast::BinaryOp::kSubtract, "OpISub"},
@@ -204,6 +205,7 @@
     BinaryArithUnsignedIntegerTest,
     testing::Values(BinaryData{ast::BinaryOp::kAdd, "OpIAdd"},
                     BinaryData{ast::BinaryOp::kAnd, "OpBitwiseAnd"},
+                    BinaryData{ast::BinaryOp::kDivide, "OpUDiv"},
                     BinaryData{ast::BinaryOp::kModulo, "OpUMod"},
                     BinaryData{ast::BinaryOp::kOr, "OpBitwiseOr"},
                     BinaryData{ast::BinaryOp::kSubtract, "OpISub"},
@@ -286,6 +288,7 @@
     BuilderTest,
     BinaryArithFloatTest,
     testing::Values(BinaryData{ast::BinaryOp::kAdd, "OpFAdd"},
+                    BinaryData{ast::BinaryOp::kDivide, "OpFDiv"},
                     BinaryData{ast::BinaryOp::kModulo, "OpFMod"},
                     BinaryData{ast::BinaryOp::kSubtract, "OpFSub"}));