Commit 620f7089 by Ben Clayton

SpirvShader: Implement OpTranspose

Bug: b/126873455 Tests: dEQP-VK.glsl.matrix.transpose.* Change-Id: I5b793ecda3d30de456b9ec7f65c386975a86b97f Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28470Tested-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarChris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 3ee52998
...@@ -362,6 +362,7 @@ namespace sw ...@@ -362,6 +362,7 @@ namespace sw
case spv::OpVectorTimesMatrix: case spv::OpVectorTimesMatrix:
case spv::OpMatrixTimesMatrix: case spv::OpMatrixTimesMatrix:
case spv::OpOuterProduct: case spv::OpOuterProduct:
case spv::OpTranspose:
case spv::OpVectorExtractDynamic: case spv::OpVectorExtractDynamic:
case spv::OpVectorInsertDynamic: case spv::OpVectorInsertDynamic:
case spv::OpNot: // Unary ops case spv::OpNot: // Unary ops
...@@ -1627,6 +1628,9 @@ namespace sw ...@@ -1627,6 +1628,9 @@ namespace sw
case spv::OpOuterProduct: case spv::OpOuterProduct:
return EmitOuterProduct(insn, state); return EmitOuterProduct(insn, state);
case spv::OpTranspose:
return EmitTranspose(insn, state);
case spv::OpNot: case spv::OpNot:
case spv::OpSNegate: case spv::OpSNegate:
case spv::OpFNegate: case spv::OpFNegate:
...@@ -2291,6 +2295,27 @@ namespace sw ...@@ -2291,6 +2295,27 @@ namespace sw
return EmitResult::Continue; return EmitResult::Continue;
} }
SpirvShader::EmitResult SpirvShader::EmitTranspose(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 mat = GenericValue(this, routine, insn.word(3));
auto numCols = type.definition.word(3);
auto numRows = getType(type.definition.word(2)).sizeInComponents;
for (auto col = 0u; col < numCols; col++)
{
for (auto row = 0u; row < numRows; row++)
{
dst.move(col * numRows + row, mat.Float(row * numCols + col));
}
}
return EmitResult::Continue;
}
SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *state) const SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *state) const
{ {
auto routine = state->routine; auto routine = state->routine;
......
...@@ -649,6 +649,7 @@ namespace sw ...@@ -649,6 +649,7 @@ namespace sw
EmitResult EmitVectorTimesMatrix(InsnIterator insn, EmitState *state) const; EmitResult EmitVectorTimesMatrix(InsnIterator insn, EmitState *state) const;
EmitResult EmitMatrixTimesMatrix(InsnIterator insn, EmitState *state) const; EmitResult EmitMatrixTimesMatrix(InsnIterator insn, EmitState *state) const;
EmitResult EmitOuterProduct(InsnIterator insn, EmitState *state) const; EmitResult EmitOuterProduct(InsnIterator insn, EmitState *state) const;
EmitResult EmitTranspose(InsnIterator insn, EmitState *state) const;
EmitResult EmitVectorExtractDynamic(InsnIterator insn, EmitState *state) const; EmitResult EmitVectorExtractDynamic(InsnIterator insn, EmitState *state) const;
EmitResult EmitVectorInsertDynamic(InsnIterator insn, EmitState *state) const; EmitResult EmitVectorInsertDynamic(InsnIterator insn, EmitState *state) const;
EmitResult EmitUnaryOp(InsnIterator insn, EmitState *state) const; EmitResult EmitUnaryOp(InsnIterator insn, EmitState *state) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment