Migrate TypeAsmInterface to OpAsmTypeInterface

lib/Analysis/SelectVariableNames/BUILD

@@ -9,7 +9,6 @@ cc_library(
     srcs = ["SelectVariableNames.cpp"],
     hdrs = ["SelectVariableNames.h"],
     deps = [
-        "@heir//lib/Utils/Tablegen:AsmInterfaces",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",

lib/Analysis/SelectVariableNames/SelectVariableNames.cpp

@@ -3,9 +3,9 @@
 #include <map>
 #include <string>
 
-#include "lib/Utils/Tablegen/AsmInterfaces.h"
 #include "llvm/include/llvm/ADT/DenseMap.h"             // from @llvm-project
 #include "mlir/include/mlir/Dialect/Func/IR/FuncOps.h"  // from @llvm-project
+#include "mlir/include/mlir/IR/OpImplementation.h"      // from @llvm-project
 #include "mlir/include/mlir/IR/Operation.h"             // from @llvm-project
 #include "mlir/include/mlir/IR/Value.h"                 // from @llvm-project
 #include "mlir/include/mlir/IR/Visitors.h"              // from @llvm-project
@@ -15,9 +15,11 @@ namespace mlir {
 namespace heir {
 
 std::string SelectVariableNames::suggestNameForValue(Value value) {
-  if (auto typeAsmInterface =
-          mlir::dyn_cast<TypeAsmInterface>(value.getType())) {
-    return typeAsmInterface.suggestedName();
+  if (auto opAsmTypeInterface =
+          mlir::dyn_cast<OpAsmTypeInterface>(value.getType())) {
+    std::string asmName;
+    opAsmTypeInterface.getAsmName([&](StringRef name) { asmName = name; });
+    return asmName;
   }
   return defaultPrefix;
 }

lib/Dialect/BGV/IR/BGVOps.td

@@ -11,24 +11,13 @@ include "lib/Dialect/LWE/IR/LWETraits.td"
 include "lib/Dialect/Polynomial/IR/PolynomialAttributes.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/BuiltinAttributes.td"
-include "mlir/IR/OpAsmInterface.td"
 
 class BGV_Op<string mnemonic, list<Trait> traits = []> :
-        Op<BGV_Dialect, mnemonic, traits # [OpAsmOpInterface]> {
+        Op<BGV_Dialect, mnemonic, traits> {
   let cppNamespace = "::mlir::heir::bgv";
   let assemblyFormat = [{
     operands attr-dict `:`  functional-type(operands, results)
   }];
-
-  let extraClassDeclaration = [{
-    // OpAsmOpInterface Methods
-    void getAsmResultNames(::mlir::OpAsmSetValueNameFn setNameFn) {
-      for (auto result : getOperation()->getResults()) {
-        if (auto ty = dyn_cast<TypeAsmInterface>(result.getType()))
-          setNameFn(result, ty.suggestedName());
-      }
-    }
-  }];
 }
 
 class BGV_CiphertextPlaintextOp<string mnemonic, list<Trait> traits =

lib/Dialect/CKKS/IR/CKKSOps.td

@@ -13,21 +13,11 @@ include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/BuiltinAttributes.td"
 
 class CKKS_Op<string mnemonic, list<Trait> traits = []> :
-        Op<CKKS_Dialect, mnemonic, traits # [OpAsmOpInterface]> {
+        Op<CKKS_Dialect, mnemonic, traits> {
   let cppNamespace = "::mlir::heir::ckks";
   let assemblyFormat = [{
     operands attr-dict `:`  functional-type(operands, results)
   }];
-
-  let extraClassDeclaration = [{
-    // OpAsmOpInterface Methods
-    void getAsmResultNames(::mlir::OpAsmSetValueNameFn setNameFn) {
-      for (auto result : getOperation()->getResults()) {
-        if (auto ty = dyn_cast<TypeAsmInterface>(result.getType()))
-          setNameFn(result, ty.suggestedName());
-      }
-    }
-  }];
 }
 
 class CKKS_CiphertextPlaintextOp<string mnemonic, list<Trait> traits =

lib/Dialect/LWE/IR/BUILD

@@ -27,7 +27,6 @@ cc_library(
         "@heir//lib/Dialect/ModArith/IR:Dialect",
         "@heir//lib/Dialect/Polynomial/IR:Dialect",
         "@heir//lib/Dialect/RNS/IR:Dialect",
-        "@heir//lib/Utils/Tablegen:AsmInterfaces",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:InferTypeOpInterface",
@@ -63,7 +62,6 @@ td_library(
     # include from the heir-root to enable fully-qualified include-paths
     includes = ["../../../.."],
     deps = [
-        "@heir//lib/Utils/Tablegen:td_files",
         "@llvm-project//mlir:BuiltinDialectTdFiles",
         "@llvm-project//mlir:InferTypeOpInterfaceTdFiles",
         "@llvm-project//mlir:OpBaseTdFiles",

lib/Dialect/LWE/IR/LWEOps.td

@@ -10,7 +10,6 @@ include "mlir/IR/BuiltinAttributeInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/IR/CommonAttrConstraints.td"
-include "mlir/IR/OpAsmInterface.td"
 
 class HasEncoding<
   string encodingHolder,
@@ -86,21 +85,11 @@ class KeyAndCiphertextMatch<
 
 // LWE Operations are always Pure by design
 class LWE_Op<string mnemonic, list<Trait> traits = []> :
-        Op<LWE_Dialect, mnemonic,  traits # [Pure, OpAsmOpInterface]> {
+        Op<LWE_Dialect, mnemonic,  traits # [Pure]> {
   let cppNamespace = "::mlir::heir::lwe";
   let assemblyFormat = [{
     operands attr-dict `:`  functional-type(operands, results)
   }];
-
-  let extraClassDeclaration = [{
-    // OpAsmOpInterface Methods
-    void getAsmResultNames(::mlir::OpAsmSetValueNameFn setNameFn) {
-      for (auto result : getOperation()->getResults()) {
-        if (auto ty = dyn_cast<TypeAsmInterface>(result.getType()))
-          setNameFn(result, ty.suggestedName());
-      }
-    }
-  }];
 }
 
 class LWE_BinOp<string mnemonic, list<Trait> traits = []> :

lib/Dialect/LWE/IR/LWETypes.h

@@ -3,7 +3,7 @@
 
 #include "lib/Dialect/LWE/IR/LWEAttributes.h"
 #include "lib/Dialect/LWE/IR/LWEDialect.h"
-#include "lib/Utils/Tablegen/AsmInterfaces.h"
+#include "mlir/include/mlir/IR/OpImplementation.h"  // from @llvm-project
 
 #define GET_TYPEDEF_CLASSES
 #include "lib/Dialect/LWE/IR/LWETypes.h.inc"

lib/Dialect/LWE/IR/LWETypes.td

@@ -27,7 +27,7 @@ def LWECiphertext : LWE_Type<"LWECiphertext", "lwe_ciphertext", [MemRefElementTy
     "::mlir::Attribute":$encoding,
     OptionalParameter<"LWEParamsAttr">:$lwe_params
   );
-  let nameSuggestion = "ct";
+  let asmName = "ct";
 }
 
 def LWECiphertextLike : TypeOrValueSemanticsContainer<LWECiphertext, "ciphertext-like">;
@@ -39,21 +39,21 @@ def RLWECiphertext : LWE_Type<"RLWECiphertext", "rlwe_ciphertext"> {
     "RLWEParamsAttr":$rlwe_params,
     "Type":$underlying_type
   );
-  let nameSuggestion = "ct";
+  let asmName = "ct";
 }
 
 def RLWECiphertextLike : TypeOrValueSemanticsContainer<RLWECiphertext, "ciphertext-like">;
 
 def RLWESecretKey : LWE_Type<"RLWESecretKey", "rlwe_secret_key"> {
   let summary = "A secret key for RLWE";
   let parameters = (ins "RLWEParamsAttr":$rlwe_params);
-  let nameSuggestion = "sk";
+  let asmName = "sk";
 }
 
 def RLWEPublicKey : LWE_Type<"RLWEPublicKey", "rlwe_public_key"> {
   let summary = "A public key for RLWE";
   let parameters = (ins "RLWEParamsAttr":$rlwe_params);
-  let nameSuggestion = "pk";
+  let asmName = "pk";
 }
 
 def RLWESecretOrPublicKey : AnyTypeOf<[RLWESecretKey, RLWEPublicKey]>;
@@ -71,7 +71,7 @@ def LWEPlaintext : LWE_Type<"LWEPlaintext", "lwe_plaintext"> {
   let parameters = (ins
     "::mlir::Attribute":$encoding
   );
-  let nameSuggestion = "pt";
+  let asmName = "pt";
 }
 
 def LWEPlaintextLike : TypeOrValueSemanticsContainer<LWEPlaintext, "lwe-plaintext-like">;
@@ -84,7 +84,7 @@ def RLWEPlaintext : LWE_Type<"RLWEPlaintext", "rlwe_plaintext"> {
     "::mlir::heir::polynomial::RingAttr":$ring,
     "Type":$underlying_type
   );
-  let nameSuggestion = "pt";
+  let asmName = "pt";
 }
 
 def RLWEPlaintextLike : TypeOrValueSemanticsContainer<RLWEPlaintext, "rlwe-plaintext-like">;

lib/Dialect/LWE/IR/NewLWETypes.td

@@ -3,22 +3,25 @@
 
 include "lib/Dialect/LWE/IR/LWEDialect.td"
 include "lib/Dialect/LWE/IR/NewLWEAttributes.td"
-include "lib/Utils/Tablegen/AsmInterfaces.td"
 
 include "mlir/IR/DialectBase.td"
 include "mlir/IR/BuiltinTypeInterfaces.td"
 include "mlir/IR/AttrTypeBase.td"
+include "mlir/IR/OpAsmInterface.td"
 
 // A base class for all types in this dialect
 class LWE_Type<string name, string typeMnemonic, list<Trait> traits = []>
-    : TypeDef<LWE_Dialect, name, traits # [
-      DeclareTypeInterfaceMethods<TypeAsmInterface, ["suggestedName"]>
-    ]> {
+    : TypeDef<LWE_Dialect, name, traits # [OpAsmTypeInterface]> {
   let mnemonic = typeMnemonic;
   let assemblyFormat = "`<` struct(params) `>`";
 
-  string nameSuggestion = ?;
-  let extraClassDeclaration = "std::string suggestedName() {return \"" # nameSuggestion # "\"; }";
+  string asmName = ?;
+  let extraClassDeclaration = [{
+    // OpAsmTypeInterface method
+    void getAsmName(::mlir::OpAsmSetNameFn setNameFn) const {
+      setNameFn("}] # asmName # [{");
+    }
+  }];
 }
 
 // This file defines new LWE types following
@@ -30,7 +33,7 @@ def NewLWESecretKey : LWE_Type<"NewLWESecretKey", "new_lwe_secret_key"> {
     "KeyAttr":$key,
     "::mlir::heir::polynomial::RingAttr":$ring
   );
-  let nameSuggestion = "sk";
+  let asmName = "sk";
 }
 
 def NewLWEPublicKey : LWE_Type<"NewLWEPublicKey", "new_lwe_public_key"> {
@@ -39,7 +42,7 @@ def NewLWEPublicKey : LWE_Type<"NewLWEPublicKey", "new_lwe_public_key"> {
     "KeyAttr":$key,
     "::mlir::heir::polynomial::RingAttr":$ring
   );
-  let nameSuggestion = "pk";
+  let asmName = "pk";
 }
 
 def NewLWESecretOrPublicKey : AnyTypeOf<[NewLWESecretKey, NewLWEPublicKey]>;
@@ -50,7 +53,7 @@ def NewLWEPlaintext : LWE_Type<"NewLWEPlaintext", "new_lwe_plaintext"> {
     "ApplicationDataAttr":$application_data,
     "PlaintextSpaceAttr":$plaintext_space
   );
-  let nameSuggestion = "pt";
+  let asmName = "pt";
 }
 
 def NewLWEPlaintextLike : TypeOrValueSemanticsContainer<NewLWEPlaintext, "new-lwe-plaintext-like">;
@@ -77,7 +80,7 @@ def NewLWECiphertext : LWE_Type<"NewLWECiphertext", "new_lwe_ciphertext"> {
   );
 
   let genVerifyDecl = 1;
-  let nameSuggestion = "ct";
+  let asmName = "ct";
 }
 
 def NewLWECiphertextLike : TypeOrValueSemanticsContainer<NewLWECiphertext, "new-lwe-ciphertext-like">;

lib/Dialect/Lattigo/IR/BUILD

@@ -27,7 +27,6 @@ cc_library(
         ":LattigoAttributes",
         ":LattigoOps",
         ":LattigoTypes",
-        "@heir//lib/Utils/Tablegen:AsmInterfaces",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
     ],
@@ -64,7 +63,6 @@ cc_library(
         ":attributes_inc_gen",
         ":dialect_inc_gen",
         ":types_inc_gen",
-        "@heir//lib/Utils/Tablegen:AsmInterfaces",
         "@llvm-project//mlir:IR",
     ],
 )
@@ -85,7 +83,6 @@ cc_library(
         ":dialect_inc_gen",
         ":ops_inc_gen",
         ":types_inc_gen",
-        "@heir//lib/Utils/Tablegen:AsmInterfaces",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Support",
     ],
@@ -110,7 +107,6 @@ td_library(
     # include from the heir-root to enable fully-qualified include-paths
     includes = ["../../../.."],
     deps = [
-        "@heir//lib/Utils/Tablegen:td_files",
         "@llvm-project//mlir:BuiltinDialectTdFiles",
         "@llvm-project//mlir:OpBaseTdFiles",
     ],

lib/Dialect/Lattigo/IR/LattigoBGVTypes.td

@@ -15,23 +15,23 @@ def Lattigo_BGVParameter : Lattigo_BGVType<"Parameter", "parameter"> {
   let description = [{
     This type represents the parameters for the BGV encryption scheme.
   }];
-  let nameSuggestion = "param";
+  let asmName = "param";
 }
 
 // BGVEvaluator type definition
 def Lattigo_BGVEvaluator : Lattigo_BGVType<"Evaluator", "evaluator"> {
   let description = [{
     This type represents the evaluator for the BGV encryption scheme.
   }];
-  let nameSuggestion = "evaluator";
+  let asmName = "evaluator";
 }
 
 // BGVEncoder type definition
 def Lattigo_BGVEncoder : Lattigo_BGVType<"Encoder", "encoder"> {
   let description = [{
     This type represents the encoder for the BGV encryption scheme.
   }];
-  let nameSuggestion = "encoder";
+  let asmName = "encoder";
 }
 
 

lib/Dialect/Lattigo/IR/LattigoCKKSTypes.td

@@ -15,23 +15,23 @@ def Lattigo_CKKSParameter : Lattigo_CKKSType<"Parameter", "parameter"> {
   let description = [{
     This type represents the parameters for the CKKS encryption scheme.
   }];
-  let nameSuggestion = "param";
+  let asmName = "param";
 }
 
 // CKKSEvaluator type definition
 def Lattigo_CKKSEvaluator : Lattigo_CKKSType<"Evaluator", "evaluator"> {
   let description = [{
     This type represents the evaluator for the CKKS encryption scheme.
   }];
-  let nameSuggestion = "evaluator";
+  let asmName = "evaluator";
 }
 
 // CKKSEncoder type definition
 def Lattigo_CKKSEncoder : Lattigo_CKKSType<"Encoder", "encoder"> {
   let description = [{
     This type represents the encoder for the CKKS encryption scheme.
   }];
-  let nameSuggestion = "encoder";
+  let asmName = "encoder";
 }
 
 

lib/Dialect/Lattigo/IR/LattigoOps.td

@@ -4,23 +4,12 @@
 include "LattigoDialect.td"
 include "LattigoTypes.td"
 include "mlir/IR/OpBase.td"
-include "mlir/IR/OpAsmInterface.td"
 
 class Lattigo_Op<string mnemonic, list<Trait> traits = []> :
-        Op<Lattigo_Dialect, mnemonic, traits # [OpAsmOpInterface]> {
+        Op<Lattigo_Dialect, mnemonic, traits> {
   let assemblyFormat = [{
     operands attr-dict `:` functional-type(operands, results)
   }];
-
-  let extraClassDeclaration = [{
-    // OpAsmOpInterface Methods
-    void getAsmResultNames(::mlir::OpAsmSetValueNameFn setNameFn) {
-      for (auto result : getOperation()->getResults()) {
-        if (auto ty = dyn_cast<TypeAsmInterface>(result.getType()))
-          setNameFn(result, ty.suggestedName());
-      }
-    }
-  }];
 }
 
 include "LattigoBGVOps.td"