diff --git a/projects/rocprofiler/bin/rpl_run.sh b/projects/rocprofiler/bin/rpl_run.sh index 8fd2e681cc..1ef5b07f2d 100755 --- a/projects/rocprofiler/bin/rpl_run.sh +++ b/projects/rocprofiler/bin/rpl_run.sh @@ -46,7 +46,6 @@ fi # runtime API trace ROCTX_TRACE=0 -KFD_TRACE=0 HSA_TRACE=0 SYS_TRACE=0 HIP_TRACE=0 @@ -174,7 +173,6 @@ usage() { echo " --hsa-trace - to trace HSA, generates API execution stats and JSON file chrome-tracing compatible" echo " --sys-trace - to trace HIP/HSA APIs and GPU activity, generates stats and JSON trace chrome-tracing compatible" echo " '--hsa-trace' can be used in addition to select activity tracing from HSA (ROCr runtime) level" - echo " --kfd-trace - to trace KFD, generates KFD Thunk API execution stats and JSON file chrome-tracing compatible" echo " Generated files: ._stats.txt .json" echo " Traced API list can be set by input .txt or .xml files." echo " Input .txt:" @@ -268,10 +266,6 @@ run() { if [ "$ROCTX_TRACE" = 1 ] ; then API_TRACE=${API_TRACE}":roctx" fi - if [ "$KFD_TRACE" = 1 ] ; then - API_TRACE=${API_TRACE}":kfd" - MY_LD_PRELOAD="$TT_DIR/lib/libkfdwrapper64.so $ROCM_LIB_PATH/libhsakmt.so.1 $MY_LD_PRELOAD" - fi if [ "$HIP_TRACE" = 1 ] ; then API_TRACE=${API_TRACE}":hip" fi @@ -416,11 +410,6 @@ while [ 1 ] ; do ARG_VAL=0 GEN_STATS=1 ROCTX_TRACE=1 - elif [ "$1" = "--kfd-trace" ] ; then - ARG_VAL=0 - export ROCP_TIMESTAMP_ON=1 - GEN_STATS=1 - KFD_TRACE=1 elif [ "$1" = "--hsa-trace" ] ; then ARG_VAL=0 export ROCP_TIMESTAMP_ON=1 diff --git a/projects/rocprofiler/bin/tblextr.py b/projects/rocprofiler/bin/tblextr.py index deafb1999f..66be273961 100755 --- a/projects/rocprofiler/bin/tblextr.py +++ b/projects/rocprofiler/bin/tblextr.py @@ -31,7 +31,6 @@ EXT_PID = 0 COPY_PID = 1 HIP_PID = 2 HSA_PID = 3 -KFD_PID = 4 OPS_PID = 5 GPU_BASE_PID = 6 NONE_PID = -1 @@ -764,7 +763,6 @@ else: hsa_statfile = re.sub(r'\.stats\.csv$', r'.hsa_stats.csv', statfile) hip_statfile = re.sub(r'\.stats\.csv$', r'.hip_stats.csv', statfile) - kfd_statfile = re.sub(r'\.stats\.csv$', r'.kfd_stats.csv', statfile) ops_statfile = statfile copy_statfile = re.sub(r'\.stats\.csv$', r'.copy_stats.csv', statfile) memcopy_info_file = re.sub(r'\.stats\.csv$', r'.memcopy_info.csv', statfile) @@ -777,8 +775,6 @@ else: ext_trace_found = fill_ext_db('rocTX', db, indir, 'roctx', EXT_PID) - kfd_trace_found = fill_api_db('KFD', db, indir, 'kfd', KFD_PID, NONE_PID, [], {}, 0) - hsa_trace_found = fill_api_db('HSA', db, indir, 'hsa', HSA_PID, COPY_PID, kern_dep_list, {}, 0) hsa_activity_found = fill_copy_db('COPY', db, indir) @@ -787,7 +783,7 @@ else: fill_kernel_db('KERN', db) - any_trace_found = ext_trace_found | kfd_trace_found | hsa_trace_found | hip_trace_found + any_trace_found = ext_trace_found | hsa_trace_found | hip_trace_found copy_trace_found = 0 if hsa_activity_found or len(ops_filtr): copy_trace_found = 1 @@ -803,9 +799,6 @@ else: if hsa_trace_found: db.label_json(HSA_PID, "CPU HSA API", jsonfile) - if kfd_trace_found: - db.label_json(KFD_PID, "CPU KFD API", jsonfile) - db.label_json(COPY_PID, "COPY", jsonfile) if any_trace_found and max_gpu_id >= 0: @@ -841,11 +834,6 @@ else: dform.gen_table_bins(db, 'OPS', ops_statfile, 'Name', 'DurationNs') dform.gen_ops_json_trace(db, 'OPS', GPU_BASE_PID, START_NS, jsonfile) - if kfd_trace_found: - dform.post_process_data(db, 'KFD') - dform.gen_table_bins(db, 'KFD', kfd_statfile, 'Name', 'DurationNs') - dform.gen_api_json_trace(db, 'KFD', START_NS, jsonfile) - if any_trace_found: dep_id = 0 for (proc_id, dep_proc) in dep_dict.items(): diff --git a/projects/rocprofiler/bin/txt2xml.sh b/projects/rocprofiler/bin/txt2xml.sh index 57785b8d97..c090ac4380 100755 --- a/projects/rocprofiler/bin/txt2xml.sh +++ b/projects/rocprofiler/bin/txt2xml.sh @@ -64,7 +64,7 @@ parse() { gpu_index=$line fi else - found=$(echo $feature | sed -n "/^\(pmc\|hip\|hsa\|kfd\)$/ p") + found=$(echo $feature | sed -n "/^\(pmc\|hip\|hsa\)$/ p") if [ -n "$found" ] ; then output=$outdir/input${index}.xml header="# $timestamp '$output' generated with '$0 $*'" @@ -90,11 +90,6 @@ EOF EOF fi - if [ "$feature" == "kfd" ] ; then - cat >> $output < -EOF - fi fi fi