diff --git a/projects/rocprofiler-compute/src/argparser.py b/projects/rocprofiler-compute/src/argparser.py index abd0b9dd48..6a6f299309 100644 --- a/projects/rocprofiler-compute/src/argparser.py +++ b/projects/rocprofiler-compute/src/argparser.py @@ -504,7 +504,7 @@ def omniarg_parser(parser, omniperf_home, omniperf_version): dest="config_dir", metavar="", help="\t\tSpecify the directory of customized configs.", - default=omniperf_home.joinpath("omniperf_soc/configs"), + default=omniperf_home.joinpath("omniperf_soc/analysis_configs/"), ) analyze_advanced_group.add_argument( "--save-dfs", diff --git a/projects/rocprofiler-compute/src/omniperf_base.py b/projects/rocprofiler-compute/src/omniperf_base.py index a35577a29d..1e213b1974 100644 --- a/projects/rocprofiler-compute/src/omniperf_base.py +++ b/projects/rocprofiler-compute/src/omniperf_base.py @@ -132,6 +132,10 @@ class Omniperf: @demarcate def detect_soc(self, arch=None): + """Load OmniSoC instance for Omniperf run + """ + # in case of analyze mode, we can explicitly specify an arch + # rather than detect from rocminfo if not arch: mspec = get_machine_specs(0) arch = mspec.GPU diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py index 331ec19447..fb1f776a0f 100644 --- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py +++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py @@ -36,7 +36,7 @@ class OmniProfiler_Base(): self.__profiler = profiler_mode self.__soc = soc - self.__perfmon_dir = os.path.join(str(config.omniperf_home), "perfmon_configs") + self.__perfmon_dir = os.path.join(str(config.omniperf_home), "omniperf_soc", "profile_configs") def get_args(self): return self.__args diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0000_top_stat.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0000_top_stat.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0100_system_info.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0100_system_info.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0100_system_info.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0100_system_info.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0200_system-speed-of-light.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0500_command-processor.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0500_command-processor.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0500_command-processor.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0500_command-processor.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0600_shader-processor-input.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0600_shader-processor-input.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0600_shader-processor-input.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0600_shader-processor-input.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0700_wavefront-launch.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/0700_wavefront-launch.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/0700_wavefront-launch.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1000_compute-unit-instruction-mix.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1000_compute-unit-instruction-mix.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1100_compute-unit-compute-pipeline.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1100_compute-unit-compute-pipeline.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1100_compute-unit-compute-pipeline.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1100_compute-unit-compute-pipeline.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1200_lds.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1200_lds.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1200_lds.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1200_lds.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1300_instruction-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1300_instruction-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1300_instruction-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1300_instruction-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1400_constant-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1400_constant-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1400_constant-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1400_constant-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1500_TA_and_TD.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1500_TA_and_TD.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1500_TA_and_TD.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1500_TA_and_TD.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1600_L1_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1600_L1_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1600_L1_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1600_L1_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1700_L2_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1700_L2_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1700_L2_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1700_L2_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1800_L2_cache_per_channel.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1800_L2_cache_per_channel.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1800_L2_cache_per_channel.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1800_L2_cache_per_channel.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1900_memory_chart.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1900_memory_chart.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/1900_memory_chart.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/1900_memory_chart.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/2000_kernels.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx906/2000_kernels.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0000_top_stat.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0000_top_stat.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0100_system_info.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0100_system_info.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0100_system_info.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0100_system_info.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0200_system-speed-of-light.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0500_command-processor.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0500_command-processor.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0500_command-processor.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0500_command-processor.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0600_shader-processor-input.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0600_shader-processor-input.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0600_shader-processor-input.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0600_shader-processor-input.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0700_wavefront-launch.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/0700_wavefront-launch.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/0700_wavefront-launch.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1000_compute-unit-instruction-mix.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1000_compute-unit-instruction-mix.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1000_compute-unit-instruction-mix.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1000_compute-unit-instruction-mix.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1100_compute-unit-compute-pipeline.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1100_compute-unit-compute-pipeline.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1100_compute-unit-compute-pipeline.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1100_compute-unit-compute-pipeline.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1200_lds.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1200_lds.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1200_lds.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1200_lds.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1300_instruction-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1300_instruction-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1300_instruction-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1300_instruction-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1400_constant-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1400_constant-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1400_constant-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1400_constant-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1500_TA_and_TD.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1500_TA_and_TD.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1500_TA_and_TD.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1500_TA_and_TD.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1600_L1_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1600_L1_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1600_L1_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1600_L1_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1700_L2_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1700_L2_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1700_L2_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1700_L2_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1800_L2_cache_per_channel.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1800_L2_cache_per_channel.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1800_L2_cache_per_channel.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1800_L2_cache_per_channel.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1900_memory_chart.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1900_memory_chart.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/1900_memory_chart.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/1900_memory_chart.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/2000_kernels.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx908/2000_kernels.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0000_top_stat.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0000_top_stat.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0100_system_info.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0100_system_info.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0100_system_info.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0100_system_info.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0200_system-speed-of-light.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0200_system-speed-of-light.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0200_system-speed-of-light.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0500_command-processor.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0500_command-processor.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0500_command-processor.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0500_command-processor.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0600_shader-processor-input.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0600_shader-processor-input.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0600_shader-processor-input.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0600_shader-processor-input.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0700_wavefront-launch.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/0700_wavefront-launch.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/0700_wavefront-launch.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1000_compute-unit-instruction-mix.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1000_compute-unit-instruction-mix.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1000_compute-unit-instruction-mix.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1000_compute-unit-instruction-mix.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1100_compute-unit-compute-pipeline.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1100_compute-unit-compute-pipeline.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1100_compute-unit-compute-pipeline.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1100_compute-unit-compute-pipeline.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1200_lds.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1200_lds.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1200_lds.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1200_lds.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1300_instruction-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1300_instruction-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1300_instruction-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1300_instruction-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1400_constant-cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1400_constant-cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1400_constant-cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1400_constant-cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1500_TA_and_TD.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1500_TA_and_TD.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1500_TA_and_TD.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1500_TA_and_TD.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1600_L1_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1600_L1_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1600_L1_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1600_L1_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1700_L2_cache.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1700_L2_cache.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1700_L2_cache.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1700_L2_cache.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1800_L2_cache_per_channel.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1800_L2_cache_per_channel.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1800_L2_cache_per_channel.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1800_L2_cache_per_channel.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1900_memory_chart.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1900_memory_chart.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/1900_memory_chart.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/1900_memory_chart.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/2000_kernels.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/gfx90a/2000_kernels.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml diff --git a/projects/rocprofiler-compute/src/omniperf_soc/configs/panel_config_template.yaml b/projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/panel_config_template.yaml similarity index 100% rename from projects/rocprofiler-compute/src/omniperf_soc/configs/panel_config_template.yaml rename to projects/rocprofiler-compute/src/omniperf_soc/analysis_configs/panel_config_template.yaml diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_cpc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_cpc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_cpc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_cpc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_cpf_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_cpf_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_cpf_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_cpf_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_spi_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_spi_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_spi_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_spi_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf2.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf2.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf2.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf2.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf3.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf3.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf3.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf3.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf4.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf4.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf4.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf4.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf6.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf6.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf6.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf6.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf8.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf8.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sq_perf8.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sq_perf8.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sqc_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sqc_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_sqc_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_sqc_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_ta_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_ta_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_ta_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_ta_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcc2_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcc2_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcc2_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcc2_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcp_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcp_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_tcp_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_tcp_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_td_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_td_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx900/pmc_td_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx900/pmc_td_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_cpc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_cpc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_cpc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_cpc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_cpf_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_cpf_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_cpf_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_cpf_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_spi_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_spi_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_spi_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_spi_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf2.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf2.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf2.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf2.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf3.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf3.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf3.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf3.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf4.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf4.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf4.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf4.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf6.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf6.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf6.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf6.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf8.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf8.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sq_perf8.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sq_perf8.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sqc_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sqc_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_sqc_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_sqc_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_ta_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_ta_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_ta_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_ta_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcc2_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcc2_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcc2_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcc2_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcp_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcp_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_tcp_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_tcp_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_td_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_td_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx906/pmc_td_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx906/pmc_td_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_cpc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_cpc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_cpc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_cpc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_cpf_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_cpf_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_cpf_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_cpf_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_spi_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_spi_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_spi_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_spi_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf2.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf2.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf2.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf2.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf3.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf3.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf3.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf3.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf4.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf4.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf4.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf4.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf6.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf6.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf6.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf6.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf8.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf8.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sq_perf8.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sq_perf8.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sqc_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sqc_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_sqc_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_sqc_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_ta_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_ta_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_ta_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_ta_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcc2_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcc2_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcc2_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcc2_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcp_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcp_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_tcp_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_tcp_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_td_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_td_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908/pmc_td_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908/pmc_td_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx908_metrics.xml b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908_metrics.xml similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx908_metrics.xml rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx908_metrics.xml diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_cpc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_cpc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_cpc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_cpc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_cpf_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_cpf_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_cpf_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_cpf_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_spi_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_spi_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_spi_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_spi_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf2.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf2.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf2.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf2.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf3.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf3.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf3.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf3.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf4.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf4.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf4.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf4.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf6.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf6.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf6.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf6.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf8.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf8.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sq_perf8.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sq_perf8.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sqc_perf1.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sqc_perf1.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_sqc_perf1.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_sqc_perf1.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_ta_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_ta_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_ta_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_ta_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcc2_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcc2_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcc2_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcc2_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcc_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcc_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcc_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcc_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcp_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcp_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_tcp_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_tcp_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_td_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_td_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/gfx90a/pmc_td_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/gfx90a/pmc_td_perf.txt diff --git a/projects/rocprofiler-compute/src/perfmon_configs/metrics.xml b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/metrics.xml similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/metrics.xml rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/metrics.xml diff --git a/projects/rocprofiler-compute/src/perfmon_configs/roofline/pmc_roof_perf.txt b/projects/rocprofiler-compute/src/omniperf_soc/profile_configs/roofline/pmc_roof_perf.txt similarity index 100% rename from projects/rocprofiler-compute/src/perfmon_configs/roofline/pmc_roof_perf.txt rename to projects/rocprofiler-compute/src/omniperf_soc/profile_configs/roofline/pmc_roof_perf.txt diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_base.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_base.py index fe90c3d7c8..089dc1d551 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_base.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_base.py @@ -51,11 +51,6 @@ class OmniSoC_Base(): return NotImplemented return self.__soc == other.get_soc() - def error(self,message): - logging.error("") - logging.error("[ERROR]: " + message) - logging.error("") - sys.exit(1) def set_perfmon_dir(self, path:str): self.__perfmon_dir = path def set_perfmon_config(self, config: dict): diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx906.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx906.py index a9feab09eb..b844770f88 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx906.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx906.py @@ -32,7 +32,7 @@ class gfx906_soc (OmniSoC_Base): super().__init__(args) soc = "gfx906" self.set_soc(soc) - self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "perfmon_configs", soc)) + self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "omniperf_soc", "profile_configs", soc)) # Per IP block max number of simulutaneous counters. GFX IP Blocks self.set_perfmon_config( { diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx908.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx908.py index ea7c0c184e..b307cb6609 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx908.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx908.py @@ -32,7 +32,7 @@ class gfx908_soc (OmniSoC_Base): super().__init__(args) soc = "gfx908" self.set_soc(soc) - self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "perfmon_configs", soc)) + self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "omniperf_soc", "profile_configs", soc)) # Per IP block max number of simulutaneous counters. GFX IP Blocks self.set_perfmon_config( { diff --git a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx90a.py b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx90a.py index 6098d4ac70..e7b97db96c 100644 --- a/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx90a.py +++ b/projects/rocprofiler-compute/src/omniperf_soc/soc_gfx90a.py @@ -35,10 +35,9 @@ class gfx90a_soc (OmniSoC_Base): soc = "gfx90a" self.set_soc(soc) if hasattr(self.get_args(), 'roof_only') and self.get_args().roof_only: - self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "perfmon_configs", "roofline")) + self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "omniperf_soc", "profile_configs", "roofline")) else: - self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "perfmon_configs", soc)) - self.__metric_config_dir = os.path.join(str(config.omniperf_home), "metric_configs", soc) + self.set_perfmon_dir(os.path.join(str(config.omniperf_home), "omniperf_soc", "profile_configs", soc)) # Per IP block max number of simulutaneous counters. GFX IP Blocks self.set_perfmon_config( { diff --git a/projects/rocprofiler-compute/src/soc_params/mi100.csv b/projects/rocprofiler-compute/src/soc_params/mi100.csv deleted file mode 100644 index c52a4e1bb8..0000000000 --- a/projects/rocprofiler-compute/src/soc_params/mi100.csv +++ /dev/null @@ -1,2 +0,0 @@ -name,numSE,numCU,numSIMD,numWavesPerCU,numSQC,L2Banks,LDSBanks,Freq,mclk -mi100,8,120,480,40,30,32,32,1502,1200 diff --git a/projects/rocprofiler-compute/src/soc_params/mi200.csv b/projects/rocprofiler-compute/src/soc_params/mi200.csv deleted file mode 100644 index bf6343fc06..0000000000 --- a/projects/rocprofiler-compute/src/soc_params/mi200.csv +++ /dev/null @@ -1,2 +0,0 @@ -name,numSE,numCU,numSIMD,numWavesPerCU,numSQC,L2Banks,LDSBanks,Freq,mclk -mi200,8,110,440,32,56,32,32,1700,1600 diff --git a/projects/rocprofiler-compute/src/soc_params/mi50.csv b/projects/rocprofiler-compute/src/soc_params/mi50.csv deleted file mode 100644 index f5e1bda0b4..0000000000 --- a/projects/rocprofiler-compute/src/soc_params/mi50.csv +++ /dev/null @@ -1,2 +0,0 @@ -name,numSE,numCU,numSIMD,numWavesPerCU,numSQC,L2Banks,LDSBanks,Freq,mclk -mi50,4,60,240,40,15,16,32,1725,1000 diff --git a/projects/rocprofiler-compute/src/utils/file_io.py b/projects/rocprofiler-compute/src/utils/file_io.py index 366105e861..e00c72f0a8 100644 --- a/projects/rocprofiler-compute/src/utils/file_io.py +++ b/projects/rocprofiler-compute/src/utils/file_io.py @@ -57,19 +57,6 @@ def load_sys_info(f): return pd.read_csv(f) -def load_soc_params(dir): - """ - Load soc params for all supported archs to a df. - """ - df = pd.DataFrame() - for root, dirs, files in os.walk(dir): - for f in files: - if f.endswith(".csv"): - tmp_df = pd.read_csv(os.path.join(root, f)) - df = pd.concat([tmp_df, df]) - df.set_index("name", inplace=True) - return df - def load_panel_configs(dir): """ Load all panel configs from yaml file.