Skip to content

Fix pod read write name attr kind #289

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
tim-hoffman merged 3 commits into from
Jan 26, 2026
Merged

Fix pod read write name attr kind #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e18c3d7
change pod read/write name to symbol ref attr
tim-hoffman Jan 26, 2026
f7f9602
cleanup
tim-hoffman Jan 26, 2026
df4e58f
changelog
tim-hoffman Jan 26, 2026
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
Empty file added changelogs/unreleased/th__fix_pod_read_write.yaml
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions include/llzk/Dialect/POD/IR/Ops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

namespace llzk::pod {

mlir::ParseResult parseRecordName(mlir::AsmParser &parser, mlir::StringAttr &name);
void printRecordName(mlir::AsmPrinter &printer, mlir::Operation *, mlir::StringAttr name);
mlir::ParseResult parseRecordName(mlir::AsmParser &parser, mlir::FlatSymbolRefAttr &name);
void printRecordName(mlir::AsmPrinter &printer, mlir::Operation *, mlir::FlatSymbolRefAttr name);

} // namespace llzk::pod
4 changes: 2 additions & 2 deletions include/llzk/Dialect/POD/IR/Ops.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def LLZK_ReadPodOp : PODDialectOp<"read"> {
}];

let arguments = (ins Arg<LLZK_PODType, "the pod to read from">:$pod_ref,
StrAttr:$record_name);
FlatSymbolRefAttr:$record_name);
let results = (outs AnyLLZKType:$result);
let assemblyFormat = [{
$pod_ref `[` custom<RecordName>($record_name) `]` `:` type($pod_ref) `,` type($result) attr-dict
Expand All @@ -154,7 +154,7 @@ def LLZK_WritePodOp : PODDialectOp<"write"> {
}];

let arguments = (ins Arg<LLZK_PODType, "the pod to write into">:$pod_ref,
StrAttr:$record_name, AnyLLZKType:$value);
FlatSymbolRefAttr:$record_name, AnyLLZKType:$value);

let assemblyFormat = [{
$pod_ref `[` custom<RecordName>($record_name) `]` `=` $value `:` type($pod_ref) `,` type($value) attr-dict
Expand Down
38 changes: 19 additions & 19 deletions lib/Dialect/POD/IR/Ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ static void collectMapAttrs(Type type, SmallVector<AffineMapAttr> &mapAttrs) {
})
.Case([&mapAttrs](array::ArrayType t) {
for (auto a : t.getDimensionSizes()) {
if (auto m = mlir::dyn_cast<AffineMapAttr>(a)) {
if (auto m = llvm::dyn_cast<AffineMapAttr>(a)) {
mapAttrs.push_back(m);
}
}
})
.Case([&mapAttrs](component::StructType t) {
for (auto param : t.getParams()) {
if (auto m = mlir::dyn_cast<AffineMapAttr>(param)) {
if (auto m = llvm::dyn_cast<AffineMapAttr>(param)) {
mapAttrs.push_back(m);
}
}
Expand Down Expand Up @@ -128,7 +128,7 @@ static LogicalResult verifyInitialValues(
llvm::StringMap<Type> records = retTy.getRecordMap();
llvm::StringSet<> seenNames;
for (auto [nameAttr, value] : llvm::zip_equal(names, values)) {
auto name = mlir::cast<StringAttr>(nameAttr).getValue(); // Per the ODS spec.
auto name = llvm::cast<StringAttr>(nameAttr).getValue(); // Per the ODS spec.
if (seenNames.contains(name)) {
emitError() << "found duplicated record name '" << name << '\'';
failed = true;
Expand All @@ -155,7 +155,7 @@ static LogicalResult verifyInitialValues(
}
}

return mlir::failure(failed);
return failure(failed);
}

static LogicalResult verifyAffineMapOperands(NewPodOp *op, Type retTy) {
Expand All @@ -174,7 +174,7 @@ static LogicalResult verifyAffineMapOperands(NewPodOp *op, Type retTy) {
}

LogicalResult NewPodOp::verify() {
auto retTy = mlir::dyn_cast<PodType>(getResult().getType());
auto retTy = llvm::dyn_cast<PodType>(getResult().getType());
assert(retTy); // per ODS spec of NewPodOp

bool failed = false;
Expand All @@ -185,7 +185,7 @@ LogicalResult NewPodOp::verify() {
);
check(verifyAffineMapOperands(this, retTy));

return mlir::failure(failed);
return failure(failed);
}

#undef check
Expand Down Expand Up @@ -265,7 +265,7 @@ ParseResult NewPodOp::parse(OpAsmParser &parser, OperationState &result) {
// Now that we have the struct type we can resolve the operands
// using the types of the struct.
for (auto attr : initializedRecords) {
auto name = mlir::cast<StringAttr>(attr); // Per ODS spec of RecordAttr
auto name = llvm::cast<StringAttr>(attr); // Per ODS spec of RecordAttr
auto lookup = resultType.getRecord(name.getValue(), [&parser, initialValuesLoc] {
return parser.emitError(initialValuesLoc);
});
Expand Down Expand Up @@ -297,7 +297,7 @@ ParseResult NewPodOp::parse(OpAsmParser &parser, OperationState &result) {
if (failed(verifyInherentAttrs(result.name, result.attributes, [&]() {
return parser.emitError(loc) << '\'' << result.name.getStringRef() << "' op ";
}))) {
return ::mlir::failure();
return failure();
}
}

Expand All @@ -321,7 +321,7 @@ void NewPodOp::print(OpAsmPrinter &printer) {
os << " : ";

auto type = getResult().getType();
if (auto validType = mlir::dyn_cast<PodType>(type)) {
if (auto validType = llvm::dyn_cast<PodType>(type)) {
printer.printStrippedAttrOrType(validType);
} else {
printer.printType(type);
Expand All @@ -337,7 +337,7 @@ SmallVector<RecordValue> NewPodOp::getInitializedRecordValues() {
return llvm::map_to_vector(
llvm::zip_equal(getInitialValues(), getInitializedRecords()), [](auto pair) {
auto [value, name] = pair;
return RecordValue {.name = mlir::cast<StringAttr>(name).getValue(), .value = value};
return RecordValue {.name = llvm::cast<StringAttr>(name).getValue(), .value = value};
}
);
}
Expand All @@ -347,14 +347,14 @@ SmallVector<RecordValue> NewPodOp::getInitializedRecordValues() {
//===----------------------------------------------------------------------===//

LogicalResult ReadPodOp::verify() {
auto podTy = mlir::dyn_cast<PodType>(getPodRef().getType());
auto podTy = llvm::dyn_cast<PodType>(getPodRef().getType());
if (!podTy) {
return emitError() << "reference operand expected a plain-old-data struct but got "
<< getPodRef().getType();
}

auto lookup = podTy.getRecord(getRecordName(), [this]() { return this->emitError(); });
if (mlir::failed(lookup)) {
if (failed(lookup)) {
return lookup;
}

Expand All @@ -363,22 +363,22 @@ LogicalResult ReadPodOp::verify() {
<< getResult().getType() << " != " << *lookup << ")";
}

return mlir::success();
return success();
}

//===----------------------------------------------------------------------===//
// WritePodOp
//===----------------------------------------------------------------------===//

LogicalResult WritePodOp::verify() {
auto podTy = mlir::dyn_cast<PodType>(getPodRef().getType());
auto podTy = llvm::dyn_cast<PodType>(getPodRef().getType());
if (!podTy) {
return emitError() << "reference operand expected a plain-old-data struct but got "
<< getPodRef().getType();
}

auto lookup = podTy.getRecord(getRecordName(), [this]() { return this->emitError(); });
if (mlir::failed(lookup)) {
if (failed(lookup)) {
return lookup;
}

Expand All @@ -387,18 +387,18 @@ LogicalResult WritePodOp::verify() {
<< getValue().getType() << " != " << *lookup << ")";
}

return mlir::success();
return success();
}

//===----------------------------------------------------------------------===//
// Parsing/Printing helpers
//===----------------------------------------------------------------------===//

ParseResult parseRecordName(AsmParser &parser, StringAttr &name) {
return parser.parseSymbolName(name);
ParseResult parseRecordName(AsmParser &parser, FlatSymbolRefAttr &name) {
return parser.parseCustomAttributeWithFallback(name);
}

void printRecordName(AsmPrinter &printer, mlir::Operation *, StringAttr name) {
void printRecordName(AsmPrinter &printer, Operation *, FlatSymbolRefAttr name) {
printer.printSymbolName(name.getValue());
}

Expand Down