Suggestion: Move parameter into module in number_test

I'm working on validating a parser for Verilog-AMS, which is basically vanilla verilog + extensions + some backports from SystemVerilog. Because of this shared heritage, quite a number of the tests in this repository are applicable and helpful. The number_test tests are useful also, because they test lexing of numberic literals. There are two tests (_3 and _4) that test SystemVerilog extensions, but the remainder are Vanilla verilog modulo the fact that `parameter` statements can't appear at top level in vanilla Verilog. By moving the parameter statements inside the model, the test would be valid in both vanilla and System Verilog. I understand that this is not a Verilog-AMS test suite, but I was hoping you might be open to generalizing the test files where the particular feature being tested itself is not a SystemVerilog extension, such that we may share some of these testcases between this repository and our Verilog-AMS test suite.
chipsalliance · Jan 28, 2021 · b04b325 · b04b325
1 parent 3aa74ac
commit b04b325
Show file tree

Hide file tree

Showing 55 changed files with 55 additions and 110 deletions.
diff --git a/tests/generic/number/number_test_0.sv b/tests/generic/number/number_test_0.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter foo = 0;
-
 module test;
+parameter foo = 0;
 endmodule
diff --git a/tests/generic/number/number_test_1.sv b/tests/generic/number/number_test_1.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 0;
-
 module test;
+parameter integer foo = 0;
 endmodule
diff --git a/tests/generic/number/number_test_10.sv b/tests/generic/number/number_test_10.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 1'bx;
-
 module test;
+parameter integer foo = 1'bx;
 endmodule
diff --git a/tests/generic/number/number_test_11.sv b/tests/generic/number/number_test_11.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 1 'b x;
-
 module test;
+parameter integer foo = 1 'b x;
 endmodule
diff --git a/tests/generic/number/number_test_12.sv b/tests/generic/number/number_test_12.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 1'bz;
-
 module test;
+parameter integer foo = 1'bz;
 endmodule
diff --git a/tests/generic/number/number_test_13.sv b/tests/generic/number/number_test_13.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 4'bxxxx;
-
 module test;
+parameter integer foo = 4'bxxxx;
 endmodule
diff --git a/tests/generic/number/number_test_14.sv b/tests/generic/number/number_test_14.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 4'bzzzz;
-
 module test;
+parameter integer foo = 4'bzzzz;
 endmodule
diff --git a/tests/generic/number/number_test_15.sv b/tests/generic/number/number_test_15.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 4'sb1111;
-
 module test;
+parameter integer foo = 4'sb1111;
 endmodule
diff --git a/tests/generic/number/number_test_16.sv b/tests/generic/number/number_test_16.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 4'Sb0000;
-
 module test;
+parameter integer foo = 4'Sb0000;
 endmodule
diff --git a/tests/generic/number/number_test_2.sv b/tests/generic/number/number_test_2.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = '0;
-
 module test;
+parameter integer foo = '0;
 endmodule
diff --git a/tests/generic/number/number_test_24.sv b/tests/generic/number/number_test_24.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'd0;
-
 module test;
+parameter integer foo = 'd0;
 endmodule
diff --git a/tests/generic/number/number_test_25.sv b/tests/generic/number/number_test_25.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'd 0;
-
 module test;
+parameter integer foo = 'd 0;
 endmodule
diff --git a/tests/generic/number/number_test_26.sv b/tests/generic/number/number_test_26.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'd1;
-
 module test;
+parameter integer foo = 32'd1;
 endmodule
diff --git a/tests/generic/number/number_test_27.sv b/tests/generic/number/number_test_27.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'D1;
-
 module test;
+parameter integer foo = 32'D1;
 endmodule
diff --git a/tests/generic/number/number_test_28.sv b/tests/generic/number/number_test_28.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32 'd 1;
-
 module test;
+parameter integer foo = 32 'd 1;
 endmodule
diff --git a/tests/generic/number/number_test_29.sv b/tests/generic/number/number_test_29.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'sd1;
-
 module test;
+parameter integer foo = 32'sd1;
 endmodule
diff --git a/tests/generic/number/number_test_3.sv b/tests/generic/number/number_test_3.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = '1;
-
 module test;
+parameter integer foo = '1;
 endmodule
diff --git a/tests/generic/number/number_test_30.sv b/tests/generic/number/number_test_30.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'Sd1;
-
 module test;
+parameter integer foo = 32'Sd1;
 endmodule
diff --git a/tests/generic/number/number_test_31.sv b/tests/generic/number/number_test_31.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dx;
-
 module test;
+parameter integer foo = 32'dx;
 endmodule
diff --git a/tests/generic/number/number_test_32.sv b/tests/generic/number/number_test_32.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dx_;
-
 module test;
+parameter integer foo = 32'dx_;
 endmodule
diff --git a/tests/generic/number/number_test_33.sv b/tests/generic/number/number_test_33.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dx__;
-
 module test;
+parameter integer foo = 32'dx__;
 endmodule
diff --git a/tests/generic/number/number_test_34.sv b/tests/generic/number/number_test_34.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dX;
-
 module test;
+parameter integer foo = 32'dX;
 endmodule
diff --git a/tests/generic/number/number_test_35.sv b/tests/generic/number/number_test_35.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dz;
-
 module test;
+parameter integer foo = 32'dz;
 endmodule
diff --git a/tests/generic/number/number_test_36.sv b/tests/generic/number/number_test_36.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'dZ;
-
 module test;
+parameter integer foo = 32'dZ;
 endmodule
diff --git a/tests/generic/number/number_test_4.sv b/tests/generic/number/number_test_4.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'b0;
-
 module test;
+parameter integer foo = 'b0;
 endmodule
diff --git a/tests/generic/number/number_test_42.sv b/tests/generic/number/number_test_42.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'o0;
-
 module test;
+parameter integer foo = 'o0;
 endmodule
diff --git a/tests/generic/number/number_test_43.sv b/tests/generic/number/number_test_43.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'o 0;
-
 module test;
+parameter integer foo = 'o 0;
 endmodule
diff --git a/tests/generic/number/number_test_44.sv b/tests/generic/number/number_test_44.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'o7;
-
 module test;
+parameter integer foo = 32'o7;
 endmodule
diff --git a/tests/generic/number/number_test_45.sv b/tests/generic/number/number_test_45.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'o7_7_7;
-
 module test;
+parameter integer foo = 32'o7_7_7;
 endmodule
diff --git a/tests/generic/number/number_test_46.sv b/tests/generic/number/number_test_46.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'O7;
-
 module test;
+parameter integer foo = 32'O7;
 endmodule
diff --git a/tests/generic/number/number_test_47.sv b/tests/generic/number/number_test_47.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32 'o 7;
-
 module test;
+parameter integer foo = 32 'o 7;
 endmodule
diff --git a/tests/generic/number/number_test_48.sv b/tests/generic/number/number_test_48.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'so7;
-
 module test;
+parameter integer foo = 32'so7;
 endmodule
diff --git a/tests/generic/number/number_test_49.sv b/tests/generic/number/number_test_49.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'So7;
-
 module test;
+parameter integer foo = 32'So7;
 endmodule
diff --git a/tests/generic/number/number_test_5.sv b/tests/generic/number/number_test_5.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'b 0;
-
 module test;
+parameter integer foo = 'b 0;
 endmodule
diff --git a/tests/generic/number/number_test_50.sv b/tests/generic/number/number_test_50.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'oxxx;
-
 module test;
+parameter integer foo = 32'oxxx;
 endmodule
diff --git a/tests/generic/number/number_test_51.sv b/tests/generic/number/number_test_51.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'oXX;
-
 module test;
+parameter integer foo = 32'oXX;
 endmodule
diff --git a/tests/generic/number/number_test_52.sv b/tests/generic/number/number_test_52.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'ozz;
-
 module test;
+parameter integer foo = 32'ozz;
 endmodule
diff --git a/tests/generic/number/number_test_53.sv b/tests/generic/number/number_test_53.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'oZZ;
-
 module test;
+parameter integer foo = 32'oZZ;
 endmodule
diff --git a/tests/generic/number/number_test_59.sv b/tests/generic/number/number_test_59.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'h0;
-
 module test;
+parameter integer foo = 'h0;
 endmodule
diff --git a/tests/generic/number/number_test_6.sv b/tests/generic/number/number_test_6.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 1'b0;
-
 module test;
+parameter integer foo = 1'b0;
 endmodule
diff --git a/tests/generic/number/number_test_60.sv b/tests/generic/number/number_test_60.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 'h 0;
-
 module test;
+parameter integer foo = 'h 0;
 endmodule
diff --git a/tests/generic/number/number_test_61.sv b/tests/generic/number/number_test_61.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'h7;
-
 module test;
+parameter integer foo = 32'h7;
 endmodule
diff --git a/tests/generic/number/number_test_62.sv b/tests/generic/number/number_test_62.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'H7fFF;
-
 module test;
+parameter integer foo = 32'H7fFF;
 endmodule
diff --git a/tests/generic/number/number_test_64.sv b/tests/generic/number/number_test_64.sv
@@ -3,7 +3,6 @@
 :description: Test
 :tags: 5.6.4 5.7.1 5.7.2
 */
-parameter int foo = 32'hdeadbeef;
-
 module test;
+parameter integer foo = 32'hdeadbeef;
 endmodule