Skip to content

Addfinal specifier to the classop #145977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions mlir/include/mlir/Dialect/EmitC/IR/EmitC.td
Original file line number Diff line number Diff line change
Expand Up @@ -1618,10 +1618,20 @@ def EmitC_ClassOp
return
}
}
// Class with a final speciferAdd commentMore actions
emitc.class final @modelClass {
emitc.field @fieldName0 : !emitc.array<1xf32> = {emitc.opaque = "input_tensor"}
emitc.func @execute() {
%0 = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
%1 = get_field @fieldName0 : !emitc.array<1xf32>
%2 = subscript %1[%0] : (!emitc.array<1xf32>, !emitc.size_t) -> !emitc.lvalue<f32>
return
}
}
```
}];

let arguments = (ins SymbolNameAttr:$sym_name);
let arguments = (ins SymbolNameAttr:$sym_name, UnitAttr:$final_specifier);

let regions = (region AnyRegion:$body);

Expand All @@ -1632,7 +1642,8 @@ def EmitC_ClassOp

let hasCustomAssemblyFormat = 1;

let assemblyFormat = [{ $sym_name attr-dict-with-keyword $body }];
let assemblyFormat =
[{ (`final` $final_specifier^)? $sym_name attr-dict-with-keyword $body }];
}

def EmitC_FieldOp : EmitC_Op<"field", [Symbol]> {
Expand Down
6 changes: 4 additions & 2 deletions mlir/lib/Target/Cpp/TranslateToCpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1000,8 +1000,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() << " {\n";
os << "public:\n";
os << "class " << classOp.getSymName();
if (classOp.getFinalSpecifier())
os << " final";
os << " {\n public:\n";
os.indent();

for (Operation &op : classOp) {
Expand Down
27 changes: 26 additions & 1 deletion mlir/test/mlir-translate/emitc_classops.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,32 @@ emitc.class @modelClass {
}
}

// CHECK: class modelClass {
// CHECK-LABEL: class modelClass {
// CHECK-NEXT: public:
// 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 = fieldName0;
// CHECK-NEXT: float[1] v3 = fieldName1;
// CHECK-NEXT: return;
// CHECK-NEXT: }
// CHECK-EMPTY:
// CHECK-NEXT: };

emitc.class final @finalClass {
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 @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-LABEL: class finalClass final {
// CHECK-NEXT: public:
// CHECK-NEXT: float[1] fieldName0;
// CHECK-NEXT: float[1] fieldName1;
Expand Down