Use linalg enum directly

Author: oowekyala

cinnamon/cmake/MLIRUtils.cmake

@@ -36,13 +36,15 @@ function(mlir_gen_ir prefix)
     mlir_tablegen(${prefix}Base.cpp.inc -gen-dialect-defs -dialect=${filter})
     mlir_tablegen(${prefix}Types.h.inc -gen-typedef-decls -typedefs-dialect=${filter})
     mlir_tablegen(${prefix}Types.cpp.inc -gen-typedef-defs -typedefs-dialect=${filter})
-    mlir_tablegen(${prefix}Enums.h.inc -gen-enum-decls)
-    mlir_tablegen(${prefix}Enums.cpp.inc -gen-enum-defs)
     mlir_tablegen(${prefix}Attributes.h.inc -gen-attrdef-decls -attrdefs-dialect=${filter})
     mlir_tablegen(${prefix}Attributes.cpp.inc -gen-attrdef-defs -attrdefs-dialect=${filter})
     mlir_tablegen(${prefix}Ops.h.inc -gen-op-decls -dialect=${filter})
     mlir_tablegen(${prefix}Ops.cpp.inc -gen-op-defs -dialect=${filter})
 
+    set(LLVM_TARGET_DEFINITIONS ${prefix}Attributes.td)
+    mlir_tablegen(${prefix}Enums.h.inc -gen-enum-decls)
+    mlir_tablegen(${prefix}Enums.cpp.inc -gen-enum-defs)
+
     add_public_tablegen_target(${prefix}IRIncGen)
     add_dependencies(${prefix}IncGen ${prefix}IRIncGen)
 endfunction()

cinnamon/include/cinm-mlir/Dialect/Cinm/IR/CinmAttributes.h

@@ -6,6 +6,7 @@
 
 #include "cinm-mlir/Dialect/Cinm/IR/CinmBase.h"
 #include "mlir/IR/Attributes.h"
+#include <mlir/Dialect/Linalg/IR/Linalg.h>
 
 //===- Generated includes -------------------------------------------------===//
 

cinnamon/include/cinm-mlir/Dialect/Cinm/IR/CinmAttributes.td

@@ -12,29 +12,6 @@ include "cinm-mlir/Dialect/Cinm/IR/CinmBase.td"
 include "mlir/IR/EnumAttr.td"
 include "mlir/IR/CommonAttrConstraints.td"
 
-// This enum is exactly the same as MLIR's `UnaryFn` enum from
-// here: mlir/include/mlir/Dialect/Linalg/IR/LinalgEnums.td,
-// ensuring easy compatibility.
-def Cinm_UnaryOp : I64EnumAttr<
-    "Cinm_UnaryOp", "",
-    [
-      I64EnumAttrCase<"exp", 0>,
-      I64EnumAttrCase<"log", 1>,
-      I64EnumAttrCase<"abs", 2>,
-      I64EnumAttrCase<"ceil", 3>,
-      I64EnumAttrCase<"floor", 4>,
-      I64EnumAttrCase<"negf", 5>,
-      I64EnumAttrCase<"reciprocal", 6>,
-      I64EnumAttrCase<"round", 7>,
-      I64EnumAttrCase<"sqrt", 8>,
-      I64EnumAttrCase<"rsqrt", 9>,
-      I64EnumAttrCase<"square", 10>,
-      I64EnumAttrCase<"tanh", 11>,
-      I64EnumAttrCase<"erf", 12>
-    ]> {
-  let cppNamespace = "::mlir::cinm";
-}
-
 def Cinm_ScanMethodAttr : I64EnumAttr<
     "ScanMethod", "",
     [
@@ -44,7 +21,6 @@ def Cinm_ScanMethodAttr : I64EnumAttr<
   let cppNamespace = "::mlir::cinm";
 }
 
-
 def Cinm_ReduceMethodAttr : I64EnumAttr<
     "ReduceMethod", "",
     [

cinnamon/include/cinm-mlir/Dialect/Cinm/IR/CinmOps.h

@@ -17,6 +17,7 @@
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
+
 //===- Generated includes -------------------------------------------------===//
 
 #define GET_OP_CLASSES

cinnamon/include/cinm-mlir/Dialect/Cinm/IR/CinmOps.td

@@ -22,8 +22,15 @@ include "mlir/Interfaces/ControlFlowInterfaces.td"
 include "mlir/Interfaces/InferTypeOpInterface.td"
 include "mlir/Interfaces/SideEffectInterfaces.td"
 include "mlir/Interfaces/DestinationStyleOpInterface.td"
+include "mlir/Dialect/Linalg/IR/LinalgEnums.td"
 
 
+// Define the attribute enums matching elementwise op kind (e.g., add).
+def ElementwiseKindAttr : EnumAttr<Cinm_Dialect,
+                                   UnaryFn, "elemwise_kind"> {
+  let assemblyFormat = "`<` $value `>`";
+}
+
 
 
 // Op templates
@@ -72,7 +79,7 @@ def Cinm_Elementwise_Unary_Op : Cinm_Op<"op.element_wise", [Pure, SameOperandsAn
   }];
 
   let arguments = (ins
-    Cinm_UnaryOp:$method,
+    ElementwiseKindAttr:$method,
     AnyRankedTensor:$input
   );
 

cinnamon/lib/Conversion/CinmToCnm/CinmToCnm.cpp

@@ -593,7 +593,7 @@ struct ConvertElementWiseUnaryToCnm : OpConversionPattern<cinm::Elementwise_Unar
         [&](ImplicitLocOpBuilder &builder, ValueRange inputs, ValueRange outputs) {
 
           builder.create<linalg::ElemwiseUnaryOp>(TypeRange{}, ValueRange(inputs), ValueRange(outputs),
-            linalg::UnaryFnAttr::get(builder.getContext(), static_cast<linalg::UnaryFn>(op.getMethod())),
+            linalg::UnaryFnAttr::get(builder.getContext(), op.getMethod()),
             linalg::TypeFnAttr::get(builder.getContext(), linalg::TypeFn::cast_signed));
         });
 

cinnamon/lib/Dialect/Cinm/IR/CinmOps.cpp

@@ -41,6 +41,7 @@
 
 using namespace mlir;
 using namespace mlir::cinm;
+using linalg::UnaryFn;
 
 //===- Generated implementation -------------------------------------------===//