rocpd: add Duration column to kernel CSV output and validation test

Add Duration column computed as (end - start) in get_kernel_csv_query().
Add kernel-duration-ns integration test validating Duration against JSON output using rocpd Python API.

Validation ensures:
- Duration == End_Timestamp - Start_Timestamp
- rocpd DB values match JSON kernel records for the same execution.

Author: ihhethan

projects/rocprofiler-sdk/source/lib/python/rocpd/csv.py

@@ -212,9 +212,7 @@ def build_agent_id_string(agent_index_value, prefix=""):
     else:
         return ""
 
-
-def write_kernel_csv(importData, config) -> None:
-
+def get_kernel_csv_query(config) -> str:
     agent_id = build_agent_id_string(config.agent_index_value)
 
     if config.kernel_rename:
@@ -249,21 +247,19 @@ def write_kernel_csv(importData, config) -> None:
         "grid_z AS Grid_Size_Z",
     ]
 
-    aliased_headers = []
-    for column in select_columns:
-        aliased_headers.append(column)
-
-    select_clause = ",\n".join(aliased_headers)
+    select_clause = ",\n".join(select_columns)
 
-    query = f"""
+    return f"""
         SELECT
             {select_clause}
         FROM "kernels"
         ORDER BY
             guid ASC, start ASC, end DESC
     """
-    write_sql_query_to_csv(importData, config, query, "kernel")
 
+def write_kernel_csv(importData, config) -> None:
+    query = get_kernel_csv_query(config)
+    write_sql_query_to_csv(importData, config, query, "kernel")
 
 def write_memory_copy_csv(importData, config) -> None:
 
@@ -280,15 +276,13 @@ def write_memory_copy_csv(importData, config) -> None:
             {dst_agent_id} AS Destination_Agent_Id,
             stack_id AS Correlation_Id,
             start AS Start_Timestamp,
-            end AS End_Timestamp,
-            (end - start) AS Duration
+            end AS End_Timestamp
         FROM "memory_copies"
         ORDER BY
             guid ASC, start ASC, end DESC
     """
     write_sql_query_to_csv(importData, config, query, "memory_copy")
 
-
 def write_memory_allocation_csv(importData, config) -> None:
 
     agent_id = build_agent_id_string(config.agent_index_value)
@@ -311,8 +305,7 @@ def write_memory_allocation_csv(importData, config) -> None:
             '0x' || printf('%016X', address) AS Address,
             stack_id AS Correlation_Id,
             start AS Start_Timestamp,
-            end AS End_Timestamp,
-            (end - start) AS Duration
+            end AS End_Timestamp
         FROM "memory_allocations"
         ORDER BY
             guid ASC, start ASC, end DESC
@@ -344,8 +337,7 @@ def write_counters_csv(importData, config) -> None:
         "counter_name",
         "value AS Counter_Value",
         "start AS Start_Timestamp",
-        "end AS End_Timestamp",
-        "(end - start) AS Duration",
+        "end AS End_Timestamp"
     ]
 
     aliased_headers = []
@@ -378,8 +370,7 @@ def write_scratch_memory_csv(importData, config) -> None:
             tid AS Thread_Id,
             alloc_flags,
             start AS Start_Timestamp,
-            end AS End_Timestamp,
-            (end - start) AS Duration
+            end AS End_Timestamp
         FROM "scratch_memory"
         ORDER BY
             guid ASC, start ASC, end DESC
@@ -398,8 +389,7 @@ def write_region_csv(importData, config) -> None:
             tid AS Thread_Id,
             stack_id AS Correlation_Id,
             start AS Start_Timestamp,
-            end AS End_Timestamp,
-            (end - start) AS Duration
+            end AS End_Timestamp
         FROM "regions"
         ORDER BY
             guid ASC, start ASC, end DESC

projects/rocprofiler-sdk/tests/rocprofv3/kernel-duration-ns/CMakeLists.txt

@@ -11,11 +11,15 @@ project(
 find_package(rocprofiler-sdk REQUIRED)
 find_package(Python3 REQUIRED)
 
-set(rocprofv3-env
+set(rocprofv3-generate-env
     "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}"
     "PYTHONPATH=${rocprofiler-sdk_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages"
     "ROCPROF_OUTPUT_FORMAT=json,rocpd")
 
+set(rocprofv3-validate-env
+    "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}"
+    "PYTHONPATH=${rocprofiler-sdk_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages")
+
 rocprofiler_configure_pytest_files(CONFIG pytest.ini COPY conftest.py validate.py)
 
 # Generate BOTH JSON and rocpd in a SINGLE execution using environment variable
@@ -28,18 +32,14 @@ add_test(
 
 set_tests_properties(
     rocprofv3-test-kernel-trace-duration-generate
-    PROPERTIES TIMEOUT
-               120
-               LABELS
-               "integration-tests;kernel-trace-duration"
-               ENVIRONMENT
-               "${rocprofv3-env}"
-               FAIL_REGULAR_EXPRESSION
-               "${ROCPROFILER_DEFAULT_FAIL_REGEX}"
-               FIXTURES_SETUP
-               rocprofv3-test-kernel-trace-duration-data)
-
-# Validate: Convert rocpd DB -> CSV and compare with JSON
+    PROPERTIES
+        TIMEOUT 120
+        LABELS "integration-tests;kernel-trace-duration"
+        ENVIRONMENT "${rocprofv3-generate-env}"
+        FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}"
+        FIXTURES_SETUP rocprofv3-test-kernel-trace-duration-data)
+
+# Validate: compare rocpd kernel query output with JSON
 add_test(
     NAME rocprofv3-test-kernel-trace-duration-validation
     COMMAND
@@ -50,13 +50,9 @@ add_test(
 
 set_tests_properties(
     rocprofv3-test-kernel-trace-duration-validation
-    PROPERTIES TIMEOUT
-               120
-               LABELS
-               "integration-tests;kernel-trace-duration"
-               ENVIRONMENT
-               "${rocprofv3-env}"
-               FIXTURES_REQUIRED
-               rocprofv3-test-kernel-trace-duration-data
-               FAIL_REGULAR_EXPRESSION
-               "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
+    PROPERTIES
+        TIMEOUT 120
+        LABELS "integration-tests;kernel-trace-duration"
+        ENVIRONMENT "${rocprofv3-validate-env}"
+        FIXTURES_REQUIRED rocprofv3-test-kernel-trace-duration-data
+        FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")