testbenches/ip/spi_engine: fix test_lanes

This commit fixes the read and write test for the offload
mode of the test_lanes. The DDR read was removed by accident in
latest commit. It also fixes the mask and the num of active lanes.

Signed-off-by: Carlos Souza <[email protected]>

Author: caosjr

testbenches/ip/spi_engine/tests/test_lanes.sv

@@ -181,8 +181,10 @@ program test_lanes (
     #100ns;
 
     fifo_spi_test();
-    sdi_lane_mask = 8'h1;
-    sdo_lane_mask = 8'h1;
+    sdi_lane_mask = {`NUM_OF_SDI{1'b1}};
+    sdo_lane_mask = {`NUM_OF_SDO{1'b1}};
+    num_of_active_sdi_lanes = $countones(sdi_lane_mask);
+    num_of_active_sdo_lanes = $countones(sdo_lane_mask);
     spi_api.fifo_command(`SET_SDI_LANE_MASK(sdi_lane_mask));//guarantee all SDI lanes must be active
     spi_api.fifo_command(`SET_SDO_LANE_MASK(sdo_lane_mask));//guarantee all SDO lanes must be active
 
@@ -389,6 +391,7 @@ program test_lanes (
 
     for (int i = 0, k = 0; i < ((`NUM_OF_TRANSFERS)*(`NUM_OF_WORDS)*(`NUM_OF_SDI)); i++) begin
       if (sdi_lane_mask[i%(`NUM_OF_SDI)]) begin
+        sdi_read_data[k] = base_env.ddr.agent.mem_model.backdoor_memory_read_4byte(xil_axi_uint'(`DDR_BA + 4*i));
         if (sdi_read_data[k] != sdi_read_data_store[k]) begin //one word at a time comparison
           `INFO(("sdi_read_data[%d]: %x; sdi_read_data_store[%d]: %x",
           k, sdi_read_data[k],

testbenches/ip/spi_engine/tests/test_program.sv

@@ -431,12 +431,12 @@ program test_program (
     // Generate a FIFO transaction, write SDO first
     for (int i = 0; i < (`NUM_OF_WORDS); i++) begin
       for (int j = 0; j < (`NUM_OF_SDI); j++) begin
-        rx_data[j]      = sdo_lane_mask[j] ? {$urandom} : `SDO_IDLE_STATE;
+        rx_data[j]      = sdo_lane_mask[j] ? $urandom : `SDO_IDLE_STATE;
         sdi_fifo_data_store[i * (`NUM_OF_SDI) + j] = rx_data[j];
       end
 
       for (int j = 0; j < num_of_active_sdo_lanes; j++) begin
-        tx_data[j]      = {$urandom};
+        tx_data[j]      = $urandom;
         tx_data_cast[j] = tx_data[j]; //a cast is necessary for the SPI API
       end