prioritize AUTOINTERFACE over AUTONC

Author: jonathan-enf

verilogpp

@@ -1606,11 +1606,11 @@ sub expand_all_macros {
     $self->expand_macro('FORINST', \&expand_forinst);
     $self->expand_macro('AUTOTOSTRING', \&expand_autotostring);
     $self->expand_macro('AUTOINC', \&expand_includes);
-    $self->expand_macro('AUTONC', \&expand_autonc);
     # note: AUTOINTERFACE must expand before AUTONET, as it will change
     #       AUTONET's behavior.
     $self->expand_macro('AUTOINTERFACE', \&expand_autointerface);
     $self->expand_macro('AUTONET', \&expand_autonet);
+    $self->expand_macro('AUTONC', \&expand_autonc);
     $self->expand_macro('TIEOUTPUTSTOZERO', \&expand_tieoutputs);
   }
 }

verilogpp_tests/autonc.vpp

@@ -6,18 +6,19 @@ module inst_of_unpacked (
   output [7:0] fee [0:10-1],
   /**AUTOINTERFACE**/
 /*PPSTART*/
-  input wire       fee_en[0:5],
-  input wire [7:0] fie[0:5],
-  input wire       fie_en[0:5]
+  output wire [7:0] another_output,
+  output wire [7:0] bar,
+  input  wire       fee_en[0:5],
+  input  wire [7:0] fie[0:5],
+  input  wire       fie_en[0:5],
+  input  wire [7:0] foo[0:5],
+  input  wire       foo_en[0:5]
 /*PPSTOP*/
 );
 
 /**AUTONET --init **/
 /*PPSTART*/
-wire [7:0] another_output;
-wire [7:0] bar;
-wire [7:0] foo[0:5];
-wire  foo_en[0:5];
+
 /*PPSTOP*/
 
 /**AUTONC
@@ -28,13 +29,7 @@ wire  foo_en[0:5];
   /^foo/
 **/
 /*PPSTART*/
-assign foo = '0;
-assign foo_en = '0;
 
-logic lint_unused_signals;
-assign lint_unused_signals =
-   (another_output == '0) ||
-   (bar == '0);
 /*PPSTOP*/
 
 

verilogpp_tests/autonc2.vpp

@@ -13,8 +13,8 @@ module inst_of_unpacked (
 /*PPSTART*/
 wire [7:0] another_output;
 wire [7:0] bar;
-wire [7:0] foo[0:5];
-wire  foo_en[0:5];
+reg [7:0] foo[0:5] = '{default: '0};
+reg  foo_en[0:5] = '{default: '0};
 /*PPSTOP*/
 
 /**AUTONC

verilogpp_tests/autonc3.vpp

@@ -13,7 +13,7 @@ module inst_of_unpacked (
 /*PPSTART*/
 wire [7:0] another_output;
 wire [7:0] bar;
-wire [7:0] foo[0:5];
+reg [7:0] foo[0:5] = '{default: '0};
 wire  foo_en[0:5];
 /*PPSTOP*/
 

verilogpp_tests/autonc4.vpp

@@ -14,7 +14,7 @@ module inst_of_unpacked (
 wire [7:0] another_output;
 wire [7:0] bar;
 wire  derived;
-wire [7:0] foo[0:5];
+reg [7:0] foo[0:5] = '{default: '0};
 wire  foo_en[0:5];
 /*PPSTOP*/