diff options
author | Denis Khalikov <khalikov.denis@huawei.com> | 2020-01-10 11:56:10 -0500 |
---|---|---|
committer | Lei Zhang <antiagainst@google.com> | 2020-01-10 12:01:28 -0500 |
commit | 0b032d7ba7157b62cd0d39f8d2dc0b0efa57a710 (patch) | |
tree | 3f9f8d66e3661202ebfd4994f613ae423a7814e3 | |
parent | 5e7beb0a4146267f1d65c57543e67ca158aca4aa (diff) | |
download | bcm5719-llvm-0b032d7ba7157b62cd0d39f8d2dc0b0efa57a710.tar.gz bcm5719-llvm-0b032d7ba7157b62cd0d39f8d2dc0b0efa57a710.zip |
[mlir][spirv] Fix typos related to (de)serialization.
Fix typos related to (de)serialization of spv.selection.
Differential Revision: https://reviews.llvm.org/D72503
-rw-r--r-- | mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp | 4 | ||||
-rw-r--r-- | mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp b/mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp index 17ddc48573a..4e030217160 100644 --- a/mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp +++ b/mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp @@ -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]; diff --git a/mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp b/mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp index 0cdcc25b77d..d7971eb5e35 100644 --- a/mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp +++ b/mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp @@ -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 |