[prim] Rename all files to match virtual cores

We expect file names to match module names. Now that the IPs are virtual
cores, rename the files to match the module names that are the new "ABI"
(so to speak).

Adjust prim_generic, prim_xilinx, and prim_xilinx_ultrascale libraries.

Co-authored-by: Hugo McNally <[email protected]>
Signed-off-by: Alexander Williams <[email protected]>

Author: a-will

hw/ip/prim_generic/lint/prim_generic_clock_buf.vlt

@@ -5,4 +5,4 @@
 
 `verilator_config
 
-lint_off -rule UNUSED -file "*/rtl/prim_generic_clock_buf.sv" -match "Parameter is not used: 'NoFpgaBuf'"
+lint_off -rule UNUSED -file "*/rtl/prim_clock_buf.sv" -match "Parameter is not used: 'NoFpgaBuf'"

hw/ip/prim_generic/lint/prim_generic_clock_buf.waiver

@@ -2,6 +2,6 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 #
-# primitives: prim_generic_clock_buf
-waive -rules PARAM_NOT_USED -location {prim_generic_clock_buf.sv} -regexp {Parameter '(NoFpgaBuf|RegionSel)' not used} \
+# primitives: prim_clock_buf
+waive -rules PARAM_NOT_USED -location {prim_clock_buf.sv} -regexp {Parameter '(NoFpgaBuf|RegionSel)' not used} \
       -comment "parameter unused but required to maintain uniform interface"

hw/ip/prim_generic/lint/prim_generic_clock_div.waiver

@@ -2,21 +2,21 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 #
-# waiver file for prim_generic_clock_div
+# waiver file for prim_clock_div
 
-waive -rules CLOCK_EDGE -location {prim_generic_clock_div.sv} -msg {Falling edge of clock 'clk_i' used here, should use rising edge} \
+waive -rules CLOCK_EDGE -location {prim_clock_div.sv} -msg {Falling edge of clock 'clk_i' used here, should use rising edge} \
       -comment "The clock switch signal is synchronized on negative edge to ensure it is away from any transition"
 
-waive -rules DUAL_EDGE_CLOCK -location {prim_generic_clock_div.sv} -regexp {.*} \
+waive -rules DUAL_EDGE_CLOCK -location {prim_clock_div.sv} -regexp {.*} \
       -comment "The clock switch signal is synchronized on negative edge to ensure it is away from any transition"
 
-waive -rules CLOCK_MUX -location {prim_generic_clock_div.sv} -regexp {.*reaches a multiplexer here, used as a clock.*} \
+waive -rules CLOCK_MUX -location {prim_clock_div.sv} -regexp {.*reaches a multiplexer here, used as a clock.*} \
       -comment "A mux is used during scan bypass, and for switching between div by 2 and div by 1 clocks"
 
-waive -rules CLOCK_USE -location {prim_generic_clock_div.sv} -regexp {'clk_i' is connected to 'prim_clock_mux2' port 'clk1_i', and used as a clock} \
+waive -rules CLOCK_USE -location {prim_clock_div.sv} -regexp {'clk_i' is connected to 'prim_clock_mux2' port 'clk1_i', and used as a clock} \
       -comment "This clock mux usage is OK."
 
-waive -rules SAME_NAME_TYPE -location {prim_generic_clock_div.sv} -regexp {'ResetValue' is used as a parameter here, and as an enumeration value at} \
+waive -rules SAME_NAME_TYPE -location {prim_clock_div.sv} -regexp {'ResetValue' is used as a parameter here, and as an enumeration value at} \
       -comment "Reused parameter name."
 
 waive -rules CLOCK_DRIVER -location {prim_generic_clock_div.sv} -regexp {'gen_div2.q_p' is driven by instance 'gen_div2\^u_div2' of module 'prim_flop', and used as a clock 'clk_i'} \

hw/ip/prim_generic/lint/prim_generic_clock_gating.vlt

@@ -5,5 +5,5 @@
 
 `verilator_config
 
-lint_off -rule UNUSED -file "*/rtl/prim_generic_clock_gating.sv" -match "Parameter is not used: 'NoFpgaGate'"
-lint_off -rule UNUSED -file "*/rtl/prim_generic_clock_gating.sv" -match "Parameter is not used: 'FpgaBufGlobal'"
+lint_off -rule UNUSED -file "*/rtl/prim_clock_gating.sv" -match "Parameter is not used: 'NoFpgaGate'"
+lint_off -rule UNUSED -file "*/rtl/prim_clock_gating.sv" -match "Parameter is not used: 'FpgaBufGlobal'"

hw/ip/prim_generic/lint/prim_generic_clock_gating.waiver

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # primitives: prim_clock_gating
-waive -rules LATCH                -location {prim_generic_clock_gating.sv} -regexp {'en_latch' is a latch} \
+waive -rules LATCH                -location {prim_clock_gating.sv} -regexp {'en_latch' is a latch} \
       -comment "clock gating cell creates a latch"
-waive -rules COMBO_NBA            -location {prim_generic_clock_gating.sv} -regexp {Non-blocking assignment to 'en_latch'} \
+waive -rules COMBO_NBA            -location {prim_clock_gating.sv} -regexp {Non-blocking assignment to 'en_latch'} \
       -comment "clock gating cell creates a latch"
-waive -rules PARAM_NOT_USED -location {prim_generic_clock_gating.sv} -regexp {Parameter 'NoFpgaGate' not used} \
+waive -rules PARAM_NOT_USED -location {prim_clock_gating.sv} -regexp {Parameter 'NoFpgaGate' not used} \
       -comment "parameter unused but required to maintain uniform interface"
-waive -rules PARAM_NOT_USED -location {prim_generic_clock_gating.sv} -regexp {Parameter 'FpgaBufGlobal' not used} \
+waive -rules PARAM_NOT_USED -location {prim_clock_gating.sv} -regexp {Parameter 'FpgaBufGlobal' not used} \
       -comment "parameter unused but required to maintain uniform interface"

hw/ip/prim_generic/lint/prim_generic_clock_mux2.vlt

@@ -5,4 +5,4 @@
 
 `verilator_config
 
-lint_off -rule UNUSED -file "*/rtl/prim_generic_clock_mux2.sv" -match "Parameter is not used: 'NoFpgaBufG'"
+lint_off -rule UNUSED -file "*/rtl/prim_clock_mux2.sv" -match "Parameter is not used: 'NoFpgaBufG'"

hw/ip/prim_generic/lint/prim_generic_clock_mux2.waiver

@@ -4,5 +4,5 @@
 #
 # waiver file for prim_clock_mux2
 
-waive -rules PARAM_NOT_USED -location {prim_generic_clock_mux2.sv} -regexp {.*Parameter 'NoFpgaBufG' not used in.*} \
+waive -rules PARAM_NOT_USED -location {prim_clock_mux2.sv} -regexp {.*Parameter 'NoFpgaBufG' not used in.*} \
       -comment "This parameter serves no function in the generic model"

hw/ip/prim_generic/lint/prim_generic_flash.waiver

@@ -2,8 +2,8 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 #
-# waiver file for prim_generic_flash
+# waiver file for prim_flash
 
 # The prim generic module does not make use of the IO ports
-waive -rules INOUT_AS_IN -location {prim_generic_flash.sv} \
+waive -rules INOUT_AS_IN -location {prim_flash.sv} \
       -regexp {Inout port 'flash_.*_io' has no driver}

hw/ip/prim_generic/lint/prim_generic_otp.vlt

@@ -6,5 +6,5 @@
 `verilator_config
 
 // The generic OTP module doesn't use vendor-specific parameters
-lint_off -rule UNUSED -file "*/rtl/prim_generic_otp.sv" -match "*VendorTestOffset*"
-lint_off -rule UNUSED -file "*/rtl/prim_generic_otp.sv" -match "*VendorTestSize*"
+lint_off -rule UNUSED -file "*/rtl/prim_otp.sv" -match "*VendorTestOffset*"
+lint_off -rule UNUSED -file "*/rtl/prim_otp.sv" -match "*VendorTestSize*"

hw/ip/prim_generic/lint/prim_generic_otp.waiver

@@ -7,10 +7,10 @@ waive -rules {CONST_FF} -location {prim_ram_1p_adv.sv} \
       -msg {Flip-flop 'rerror_q' is driven by constant zeros in module 'prim_ram_1p_adv' (Depth=1024,Width=22,EnableInputPipeline=1,EnableOutputPipeline=1)} \
       -comment "The read error bits are unused and hence set to zero."
 
-waive -rules {INOUT_AS_IN} -location {prim_generic_otp.sv} \
-      -msg {Inout port 'ext_voltage_io' has no driver in module 'prim_generic_otp'} \
+waive -rules {INOUT_AS_IN} -location {prim_otp.sv} \
+      -msg {Inout port 'ext_voltage_io' has no driver in module 'prim_otp'} \
       -comment "This signal is not driven in the generic model."
 
-waive -rules {PARAM_NOT_USED} -location {prim_generic_otp.sv} \
-      -regexp {Parameter '(VendorTestOffset|VendorTestSize)' not used in module 'prim_generic_otp'} \
+waive -rules {PARAM_NOT_USED} -location {prim_otp.sv} \
+      -regexp {Parameter '(VendorTestOffset|VendorTestSize)' not used in module 'prim_otp'} \
       -comment "These two parameters are not used in the generic model."