[Operations] Change naming of operands and results to be declarative

experimental/lib/Support/FormalProperty.cpp

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 #include "experimental/Support/FormalProperty.h"
 #include "dynamatic/Analysis/NameAnalysis.h"
-#include "dynamatic/Dialect/Handshake/HandshakeInterfaces.h"
+#include "dynamatic/Dialect/Handshake/HandshakeOps.h"
 #include "dynamatic/Support/JSON/JSON.h"
 #include "llvm/Support/JSON.h"
 #include <memory>
@@ -128,9 +128,6 @@ AbsenceOfBackpressure::AbsenceOfBackpressure(unsigned long id, TAG tag,
   Operation *ownerOp = res.getOwner();
   Operation *userOp = *res.getUsers().begin();
 
-  handshake::PortNamer ownerNamer(ownerOp);
-  handshake::PortNamer userNamer(userOp);
-
   unsigned long operandIndex = userOp->getNumOperands();
   for (auto [j, arg] : llvm::enumerate(userOp->getOperands())) {
     if (arg == res) {
@@ -144,9 +141,11 @@ AbsenceOfBackpressure::AbsenceOfBackpressure(unsigned long id, TAG tag,
   userChannel.operationName = getUniqueName(userOp).str();
   ownerChannel.channelIndex = res.getResultNumber();
   userChannel.channelIndex = operandIndex;
+  auto handshakeOwnerOp = handshake::getHandshakeBase(ownerOp);
   ownerChannel.channelName =
-      ownerNamer.getOutputName(res.getResultNumber()).str();
-  userChannel.channelName = userNamer.getInputName(operandIndex).str();
+      handshakeOwnerOp.getResultName(res.getResultNumber());
+  auto handshakeUserOp = handshake::getHandshakeBase(userOp);
+  userChannel.channelName = handshakeUserOp.getOperandName(operandIndex);
 }
 
 llvm::json::Value AbsenceOfBackpressure::extraInfoToJSON() const {
@@ -184,18 +183,18 @@ ValidEquivalence::ValidEquivalence(unsigned long id, TAG tag,
     : FormalProperty(id, tag, TYPE::VEQ) {
   Operation *op1 = res1.getOwner();
   unsigned int i = res1.getResultNumber();
-  handshake::PortNamer namer1(op1);
 
   Operation *op2 = res2.getOwner();
   unsigned int j = res2.getResultNumber();
-  handshake::PortNamer namer2(op2);
 
   ownerChannel.operationName = getUniqueName(op1).str();
   targetChannel.operationName = getUniqueName(op2).str();
   ownerChannel.channelIndex = i;
   targetChannel.channelIndex = j;
-  ownerChannel.channelName = namer1.getOutputName(i).str();
-  targetChannel.channelName = namer2.getOutputName(j).str();
+  auto handshakeOp1 = handshake::getHandshakeBase(op1);
+  auto handshakeOp2 = handshake::getHandshakeBase(op2);
+  ownerChannel.channelName = handshakeOp1.getResultName(i);
+  targetChannel.channelName = handshakeOp2.getResultName(j);
 }
 
 llvm::json::Value ValidEquivalence::extraInfoToJSON() const {