maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir][spirv] Fix typos related to (de)serialization. 

Fix typos related to (de)serialization of spv.selection.

Differential Revision: https://reviews.llvm.org/D72503
This commit is contained in:
Denis Khalikov 2020-01-10 11:56:10 -05:00 committed by Lei Zhang
parent 5e7beb0a41
commit 0b032d7ba7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp
View File

@ -1558,10 +1558,10 @@ LogicalResult Deserializer::processSelectionMerge(ArrayRef<uint32_t> operands) {
if (operands.size() < 2) {
return emitError(
unknownLoc,
"OpLoopMerge must specify merge target and selection control");
"OpSelectionMerge must specify merge target and selection control");
}
if (static_cast<uint32_t>(spirv::LoopControl::None) != operands[1]) {
if (static_cast<uint32_t>(spirv::SelectionControl::None) != operands[1]) {
return emitError(unknownLoc,
"unimplmented OpSelectionMerge selection control: ")
<< operands[2];

6
mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp
View File

@ -1448,13 +1448,13 @@ LogicalResult Serializer::processSelectionOp(spirv::SelectionOp selectionOp) {
auto mergeID = getBlockID(mergeBlock);
// Emit the selection header block, which dominates all other blocks, first.
// We need to emit an OpSelectionMerge instruction before the loop header
// We need to emit an OpSelectionMerge instruction before the selection header
// block's terminator.
auto emitSelectionMerge = [&]() {
// TODO(antiagainst): properly support loop control here
// TODO(antiagainst): properly support selection control here
encodeInstructionInto(
functionBody, spirv::Opcode::OpSelectionMerge,
{mergeID, static_cast<uint32_t>(spirv::LoopControl::None)});
{mergeID, static_cast<uint32_t>(spirv::SelectionControl::None)});
};
// For structured selection, we cannot have blocks in the selection construct
// branching to the selection header block. Entering the selection (and