[mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 #81443

SahilPatidar · 2024-02-12T07:05:21Z

github-actions · 2024-02-12T07:05:38Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2024-02-12T07:06:04Z

@llvm/pr-subscribers-mlir-spirv

@llvm/pr-subscribers-mlir

Author: None (SahilPatidar)

Changes

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 --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});

joker-eph · 2024-02-12T07:07:07Z

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();


Why StringRef instead of StringAttr?
We'll use string comparison instead of pointer comparison...

should I alter this all across the place?

antiagainst

Thanks for the change! LGM in general; but there are a few naming style issues. I just went ahead and fixed them given that you have been waiting for a while. Sorry about the delay in reviewing!

github-actions · 2024-02-18T06:21:52Z

@SahilPatidar Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested
by our build bots. If there is a problem with a build, you may recieve a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as
the builds can include changes from many authors. It is not uncommon for your
change to be included in a build that fails due to someone else's changes, or
infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself.
This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

[mlir][spirv] Replace hardcoded attribute strings with op methods Res…

733dbe7

…olve llvm#77627

SahilPatidar requested review from antiagainst and kuhar as code owners February 12, 2024 07:05

llvmbot added mlir:spirv mlir labels Feb 12, 2024

joker-eph reviewed Feb 12, 2024

View reviewed changes

replace strref to StringAttr

77dd0c8

SahilPatidar requested a review from joker-eph February 14, 2024 09:15

antiagainst added 2 commits February 17, 2024 21:51

Merge remote-tracking branch 'origin/main' into hardcoded-string

c00e1d1

Fix naming style

ebf81e6

antiagainst approved these changes Feb 18, 2024

View reviewed changes

antiagainst merged commit ead0a97 into llvm:main Feb 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 #81443

[mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 #81443

SahilPatidar commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

llvmbot commented Feb 12, 2024 •

edited

Loading

joker-eph Feb 12, 2024 •

edited

Loading

SahilPatidar Feb 12, 2024

joker-eph Feb 13, 2024

SahilPatidar Feb 14, 2024

antiagainst left a comment

github-actions bot commented Feb 18, 2024

[mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 #81443

[mlir][spirv] Replace hardcoded attribute strings with op methods Resolve #77627 #81443

Conversation

SahilPatidar commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

llvmbot commented Feb 12, 2024 • edited Loading

joker-eph Feb 12, 2024 • edited Loading

Choose a reason for hiding this comment

SahilPatidar Feb 12, 2024

Choose a reason for hiding this comment

joker-eph Feb 13, 2024

Choose a reason for hiding this comment

SahilPatidar Feb 14, 2024

Choose a reason for hiding this comment

antiagainst left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 18, 2024

llvmbot commented Feb 12, 2024 •

edited

Loading

joker-eph Feb 12, 2024 •

edited

Loading