From 256ada088d6d6a66a85efa8f8cce896cec83f991 Mon Sep 17 00:00:00 2001 From: josantos Date: Thu, 24 Aug 2023 16:43:45 -0500 Subject: [PATCH 1/2] uses c++filt instead of llvm-cxxfilt Signed-off-by: josantos --- src/utils/csv_processor.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/utils/csv_processor.py b/src/utils/csv_processor.py index c61407bb64..5d3fab0948 100644 --- a/src/utils/csv_processor.py +++ b/src/utils/csv_processor.py @@ -59,7 +59,7 @@ def kernel_name_shortener(workload_dir, level): if original_name in cache: continue - cmd = [llvm_filt, original_name] + cmd = [cpp_filt, original_name] proc = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE @@ -127,15 +127,11 @@ def kernel_name_shortener(workload_dir, level): # Only shorten if valid shortening level if level < 5: - returnPath = True - rocprof_path = resolve_rocprof(returnPath) - # Given expected rocprof dir format (ie '/opt/rocm-x.x.x/bin/rocprof') navigate to llvm in parent - rocm_dir = os.path.abspath(os.path.join(rocprof_path, os.pardir, os.pardir)) - llvm_filt = os.path.join(rocm_dir, "llvm", "bin", "llvm-cxxfilt") - if not os.path.isfile(llvm_filt): + cpp_filt = os.path.join("/usr", "bin", "c++filt") + if not os.path.isfile(cpp_filt): print( "Error: Could not resolve llvm-cxxfilt in rocm install: {}".format( - llvm_filt + cpp_filt ) ) sys.exit(0) From 56e497fd62eb42ad6551a6a49a34d65634d8d7d3 Mon Sep 17 00:00:00 2001 From: JoseSantosAMD <87447437+JoseSantosAMD@users.noreply.github.com> Date: Wed, 30 Aug 2023 17:03:39 -0500 Subject: [PATCH 2/2] Update src/utils/csv_processor.py Co-authored-by: Cole Ramos Signed-off-by: JoseSantosAMD <87447437+JoseSantosAMD@users.noreply.github.com> --- src/utils/csv_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/csv_processor.py b/src/utils/csv_processor.py index 5d3fab0948..76660ca39f 100644 --- a/src/utils/csv_processor.py +++ b/src/utils/csv_processor.py @@ -130,7 +130,7 @@ def kernel_name_shortener(workload_dir, level): cpp_filt = os.path.join("/usr", "bin", "c++filt") if not os.path.isfile(cpp_filt): print( - "Error: Could not resolve llvm-cxxfilt in rocm install: {}".format( + "Error: Could not resolve c++filt in expected directory: {}".format( cpp_filt ) )