Add regression tests for package import reference order
Check separately that explicit and wildcard package imports only affect following references. Use outer-scope declarations and package declarations with the same names so references before and after each import resolve differently. Also cover implicit named port connections and repeated explicit imports. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
parent
3679d25e4b
commit
b8b6e225fc
|
|
@ -0,0 +1,40 @@
|
||||||
|
// Check package import ordering for implicit named port connections.
|
||||||
|
|
||||||
|
package p;
|
||||||
|
integer value = 2;
|
||||||
|
endpackage
|
||||||
|
|
||||||
|
module child(input integer value = 1, output wire [31:0] result);
|
||||||
|
|
||||||
|
assign result = value;
|
||||||
|
|
||||||
|
endmodule
|
||||||
|
|
||||||
|
module test;
|
||||||
|
|
||||||
|
wire [31:0] result;
|
||||||
|
child i_child(.result(result), .*);
|
||||||
|
|
||||||
|
import p::value;
|
||||||
|
|
||||||
|
reg failed;
|
||||||
|
|
||||||
|
`define check(val, exp) \
|
||||||
|
if (val !== exp) begin \
|
||||||
|
$display("FAILED(%0d). '%s' expected %b, got %b", `__LINE__, \
|
||||||
|
`"val`", exp, val); \
|
||||||
|
failed = 1'b1; \
|
||||||
|
end
|
||||||
|
|
||||||
|
initial begin
|
||||||
|
failed = 1'b0;
|
||||||
|
#1;
|
||||||
|
|
||||||
|
`check(result, 1);
|
||||||
|
|
||||||
|
if (!failed) begin
|
||||||
|
$display("PASSED");
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
endmodule
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
// Check that an explicit package import only affects following references.
|
||||||
|
|
||||||
|
package p;
|
||||||
|
parameter value = 2;
|
||||||
|
endpackage
|
||||||
|
|
||||||
|
parameter value = 1;
|
||||||
|
|
||||||
|
module test;
|
||||||
|
|
||||||
|
localparam value_before = value;
|
||||||
|
import p::value;
|
||||||
|
localparam value_after = value;
|
||||||
|
import p::value;
|
||||||
|
|
||||||
|
reg failed;
|
||||||
|
|
||||||
|
`define check(val, exp) \
|
||||||
|
if (val !== exp) begin \
|
||||||
|
$display("FAILED(%0d). '%s' expected %b, got %b", `__LINE__, \
|
||||||
|
`"val`", exp, val); \
|
||||||
|
failed = 1'b1; \
|
||||||
|
end
|
||||||
|
|
||||||
|
initial begin
|
||||||
|
failed = 1'b0;
|
||||||
|
|
||||||
|
`check(value_before, 1);
|
||||||
|
`check(value_after, 2);
|
||||||
|
|
||||||
|
if (!failed) begin
|
||||||
|
$display("PASSED");
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
endmodule
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
// Check that a wildcard package import only affects following references.
|
||||||
|
|
||||||
|
package p;
|
||||||
|
parameter value = 2;
|
||||||
|
endpackage
|
||||||
|
|
||||||
|
parameter value = 1;
|
||||||
|
|
||||||
|
module test;
|
||||||
|
|
||||||
|
localparam value_before = value;
|
||||||
|
import p::*;
|
||||||
|
localparam value_after = value;
|
||||||
|
|
||||||
|
reg failed;
|
||||||
|
|
||||||
|
`define check(val, exp) \
|
||||||
|
if (val !== exp) begin \
|
||||||
|
$display("FAILED(%0d). '%s' expected %b, got %b", `__LINE__, \
|
||||||
|
`"val`", exp, val); \
|
||||||
|
failed = 1'b1; \
|
||||||
|
end
|
||||||
|
|
||||||
|
initial begin
|
||||||
|
failed = 1'b0;
|
||||||
|
|
||||||
|
`check(value_before, 1);
|
||||||
|
`check(value_after, 2);
|
||||||
|
|
||||||
|
if (!failed) begin
|
||||||
|
$display("PASSED");
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
endmodule
|
||||||
|
|
@ -399,7 +399,10 @@ sv_module_port3 vvp_tests/sv_module_port3.json
|
||||||
sv_module_port4 vvp_tests/sv_module_port4.json
|
sv_module_port4 vvp_tests/sv_module_port4.json
|
||||||
sv_net_array_decl_assign vvp_tests/sv_net_array_decl_assign.json
|
sv_net_array_decl_assign vvp_tests/sv_net_array_decl_assign.json
|
||||||
sv_net_decl_assign vvp_tests/sv_net_decl_assign.json
|
sv_net_decl_assign vvp_tests/sv_net_decl_assign.json
|
||||||
|
sv_package_import_order_dotstar vvp_tests/sv_package_import_order_dotstar.json
|
||||||
|
sv_package_import_order_explicit vvp_tests/sv_package_import_order_explicit.json
|
||||||
sv_package_import_order_typedef vvp_tests/sv_package_import_order_typedef.json
|
sv_package_import_order_typedef vvp_tests/sv_package_import_order_typedef.json
|
||||||
|
sv_package_import_order_wildcard vvp_tests/sv_package_import_order_wildcard.json
|
||||||
sv_package_lifetime vvp_tests/sv_package_lifetime.json
|
sv_package_lifetime vvp_tests/sv_package_lifetime.json
|
||||||
sv_package_lifetime_fail vvp_tests/sv_package_lifetime_fail.json
|
sv_package_lifetime_fail vvp_tests/sv_package_lifetime_fail.json
|
||||||
parameter_omit1 vvp_tests/parameter_omit1.json
|
parameter_omit1 vvp_tests/parameter_omit1.json
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"type" : "normal",
|
||||||
|
"source" : "sv_package_import_order_dotstar.v",
|
||||||
|
"iverilog-args" : [ "-g2005-sv" ],
|
||||||
|
"vlog95" : {
|
||||||
|
"iverilog-args" : [ "-pallowsigned=1" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"type" : "normal",
|
||||||
|
"source" : "sv_package_import_order_explicit.v",
|
||||||
|
"iverilog-args" : [ "-g2005-sv" ]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"type" : "normal",
|
||||||
|
"source" : "sv_package_import_order_wildcard.v",
|
||||||
|
"iverilog-args" : [ "-g2005-sv" ]
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue