Merge branch 'xnevrk03-fix-mem-tester' into 'devel'

Fix mem tester

See merge request ndk/ndk-fpga!146

Author: jakubcabal

comp/debug/mem_tester/sw/mem_tester.py

@@ -205,13 +205,14 @@ def config_test(
         }
 
     def check_test_result(self, config, status, stats):
+        burst = status['burst_cnt']
         errs = ""
         if status["err_cnt"] != 0 and not config["rand_addr"]:
             errs += f"{status['err_cnt']} words were wrong\n"
         if status["ecc_err_occ"]:
             errs += "ECC error occurred\n"
-        if stats['Requests']["rd req words"] != stats['Requests']["rd resp words"]:
-            errs += f"{stats['Requests']['rd req words'] - stats['Requests']['rd resp words']} words were not received\n"
+        if stats['Requests']["rd req cnt"][-1] * burst != stats['Requests']["rd resp words"][-1]:
+            errs += f"{stats['Requests']['rd req cnt'][-1] * burst - stats['Requests']['rd resp words'][-1]} words were not received\n"
         if not status["test_succ"] and errs == "" and not config["rand_addr"]:
             errs += "Unknown error occurred\n"
         return errs

comp/debug/mem_tester/sw/report_gen.py

@@ -276,14 +276,20 @@ def latency_table(pdf, bursts, data):
             req_cnt = np.array(data['Requests']["rd req cnt"]).reshape(-1, 1)
 
             hist_arr = hist_arr / req_cnt
-            offset = hist_x[1] - hist_x[0]
+            hist_arr = hist_arr.T
+
+            # Delete all empty rows
+            # But leave last one empty row for better visuals
+            while hist_arr.shape[0] > 0 and np.all(hist_arr[-2:] <= 0):
+                hist_arr = hist_arr[:-1]
+                hist_x   = hist_x[:-1]
+
             limits = (
                 min(burst_seq_b), max(burst_seq_b),
-                min(data['Values']['latency']['min']) - offset,
-                max(data['Values']['latency']['max']) - offset
+                hist_x[0], hist_x[-1]
             )
 
-            graph_gen.init_plots()  # title="Read latency")
+            graph_gen.init_plots()
             graph_gen.basic_plot(burst_seq_b, [
                 data['Values']['latency']["min"],
                 data['Values']['latency']["max"],
@@ -293,15 +299,6 @@ def latency_table(pdf, bursts, data):
             graph_gen.set_ylabel("latency [ns]")
             graph_gen.plot_save(f"{index}_latency_" + type)
 
-            #zoom_burst = 0
-            #x = list(data['latency']['hist_ns'].keys())
-            #y = [i[zoom_burst] for i in data['latency']['hist_ns'].values()]
-            #graph_gen.init_plots()  #title="Read latency")
-            #graph_gen.histogram_plot(x, [y], log=True)
-            #graph_gen.set_xlabel("latency [ns]")
-            #graph_gen.set_ylabel("occurrence")
-            #graph_gen.plot_save(f"{index}_latency_" + type + f'_zoom_{zoom_burst}')
-
     ## Generate PDF ##
     print_progress(progress, 'generating report')
     pdf.heading(1, "Memory tester report")