commit 79797490d8467072ff372ba5fc5cbe0c47bcfee7
author David Neto <dneto@google.com> Tue Apr 14 16:16:09 2020 +0000
committer David Neto <dneto@google.com> Tue Apr 14 16:16:09 2020 +0000
tree 4af702758d3d997b570b91b50c645bb51aad373a
parent a51d697f8c830ccfa5b3c1d762e8177e3b06de36

[spirv-reader] Support OpFAdd

Bug: tint:3
Change-Id: I22a6ff13d3777544101fa8334d598e5a2524caec
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19223
Reviewed-by: dan sinclair <dsinclair@google.com>

src/reader/spirv/function.cc

diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index d356e1f..64256a0 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -40,6 +40,7 @@
 ast::BinaryOp ConvertBinaryOp(SpvOp opcode) {
   switch (opcode) {
     case SpvOpIAdd:
+    case SpvOpFAdd:
       return ast::BinaryOp::kAdd;
     default:
       break;

src/reader/spirv/function_arithmetic_test.cc

diff --git a/src/reader/spirv/function_arithmetic_test.cc b/src/reader/spirv/function_arithmetic_test.cc
index 0b61c09..487dea3 100644
--- a/src/reader/spirv/function_arithmetic_test.cc
+++ b/src/reader/spirv/function_arithmetic_test.cc
@@ -41,8 +41,8 @@
   %uint_20 = OpConstant %uint 20
   %int_30 = OpConstant %int 30
   %int_40 = OpConstant %int 40
-  %float_50 = OpConstant %uint 50
-  %float_60 = OpConstant %uint 60
+  %float_50 = OpConstant %float 50
+  %float_60 = OpConstant %float 60
 
   %ptr_uint = OpTypePointer Function %uint
   %ptr_int = OpTypePointer Function %int
@@ -50,11 +50,14 @@
 
   %v2uint = OpTypeVector %uint 2
   %v2int = OpTypeVector %int 2
+  %v2float = OpTypeVector %float 2
 
   %v2uint_10_20 = OpConstantComposite %v2uint %uint_10 %uint_20
   %v2uint_20_10 = OpConstantComposite %v2uint %uint_20 %uint_10
   %v2int_30_40 = OpConstantComposite %v2int %int_30 %int_40
   %v2int_40_30 = OpConstantComposite %v2int %int_40 %int_30
+  %v2float_50_60 = OpConstantComposite %v2float %float_50 %float_60
+  %v2float_60_50 = OpConstantComposite %v2float %float_60 %float_50
 )";
 }
 
@@ -88,6 +91,20 @@
           ScalarConstructor{30}
         })";
   }
+  if (assembly == "v2float_50_60") {
+    return R"(TypeConstructor{
+          __vec_2__f32
+          ScalarConstructor{50.000000}
+          ScalarConstructor{60.000000}
+        })";
+  }
+  if (assembly == "v2float_60_50") {
+    return R"(TypeConstructor{
+          __vec_2__f32
+          ScalarConstructor{60.000000}
+          ScalarConstructor{50.000000}
+        })";
+  }
   return "bad case";
 }
 
@@ -136,8 +153,9 @@
      << "\n        " << GetParam().ast_rhs;
   EXPECT_THAT(ToString(fe.ast_body()), HasSubstr(ss.str())) << assembly;
 }
+
 INSTANTIATE_TEST_SUITE_P(
-    SpvParserTest,
+    SpvParserTest_IAdd,
     SpvBinaryTest,
     ::testing::Values(
         // Both uint
@@ -169,6 +187,19 @@
                    "__vec_2__i32", AstFor("v2int_40_30"), "add",
                    AstFor("v2uint_20_10")}));
 
+INSTANTIATE_TEST_SUITE_P(
+    SpvParserTest_FAdd,
+    SpvBinaryTest,
+    ::testing::Values(
+        // Scalar float
+        BinaryData{"float", "float_50", "OpFAdd", "float_60", "__f32",
+                   "ScalarConstructor{50.000000}", "add",
+                   "ScalarConstructor{60.000000}"},
+        // Vector float
+        BinaryData{"v2float", "v2float_50_60", "OpFAdd", "v2float_60_50",
+                   "__vec_2__f32", AstFor("v2float_50_60"), "add",
+                   AstFor("v2float_60_50")}));
+
 }  // namespace
 }  // namespace spirv
 }  // namespace reader