Simplify the classop translation

Author: Jaddyen

mlir/lib/Target/Cpp/TranslateToCpp.cpp

@@ -9,6 +9,7 @@
 #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
 #include "mlir/Dialect/EmitC/IR/EmitC.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
+#include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
@@ -1000,22 +1001,10 @@ static LogicalResult printOperation(CppEmitter &emitter, ModuleOp moduleOp) {
 static LogicalResult printOperation(CppEmitter &emitter, ClassOp classOp) {
   CppEmitter::Scope classScope(emitter);
   raw_indented_ostream &os = emitter.ostream();
-  os << "class " << classOp.getSymName() << " final {\n";
-  os << "public:\n\n";
-
+  os << "class " << classOp.getSymName() << " {\n";
+  os << "public:\n";
   os.indent();
-  os << "const std::map<std::string, char*> _buffer_map {\n";
-  for (Operation &op : classOp) {
-    if (auto fieldOp = dyn_cast<FieldOp>(op))
-      os << "  { \"" << fieldOp.getSymName() << "\", reinterpret_cast<char*>(&"
-         << fieldOp.getAttrs() << ") },\n";
-  }
-  os << "};\n";
-
-  os << "char* getBufferForName(const std::string& name) const {\n";
-  os << "  auto it = _buffer_map.find(name);\n";
-  os << "  return (it == _buffer_map.end()) ? nullptr : it->second;\n";
-  os << "}\n\n";
+  
   for (Operation &op : classOp) {
     if (failed(emitter.emitOperation(op, /*trailingSemicolon=*/false)))
       return failure();
@@ -1660,15 +1649,16 @@ LogicalResult CppEmitter::emitOperation(Operation &op, bool trailingSemicolon) {
                 emitc::BitwiseAndOp, emitc::BitwiseLeftShiftOp,
                 emitc::BitwiseNotOp, emitc::BitwiseOrOp,
                 emitc::BitwiseRightShiftOp, emitc::BitwiseXorOp, emitc::CallOp,
-                emitc::CallOpaqueOp, emitc::CastOp, emitc::CmpOp,
-                emitc::ConditionalOp, emitc::ConstantOp, emitc::DeclareFuncOp,
-                emitc::DivOp, emitc::ExpressionOp, emitc::FileOp, emitc::ForOp,
-                emitc::FuncOp, emitc::GlobalOp, emitc::IfOp, emitc::IncludeOp,
-                emitc::LoadOp, emitc::LogicalAndOp, emitc::LogicalNotOp,
-                emitc::LogicalOrOp, emitc::MulOp, emitc::RemOp, emitc::ReturnOp,
-                emitc::SubOp, emitc::SwitchOp, emitc::UnaryMinusOp,
-                emitc::UnaryPlusOp, emitc::VariableOp, emitc::VerbatimOp,
-                emitc::ClassOp, emitc::FieldOp, emitc::GetFieldOp>(
+                emitc::CallOpaqueOp, emitc::CastOp, emitc::ClassOp,
+                emitc::CmpOp, emitc::ConditionalOp, emitc::ConstantOp,
+                emitc::DeclareFuncOp, emitc::DivOp, emitc::ExpressionOp,
+                emitc::FieldOp, emitc::FileOp, emitc::ForOp, emitc::FuncOp,
+                emitc::GetFieldOp, emitc::GlobalOp, emitc::IfOp,
+                emitc::IncludeOp, emitc::LoadOp, emitc::LogicalAndOp,
+                emitc::LogicalNotOp, emitc::LogicalOrOp, emitc::MulOp,
+                emitc::RemOp, emitc::ReturnOp, emitc::SubOp, emitc::SwitchOp,
+                emitc::UnaryMinusOp, emitc::UnaryPlusOp, emitc::VariableOp,
+                emitc::VerbatimOp>(
 
               [&](auto op) { return printOperation(*this, op); })
           // Func ops.

mlir/test/mlir-translate/emitc_classops.mlir

@@ -1,35 +1,25 @@
 // RUN: mlir-translate --mlir-to-cpp %s | FileCheck %s
 
 emitc.class @modelClass {
-    emitc.field @input_tensor : !emitc.array<1xf32> 
-    emitc.field @some_feature : !emitc.array<1xf32>  {emitc.opaque = ["some_feature"]}
+    emitc.field @fieldName0 : !emitc.array<1xf32> 
+    emitc.field @fieldName1 : !emitc.array<1xf32> 
     emitc.func @execute() {
         %0 = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
-        %1 = get_field @input_tensor : !emitc.array<1xf32>
-        %2 = get_field @some_feature : !emitc.array<1xf32>
+        %1 = get_field @fieldName0 : !emitc.array<1xf32>
+        %2 = get_field @fieldName1 : !emitc.array<1xf32>
         %3 = subscript %1[%0] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
         return
     }
 }
 
-// CHECK: class modelClass final {
+// CHECK: class modelClass {
 // CHECK-NEXT: public:
-// CHECK-EMPTY:
-// CHECK-NEXT:  const std::map<std::string, char*> _buffer_map {
-// CHECK-NEXT:    { "input_tensor", reinterpret_cast<char*>(&None) },
-// CHECK-NEXT:    { "some_feature", reinterpret_cast<char*>(&{emitc.opaque = ["some_feature"]}) }, 
-// CHECK-NEXT:  };
-// CHECK-NEXT:  char* getBufferForName(const std::string& name) const {
-// CHECK-NEXT:     auto it = _buffer_map.find(name);
-// CHECK-NEXT:     return (it == _buffer_map.end()) ? nullptr : it->second;
-// CHECK-NEXT:  }
-// CHECK-EMPTY:
-// CHECK-NEXT:  float[1] input_tensor;
-// CHECK-NEXT:  float[1] some_feature;
+// CHECK-NEXT:  float[1] fieldName0;
+// CHECK-NEXT:  float[1] fieldName1;
 // CHECK-NEXT:  void execute() {
 // CHECK-NEXT:    size_t v1 = 0;
-// CHECK-NEXT:    float[1] v2 = input_tensor;
-// CHECK-NEXT:    float[1] v3 = some_feature;
+// CHECK-NEXT:    float[1] v2 = fieldName0;
+// CHECK-NEXT:    float[1] v3 = fieldName1;
 // CHECK-NEXT:    return;
 // CHECK-NEXT:  }
 // CHECK-EMPTY: