-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[mlir][TableGen] Emit interface traits after all interfaces #147699
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
[mlir][TableGen] Emit interface traits after all interfaces #147699
Conversation
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-mlir-core Author: Andrei Golubev (andrey-golubev) ChangesInterface traits may provide default implementation of methods. When this happens, the implementation may rely on another interface that is not yet defined meaning that one gets "incomplete type" error during C++ compilation. In pseudo-code, the problem is the following:
The two more "advanced" cases are:
It seems reasonable to emit interface traits after all of the interfaces have been defined to avoid the problem altogether. As a drive by, make forward declarations of the interfaces early so that user code does not need to forward declare. Full diff: https://github.com/llvm/llvm-project/pull/147699.diff 2 Files Affected:
diff --git a/mlir/test/lib/Dialect/Test/TestInterfaces.td b/mlir/test/lib/Dialect/Test/TestInterfaces.td
index dea26b8dda62a..d3d96ea5a65a4 100644
--- a/mlir/test/lib/Dialect/Test/TestInterfaces.td
+++ b/mlir/test/lib/Dialect/Test/TestInterfaces.td
@@ -174,4 +174,32 @@ def TestOptionallyImplementedTypeInterface
}];
}
+// Dummy type interface "A" that requires type interface "B" to be complete.
+def TestCyclicTypeInterfaceA : TypeInterface<"TestCyclicTypeInterfaceA"> {
+ let cppNamespace = "::mlir";
+ let methods = [
+ InterfaceMethod<"",
+ "::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB>",
+ /*methodName=*/"returnB",
+ (ins),
+ /*methodBody=*/"",
+ /*defaultImpl=*/"return mlir::failure();"
+ >,
+ ];
+}
+
+// Dummy type interface "B" that requires type interface "A" to be complete.
+def TestCyclicTypeInterfaceB : TypeInterface<"TestCyclicTypeInterfaceB"> {
+ let cppNamespace = "::mlir";
+ let methods = [
+ InterfaceMethod<"",
+ "::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA>",
+ /*methodName=*/"returnA",
+ (ins),
+ /*methodBody=*/"",
+ /*defaultImpl=*/"return mlir::failure();"
+ >,
+ ];
+}
+
#endif // MLIR_TEST_DIALECT_TEST_INTERFACES
diff --git a/mlir/tools/mlir-tblgen/OpInterfacesGen.cpp b/mlir/tools/mlir-tblgen/OpInterfacesGen.cpp
index 4dfa1908b3267..ba1396e7d12be 100644
--- a/mlir/tools/mlir-tblgen/OpInterfacesGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpInterfacesGen.cpp
@@ -96,9 +96,9 @@ class InterfaceGenerator {
void emitConceptDecl(const Interface &interface);
void emitModelDecl(const Interface &interface);
void emitModelMethodsDef(const Interface &interface);
- void emitTraitDecl(const Interface &interface, StringRef interfaceName,
- StringRef interfaceTraitsName);
+ void forwardDeclareInterface(const Interface &interface);
void emitInterfaceDecl(const Interface &interface);
+ void emitInterfaceTraitDecl(const Interface &interface);
/// The set of interface records to emit.
std::vector<const Record *> defs;
@@ -445,9 +445,16 @@ void InterfaceGenerator::emitModelMethodsDef(const Interface &interface) {
os << "} // namespace " << ns << "\n";
}
-void InterfaceGenerator::emitTraitDecl(const Interface &interface,
- StringRef interfaceName,
- StringRef interfaceTraitsName) {
+void InterfaceGenerator::emitInterfaceTraitDecl(const Interface &interface) {
+ llvm::SmallVector<StringRef, 2> namespaces;
+ llvm::SplitString(interface.getCppNamespace(), namespaces, "::");
+ for (StringRef ns : namespaces)
+ os << "namespace " << ns << " {\n";
+
+ os << "namespace detail {\n";
+
+ StringRef interfaceName = interface.getName();
+ auto interfaceTraitsName = (interfaceName + "InterfaceTraits").str();
os << llvm::formatv(" template <typename {3}>\n"
" struct {0}Trait : public ::mlir::{2}<{0},"
" detail::{1}>::Trait<{3}> {{\n",
@@ -494,6 +501,10 @@ void InterfaceGenerator::emitTraitDecl(const Interface &interface,
os << tblgen::tgfmt(*extraTraitDecls, &traitMethodFmt) << "\n";
os << " };\n";
+ os << "}// namespace detail\n";
+
+ for (StringRef ns : llvm::reverse(namespaces))
+ os << "} // namespace " << ns << "\n";
}
static void emitInterfaceDeclMethods(const Interface &interface,
@@ -517,6 +528,19 @@ static void emitInterfaceDeclMethods(const Interface &interface,
os << tblgen::tgfmt(extraDecls->rtrim(), &extraDeclsFmt) << "\n";
}
+void InterfaceGenerator::forwardDeclareInterface(const Interface &interface) {
+ llvm::SmallVector<StringRef, 2> namespaces;
+ llvm::SplitString(interface.getCppNamespace(), namespaces, "::");
+ for (StringRef ns : namespaces)
+ os << "namespace " << ns << " {\n";
+
+ StringRef interfaceName = interface.getName();
+ os << "class " << interfaceName << ";\n";
+
+ for (StringRef ns : llvm::reverse(namespaces))
+ os << "} // namespace " << ns << "\n";
+}
+
void InterfaceGenerator::emitInterfaceDecl(const Interface &interface) {
llvm::SmallVector<StringRef, 2> namespaces;
llvm::SplitString(interface.getCppNamespace(), namespaces, "::");
@@ -533,7 +557,6 @@ void InterfaceGenerator::emitInterfaceDecl(const Interface &interface) {
if (!comments.empty()) {
os << comments << "\n";
}
- os << "class " << interfaceName << ";\n";
// Emit the traits struct containing the concept and model declarations.
os << "namespace detail {\n"
@@ -603,10 +626,6 @@ void InterfaceGenerator::emitInterfaceDecl(const Interface &interface) {
os << "};\n";
- os << "namespace detail {\n";
- emitTraitDecl(interface, interfaceName, interfaceTraitsName);
- os << "}// namespace detail\n";
-
for (StringRef ns : llvm::reverse(namespaces))
os << "} // namespace " << ns << "\n";
}
@@ -619,10 +638,15 @@ bool InterfaceGenerator::emitInterfaceDecls() {
llvm::sort(sortedDefs, [](const Record *lhs, const Record *rhs) {
return lhs->getID() < rhs->getID();
});
+ for (const Record *def : sortedDefs)
+ forwardDeclareInterface(Interface(def));
for (const Record *def : sortedDefs)
emitInterfaceDecl(Interface(def));
for (const Record *def : sortedDefs)
emitModelMethodsDef(Interface(def));
+ for (const Record *def : sortedDefs)
+ emitInterfaceTraitDecl(Interface(def));
+
return false;
}
|
@ftynse @joker-eph @River707 please take a look! I have stumbled upon this problem when patching one-shot bufferization and figured it makes sense to fix the behaviour instead of working around it. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fyi: Interface
ctor can be rather expensive (it has a vector of base interfaces that it populates + vector of methods).
As we re-create the objects 4 times here, does it make sense to refactor? (I failed to do it immediately so it'd probably go into a separate patch).
FWIW tablegen is part of the build system so if it is slow, the whole build is slow.
Gentle ping @ftynse @River707 @joker-eph. Also, I haven't looked at it (due to the lack of time), but perhaps just moving method definitions later (similarly to how it's done for methods?) would be possible and more preferred? |
Gentle ping. |
Gentle ping @ftynse @joker-eph. @matthias-springer do you feel comfortable to review this PR? I infer that Alex / Mehdi are on vacation or busy, so perhaps you could take a look instead. This isn't super controversial afaict. Maybe you could cast your vote on this as well:
|
ping. |
Can you link the before/after output of |
db672ed
to
b7ee12f
Compare
Sure. Here's the full gist with "before" and "after" - https://gist.github.com/andrey-golubev/a337305e3ef31c595b8c2f4e9267ab78 In case this goes stale, the snippet below shows the issue (note: my added comments start with namespace mlir {
class TestCyclicTypeInterfaceA; // ag: forward declaration - only for "A"!
namespace detail {
struct TestCyclicTypeInterfaceAInterfaceTraits {
struct Concept {
/// The methods defined by the interface.
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> (*returnB)(const Concept *impl, ::mlir::Type );
// ag: here, TestCyclicTypeInterfaceB must be declared
};
template<typename ConcreteType>
class Model : public Concept {
public:
using Interface = ::mlir::TestCyclicTypeInterfaceA;
Model() : Concept{returnB} {}
static inline ::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> returnB(const Concept *impl, ::mlir::Type tablegen_opaque_val);
};
template<typename ConcreteType>
class FallbackModel : public Concept {
public:
using Interface = ::mlir::TestCyclicTypeInterfaceA;
FallbackModel() : Concept{returnB} {}
static inline ::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> returnB(const Concept *impl, ::mlir::Type tablegen_opaque_val);
};
template<typename ConcreteModel, typename ConcreteType>
class ExternalModel : public FallbackModel<ConcreteModel> {
public:
using ConcreteEntity = ConcreteType;
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> returnB(::mlir::Type tablegen_opaque_val) const;
};
};
template <typename ConcreteType>
struct TestCyclicTypeInterfaceATrait;
} // namespace detail
// ag: this is a definition for the interface - works fine as there are no method definitions
class TestCyclicTypeInterfaceA : public ::mlir::TypeInterface<TestCyclicTypeInterfaceA, detail::TestCyclicTypeInterfaceAInterfaceTraits> {
public:
using ::mlir::TypeInterface<TestCyclicTypeInterfaceA, detail::TestCyclicTypeInterfaceAInterfaceTraits>::TypeInterface;
template <typename ConcreteType>
struct Trait : public detail::TestCyclicTypeInterfaceATrait<ConcreteType> {};
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> returnB() const;
};
// ag: this is a trait generated for the interface above, it has interface method *definitions* inline (due to default implementation)
namespace detail {
template <typename ConcreteType>
struct TestCyclicTypeInterfaceATrait : public ::mlir::TypeInterface<TestCyclicTypeInterfaceA, detail::TestCyclicTypeInterfaceAInterfaceTraits>::Trait<ConcreteType> {
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceB> returnB() const {
// ag: here, TestCyclicTypeInterfaceB must be *complete*
return mlir::failure();
}
};
}// namespace detail
} // namespace mlir
// ag: this is the start of interface "B" definition (but it's too late)
namespace mlir {
class TestCyclicTypeInterfaceB;
namespace detail {
struct TestCyclicTypeInterfaceBInterfaceTraits {
struct Concept {
/// The methods defined by the interface.
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> (*returnA)(const Concept *impl, ::mlir::Type );
};
template<typename ConcreteType>
class Model : public Concept {
public:
using Interface = ::mlir::TestCyclicTypeInterfaceB;
Model() : Concept{returnA} {}
static inline ::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> returnA(const Concept *impl, ::mlir::Type tablegen_opaque_val);
};
template<typename ConcreteType>
class FallbackModel : public Concept {
public:
using Interface = ::mlir::TestCyclicTypeInterfaceB;
FallbackModel() : Concept{returnA} {}
static inline ::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> returnA(const Concept *impl, ::mlir::Type tablegen_opaque_val);
};
template<typename ConcreteModel, typename ConcreteType>
class ExternalModel : public FallbackModel<ConcreteModel> {
public:
using ConcreteEntity = ConcreteType;
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> returnA(::mlir::Type tablegen_opaque_val) const;
};
};
template <typename ConcreteType>
struct TestCyclicTypeInterfaceBTrait;
} // namespace detail
class TestCyclicTypeInterfaceB : public ::mlir::TypeInterface<TestCyclicTypeInterfaceB, detail::TestCyclicTypeInterfaceBInterfaceTraits> {
public:
using ::mlir::TypeInterface<TestCyclicTypeInterfaceB, detail::TestCyclicTypeInterfaceBInterfaceTraits>::TypeInterface;
template <typename ConcreteType>
struct Trait : public detail::TestCyclicTypeInterfaceBTrait<ConcreteType> {};
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> returnA() const;
};
namespace detail {
template <typename ConcreteType>
struct TestCyclicTypeInterfaceBTrait : public ::mlir::TypeInterface<TestCyclicTypeInterfaceB, detail::TestCyclicTypeInterfaceBInterfaceTraits>::Trait<ConcreteType> {
::mlir::FailureOr<::mlir::TestCyclicTypeInterfaceA> returnA() const {
return mlir::failure();
}
};
}// namespace detail
} // namespace mlir what the PR does is:
|
Interface traits may provide default implementation of methods. When this happens, the implementation may rely on another interface that is not yet defined meaning that one gets "incomplete type" error during C++ compilation. In pseudo-code, the problem is the following: ``` InterfaceA has methodB() { return InterfaceB(); } InterfaceB defined later // What's generated is: class InterfaceA { ... } class InterfaceATrait { // error: InterfaceB is an incomplete type InterfaceB methodB() { return InterfaceB(); } } class InterfaceB { ... } // defined here ``` The two more "advanced" cases are: * Cyclic dependency (A requires B and B requires A) * Type-traited usage of an incomplete type (e.g. `FailureOr<InterfaceB>`) It seems reasonable to emit interface traits *after* all of the interfaces have been defined to avoid the problem altogether. As a drive by, make forward declarations of the interfaces early so that user code does not need to forward declare.
b7ee12f
to
25b4a76
Compare
@matthias-springer do you know anything about: ? i'm not sure if the fact that it's cancelled is OK to merge this one. |
I think it's fine to merge given that the Linux + Windows CIs passed. |
Interface traits may provide default implementation of methods. When this happens, the implementation may rely on another interface that is not yet defined meaning that one gets "incomplete type" error during C++ compilation. In pseudo-code, the problem is the following:
The two more "advanced" cases are:
FailureOr<InterfaceB>
)It seems reasonable to emit interface traits after all of the interfaces have been defined to avoid the problem altogether.
As a drive by, make forward declarations of the interfaces early so that user code does not need to forward declare.