Merge

Makefile

@@ -177,7 +177,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.61+0
+YOSYS_VER := 0.61+21
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'.' -f3)

kernel/rtlil.cc

@@ -33,6 +33,7 @@
 #include <optional>
 #include <set>
 #include <string_view>
+#include <sstream>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -1550,6 +1551,13 @@ void RTLIL::Design::pop_selection()
 		push_full_selection();
 }
 
+std::string RTLIL::Design::to_rtlil_str(bool only_selected) const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_design(f, const_cast<RTLIL::Design*>(this), only_selected);
+	return f.str();
+}
+
 std::vector<RTLIL::Module*> RTLIL::Design::selected_modules(RTLIL::SelectPartials partials, RTLIL::SelectBoxes boxes) const
 {
 	bool include_partials = partials == RTLIL::SELECT_ALL;
@@ -4333,6 +4341,13 @@ RTLIL::SigSpec RTLIL::Module::FutureFF(RTLIL::IdString name, const RTLIL::SigSpe
 	return sig;
 }
 
+std::string RTLIL::Module::to_rtlil_str() const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_module(f, "", const_cast<RTLIL::Module*>(this), design, false);
+	return f.str();
+}
+
 RTLIL::Wire::Wire()
 {
 	static unsigned int hashidx_count = 123456789;
@@ -4360,6 +4375,13 @@ RTLIL::Wire::~Wire()
 #endif
 }
 
+std::string RTLIL::Wire::to_rtlil_str() const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_wire(f, "", this);
+	return f.str();
+}
+
 #ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Wire*> all_wires;
 std::map<unsigned int, RTLIL::Wire*> *RTLIL::Wire::get_all_wires(void)
@@ -4382,6 +4404,13 @@ RTLIL::Memory::Memory()
 #endif
 }
 
+std::string RTLIL::Memory::to_rtlil_str() const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_memory(f, "", this);
+	return f.str();
+}
+
 RTLIL::Process::Process() : module(nullptr)
 {
 	static unsigned int hashidx_count = 123456789;
@@ -4389,6 +4418,13 @@ RTLIL::Process::Process() : module(nullptr)
 	hashidx_ = hashidx_count;
 }
 
+std::string RTLIL::Process::to_rtlil_str() const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_proc(f, "", this);
+	return f.str();
+}
+
 RTLIL::Cell::Cell() : module(nullptr)
 {
 	static unsigned int hashidx_count = 123456789;
@@ -4410,6 +4446,13 @@ RTLIL::Cell::~Cell()
 #endif
 }
 
+std::string RTLIL::Cell::to_rtlil_str() const
+{
+	std::ostringstream f;
+	RTLIL_BACKEND::dump_cell(f, "", this);
+	return f.str();
+}
+
 #ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Cell*> all_cells;
 std::map<unsigned int, RTLIL::Cell*> *RTLIL::Cell::get_all_cells(void)

kernel/rtlil.h

@@ -2043,6 +2043,8 @@ struct RTLIL::Design
 	void run_pass(std::string command);
 
 	static std::map<unsigned int, RTLIL::Design*> *get_all_designs(void);
+
+	std::string to_rtlil_str(bool only_selected = true) const;
 };
 
 struct RTLIL::Module : public RTLIL::NamedObject
@@ -2409,6 +2411,7 @@ public:
 	std::string rtlil_dump();
 	unsigned int rtlil_hash();
 
+	std::string to_rtlil_str() const;
 #ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Module*> *get_all_modules(void);
 #endif
@@ -2462,6 +2465,7 @@ public:
 		return zero_index + start_offset;
 	}
 
+	std::string to_rtlil_str() const;
 #ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Wire*> *get_all_wires(void);
 #endif
@@ -2479,6 +2483,8 @@ struct RTLIL::Memory : public RTLIL::NamedObject
 	Memory();
 
 	int width, start_offset, size;
+
+	std::string to_rtlil_str() const;
 #ifdef YOSYS_ENABLE_PYTHON
 	~Memory();
 	static std::map<unsigned int, RTLIL::Memory*> *get_all_memorys(void);
@@ -2537,6 +2543,8 @@ public:
 	template<typename T> void rewrite_sigspecs(T &functor);
 	template<typename T> void rewrite_sigspecs2(T &functor);
 
+	std::string to_rtlil_str() const;
+
 #ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Cell*> *get_all_cells(void);
 #endif
@@ -2615,6 +2623,7 @@ public:
 	template<typename T> void rewrite_sigspecs(T &functor);
 	template<typename T> void rewrite_sigspecs2(T &functor);
 	RTLIL::Process *clone() const;
+	std::string to_rtlil_str() const;
 };
 
 

tests/unit/kernel/rtlilStringTest.cc

@@ -0,0 +1,61 @@
+#include <gtest/gtest.h>
+
+#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+namespace RTLIL {
+
+	TEST(RtlilStrTest, DesignToString) {
+		Design design;
+		Module *mod = design.addModule(ID(my_module));
+		mod->addWire(ID(my_wire), 1);
+
+		std::string design_str = design.to_rtlil_str();
+
+		EXPECT_NE(design_str.find("module \\my_module"), std::string::npos);
+		EXPECT_NE(design_str.find("end"), std::string::npos);
+	}
+
+	TEST(RtlilStrTest, ModuleToString) {
+		Design design;
+		Module *mod = design.addModule(ID(test_mod));
+		Wire *wire = mod->addWire(ID(clk), 1);
+		wire->port_input = true;
+
+		std::string mod_str = mod->to_rtlil_str();
+
+		EXPECT_NE(mod_str.find("module \\test_mod"), std::string::npos);
+		EXPECT_NE(mod_str.find("wire"), std::string::npos);
+		EXPECT_NE(mod_str.find("\\clk"), std::string::npos);
+		EXPECT_NE(mod_str.find("input"), std::string::npos);
+	}
+
+	TEST(RtlilStrTest, WireToString) {
+		Design design;
+		Module *mod = design.addModule(ID(m));
+		Wire *wire = mod->addWire(ID(data), 8);
+
+		std::string wire_str = wire->to_rtlil_str();
+
+		EXPECT_NE(wire_str.find("wire"), std::string::npos);
+		EXPECT_NE(wire_str.find("width 8"), std::string::npos);
+		EXPECT_NE(wire_str.find("\\data"), std::string::npos);
+	}
+
+	TEST(RtlilStrTest, CellToString) {
+		Design design;
+		Module *mod = design.addModule(ID(m));
+		Cell *cell = mod->addCell(ID(u1), ID(my_cell_type));
+
+		std::string cell_str = cell->to_rtlil_str();
+
+		EXPECT_NE(cell_str.find("cell"), std::string::npos);
+		EXPECT_NE(cell_str.find("\\my_cell_type"), std::string::npos);
+		EXPECT_NE(cell_str.find("\\u1"), std::string::npos);
+	}
+
+}
+
+YOSYS_NAMESPACE_END