@@ -1536,10 +1536,13 @@ StringRef maybeGetValueNameFromLoc(Value value, StringRef name) {
1536
1536
} // namespace
1537
1537
1538
1538
void SSANameState::numberValuesInRegion (Region ®ion) {
1539
+ // indicate whether OpAsmOpInterface set a name.
1540
+ bool opAsmOpInterfaceUsed = false ;
1539
1541
auto setBlockArgNameFn = [&](Value arg, StringRef name) {
1540
1542
assert (!valueIDs.count (arg) && " arg numbered multiple times" );
1541
1543
assert (llvm::cast<BlockArgument>(arg).getOwner ()->getParent () == ®ion &&
1542
1544
" arg not defined in current region" );
1545
+ opAsmOpInterfaceUsed = true ;
1543
1546
if (LLVM_UNLIKELY (printerFlags.shouldUseNameLocAsPrefix ()))
1544
1547
name = maybeGetValueNameFromLoc (arg, name);
1545
1548
setValueName (arg, name);
@@ -1549,6 +1552,18 @@ void SSANameState::numberValuesInRegion(Region ®ion) {
1549
1552
if (Operation *op = region.getParentOp ()) {
1550
1553
if (auto asmInterface = dyn_cast<OpAsmOpInterface>(op))
1551
1554
asmInterface.getAsmBlockArgumentNames (region, setBlockArgNameFn);
1555
+ if (!opAsmOpInterfaceUsed) {
1556
+ // If the OpAsmOpInterface didn't set a name, get name from the type.
1557
+ for (auto arg : region.getArguments ()) {
1558
+ if (auto typeInterface =
1559
+ mlir::dyn_cast<OpAsmTypeInterface>(arg.getType ())) {
1560
+ auto setNameFn = [&](StringRef name) {
1561
+ setBlockArgNameFn (arg, name);
1562
+ };
1563
+ typeInterface.getAsmName (setNameFn);
1564
+ }
1565
+ }
1566
+ }
1552
1567
}
1553
1568
}
1554
1569
@@ -1598,9 +1613,12 @@ void SSANameState::numberValuesInBlock(Block &block) {
1598
1613
void SSANameState::numberValuesInOp (Operation &op) {
1599
1614
// Function used to set the special result names for the operation.
1600
1615
SmallVector<int , 2 > resultGroups (/* Size=*/ 1 , /* Value=*/ 0 );
1616
+ // indicating whether OpAsmOpInterface set a name.
1617
+ bool opAsmOpInterfaceUsed = false ;
1601
1618
auto setResultNameFn = [&](Value result, StringRef name) {
1602
1619
assert (!valueIDs.count (result) && " result numbered multiple times" );
1603
1620
assert (result.getDefiningOp () == &op && " result not defined by 'op'" );
1621
+ opAsmOpInterfaceUsed = true ;
1604
1622
if (LLVM_UNLIKELY (printerFlags.shouldUseNameLocAsPrefix ()))
1605
1623
name = maybeGetValueNameFromLoc (result, name);
1606
1624
setValueName (result, name);
@@ -1630,6 +1648,23 @@ void SSANameState::numberValuesInOp(Operation &op) {
1630
1648
asmInterface.getAsmBlockNames (setBlockNameFn);
1631
1649
asmInterface.getAsmResultNames (setResultNameFn);
1632
1650
}
1651
+ if (!opAsmOpInterfaceUsed) {
1652
+ // If the OpAsmOpInterface didn't set a name, and
1653
+ // all results have OpAsmTypeInterface, get names from types.
1654
+ bool allHaveOpAsmTypeInterface =
1655
+ llvm::all_of (op.getResultTypes (), [&](Type type) {
1656
+ return mlir::isa<OpAsmTypeInterface>(type);
1657
+ });
1658
+ if (allHaveOpAsmTypeInterface) {
1659
+ for (auto result : op.getResults ()) {
1660
+ auto typeInterface = mlir::cast<OpAsmTypeInterface>(result.getType ());
1661
+ auto setNameFn = [&](StringRef name) {
1662
+ setResultNameFn (result, name);
1663
+ };
1664
+ typeInterface.getAsmName (setNameFn);
1665
+ }
1666
+ }
1667
+ }
1633
1668
}
1634
1669
1635
1670
unsigned numResults = op.getNumResults ();
0 commit comments