From 60ffc21e648693ca13000f83a72dff351de4c998 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 9 Apr 2020 09:14:03 -0700
Subject: [PATCH 1/2] kernel: include "kernel/constids.inc" instead of
 "constids.inc"

---
 kernel/rtlil.cc | 2 +-
 kernel/rtlil.h  | 2 +-
 kernel/yosys.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 00c116115..64fa531de 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -42,7 +42,7 @@ int RTLIL::IdString::last_created_idx_ptr_;
 #endif
 
 #define X(_id) IdString RTLIL::ID::_id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 
 dict<std::string, std::string> RTLIL::constpad;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 7279835ea..c90cdb971 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -377,7 +377,7 @@ namespace RTLIL
 
 	namespace ID {
 #define X(_id) extern IdString _id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 	};
 
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 380f7030b..6009d6647 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -516,7 +516,7 @@ void yosys_setup()
 	already_setup = true;
 
 #define X(_id) RTLIL::ID::_id = "\\" # _id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 
 	#ifdef WITH_PYTHON

From f11dd6e20838bce1b1fa8e085570d2126484d10f Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 9 Apr 2020 09:45:20 -0700
Subject: [PATCH 2/2] tests: add a quick plugin test

---
 tests/various/.gitignore |  1 +
 tests/various/plugin.cc  | 15 +++++++++++++++
 tests/various/plugin.sh  |  6 ++++++
 3 files changed, 22 insertions(+)
 create mode 100644 tests/various/plugin.cc
 create mode 100644 tests/various/plugin.sh

diff --git a/tests/various/.gitignore b/tests/various/.gitignore
index 4b286fd61..12d4e5048 100644
--- a/tests/various/.gitignore
+++ b/tests/various/.gitignore
@@ -3,3 +3,4 @@
 /write_gzip.v
 /write_gzip.v.gz
 /run-test.mk
+/plugin.so
diff --git a/tests/various/plugin.cc b/tests/various/plugin.cc
new file mode 100644
index 000000000..be305fbda
--- /dev/null
+++ b/tests/various/plugin.cc
@@ -0,0 +1,15 @@
+#include "kernel/rtlil.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+struct TestPass : public Pass {
+	TestPass() : Pass("test", "test") { }
+	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
+	{
+		size_t argidx = 1;
+		extra_args(args, argidx, design);
+		log("Plugin test passed!\n");
+	}
+} TestPass;
+
+YOSYS_NAMESPACE_END
diff --git a/tests/various/plugin.sh b/tests/various/plugin.sh
new file mode 100644
index 000000000..d6d4aee59
--- /dev/null
+++ b/tests/various/plugin.sh
@@ -0,0 +1,6 @@
+set -e
+rm -f plugin.so
+CXXFLAGS=$(../../yosys-config --cxxflags)
+CXXFLAGS=${CXXFLAGS// -I\/usr\/local\/share\/yosys\/include/ -I..\/..\/share\/include}
+../../yosys-config --exec --cxx ${CXXFLAGS} --ldflags -shared -o plugin.so plugin.cc
+../../yosys -m ./plugin.so -p "test" | grep -q "Plugin test passed!"