add OpsCounter and GPUStats

Author: chloechia4

cuda_bindings/tests/test_cufile.py

@@ -2181,19 +2181,18 @@ def test_get_stats_l1():
         # Get L1 statistics (basic operation counts)
         cufile.get_stats_l1(stats.ptr)
 
-        # Verify actual field values
-        # Access numpy recarray fields: read_ops returns a recarray with 'ok' and 'err' fields
-        read_ops_ok = int(stats.read_ops['ok'][0])
-        write_ops_ok = int(stats.write_ops['ok'][0])
+        # Verify actual field values using OpCounter class for cleaner access
+        read_ops = cufile.OpCounter.from_data(stats.read_ops)
+        write_ops = cufile.OpCounter.from_data(stats.write_ops)
         read_bytes = int(stats.read_bytes)
         write_bytes = int(stats.write_bytes)
 
-        assert read_ops_ok > 0, f"Expected read operations, got {read_ops_ok}"
-        assert write_ops_ok > 0, f"Expected write operations, got {write_ops_ok}"
+        assert read_ops.ok > 0, f"Expected read operations, got {read_ops.ok}"
+        assert write_ops.ok > 0, f"Expected write operations, got {write_ops.ok}"
         assert read_bytes > 0, f"Expected read bytes, got {read_bytes}"
         assert write_bytes > 0, f"Expected write bytes, got {write_bytes}"
 
-        logging.info(f"Stats: reads={read_ops_ok}, writes={write_ops_ok}, "
+        logging.info(f"Stats: reads={read_ops.ok}, writes={write_ops.ok}, "
                     f"read_bytes={read_bytes}, write_bytes={write_bytes}")
 
         # Stop statistics collection
@@ -2284,7 +2283,13 @@ def test_get_stats_l2():
         write_hist_total = int(stats.write_size_kb_hist.sum())
         assert read_hist_total > 0 or write_hist_total > 0, "Expected L2 histogram data"
 
-        logging.info(f"L2 Stats: read_hist_total={read_hist_total}, write_hist_total={write_hist_total}")
+        # L2 also contains L1 basic stats - verify using OpCounter class
+        basic_stats = cufile.StatsLevel1.from_data(stats.basic)
+        read_ops = cufile.OpCounter.from_data(basic_stats.read_ops)
+        write_ops = cufile.OpCounter.from_data(basic_stats.write_ops)
+
+        logging.info(f"L2 Stats: read_hist_total={read_hist_total}, write_hist_total={write_hist_total}, "
+                    f"basic_reads={read_ops.ok}, basic_writes={write_ops.ok}")
 
         # Stop statistics collection
         cufile.stats_stop()
@@ -2376,17 +2381,24 @@ def test_get_stats_l3():
         num_gpus = int(stats.num_gpus)
         assert num_gpus >= 0, f"Expected valid GPU count, got {num_gpus}"
 
-        # Check if we have at least one GPU with stats
-        # per_gpu_stats is a numpy recarray with shape (16,)
+        # Check if we have at least one GPU with stats using PerGpuStats class
         gpu_with_data = False
         for i in range(min(num_gpus, 16)):
-            gpu_stats = stats.per_gpu_stats[i]
-            # Access scalar values from the recarray element
-            if int(gpu_stats['n_total_reads'][0]) > 0 or int(gpu_stats['read_bytes'][0]) > 0:
+            # Access per-GPU stats using PerGpuStats class
+            # stats.per_gpu_stats has shape (1, 16), we need to get [0] first to get the (16,) array
+            # then slice [i:i+1] to get a 1-d array view (required by from_data)
+            per_gpu_array = stats.per_gpu_stats[0]  # Get the (16,) array
+            gpu_stats = cufile.PerGpuStats.from_data(per_gpu_array[i:i+1])
+            if gpu_stats.n_total_reads > 0 or gpu_stats.read_bytes > 0:
                 gpu_with_data = True
                 break
 
-        logging.info(f"L3 Stats: num_gpus={num_gpus}, gpu_with_data={gpu_with_data}")
+        # L3 also contains L2 detailed stats (which includes L1 basic stats)
+        detailed_stats = cufile.StatsLevel2.from_data(stats.detailed)
+        read_hist_total = int(detailed_stats.read_size_kb_hist.sum())
+        
+        logging.info(f"L3 Stats: num_gpus={num_gpus}, gpu_with_data={gpu_with_data}, "
+                    f"detailed_read_hist={read_hist_total}")
 
         # Stop statistics collection
         cufile.stats_stop()