Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix dialect template generation #550

Merged
merged 1 commit into from Mar 24, 2024
Merged

fix dialect template generation #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/Dialect/include/Attributes.h.jinja
View file
Open in desktop
@@ -1,9 +1,9 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_H_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_H_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_H_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_H_

#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.h"

#define GET_ATTRDEF_CLASSES
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Attributes.h.inc"

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_H_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_H_
6 changes: 3 additions & 3 deletions templates/Dialect/include/Attributes.td.jinja
View file
Open in desktop
@@ -1,10 +1,10 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_TD_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_TD_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_TD_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_TD_

include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.td"

include "mlir/IR/AttrTypeBase.td"
include "mlir/IR/DialectBase.td"


#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}ATTRIBUTES_TD_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}ATTRIBUTES_TD_
6 changes: 3 additions & 3 deletions templates/Dialect/include/Dialect.h.jinja
View file
Open in desktop
@@ -1,10 +1,10 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_H_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_H_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_H_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_H_

#include "mlir/include/mlir/IR/Builders.h" // from @llvm-project
#include "mlir/include/mlir/IR/Dialect.h" // from @llvm-project

// Generated headers (block clang-format from messing up order)
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.h.inc"

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_H_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_H_
9 changes: 3 additions & 6 deletions templates/Dialect/include/Dialect.td.jinja
View file
Open in desktop
@@ -1,5 +1,5 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_TD_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_TD_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_TD_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_TD_

include "mlir/IR/DialectBase.td"

Expand All @@ -11,9 +11,6 @@ def {{ dialect_name }}_Dialect : Dialect {
}];

let cppNamespace = "::mlir::heir::{{ dialect_namespace }}";

let useDefaultTypePrinterParser = 1;
let useDefaultAttributePrinterParser = 1;
}

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}DIALECT_TD_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}DIALECT_TD_
6 changes: 3 additions & 3 deletions templates/Dialect/include/Ops.h.jinja
View file
Open in desktop
@@ -1,5 +1,5 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_H_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_H_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_H_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_H_

#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.h"
{% if enable_types %}
Expand All @@ -10,4 +10,4 @@
#define GET_OP_CLASSES
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Ops.h.inc"

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_H_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_H_
11 changes: 5 additions & 6 deletions templates/Dialect/include/Ops.td.jinja
View file
Open in desktop
@@ -1,14 +1,13 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_TD_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_TD_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_TD_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_TD_

include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.td"
{% if enable_types %}
include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Types.td"
{% endif %}
{% if enable_types %}include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Types.td"{% endif %}
include "mlir/IR/OpBase.td"

class {{ dialect_name }}_Op<string mnemonic, list<Trait> traits = []> :
Op<{{ dialect_name }}_Dialect, mnemonic, traits> {
let cppNamespace = "::mlir::heir::{{ dialect_namespace }}";
}

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}OPS_TD_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}OPS_TD_
6 changes: 3 additions & 3 deletions templates/Dialect/include/Types.h.jinja
View file
Open in desktop
@@ -1,5 +1,5 @@
#ifndef HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_H_
#define HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_H_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_H_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_H_

{% if enable_attributes %}
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Attributes.h"
Expand All @@ -9,4 +9,4 @@
#define GET_TYPEDEF_CLASSES
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Types.h.inc"

#endif // HEIR_INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_H_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_H_
6 changes: 3 additions & 3 deletions templates/Dialect/include/Types.td.jinja
View file
Open in desktop
@@ -1,5 +1,5 @@
#ifndef INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_TD_
#define INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_TD_
#ifndef INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_TD_
#define INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_TD_

include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Dialect.td"
{% if enable_attributes %}
Expand All @@ -16,4 +16,4 @@ class {{ dialect_name }}_Type<string name, string typeMnemonic>
}


#endif // INCLUDE_DIALECT_{{ dialect_name }}_IR_{{ dialect_name }}TYPES_TD_
#endif // INCLUDE_DIALECT_{{ dialect_name | upper }}_IR_{{ dialect_name | upper }}TYPES_TD_
1 change: 1 addition & 0 deletions templates/Dialect/lib/BUILD.jinja
View file
Open in desktop
Expand Up @@ -76,6 +76,7 @@ cc_library(
],
hdrs = [
"@heir//include/Dialect/{{ dialect_name }}/IR:{{ dialect_name }}Dialect.h",
"@heir//include/Dialect/{{ dialect_name }}/IR:{{ dialect_name }}Types.h",
{% if enable_attributes %}
"@heir//include/Dialect/{{ dialect_name }}/IR:{{ dialect_name }}Attributes.h",
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion templates/Dialect/lib/Types.cpp.jinja
View file
Open in desktop
@@ -1,4 +1,4 @@
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Ops.h"
#include "include/Dialect/{{ dialect_name }}/IR/{{ dialect_name }}Types.h"


namespace mlir {
Expand Down