From 9ebe1b804c0c4f46ff367a4869e1a3dce9274d06 Mon Sep 17 00:00:00 2001 From: coleramos425 Date: Fri, 1 Mar 2024 14:17:12 -0600 Subject: [PATCH] Remove hardcoded gfx90a in gen_sysinfo util Signed-off-by: coleramos425 [ROCm/rocprofiler-compute commit: 1c3e7598a6e507bfbf0d4c272643007467f98a1a] --- .../rocprofiler-compute/src/omniperf_profile/profiler_base.py | 1 + projects/rocprofiler-compute/src/omniperf_soc/soc_gfx940.py | 2 +- projects/rocprofiler-compute/src/omniperf_soc/soc_gfx941.py | 2 +- projects/rocprofiler-compute/src/omniperf_soc/soc_gfx942.py | 2 +- projects/rocprofiler-compute/src/roofline.py | 3 +++ projects/rocprofiler-compute/src/utils/utils.py | 4 ++-- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py index a8f830746e..5853a83a42 100644 --- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py +++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py @@ -400,6 +400,7 @@ class OmniProfiler_Base: skip_roof=self.__args.no_roof, roof_only=self.__args.roof_only, mspec=self._soc._mspec, + soc=self._soc ) diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx940.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx940.py index 0f573538bb..cfc58b8fd8 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx940.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx940.py @@ -67,7 +67,7 @@ class gfx940_soc(OmniSoC_Base): "TCC_channels": 32, } ) - self.roofline_obj = Roofline(args, self._mspec) + #self.roofline_obj = Roofline(args, self._mspec) # Set arch specific specs self._mspec._l2_banks = 16 diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx941.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx941.py index 884d15d1e7..7027e451a4 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx941.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx941.py @@ -67,7 +67,7 @@ class gfx941_soc(OmniSoC_Base): "TCC_channels": 32, } ) - self.roofline_obj = Roofline(args, self._mspec) + #self.roofline_obj = Roofline(args, self._mspec) # Set arch specific specs self._mspec._l2_banks = 16 diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx942.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx942.py index b0e03c6946..20a714e656 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx942.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx942.py @@ -67,7 +67,7 @@ class gfx942_soc(OmniSoC_Base): "TCC_channels": 32, } ) - self.roofline_obj = Roofline(args, self._mspec) + #self.roofline_obj = Roofline(args, self._mspec) # Set arch specific specs self._mspec._l2_banks = 16 diff --git a/projects/rocprofiler-compute/src/roofline.py b/projects/rocprofiler-compute/src/roofline.py index 68064429cf..34c735aec1 100644 --- a/projects/rocprofiler-compute/src/roofline.py +++ b/projects/rocprofiler-compute/src/roofline.py @@ -376,6 +376,8 @@ class Roofline: sysinfo_path = os.path.join(self.__args.path, "sysinfo.csv") if not os.path.isfile(sysinfo_path): logging.info("[roofline] sysinfo.csv not found. Generating...") + class Dummy_SoC: + roofline_obj = True gen_sysinfo( workload_name=self.__args.name, workload_dir=self.__workload_dir, @@ -384,6 +386,7 @@ class Roofline: skip_roof=self.__args.no_roof, roof_only=self.__args.roof_only, mspec=self.__mspec, + soc=Dummy_SoC ) @abstractmethod diff --git a/projects/rocprofiler-compute/src/utils/utils.py b/projects/rocprofiler-compute/src/utils/utils.py index f372e8598e..8fe262e757 100644 --- a/projects/rocprofiler-compute/src/utils/utils.py +++ b/projects/rocprofiler-compute/src/utils/utils.py @@ -301,7 +301,7 @@ def replace_timestamps(workload_dir): def gen_sysinfo( - workload_name, workload_dir, ip_blocks, app_cmd, skip_roof, roof_only, mspec + workload_name, workload_dir, ip_blocks, app_cmd, skip_roof, roof_only, mspec, soc ): df = mspec.get_class_members() @@ -315,7 +315,7 @@ def gen_sysinfo( blocks += t else: blocks += ip_blocks - if mspec.gpu_arch == "gfx90a" and (not skip_roof): + if hasattr(soc, "roofline_obj") and (not skip_roof): blocks.append("roofline") df["ip_blocks"] = "|".join(blocks)