[Mlir-commits] [mlir] [mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 (PR #81443)

[llvmlistbot at llvm.org]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-mlir

Author: None (SahilPatidar)

<details>
<summary>Changes</summary>

Resolve #<!-- -->77627

---
Full diff: https://github.com/llvm/llvm-project/pull/81443.diff


3 Files Affected:

- (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (+5-2) 
- (modified) mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp (+12-8) 
- (modified) mlir/lib/Target/SPIRV/Serialization/Serializer.cpp (+5-2) 


``````````diff
diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
index 02d03b3a0faeee..ee2f8c2fb37308 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
+++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
@@ -215,11 +215,14 @@ spirv::Deserializer::processMemoryModel(ArrayRef<uint32_t> operands) {
   if (operands.size() != 2)
     return emitError(unknownLoc, "OpMemoryModel must have two operands");
 
+  StringRef addressing_model = module->getAddressingModelAttrName().strref();
   (*module)->setAttr(
-      "addressing_model",
+      addressing_model,
       opBuilder.getAttr<spirv::AddressingModelAttr>(
           static_cast<spirv::AddressingModel>(operands.front())));
-  (*module)->setAttr("memory_model",
+
+  StringRef memory_model = module->getMemoryModelAttrName().strref();
+  (*module)->setAttr(memory_model,
                      opBuilder.getAttr<spirv::MemoryModelAttr>(
                          static_cast<spirv::MemoryModel>(operands.back())));
 
diff --git a/mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp b/mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
index 41d2c0310d0008..7e6f2f0c5bff27 100644
--- a/mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
+++ b/mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
@@ -708,33 +708,37 @@ Serializer::processOp<spirv::CopyMemoryOp>(spirv::CopyMemoryOp op) {
     operands.push_back(id);
   }
 
-  if (auto attr = op->getAttr("memory_access")) {
+  StringRef memory_access = op.getMemoryAccessAttrName().strref();
+  if (auto attr = op->getAttr(memory_access)) {
     operands.push_back(
         static_cast<uint32_t>(cast<spirv::MemoryAccessAttr>(attr).getValue()));
   }
 
-  elidedAttrs.push_back("memory_access");
+  elidedAttrs.push_back(memory_access);
 
-  if (auto attr = op->getAttr("alignment")) {
+  StringRef alignment = op.getAlignmentAttrName().strref();
+  if (auto attr = op->getAttr(alignment)) {
     operands.push_back(static_cast<uint32_t>(
         cast<IntegerAttr>(attr).getValue().getZExtValue()));
   }
 
-  elidedAttrs.push_back("alignment");
+  elidedAttrs.push_back(alignment);
 
-  if (auto attr = op->getAttr("source_memory_access")) {
+  StringRef source_memory_access = op.getSourceMemoryAccessAttrName().strref();
+  if (auto attr = op->getAttr(source_memory_access)) {
     operands.push_back(
         static_cast<uint32_t>(cast<spirv::MemoryAccessAttr>(attr).getValue()));
   }
 
-  elidedAttrs.push_back("source_memory_access");
+  elidedAttrs.push_back(source_memory_access);
 
-  if (auto attr = op->getAttr("source_alignment")) {
+  StringRef source_alignment = op.getSourceAlignmentAttrName().strref();
+  if (auto attr = op->getAttr(source_alignment)) {
     operands.push_back(static_cast<uint32_t>(
         cast<IntegerAttr>(attr).getValue().getZExtValue()));
   }
 
-  elidedAttrs.push_back("source_alignment");
+  elidedAttrs.push_back(source_alignment);
   if (failed(emitDebugLine(functionBody, op.getLoc())))
     return failure();
   encodeInstructionInto(functionBody, spirv::Opcode::OpCopyMemory, operands);
diff --git a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
index 40337e007bbf74..51fab95ad3a847 100644
--- a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
+++ b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
@@ -197,10 +197,13 @@ void Serializer::processExtension() {
 }
 
 void Serializer::processMemoryModel() {
+  StringRef memory_model = module.getMemoryModelAttrName().strref();
   auto mm = static_cast<uint32_t>(
-      module->getAttrOfType<spirv::MemoryModelAttr>("memory_model").getValue());
+      module->getAttrOfType<spirv::MemoryModelAttr>(memory_model).getValue());
+
+  StringRef addressing_model = module.getAddressingModelAttrName().strref();
   auto am = static_cast<uint32_t>(
-      module->getAttrOfType<spirv::AddressingModelAttr>("addressing_model")
+      module->getAttrOfType<spirv::AddressingModelAttr>(addressing_model)
           .getValue());
 
   encodeInstructionInto(memoryModel, spirv::Opcode::OpMemoryModel, {am, mm});

``````````

</details>


https://github.com/llvm/llvm-project/pull/81443