Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
733dbe7
[mlir][spirv] Replace hardcoded attribute strings with op methods Res…
Feb 12, 2024
77dd0c8
replace strref to StringAttr
Feb 14, 2024
c00e1d1
Merge remote-tracking branch 'origin/main' into hardcoded-string
antiagainst Feb 18, 2024
ebf81e6
Fix naming style
antiagainst Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Collaborator

@joker-eph joker-eph Feb 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I alter this all across the place?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

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

Expand Down
20 changes: 12 additions & 8 deletions mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down