Skip to content

refactor plugin system #17

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

Open
michael-kenzel wants to merge 2 commits into
base: plugins
Choose a base branch
from
Open

refactor plugin system #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d6a5f
refactor plugin system
michael-kenzel Jul 5, 2023
973c7cc
fix windows build
michael-kenzel Jul 27, 2023
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
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ if (Thorin_HAS_LLVM_SUPPORT)
llvm_config(artic ${AnyDSL_LLVM_LINK_SHARED} core support)
endif ()

target_link_libraries(artic PUBLIC dl)
target_link_libraries(artic PUBLIC ${CMAKE_DL_LIBS})
11 changes: 6 additions & 5 deletions src/emit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,6 +1676,10 @@ const thorin::Def* FnDecl::emit(Emitter& emitter) const {
} else if (auto import_attr = attrs->find("import")) {
if (auto name_attr = import_attr->find("name"))
cont->set_name(name_attr->as<LiteralAttr>()->lit.as_string());
if (auto depends_attr = import_attr->find("depends")) {
auto depends = depends_attr->as<PathAttr>();
cont->attributes().depends = depends->path.emit(emitter)->as<thorin::Continuation>();
}
if (auto cc_attr = import_attr->find("cc")) {
auto cc = cc_attr->as<LiteralAttr>()->lit.as_string();
if (cc == "device") {
Expand All @@ -1687,14 +1691,11 @@ const thorin::Def* FnDecl::emit(Emitter& emitter) const {
} else if (cc == "thorin")
cont->set_intrinsic();
else if (cc == "plugin")
cont->attributes().intrinsic = thorin::Intrinsic::Plugin;
// any depends are guaranteed to be emitted earlier
emitter.world.link_plugin_intrinsic(cont);
else if (cc == "builtin")
emitter.builtin(*this, cont);
}
if (auto depends_attr = import_attr->find("depends")) {
auto depends = depends_attr->as<PathAttr>();
cont->attributes().depends = depends->path.emit(emitter)->as<thorin::Continuation>();
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ int main(int argc, char** argv) {
world.set(opts.log_level);
world.set(std::make_shared<thorin::Stream>(std::cerr));

for (auto plugin_to_load : opts.plugin_files) {
world.load_plugin(plugin_to_load.c_str());
}

ast::ModDecl program;
bool success = compile(
opts.files, file_data,
Expand All @@ -322,10 +326,6 @@ int main(int argc, char** argv) {
if (!success)
return EXIT_FAILURE;

for (auto plugin_to_load : opts.plugin_files) {
world.register_plugin(plugin_to_load.c_str());
}

if (opts.opt_level == 1)
world.cleanup();
if (opts.emit_c_int) {
Expand Down