[llvm-branch-commits] [mlir] 4234292 - [mlir][SPIRV] Rename OpSpecConstantOperation -> OpSpecConstantOp
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Thu Jan 21 08:01:03 PST 2021
Author: MaheshRavishankar
Date: 2021-01-21T07:56:43-08:00
New Revision: 4234292ecf4902ad53286652acc3969c6758fed0
URL: https://github.com/llvm/llvm-project/commit/4234292ecf4902ad53286652acc3969c6758fed0
DIFF: https://github.com/llvm/llvm-project/commit/4234292ecf4902ad53286652acc3969c6758fed0.diff
LOG: [mlir][SPIRV] Rename OpSpecConstantOperation -> OpSpecConstantOp
The SPIR-V spec uses OpSpecConstantOp. Using an inconsistent name
makes the dialect generation scripts fail. Update to use the right
operation name, and fix the auto generation scripts as well.
Differential Revision: https://reviews.llvm.org/D95097
Added:
Modified:
mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
mlir/lib/Target/SPIRV/Deserialization/DeserializeOps.cpp
mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
mlir/lib/Target/SPIRV/Serialization/Serialization.cpp
mlir/utils/spirv/define_opcodes.sh
Removed:
################################################################################
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
index b211f69bb68e..ba1db323371b 100644
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
@@ -3172,7 +3172,7 @@ def SPV_OC_OpSpecConstantTrue : I32EnumAttrCase<"OpSpecConstantTrue", 4
def SPV_OC_OpSpecConstantFalse : I32EnumAttrCase<"OpSpecConstantFalse", 49>;
def SPV_OC_OpSpecConstant : I32EnumAttrCase<"OpSpecConstant", 50>;
def SPV_OC_OpSpecConstantComposite : I32EnumAttrCase<"OpSpecConstantComposite", 51>;
-def SPV_OC_OpSpecConstantOperation : I32EnumAttrCase<"OpSpecConstantOperation", 52>;
+def SPV_OC_OpSpecConstantOp : I32EnumAttrCase<"OpSpecConstantOp", 52>;
def SPV_OC_OpFunction : I32EnumAttrCase<"OpFunction", 54>;
def SPV_OC_OpFunctionParameter : I32EnumAttrCase<"OpFunctionParameter", 55>;
def SPV_OC_OpFunctionEnd : I32EnumAttrCase<"OpFunctionEnd", 56>;
@@ -3317,19 +3317,19 @@ def SPV_OpcodeAttr :
SPV_OC_OpConstantTrue, SPV_OC_OpConstantFalse, SPV_OC_OpConstant,
SPV_OC_OpConstantComposite, SPV_OC_OpConstantNull, SPV_OC_OpSpecConstantTrue,
SPV_OC_OpSpecConstantFalse, SPV_OC_OpSpecConstant,
- SPV_OC_OpSpecConstantComposite, SPV_OC_OpSpecConstantOperation,
- SPV_OC_OpFunction, SPV_OC_OpFunctionParameter,
- SPV_OC_OpFunctionEnd, SPV_OC_OpFunctionCall, SPV_OC_OpVariable, SPV_OC_OpLoad,
- SPV_OC_OpStore, SPV_OC_OpCopyMemory, SPV_OC_OpAccessChain, SPV_OC_OpDecorate,
- SPV_OC_OpMemberDecorate, SPV_OC_OpVectorExtractDynamic,
- SPV_OC_OpVectorInsertDynamic, SPV_OC_OpCompositeConstruct,
- SPV_OC_OpCompositeExtract, SPV_OC_OpCompositeInsert, SPV_OC_OpTranspose,
- SPV_OC_OpConvertFToU, SPV_OC_OpConvertFToS, SPV_OC_OpConvertSToF,
- SPV_OC_OpConvertUToF, SPV_OC_OpUConvert, SPV_OC_OpSConvert, SPV_OC_OpFConvert,
- SPV_OC_OpBitcast, SPV_OC_OpSNegate, SPV_OC_OpFNegate, SPV_OC_OpIAdd,
- SPV_OC_OpFAdd, SPV_OC_OpISub, SPV_OC_OpFSub, SPV_OC_OpIMul, SPV_OC_OpFMul,
- SPV_OC_OpUDiv, SPV_OC_OpSDiv, SPV_OC_OpFDiv, SPV_OC_OpUMod, SPV_OC_OpSRem,
- SPV_OC_OpSMod, SPV_OC_OpFRem, SPV_OC_OpFMod, SPV_OC_OpMatrixTimesScalar,
+ SPV_OC_OpSpecConstantComposite, SPV_OC_OpSpecConstantOp, SPV_OC_OpFunction,
+ SPV_OC_OpFunctionParameter, SPV_OC_OpFunctionEnd, SPV_OC_OpFunctionCall,
+ SPV_OC_OpVariable, SPV_OC_OpLoad, SPV_OC_OpStore, SPV_OC_OpCopyMemory,
+ SPV_OC_OpAccessChain, SPV_OC_OpDecorate, SPV_OC_OpMemberDecorate,
+ SPV_OC_OpVectorExtractDynamic, SPV_OC_OpVectorInsertDynamic,
+ SPV_OC_OpCompositeConstruct, SPV_OC_OpCompositeExtract,
+ SPV_OC_OpCompositeInsert, SPV_OC_OpTranspose, SPV_OC_OpConvertFToU,
+ SPV_OC_OpConvertFToS, SPV_OC_OpConvertSToF, SPV_OC_OpConvertUToF,
+ SPV_OC_OpUConvert, SPV_OC_OpSConvert, SPV_OC_OpFConvert, SPV_OC_OpBitcast,
+ SPV_OC_OpSNegate, SPV_OC_OpFNegate, SPV_OC_OpIAdd, SPV_OC_OpFAdd,
+ SPV_OC_OpISub, SPV_OC_OpFSub, SPV_OC_OpIMul, SPV_OC_OpFMul, SPV_OC_OpUDiv,
+ SPV_OC_OpSDiv, SPV_OC_OpFDiv, SPV_OC_OpUMod, SPV_OC_OpSRem, SPV_OC_OpSMod,
+ SPV_OC_OpFRem, SPV_OC_OpFMod, SPV_OC_OpMatrixTimesScalar,
SPV_OC_OpMatrixTimesMatrix, SPV_OC_OpLogicalEqual, SPV_OC_OpLogicalNotEqual,
SPV_OC_OpLogicalOr, SPV_OC_OpLogicalAnd, SPV_OC_OpLogicalNot, SPV_OC_OpSelect,
SPV_OC_OpIEqual, SPV_OC_OpINotEqual, SPV_OC_OpUGreaterThan,
diff --git a/mlir/lib/Target/SPIRV/Deserialization/DeserializeOps.cpp b/mlir/lib/Target/SPIRV/Deserialization/DeserializeOps.cpp
index f11804a11a9a..b68c75039f66 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/DeserializeOps.cpp
+++ b/mlir/lib/Target/SPIRV/Deserialization/DeserializeOps.cpp
@@ -172,7 +172,7 @@ LogicalResult spirv::Deserializer::processInstruction(
return processConstantComposite(operands);
case spirv::Opcode::OpSpecConstantComposite:
return processSpecConstantComposite(operands);
- case spirv::Opcode::OpSpecConstantOperation:
+ case spirv::Opcode::OpSpecConstantOp:
return processSpecConstantOperation(operands);
case spirv::Opcode::OpConstantTrue:
return processConstantBool(/*isTrue=*/true, operands, /*isSpec=*/false);
diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
index 826441da1dc0..c2e75d0a62ba 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
+++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
@@ -303,11 +303,11 @@ class Deserializer {
/// `operands`.
LogicalResult processSpecConstantComposite(ArrayRef<uint32_t> operands);
- /// Processes a SPIR-V OpSpecConstantOperation instruction with the given
+ /// Processes a SPIR-V OpSpecConstantOp instruction with the given
/// `operands`.
LogicalResult processSpecConstantOperation(ArrayRef<uint32_t> operands);
- /// Materializes/emits an OpSpecConstantOperation instruction.
+ /// Materializes/emits an OpSpecConstantOp instruction.
Value materializeSpecConstantOperation(uint32_t resultID,
spirv::Opcode enclosedOpcode,
uint32_t resultTypeID,
@@ -537,7 +537,7 @@ class Deserializer {
// Result <id> to composite spec constant mapping.
DenseMap<uint32_t, spirv::SpecConstantCompositeOp> specConstCompositeMap;
- /// Result <id> to info needed to materialize an OpSpecConstantOperation
+ /// Result <id> to info needed to materialize an OpSpecConstantOp
/// mapping.
DenseMap<uint32_t, SpecConstOperationMaterializationInfo>
specConstOperationMap;
diff --git a/mlir/lib/Target/SPIRV/Serialization/Serialization.cpp b/mlir/lib/Target/SPIRV/Serialization/Serialization.cpp
index fae509ff63f9..5eea6f1752dd 100644
--- a/mlir/lib/Target/SPIRV/Serialization/Serialization.cpp
+++ b/mlir/lib/Target/SPIRV/Serialization/Serialization.cpp
@@ -750,8 +750,8 @@ Serializer::processSpecConstantOperationOp(spirv::SpecConstantOperationOp op) {
operands.push_back(id);
}
- encodeInstructionInto(typesGlobalValues,
- spirv::Opcode::OpSpecConstantOperation, operands);
+ encodeInstructionInto(typesGlobalValues, spirv::Opcode::OpSpecConstantOp,
+ operands);
valueIDMap[op.getResult()] = resultID;
return success();
diff --git a/mlir/utils/spirv/define_opcodes.sh b/mlir/utils/spirv/define_opcodes.sh
index 7b9aeab9c08f..5284ce8e7db2 100755
--- a/mlir/utils/spirv/define_opcodes.sh
+++ b/mlir/utils/spirv/define_opcodes.sh
@@ -24,5 +24,5 @@ current_file="$(readlink -f "$0")"
current_dir="$(dirname "$current_file")"
python3 ${current_dir}/gen_spirv_dialect.py \
- --base-td-path ${current_dir}/../../include/mlir/Dialect/SPIRV/SPIRVBase.td \
+ --base-td-path ${current_dir}/../../include/mlir/Dialect/SPIRV/IR/SPIRVBase.td \
--new-opcode $@
More information about the llvm-branch-commits
mailing list