Update reg to apb in tb

Author: micprog

test/frontend/tb_idma_desc64_bench.sv

@@ -5,8 +5,8 @@
 // Authors:
 // - Axel Vanoni <axvanoni@ethz.ch>
 
-`include "register_interface/typedef.svh"
-`include "register_interface/assign.svh"
+`include "apb/typedef.svh"
+`include "apb/assign.svh"
 `include "idma/tracer.svh"
 `include "idma/typedef.svh"
 `include "axi/typedef.svh"
@@ -20,7 +20,7 @@ module tb_idma_desc64_bench
     import idma_desc64_addrmap_pkg::IDMA_DESC64_REG_STATUS_REG_OFFSET;
     import rand_verif_pkg::rand_wait;
     import axi_pkg::*;
-    import reg_test::reg_driver; #(
+    import apb_test::apb_driver; #(
     parameter integer NumberOfTests           = 100,
     parameter integer SimulationTimeoutCycles = 1000000,
     parameter integer ChainedDescriptors      = 10,
@@ -70,7 +70,7 @@ module tb_idma_desc64_bench
     typedef axi_test::axi_w_beat  #(.DW(64), .UW(1))         w_beat_t;
     typedef axi_test::axi_b_beat  #(.IW(3),  .UW(1))         b_beat_t;
 
-    `REG_BUS_TYPEDEF_ALL(reg, /* addr */ addr_t, /* data */ logic [63:0], /* strobe */ logic [7:0])
+    `APB_TYPEDEF_ALL(apb, /* addr */ addr_t, /* data */ logic [63:0], /* strobe */ logic [7:0])
     `AXI_TYPEDEF_ALL(axi, /* addr */ addr_t, /* id */ axi_id_t, /* data */ logic [63:0], /* strb */ logic [7:0], /* user */ logic [0:0])
     `AXI_TYPEDEF_ALL(mem_axi, /* addr */ addr_t, /* id */ mem_axi_id_t, /* data */ logic [63:0], /* strb */ logic [7:0], /* user */ logic [0:0])
 
@@ -158,17 +158,17 @@ module tb_idma_desc64_bench
     );
 
     // dut signals and module
-    REG_BUS #(
+    APB_BUS #(
         .ADDR_WIDTH(64),
         .DATA_WIDTH(64)
-    ) i_reg_iface_bus (clk);
+    ) i_apb_bus (clk);
 
-    reg_driver #(
-        .AW(64),
-        .DW(64),
+    apb_driver #(
+        .ADDR_WIDTH(64),
+        .DATA_WIDTH(64),
         .TA(APPL_DELAY),
         .TT(ACQ_DELAY)
-    ) i_reg_iface_driver = new (i_reg_iface_bus);
+    ) i_apb_driver = new (i_apb_bus);
 
     axi_resp_t dma_fe_master_response;
     axi_req_t  dma_fe_master_request;
@@ -206,8 +206,8 @@ module tb_idma_desc64_bench
         .TT(ACQ_DELAY)
     ) i_axi_iface_driver = new (i_axi_iface_bus);
 
-    reg_rsp_t dma_slave_response;
-    reg_req_t dma_slave_request;
+    apb_resp_t dma_slave_response;
+    apb_req_t dma_slave_request;
 
     idma_pkg::idma_busy_t busy;
     idma_req_t dma_be_req;
@@ -229,8 +229,8 @@ module tb_idma_desc64_bench
         .axi_req_t       (axi_req_t),
         .axi_ar_chan_t   (axi_ar_chan_t),
         .axi_r_chan_t    (axi_r_chan_t),
-        .reg_rsp_t       (reg_rsp_t),
-        .reg_req_t       (reg_req_t),
+        .apb_rsp_t       (apb_resp_t),
+        .apb_req_t       (apb_req_t),
         .InputFifoDepth  (InputFifoDepth),
         .PendingFifoDepth(PendingFifoDepth),
         .BackendDepth    (NumAxInFlight + BufferDepth),
@@ -422,8 +422,16 @@ module tb_idma_desc64_bench
         .mst_resp_i  ( axi_mem_response       )
     );
 
-    `REG_BUS_ASSIGN_TO_REQ(dma_slave_request, i_reg_iface_bus);
-    `REG_BUS_ASSIGN_FROM_RSP(i_reg_iface_bus, dma_slave_response);
+    assign dma_slave_request.paddr   = i_apb_bus.paddr;
+    assign dma_slave_request.pprot   = i_apb_bus.pprot;
+    assign dma_slave_request.psel    = i_apb_bus.psel;
+    assign dma_slave_request.penable = i_apb_bus.penable;
+    assign dma_slave_request.pwrite  = i_apb_bus.pwrite;
+    assign dma_slave_request.pwdata  = i_apb_bus.pwdata;
+    assign dma_slave_request.pstrb   = i_apb_bus.pstrb;
+    assign i_apb_bus.pready          = dma_slave_response.pready;
+    assign i_apb_bus.prdata          = dma_slave_response.prdata;
+    assign i_apb_bus.pslverr         = dma_slave_response.pslverr;
 
     `AXI_ASSIGN_FROM_REQ(i_axi_iface_bus, dma_fe_master_request);
     `AXI_ASSIGN_FROM_RESP(i_axi_iface_bus, dma_fe_master_response);
@@ -596,7 +604,7 @@ module tb_idma_desc64_bench
     // regbus slave interaction (we're acting as master)
     task regbus_slave_interaction();
         automatic stimulus_t current_stimulus_group[$];
-        i_reg_iface_driver.reset_master();
+        i_apb_driver.reset_master();
         @(posedge rst_n);
 
         forever begin
@@ -607,7 +615,7 @@ module tb_idma_desc64_bench
             wait (generated_stimuli.size() > '0);
             current_stimulus_group = generated_stimuli.pop_front();
 
-            i_reg_iface_driver.send_write(
+            i_apb_driver.send_write(
                 .addr (IDMA_DESC64_REG_DESC_ADDR_REG_OFFSET) ,
                 .data (current_stimulus_group[0].base),
                 .strb (8'hff)                         ,
@@ -846,7 +854,7 @@ module tb_idma_desc64_bench
                 forever begin
                     automatic logic [63:0] status;
                     automatic logic error;
-                    i_reg_iface_driver.send_read(
+                    i_apb_driver.send_read(
                         .addr(IDMA_DESC64_REG_STATUS_REG_OFFSET),
                         .data(status),
                         .error(error)