Merge pull request #5265 from bhagwat-rahul/fix-package-import

Support package import

frontends/ast/ast.cc

@@ -174,6 +174,7 @@ std::string AST::type2str(AstNodeType type)
 	X(AST_MODPORT)
 	X(AST_MODPORTMEMBER)
 	X(AST_PACKAGE)
+	X(AST_IMPORT)
 	X(AST_WIRETYPE)
 	X(AST_TYPEDEF)
 	X(AST_STRUCT)

frontends/ast/ast.h

@@ -153,6 +153,7 @@ namespace AST
 		AST_MODPORT,
 		AST_MODPORTMEMBER,
 		AST_PACKAGE,
+		AST_IMPORT,
 
 		AST_WIRETYPE,
 		AST_TYPEDEF,

frontends/ast/genrtlil.cc

@@ -1361,6 +1361,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_GENIF:
 	case AST_GENCASE:
 	case AST_PACKAGE:
+	case AST_IMPORT:
 	case AST_ENUM:
 	case AST_MODPORT:
 	case AST_MODPORTMEMBER:

frontends/ast/simplify.cc

@@ -1103,6 +1103,72 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		int counter = 0;
 		label_genblks(existing, counter);
 		std::map<std::string, AstNode*> this_wire_scope;
+
+		// Process package imports after clearing the scope but before processing module declarations
+		for (size_t i = 0; i < children.size(); i++) {
+			AstNode *child = children[i];
+			if (child->type == AST_IMPORT) {
+				// Find the package in the design
+				AstNode *package_node = nullptr;
+
+				// First look in current_ast->children (for packages in same file)
+				if (current_ast != nullptr) {
+					for (auto &design_child : current_ast->children) {
+						if (design_child->type == AST_PACKAGE) {
+							if (design_child->str == child->str) {
+								package_node = design_child;
+								break;
+							}
+						}
+					}
+				}
+
+				// If not found, look in design->verilog_packages (for packages from other files)
+				if (!package_node && simplify_design_context != nullptr) {
+					for (auto &design_package : simplify_design_context->verilog_packages) {
+						// Handle both with and without leading backslash
+						std::string package_name = design_package->str;
+						if (package_name[0] == '\\') {
+							package_name = package_name.substr(1);
+						}
+						if (package_name == child->str || design_package->str == child->str) {
+							package_node = design_package;
+							break;
+						}
+					}
+				}
+
+				if (package_node) {
+					// Import all names from the package into current scope
+					for (auto &pkg_child : package_node->children) {
+						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
+							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
+							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
+							current_scope[pkg_child->str] = pkg_child;
+						}
+						if (pkg_child->type == AST_ENUM) {
+							for (auto enode : pkg_child->children) {
+								log_assert(enode->type==AST_ENUM_ITEM);
+								if (current_scope.count(enode->str) == 0)
+									current_scope[enode->str] = enode;
+								else
+									input_error("enum item %s already exists in current scope\n", enode->str.c_str());
+							}
+						}
+					}
+					// Remove the import node since it's been processed
+					delete child;
+					children.erase(children.begin() + i);
+					i--; // Adjust index since we removed an element
+				} else {
+					// If we can't find the package, just remove the import node to avoid errors later
+					log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str());
+					delete child;
+					children.erase(children.begin() + i);
+					i--; // Adjust index since we removed an element
+				}
+			}
+		}
 		for (size_t i = 0; i < children.size(); i++) {
 			AstNode *node = children[i];
 

frontends/verilog/verilog_lexer.l

@@ -334,6 +334,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 "specparam"    { return TOK_SPECPARAM; }
 "package"      { SV_KEYWORD(TOK_PACKAGE); }
 "endpackage"   { SV_KEYWORD(TOK_ENDPACKAGE); }
+"import"       { SV_KEYWORD(TOK_IMPORT); }
 "interface"    { SV_KEYWORD(TOK_INTERFACE); }
 "endinterface" { SV_KEYWORD(TOK_ENDINTERFACE); }
 "modport"      { SV_KEYWORD(TOK_MODPORT); }

frontends/verilog/verilog_parser.y

@@ -418,6 +418,7 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
 %token TOK_SUB_ASSIGN TOK_DIV_ASSIGN TOK_MOD_ASSIGN TOK_MUL_ASSIGN
 %token TOK_SHL_ASSIGN TOK_SHR_ASSIGN TOK_SSHL_ASSIGN TOK_SSHR_ASSIGN
 %token TOK_BIND TOK_TIME_SCALE
+%token TOK_IMPORT
 
 %type <ast> range range_or_multirange non_opt_range non_opt_multirange
 %type <ast> wire_type expr basic_expr concat_list rvalue lvalue lvalue_concat_list non_io_wire_type io_wire_type
@@ -484,6 +485,7 @@ design:
 	localparam_decl design |
 	typedef_decl design |
 	package design |
+	import_stmt design |
 	interface design |
 	bind_directive design |
 	%empty;
@@ -730,6 +732,15 @@ package_body:
 package_body_stmt:
 	typedef_decl | localparam_decl | param_decl | task_func_decl;
 
+import_stmt:
+	TOK_IMPORT hierarchical_id TOK_PACKAGESEP '*' ';' {
+		// Create an import node to track package imports
+		AstNode *import_node = new AstNode(AST_IMPORT);
+		import_node->str = *$2;
+		ast_stack.back()->children.push_back(import_node);
+		delete $2;
+	};
+
 interface:
 	TOK_INTERFACE {
 		enterTypeScope();

tests/verilog/package_import_separate.sv

@@ -0,0 +1,14 @@
+package package_import_separate;
+
+  localparam integer
+    DATAWIDTH = 8,
+    ADDRWIDTH = 4;
+
+  localparam logic [2:0]
+    IDLE  = 3'b000,
+    START = 3'b001,
+    DATA  = 3'b010,
+    STOP  = 3'b100,
+    DONE  = 3'b101;
+
+endpackage

tests/verilog/package_import_separate.ys

@@ -0,0 +1,5 @@
+read_verilog -sv package_import_separate.sv
+read_verilog -sv package_import_separate_module.sv
+hierarchy -check
+proc
+opt -full

tests/verilog/package_import_separate_module.sv

@@ -0,0 +1,19 @@
+import package_import_separate::*;
+
+module package_import_separate_module;
+  logic [DATAWIDTH-1:0] data;
+  logic [ADDRWIDTH-1:0] addr;
+  logic [2:0] state;
+
+  always_comb begin
+    case (state)
+      IDLE: data = 8'h00;
+      START: data = 8'h01;
+      DATA: data = 8'h02;
+      STOP: data = 8'h04;
+      DONE: data = 8'h05;
+      default: data = 8'hFF;
+    endcase
+  end
+
+endmodule