Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 21 additions & 1 deletion lib/PTO/IR/PTO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5324,9 +5324,29 @@ mlir::LogicalResult mlir::pto::TInsertOp::verify() {
return success();
}

// A5 acc->vec path (L0C->UB, ND/NZ modes in pto-isa).
if (*srcSpace == pto::AddressSpace::ACC && *dstSpace == pto::AddressSpace::VEC) {
if (!isColMajorRowMajorNZ(srcTb))
return emitOpError(
"expects A5 acc->vec tinsert src to use blayout=col_major and slayout=row_major");
bool dstIsND = isRowMajorNoneBoxND(dstTb);
bool dstIsNZ = isColMajorRowMajorNZ(dstTb);
if (!dstIsND && !dstIsNZ)
return emitOpError(
"expects A5 acc->vec tinsert dst to use ND (row_major/none_box) or NZ (col_major/row_major) layout");
bool okTypes = (srcElem.isF32() &&
(dstElem.isF16() || dstElem.isBF16() || dstElem.isF32())) ||
(srcElem.isInteger(32) && dstElem.isInteger(32));
if (!okTypes)
return emitOpError(
"expects A5 acc->vec tinsert element types to be "
"(src=f32,dst=f16/bf16/f32) or (src=i32,dst=i32)");
return success();
}

return emitOpError(
"expects A5 tinsert to use a supported src/dst loc pair: "
"acc->mat, vec->mat, or vec->vec");
"acc->mat, acc->vec, vec->mat, or vec->vec");
};
return dispatchVerifierByArch(getOperation(), verifyA2A3, verifyA5);
}
Expand Down
17 changes: 13 additions & 4 deletions lib/PTO/IR/VPTO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2625,12 +2625,21 @@ static ParseResult parseStructuredAccStoreClauses(
if (seenClause) {
if (failed(parser.parseOptionalComma()))
return success();
} else {
// First iteration: optionally consume the comma between operands and
// clauses. For some callers (MteL0cUbOp after dst_mode parsing with
// parseOptionalComma already consumed), the comma may already be gone.
(void)parser.parseOptionalComma();
}
StringRef keyword;
if (parser.parseKeyword(&keyword)) {
if (failed(parser.parseOptionalKeyword(&keyword))) {
// No keyword found. If this is the first iteration (no clauses yet),
// that means there are zero clauses — return success without error.
// On subsequent iterations, a keyword is expected after the comma.
if (!seenClause)
return success();
return failure();
return parser.emitError(parser.getCurrentLocation(),
"expected mte_l0c clause keyword");
}
seenClause = true;

Expand Down Expand Up @@ -6996,7 +7005,7 @@ ParseResult MteL0cL1Op::parse(OpAsmParser &parser, OperationState &result) {
parseRequiredOperandWithComma(parser, m) ||
parseRequiredOperandWithComma(parser, n) ||
parseRequiredOperandWithComma(parser, srcStride) ||
parseRequiredOperandWithComma(parser, dstStride) ||
parser.parseOperand(dstStride) ||
parseStructuredAccStoreClauses(parser, state) ||
parser.parseOptionalAttrDict(result.attributes) || parser.parseColon())
return failure();
Expand Down Expand Up @@ -7164,7 +7173,7 @@ ParseResult MteL0cGmOp::parse(OpAsmParser &parser, OperationState &result) {
parseRequiredOperandWithComma(parser, srcStride) ||
parseRequiredOperandWithComma(parser, dstStride) ||
parseRequiredOperandWithComma(parser, sid) ||
parseRequiredOperandWithComma(parser, l2CacheCtrl) ||
parser.parseOperand(l2CacheCtrl) ||
parseStructuredAccStoreClauses(parser, state) ||
parser.parseOptionalAttrDict(result.attributes) || parser.parseColon())
return failure();
Expand Down
Loading
Loading