diff --git a/hta/common/trace_filter.py b/hta/common/trace_filter.py index e0f0d77..78dce4b 100644 --- a/hta/common/trace_filter.py +++ b/hta/common/trace_filter.py @@ -309,7 +309,7 @@ def _filter_gpu_kernels_with_cuda_sync( # run on GPU event_sync_id = symbol_table.get_sym_id_map().get("Event Sync", -1) context_sync_id = symbol_table.get_sym_id_map().get("Context Sync", -1) - return (df["stream"] > 0) | df["name"].isin([event_sync_id, context_sync_id]) + return (df["stream"] >= 0) | df["name"].isin([event_sync_id, context_sync_id]) class GPUKernelFilter(Filter): @@ -328,7 +328,7 @@ class GPUKernelFilter(Filter): logger.warning( "GPUKernelFilter needs symbol table to identify GPU synchronization events" ) - return df.loc[df["stream"] > 0] + return df.loc[df["stream"] >= 0] return df.loc[_filter_gpu_kernels_with_cuda_sync(df, symbol_table)] diff --git a/hta/common/trace_symbol_table.py b/hta/common/trace_symbol_table.py index 60ebb80..0be4db4 100644 --- a/hta/common/trace_symbol_table.py +++ b/hta/common/trace_symbol_table.py @@ -142,9 +142,17 @@ class TraceSymbolTable: cudaMemcpyAsync_id = self.sym_index.get("cudaMemcpyAsync", -128) cudaMemsetAsync_id = self.sym_index.get("cudaMemsetAsync", -128) + hipLaunchKernel_id = self.sym_index.get("hipLaunchKernel", -128) + hipLaunchKernelExC_id = self.sym_index.get("hipLaunchKernelExC", -128) + hLaunchKernel_id = self.sym_index.get("hipLaunchKernel", -128) + hipMemcpyAsync_id = self.sym_index.get("hipMemcpyAsync", -128) + hipMemsetAsync_id = self.sym_index.get("hipMemsetAsync", -128) + return ( f"((name == {cudaMemsetAsync_id}) or (name == {cudaMemcpyAsync_id}) or " - f" (name == {cudaLaunchKernel_id}) or (name == {cudaLaunchKernelExC_id})" + f"(name == {cudaLaunchKernel_id}) or (name == {cudaLaunchKernelExC_id}) or " + f"(name == {hipLaunchKernel_id}) or (name == {hipLaunchKernelExC_id}) or" + f"(name == {hipMemsetAsync_id}) or (name == {hipMemcpyAsync_id}) or (name == {hLaunchKernel_id})" f" or (name == {cuLaunchKernel_id})) and (index_correlation > 0)" )