Merge pull request #242 from povik/whitequark/emit-hdlname

Emit \hdlname attribute

Author: povik

src/slang_frontend.cc

@@ -1972,7 +1972,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 			for (auto chunk : latch_driven.chunks()) {
 				RTLIL::SigSpec en = netlist.canvas->addWire(netlist.new_id(), chunk.bitwidth());
 				RTLIL::SigSpec staging = netlist.canvas->addWire(netlist.new_id(), chunk.bitwidth());
-				
+
 				for (int i = 0; i < chunk.bitwidth(); i++) {
 					RTLIL::Cell *cell = netlist.canvas->addDlatch(netlist.new_id(), en[i],
 											staging[i], netlist.convert_static(chunk[i]), true);
@@ -2230,6 +2230,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 		// blackboxes get special handling no matter the hierarchy mode
 		if (sym.isModule() && netlist.is_blackbox(sym.body.getDefinition())) {
 			RTLIL::Cell *cell = netlist.canvas->addCell(netlist.id(sym), RTLIL::escape_id(std::string(sym.body.name)));
+			cell->set_string_attribute(ID::hdlname, netlist.hdlname(sym));
 
 			for (auto *conn : sym.getPortConnections()) {
 				switch (conn->port.kind) {
@@ -2341,6 +2342,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 			auto [submodule, inserted] = queue.get_or_emplace(ref_body, netlist, *ref_body->parentInstance);
 
 			RTLIL::Cell *cell = netlist.canvas->addCell(netlist.id(sym), module_type_id(*ref_body));
+			cell->set_string_attribute(ID::hdlname, netlist.hdlname(sym));
 			for (auto *conn : sym.getPortConnections()) {
 				slang::SourceLocation loc;
 				if (auto expr = conn->getExpression())
@@ -2560,6 +2562,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 
 			if (netlist.is_inferred_memory(sym)) {
 				RTLIL::Memory *m = new RTLIL::Memory;
+				m->set_string_attribute(ID::hdlname, netlist.hdlname(sym));
 				transfer_attrs(sym, m);
 				m->name = netlist.id(sym);
 				m->width = sym.getType().getArrayElementType()->getBitstreamWidth();
@@ -2640,7 +2643,7 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 					} else {
 						auto wire = netlist.wire(sym);
 						log_assert(wire);
-						wire->attributes[RTLIL::ID::init] = const_;
+						wire->attributes[ID::init] = const_;
 					}
 				}
 			}
@@ -2691,7 +2694,8 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 		}
 
 		RTLIL::Cell *cell = netlist.canvas->addCell(netlist.id(sym),
-												id(sym.definitionName));
+													id(sym.definitionName));
+		cell->set_string_attribute(ID::hdlname, netlist.hdlname(sym));
 		transfer_attrs(sym, cell);
 
 		auto port_names = sym.getPortNames();
@@ -2906,14 +2910,15 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 };
 
 static void build_hierpath2(NetlistContext &netlist,
-							std::ostringstream &s, const ast::Scope *scope)
+							std::ostringstream &s, const ast::Scope *scope,
+							const std::string &sep = ".")
 {
 	if (!scope ||
 		static_cast<const ast::Scope *>(&netlist.realm) == scope)
 		return;
 
 	if (netlist.scopes_remap.count(scope)) {
-		s << netlist.scopes_remap.at(scope) << ".";
+		s << netlist.scopes_remap.at(scope) << sep;
 		return;
 	}
 
@@ -2925,17 +2930,17 @@ static void build_hierpath2(NetlistContext &netlist,
 		symbol = symbol->as<ast::CheckerInstanceBodySymbol>().parentInstance;
 
 	if (auto parent = symbol->getParentScope())
-		build_hierpath2(netlist, s, parent);
+		build_hierpath2(netlist, s, parent, sep);
 
 	if (symbol->kind == ast::SymbolKind::GenerateBlockArray) {
 		auto &array = symbol->as<ast::GenerateBlockArraySymbol>();
 		s << array.getExternalName();
 	} else if (symbol->kind == ast::SymbolKind::GenerateBlock) {
 		auto &block = symbol->as<ast::GenerateBlockSymbol>();
 		if (auto index = block.arrayIndex) {
-			s << "[" << index->toString(slang::LiteralBase::Decimal, false) << "].";
+			s << "[" << index->toString(slang::LiteralBase::Decimal, false) << "]" << sep;
 		} else {
-			s << block.getExternalName() << ".";
+			s << block.getExternalName() << sep;
 		}
 	} else if (symbol->kind == ast::SymbolKind::Instance ||
 			   symbol->kind == ast::SymbolKind::CheckerInstance) {
@@ -2950,13 +2955,13 @@ static void build_hierpath2(NetlistContext &netlist,
 				s << "[" << ((int) inst.arrayPath[i]) + dimensions[i].lower() << "]";
 		}
 
-		s << ".";
+		s << sep;
 	} else if (symbol->kind == ast::SymbolKind::InstanceArray) {
 		s << symbol->name;
 	} else if (!symbol->name.empty()) {
-		s << symbol->name << ".";
+		s << symbol->name << sep;
 	} else if (symbol->kind == ast::SymbolKind::StatementBlock) {
-		s << "$" << (int) symbol->getIndex() << ".";
+		s << "$" << (int) symbol->getIndex() << sep;
 	}
 }
 
@@ -3041,10 +3046,11 @@ std::string hierpath_relative_to(const ast::Scope *relative_to, const ast::Scope
 	return path.str();
 }
 
-RTLIL::IdString NetlistContext::id(const ast::Symbol &symbol)
+std::string build_hiername(NetlistContext &netlist, const ast::Symbol &symbol,
+						   const std::string &sep)
 {
 	std::ostringstream path;
-	build_hierpath2(*this, path, symbol.getParentScope());
+	build_hierpath2(netlist, path, symbol.getParentScope(), sep);
 	path << symbol.name;
 
 	if (symbol.kind == ast::SymbolKind::Instance ||
@@ -3058,12 +3064,23 @@ RTLIL::IdString NetlistContext::id(const ast::Symbol &symbol)
 		}
 	}
 
-	return RTLIL::escape_id(path.str());
+	return path.str();
+}
+
+RTLIL::IdString NetlistContext::id(const ast::Symbol &symbol)
+{
+	return RTLIL::escape_id(build_hiername(*this, symbol, "."));
+}
+
+std::string NetlistContext::hdlname(const ast::Symbol &symbol)
+{
+	return build_hiername(*this, symbol, " ");
 }
 
 RTLIL::Wire *NetlistContext::add_wire(const ast::ValueSymbol &symbol)
 {
 	auto w = canvas->addWire(id(symbol), symbol.getType().getBitstreamWidth());
+	w->set_string_attribute(ID::hdlname, hdlname(symbol));
 	wire_cache[&symbol] = w;
 	transfer_attrs(symbol, w);
 	return w;

src/slang_frontend.h

@@ -452,6 +452,7 @@ struct NetlistContext : RTLILBuilder, public DiagnosticIssuer {
 
 	// Returns an ID string to use in the netlist to represent the given symbol.
 	RTLIL::IdString id(const ast::Symbol &sym);
+	std::string hdlname(const ast::Symbol &sym);
 
 	RTLIL::Wire *add_wire(const ast::ValueSymbol &sym);
 	RTLIL::Wire *wire(const ast::Symbol &sym);