From 95c25acfee13f19141ff73f256b8680f5d86b75f Mon Sep 17 00:00:00 2001 From: Benjamin Welton Date: Tue, 16 Apr 2024 23:43:59 +0000 Subject: [PATCH] Remove unnecessary unknown gfx --- .../pc_sampling/parser/CMakeLists.txt | 2 +- .../pc_sampling/parser/correlation.hpp | 2 -- .../parser/pc_record_interface.cpp | 2 -- .../parser/pc_record_interface.hpp | 2 +- .../pc_sampling/parser/translation.hpp | 25 ------------------- 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt index 87ec7533be..7a0e30326e 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt @@ -1,6 +1,6 @@ set(ROCPROFILER_LIB_PC_SAMPLING_PARSER_SOURCES pc_record_interface.cpp) set(ROCPROFILER_LIB_PC_SAMPLING_PARSER_HEADERS - correlation.hpp gfx9.hpp gfx11.hpp gfx_unknown.hpp parser_types.h pc_record_interface.hpp + correlation.hpp gfx9.hpp gfx11.hpp parser_types.h pc_record_interface.hpp rocr.h translation.hpp) target_sources( diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp b/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp index f3339e9dcd..bb6bc15825 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp @@ -299,8 +299,6 @@ pcsample_status_t inline parse_buffer(generic_sample_t* buffer, parseSample_func = _parse_buffer; else if(gfxip_major == 11) parseSample_func = _parse_buffer; - else if(gfxip_major == 0) - parseSample_func = _parse_buffer; else return PCSAMPLE_STATUS_INVALID_GFXIP; diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp b/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp index 4a39865d4e..a42acebdbc 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp @@ -43,8 +43,6 @@ PCSamplingParserContext::parse(const upcoming_samples_t& upcoming, auto parseSample_func = &PCSamplingParserContext::_parse; if(gfxip_major == 11) parseSample_func = &PCSamplingParserContext::_parse; - else if(gfxip_major == 0) - parseSample_func = &PCSamplingParserContext::_parse; else if(gfxip_major != 9) return PCSAMPLE_STATUS_INVALID_GFXIP; diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp b/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp index 41de7fe447..6623dac136 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp @@ -60,7 +60,7 @@ public: * As an intermediate step, "midway_signal" signals when it's safe to reuse/delete "data". * @param[in] upcoming Metadata of upcoming samples * @param[in] data Pointer containing the raw hardware samples. Must match upcoming.num_samples. - * @param[in] gfxip_major GFXIP of these samples (GFX9==9/GFX11==11/gfx_unknown==12). + * @param[in] gfxip_major GFXIP of these samples (GFX9==9/GFX11==11). * @param[in] midway_signal notifies_all when the samples have been processed. * @param[in] bFlushCorrelationIds Set to true if this is the last batch from a ROCr buffer. * @returns PCSAMPLE_STATUS_SUCCESS on success. diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp b/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp index f81857a044..bff92473bb 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp @@ -27,7 +27,6 @@ #include #include "lib/rocprofiler-sdk/pc_sampling/parser/gfx11.hpp" -#include "lib/rocprofiler-sdk/pc_sampling/parser/gfx_unknown.hpp" #include "lib/rocprofiler-sdk/pc_sampling/parser/gfx9.hpp" #include "lib/rocprofiler-sdk/pc_sampling/parser/parser_types.h" #include "lib/rocprofiler-sdk/pc_sampling/parser/rocr.h" @@ -108,30 +107,6 @@ copyStochasticSample(const perf_sample_snapshot_v1& sample) return ret; } -template <> -inline pcsample_v1_t -copyStochasticSample(const perf_sample_snapshot_v1& sample) -{ - pcsample_v1_t ret = copySampleHeader(sample); - ret.flags.valid = sample.perf_snapshot_data & 0x1; - // Check wave_id matches snapshot_wave_id - - ret.flags.has_wave_cnt = true; - ret.flags.has_stall_reason = true; - - ret.wave_issued = sample.perf_snapshot_data >> 1; - ret.snapshot.inst_type = sample.perf_snapshot_data >> 2; - ret.snapshot.reason_not_issued = (sample.perf_snapshot_data >> 6) & 0x7; - - ret.wave_count = sample.perf_snapshot_data1 & 0x3F; - ret.snapshot.arb_state_issue = (sample.perf_snapshot_data1 >> 6) & 0xFF; - ret.snapshot.arb_state_stall = (sample.perf_snapshot_data1 >> 14) & 0xFF; - - ret.flags.has_memory_counter = true; - ret.memory_counters.raw = sample.perf_snapshot_data2; - return ret; -} - #define BITSHIFT(sname) out |= ((in >> GFX::sname) & 1) << PCSAMPLE::sname template