[hw,gpio,dv] Fix module_instance_name usages

Signed-off-by: Robert Schilling <[email protected]>

Author: Razer6

hw/ip_templates/gpio/dv/env/gpio_env_cfg.sv.tpl

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 class ${module_instance_name}_env_cfg extends cip_base_env_cfg #(
-  .RAL_T(gpio_reg_block)
+  .RAL_T(${module_instance_name}_reg_block)
 );
 
   // flag to indicate if weak pullup has been introduced on gpio

hw/ip_templates/gpio/dv/env/gpio_env_pkg.sv.tpl

@@ -12,7 +12,7 @@ package ${module_instance_name}_env_pkg;
   import tl_agent_pkg::*;
   import dv_lib_pkg::*;
   import cip_base_pkg::*;
-  import gpio_ral_pkg::*;
+  import ${module_instance_name}_ral_pkg::*;
 
   // macro includes
   `include "uvm_macros.svh"

hw/ip_templates/gpio/dv/env/seq_lib/gpio_filter_stress_vseq.sv.tpl

@@ -198,4 +198,4 @@ class ${module_instance_name}_filter_stress_vseq extends ${module_instance_name}
     csr_rd_check(.ptr(ral.intr_state), .compare_value(predicted_intr_state));
   endtask : read_and_check
 
-endclass : gpio_filter_stress_vseq
+endclass : ${module_instance_name}_filter_stress_vseq

hw/ip_templates/gpio/dv/env/seq_lib/gpio_intr_rand_pgm_vseq.sv.tpl

@@ -92,4 +92,4 @@ class ${module_instance_name}_intr_rand_pgm_vseq extends ${module_instance_name}
 
   endtask : body
 
-endclass : gpio_intr_rand_pgm_vseq
+endclass : ${module_instance_name}_intr_rand_pgm_vseq

hw/ip_templates/gpio/dv/gpio_sim_cfg.hjson.tpl

@@ -71,77 +71,77 @@
   tests: [
     {
       name: gpio_smoke
-      uvm_test_seq: gpio_smoke_vseq
+      uvm_test_seq: ${module_instance_name}_smoke_vseq
     }
 
     {
       name: gpio_smoke_no_pullup_pulldown
-      uvm_test_seq: gpio_smoke_vseq
+      uvm_test_seq: ${module_instance_name}_smoke_vseq
       run_opts: ["+no_pullup_pulldown=1"]
     }
 
 % if num_inp_period_counters > 0:
     {
       name: gpio_inp_prd_cnt
-      uvm_test_seq: gpio_inp_prd_cnt_vseq
+      uvm_test_seq: ${module_instance_name}_inp_prd_cnt_vseq
     }
 
 % endif
     {
       name: gpio_random_dout_din
-      uvm_test_seq: gpio_random_dout_din_vseq
+      uvm_test_seq: ${module_instance_name}_random_dout_din_vseq
     }
 
     {
       name: gpio_random_dout_din_no_pullup_pulldown
-      uvm_test_seq: gpio_random_dout_din_vseq
+      uvm_test_seq: ${module_instance_name}_random_dout_din_vseq
       run_opts: ["+no_pullup_pulldown=1"]
     }
 
     {
       name: gpio_dout_din_regs_random_rw
-      uvm_test_seq: gpio_dout_din_regs_random_rw_vseq
+      uvm_test_seq: ${module_instance_name}_dout_din_regs_random_rw_vseq
     }
 
     {
       name: gpio_intr_rand_pgm
-      uvm_test_seq: gpio_intr_rand_pgm_vseq
+      uvm_test_seq: ${module_instance_name}_intr_rand_pgm_vseq
       run_opts: ["+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_rand_intr_trigger
-      uvm_test_seq: gpio_rand_intr_trigger_vseq
+      uvm_test_seq: ${module_instance_name}_rand_intr_trigger_vseq
       run_opts: ["+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_intr_with_filter_rand_intr_event
-      uvm_test_seq: gpio_intr_with_filter_rand_intr_event_vseq
+      uvm_test_seq: ${module_instance_name}_intr_with_filter_rand_intr_event_vseq
       run_opts: ["+en_scb=0", "+zero_delays=1", "+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_filter_stress
-      uvm_test_seq: gpio_filter_stress_vseq
+      uvm_test_seq: ${module_instance_name}_filter_stress_vseq
       run_opts: ["+en_scb=0", "+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_random_long_reg_writes_reg_reads
-      uvm_test_seq: gpio_random_long_reg_writes_reg_reads_vseq
+      uvm_test_seq: ${module_instance_name}_random_long_reg_writes_reg_reads_vseq
       run_opts: ["+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_full_random
-      uvm_test_seq: gpio_full_random_vseq
+      uvm_test_seq: ${module_instance_name}_full_random_vseq
       run_opts: ["+do_clear_all_interrupts=0"]
     }
 
     {
       name: gpio_stress_all
-      uvm_test_seq: gpio_stress_all_vseq
+      uvm_test_seq: ${module_instance_name}_stress_all_vseq
       run_opts: ["+do_clear_all_interrupts=0"]
     }
 
@@ -178,19 +178,19 @@
     // Additional smoke checks for second build mode
     {
       name: gpio_smoke_en_cdc_prim
-      uvm_test_seq: gpio_smoke_vseq
+      uvm_test_seq: ${module_instance_name}_smoke_vseq
       build_mode: en_cdc_prims
     }
 
     {
       name: gpio_smoke_no_pullup_pulldown_en_cdc_prim
-      uvm_test_seq: gpio_smoke_vseq
+      uvm_test_seq: ${module_instance_name}_smoke_vseq
       build_mode: en_cdc_prims
       run_opts: ["+no_pullup_pulldown=1"]
     }
     {
       name: gpio_rand_straps
-      uvm_test_seq: gpio_rand_straps_vseq
+      uvm_test_seq: ${module_instance_name}_rand_straps_vseq
     }
   ]