Removed tf attributes and allowed for no attributes

Author: Jaddyen

mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

@@ -1584,14 +1584,13 @@ def EmitC_ClassOp
     for its data fields (`emitc.field`) and methods (`emitc.func`).
     It creates a distinct scope, isolating its contents from the surrounding
     MLIR region, similar to how C++ classes encapsulate their internals.
-    All the class memebrs need to be default initalizable. 
 
     Example:
     ```mlir
-    emitc.class @MymainClass {
-      emitc.field @another_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["another_feature"]}
-      emitc.field @some_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["some_feature"]}
-      emitc.field @output_0 : !emitc.array<1xf32> = {tf_saved_model.index_path = ["output_0"]}
+    emitc.class @mainClass {
+      emitc.field @another_feature : !emitc.array<1xf32> = {emitc.opaque = ["another_feature"]}
+      emitc.field @some_feature : !emitc.array<1xf32> = {emitc.opaque = ["some_feature"]}
+      emitc.field @output_0 : !emitc.array<1xf32> = {emitc.opaque = ["output_0"]}
 
       emitc.func @execute() {
         %0 = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
@@ -1634,15 +1633,22 @@ def EmitC_FieldOp : EmitC_Op<"field", [Symbol]> {
   let summary = "A field within a class";
   let description = [{
     The `emitc.field` operation declares a named field within an `emitc.class`
-    operation. The field's type must be an EmitC type. An optional initial value can be provided.
+    operation. The field's type must be an EmitC type. The initial value is optional. 
+    If the argument has attributes, these become the initial value, else we end up with no initial value.
 
     Example with initial values:
 
     ```mlir
-    emitc.class @MyModelClass {
-      emitc.field @another_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["another_feature"]}
-      emitc.field @some_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["some_feature"]}
-      emitc.field @output_0 : !emitc.array<1xf32> = {tf_saved_model.index_path = ["output_0"]}
+    emitc.class @modelClass {
+      emitc.field @another_feature : !emitc.array<1xf32> = {emitc.opaque = ["another_feature"]}
+      emitc.field @some_feature : !emitc.array<1xf32> = {emitc.opaque = ["some_feature"]}
+      emitc.field @output_0 : !emitc.array<1xf32> = {emitc.opaque = ["output_0"]}
+    }
+    ```
+    Example with no initial value:
+    ```mlir
+     emitc.class @modelClass {
+      emitc.field @another_feature : !emitc.array<1xf32>
     }
     ```
   }];

mlir/lib/Dialect/EmitC/Transforms/WrapFuncInClass.cpp

@@ -12,13 +12,17 @@
 #include "mlir/Dialect/EmitC/Transforms/Transforms.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
+#include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/TypeRange.h"
+#include "mlir/IR/Value.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/GraphWriter.h"
 #include "llvm/Support/LogicalResult.h"
+#include <string>
 
 namespace mlir {
 namespace emitc {
@@ -67,7 +71,7 @@ class WrapFuncInClass : public OpRewritePattern<emitc::FuncOp> {
     if (funcOp->getParentOfType<emitc::ClassOp>()) {
       return failure();
     }
-    auto className = "My" + funcOp.getSymNameAttr().str() + "Class";
+    auto className = funcOp.getSymNameAttr().str() + "Class";
     mlir::emitc::ClassOp newClassOp =
         rewriter.create<emitc::ClassOp>(funcOp.getLoc(), className);
 
@@ -76,25 +80,33 @@ class WrapFuncInClass : public OpRewritePattern<emitc::FuncOp> {
     rewriter.setInsertionPointToStart(&newClassOp.getBody().front());
 
     auto argAttrs = funcOp.getArgAttrs();
-    if (argAttrs) {
-      for (const auto &[arg, val] :
-           llvm::zip(*argAttrs, funcOp.getArguments())) {
-        if (auto namedAttr =
-                dyn_cast<mlir::DictionaryAttr>(arg).getNamed(attributeName)) {
-          Attribute nv = namedAttr->getValue();
-          StringAttr fieldName =
-              cast<mlir::StringAttr>(cast<mlir::ArrayAttr>(nv)[0]);
-          TypeAttr typeAttr = TypeAttr::get(val.getType());
-          fields.push_back({fieldName, typeAttr});
-
-          rewriter.create<emitc::FieldOp>(funcOp.getLoc(), fieldName, typeAttr,
-                                          /* attributes*/ arg);
+    size_t idx = 0;
+
+    for (const BlockArgument &val : funcOp.getArguments()) {
+      StringAttr fieldName;
+      Attribute argAttr = nullptr;
+
+      if (argAttrs && idx < argAttrs->size()) {
+        if (DictionaryAttr dictAttr =
+                dyn_cast<mlir::DictionaryAttr>((*argAttrs)[idx])) {
+          if (auto namedAttr = dictAttr.getNamed(attributeName)) {
+            Attribute nv = namedAttr->getValue();
+            fieldName = cast<mlir::StringAttr>(cast<mlir::ArrayAttr>(nv)[0]);
+            argAttr = (*argAttrs)[idx];
+          }
         }
       }
-    } else {
-      funcOp->emitOpError("arguments should have attributes so we can "
-                          "initialize class fields.");
-      return failure();
+
+      if (!fieldName) {
+        fieldName = rewriter.getStringAttr("fieldName" + std::to_string(idx));
+      }
+
+      TypeAttr typeAttr = TypeAttr::get(val.getType());
+      fields.push_back({fieldName, typeAttr});
+      rewriter.create<emitc::FieldOp>(funcOp.getLoc(), fieldName, typeAttr,
+                                      argAttr);
+
+      ++idx;
     }
 
     rewriter.setInsertionPointToEnd(&newClassOp.getBody().front());
@@ -112,7 +124,7 @@ class WrapFuncInClass : public OpRewritePattern<emitc::FuncOp> {
     rewriter.setInsertionPointToStart(&newFuncOp.getBody().front());
     std::vector<Value> newArguments;
     for (auto [fieldName, attr] : fields) {
-      auto arg =
+      GetFieldOp arg =
           rewriter.create<emitc::GetFieldOp>(loc, attr.getValue(), fieldName);
       newArguments.push_back(arg);
     }
@@ -122,14 +134,13 @@ class WrapFuncInClass : public OpRewritePattern<emitc::FuncOp> {
       rewriter.replaceAllUsesWith(oldArg, newArg);
     }
 
-    while (!newFuncOp.getArguments().empty()) {
-      if (failed(newFuncOp.eraseArgument(0))) {
-        break;
-      }
+    llvm::BitVector argsToErase(newFuncOp.getNumArguments(), true);
+    if (failed(newFuncOp.eraseArguments(argsToErase))) {
+      newFuncOp->emitOpError("Failed to erase all arguments using BitVector.");
     }
 
     rewriter.replaceOp(funcOp, newClassOp);
-    return funcOp->use_empty() ? success() : failure();
+    return success();
   }
 };
 

mlir/test/Dialect/EmitC/wrap_emitc_func_in_class.mlir

@@ -1,7 +1,7 @@
-// RUN: mlir-opt --wrap-emitc-func-in-class='named-attribute=tf_saved_model.index_path' %s | FileCheck %s
+// RUN: mlir-opt --wrap-emitc-func-in-class='named-attribute=emitc.opaque' %s | FileCheck %s
 
-module attributes {tf_saved_model.semantics, tfl.description = "MLIR Converted.", tfl.schema_version = 3 : i32} {
-  emitc.func @Model(%arg0: !emitc.array<1xf32> {tf_saved_model.index_path = ["another_feature"]}, %arg1: !emitc.array<1xf32> {tf_saved_model.index_path = ["some_feature"]}, %arg2: !emitc.array<1xf32> {tf_saved_model.index_path = ["output_0"]}) attributes {tf.entry_function = {inputs = "serving_default_another_feature:0,serving_default_some_feature:0", outputs = "PartitionedCall:0"}, tf_saved_model.exported_names = ["serving_default"]} {
+module attributes { } {
+  emitc.func @model(%arg0: !emitc.array<1xf32> {emitc.opaque = ["another_feature"]}, %arg1: !emitc.array<1xf32> {emitc.opaque = ["some_feature"]}, %arg2: !emitc.array<1xf32> {emitc.opaque = ["output_0"]}) attributes { } {
     %0 = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
     %1 = subscript %arg1[%0] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
     %2 = load %1 : <f32>
@@ -14,24 +14,26 @@ module attributes {tf_saved_model.semantics, tfl.description = "MLIR Converted."
   }
 }
 
-// CHECK: module attributes {tf_saved_model.semantics, tfl.description = "MLIR Converted.", tfl.schema_version = 3 : i32} {
-// CHECK:   emitc.class @MyModelClass {
-// CHECK:     emitc.field @another_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["another_feature"]}
-// CHECK:     emitc.field @some_feature : !emitc.array<1xf32> = {tf_saved_model.index_path = ["some_feature"]}
-// CHECK:     emitc.field @output_0 : !emitc.array<1xf32> = {tf_saved_model.index_path = ["output_0"]}
-// CHECK:     emitc.func @execute() {
-// CHECK:       %{{[0-9]+}} = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
-// CHECK:       %{{[0-9]+}} = get_field @another_feature : !emitc.array<1xf32>
-// CHECK:       %{{[0-9]+}} = get_field @some_feature : !emitc.array<1xf32>
-// CHECK:       %{{[0-9]+}} = get_field @output_0 : !emitc.array<1xf32>
-// CHECK:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
-// CHECK:       %{{[0-9]+}} = load %{{[0-9]+}} : <f32>
-// CHECK:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
-// CHECK:       %{{[0-9]+}} = load %{{[0-9]+}} : <f32>
-// CHECK:       %{{[0-9]+}} = add %{{[0-9]+}}, %{{[0-9]+}} : (f32, f32) -> f32
-// CHECK:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
-// CHECK:       assign %{{[0-9]+}} : f32 to %{{[0-9]+}} : <f32>
-// CHECK:       return
-// CHECK:     }
-// CHECK:   }
-// CHECK: }
+
+// CHECK: module {
+// CHECK-NEXT:   emitc.class @modelClass {
+// CHECK-NEXT:     emitc.field @another_feature : !emitc.array<1xf32> = {emitc.opaque = ["another_feature"]}
+// CHECK-NEXT:     emitc.field @some_feature : !emitc.array<1xf32> = {emitc.opaque = ["some_feature"]}
+// CHECK-NEXT:     emitc.field @output_0 : !emitc.array<1xf32> = {emitc.opaque = ["output_0"]}
+// CHECK-NEXT:     emitc.func @execute() {
+// CHECK-NEXT:       %{{[0-9]+}} = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
+// CHECK-NEXT:       %{{[0-9]+}} = get_field @another_feature : !emitc.array<1xf32>
+// CHECK-NEXT:       %{{[0-9]+}} = get_field @some_feature : !emitc.array<1xf32>
+// CHECK-NEXT:       %{{[0-9]+}} = get_field @output_0 : !emitc.array<1xf32>
+// CHECK-NEXT:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
+// CHECK-NEXT:       %{{[0-9]+}} = load %{{[0-9]+}} : <f32>
+// CHECK-NEXT:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
+// CHECK-NEXT:       %{{[0-9]+}} = load %{{[0-9]+}} : <f32>
+// CHECK-NEXT:       %{{[0-9]+}} = add %{{[0-9]+}}, %{{[0-9]+}} : (f32, f32) -> f32
+// CHECK-NEXT:       %{{[0-9]+}} = subscript %{{[0-9]+}}[%{{[0-9]+}}] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
+// CHECK-NEXT:       assign %{{[0-9]+}} : f32 to %{{[0-9]+}} : <f32>
+// CHECK-NEXT:       return
+// CHECK-NEXT:     }
+// CHECK-NEXT:   }
+// CHECK-NEXT: }
+

mlir/test/Dialect/EmitC/wrap_emitc_func_in_class_neg.mlir

@@ -0,0 +1,17 @@
+// RUN: mlir-opt --wrap-emitc-func-in-class='named-attribute=emitc.opaque' %s | FileCheck %s
+
+emitc.func @foo(%arg0 : !emitc.array<1xf32>) {
+  emitc.call_opaque "bar" (%arg0) : (!emitc.array<1xf32>) -> ()
+  emitc.return
+}
+
+// CHECK: module {
+// CHECK-NEXT:   emitc.class @fooClass {
+// CHECK-NEXT:     emitc.field @fieldName0 : !emitc.array<1xf32>
+// CHECK-NEXT:     emitc.func @execute() {
+// CHECK-NEXT:       %0 = get_field @fieldName0 : !emitc.array<1xf32>
+// CHECK-NEXT:       call_opaque "bar"(%0) : (!emitc.array<1xf32>) -> ()
+// CHECK-NEXT:       return
+// CHECK-NEXT:     }
+// CHECK-NEXT:   }
+// CHECK-NEXT: }