commit a563dd8c5734cb588c347c0e1093c8171b145e4d
author Chris Forbes <chrisforbes@google.com> Thu Mar 28 10:32:55 2019 +1300
committer Chris Forbes <chrisforbes@google.com> Thu Mar 28 19:49:02 2019 +0000
tree 3f9b909b75613a2cfcffce531dd5b872455c32a5
parent 06f4ed7ed4d116b98cd8f72e185ad68a67ba00d8

Add support for OpVectorTimesMatrix

Bug: b/126873455
Test: dEQP-VK.glsl.matrix.mul.*
Change-Id: Ifbc224ad72c27a0168578565a2b50eae8a1088f7
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28131
Tested-by: Chris Forbes <chrisforbes@google.com>
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Pipeline/SpirvShader.cpp

diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
index 617c02f..9383517 100644
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -360,6 +360,7 @@
 			case spv::OpVectorTimesScalar:
 			case spv::OpMatrixTimesScalar:
 			case spv::OpMatrixTimesVector:
+			case spv::OpVectorTimesMatrix:
 			case spv::OpVectorExtractDynamic:
 			case spv::OpVectorInsertDynamic:
 			case spv::OpNot: // Unary ops
@@ -1476,6 +1477,9 @@
 		case spv::OpMatrixTimesVector:
 			return EmitMatrixTimesVector(insn, state);
 
+		case spv::OpVectorTimesMatrix:
+			return EmitVectorTimesMatrix(insn, state);
+
 		case spv::OpNot:
 		case spv::OpSNegate:
 		case spv::OpFNegate:
@@ -2079,6 +2083,28 @@
 		return EmitResult::Continue;
 	}
 
+	SpirvShader::EmitResult SpirvShader::EmitVectorTimesMatrix(InsnIterator insn, EmitState *state) const
+	{
+		auto routine = state->routine;
+		auto &type = getType(insn.word(1));
+		auto &dst = routine->createIntermediate(insn.word(2), type.sizeInComponents);
+		auto lhs = GenericValue(this, routine, insn.word(3));
+		auto rhs = GenericValue(this, routine, insn.word(4));
+		auto lhsType = getType(getObject(insn.word(3)).type);
+
+		for (auto i = 0u; i < type.sizeInComponents; i++)
+		{
+			SIMD::Float v = lhs.Float(0) * rhs.Float(i * lhsType.sizeInComponents);
+			for (auto j = 1u; j < lhsType.sizeInComponents; j++)
+			{
+				v += lhs.Float(j) * rhs.Float(i * lhsType.sizeInComponents + j);
+			}
+			dst.move(i, v);
+		}
+
+		return EmitResult::Continue;
+	}
+
 	SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *state) const
 	{
 		auto routine = state->routine;