diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/core.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/core.cpp index 430bde0db6..5ecbf5e3cc 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/core.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/core.cpp @@ -788,6 +788,8 @@ rocprofiler-sdk: - gfx906 - gfx1100 - gfx1101 + - gfx1150 + - gfx1151 - gfx908 - gfx90a - gfx9 @@ -838,6 +840,8 @@ rocprofiler-sdk: - gfx906 - gfx1100 - gfx1101 + - gfx1150 + - gfx1151 - gfx940 - gfx908 - gfx900 @@ -865,6 +869,8 @@ rocprofiler-sdk: - gfx906 - gfx1100 - gfx1101 + - gfx1150 + - gfx1151 - gfx908 - gfx90a - gfx9 diff --git a/projects/rocprofiler-sdk/source/share/rocprofiler-sdk/counter_defs.yaml b/projects/rocprofiler-sdk/source/share/rocprofiler-sdk/counter_defs.yaml index 67882f47cb..cc5707b0c8 100644 --- a/projects/rocprofiler-sdk/source/share/rocprofiler-sdk/counter_defs.yaml +++ b/projects/rocprofiler-sdk/source/share/rocprofiler-sdk/counter_defs.yaml @@ -431,6 +431,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -458,6 +460,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx900 - gfx906 @@ -596,6 +600,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 expression: (GL2C_EA_RDREQ_32B_sum*32+GL2C_EA_RDREQ_64B_sum*64+GL2C_EA_RDREQ_96B_sum*96+GL2C_EA_RDREQ_128B_sum*128)/1024 - architectures: - gfx12 @@ -721,6 +727,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 102 - architectures: @@ -743,6 +751,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -761,6 +771,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 99 - architectures: @@ -783,6 +795,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -801,6 +815,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 100 - architectures: @@ -823,6 +839,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -841,6 +859,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 101 - name: GL2C_EA_RDREQ_96B_sum @@ -857,6 +877,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 expression: reduce(GL2C_EA_RDREQ_96B,sum) - name: GL2C_EA_WRREQ description: Number of transactions (all sizes) going over the GL2C_EA_WRREQ interface for all clients. This does not @@ -912,6 +934,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 85 - architectures: @@ -935,6 +959,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -953,6 +979,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 42 - architectures: @@ -975,6 +1003,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -993,6 +1023,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 96 - name: GL2C_MC_RDREQ_sum @@ -1009,6 +1041,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 expression: reduce(GL2C_MC_RDREQ,sum) - name: GL2C_MC_WRREQ description: Number of transactions (either 32-byte or 64-byte) going over the GL2C_EA_wrreq interface. Atomics may travel @@ -1025,6 +1059,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 83 - name: GL2C_MC_WRREQ_STALL @@ -1041,6 +1077,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 88 - architectures: @@ -1064,6 +1102,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 expression: reduce(GL2C_MC_WRREQ,sum) - name: GL2C_MISS description: Number of cache misses. UC reads count as misses. @@ -1079,6 +1119,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: GL2C event: 43 - architectures: @@ -1101,6 +1143,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1119,6 +1163,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1137,6 +1183,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx900 - gfx906 @@ -1160,6 +1208,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1187,6 +1237,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1301,6 +1353,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1424,6 +1478,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1449,6 +1505,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1540,6 +1598,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx900 - gfx906 @@ -1559,6 +1619,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1579,6 +1641,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1609,6 +1673,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -1636,6 +1702,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx906 - gfx908 @@ -1777,6 +1845,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx906 - gfx908 @@ -1799,6 +1869,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx900 - gfx906 @@ -1827,6 +1899,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx906 - gfx908 @@ -2862,6 +2936,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 256 - architectures: @@ -2888,6 +2964,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 261 - architectures: @@ -2990,6 +3068,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -3262,6 +3342,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -3433,6 +3515,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 56 - architectures: @@ -3546,6 +3630,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 57 - architectures: @@ -3616,6 +3702,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 58 - architectures: @@ -3686,6 +3774,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 59 - architectures: @@ -3733,6 +3823,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 66 - architectures: @@ -3751,6 +3843,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 67 - architectures: @@ -3789,6 +3883,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 62 - architectures: @@ -4353,6 +4449,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 70 - architectures: @@ -4379,6 +4477,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 72 - architectures: @@ -4405,6 +4505,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 73 - architectures: @@ -5024,6 +5126,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 82 - architectures: @@ -5049,6 +5153,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 block: SQ event: 83 - architectures: @@ -5075,6 +5181,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -5247,6 +5355,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -5294,6 +5404,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -5870,6 +5982,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -5897,6 +6011,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -5924,6 +6040,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -6149,6 +6267,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 @@ -10289,6 +10409,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx906 - gfx908 @@ -10483,6 +10605,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 expression: ((GL2C_MC_WRREQ_sum-GL2C_EA_WRREQ_64B_sum)*32+GL2C_EA_WRREQ_64B_sum*64)/1024 - architectures: - gfx940 @@ -10532,6 +10656,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx9 - gfx906 - gfx908 @@ -10577,6 +10703,8 @@ rocprofiler-sdk: - gfx1100 - gfx1101 - gfx1102 + - gfx1150 + - gfx1151 - gfx12 - gfx1200 - gfx1201 diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/extra_counters/extra_counters.yaml b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/extra_counters/extra_counters.yaml index bd74dd5eb8..9a417f8e60 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/extra_counters/extra_counters.yaml +++ b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/extra_counters/extra_counters.yaml @@ -18,6 +18,8 @@ rocprofiler-sdk: - gfx906 - gfx1100 - gfx1101 + - gfx1150 + - gfx1151 - gfx908 - gfx90a - gfx9 diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/input1/validate.py b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/input1/validate.py index 82708fb56c..3d2772782b 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/input1/validate.py +++ b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/input1/validate.py @@ -80,7 +80,7 @@ def test_validate_counter_collection_pmc1_json(json_data): counter_collection_data = data["callback_records"]["counter_collection"] dispatch_ids = [] # at present, AQLProfile has bugs when reporting the counters for below architectures - skip_gfx = ("gfx1101", "gfx1102") + skip_gfx = ("gfx1101", "gfx1102", "gfx1150", "gfx1151") def get_kernel_name(kernel_id): return data["kernel_symbols"][kernel_id]["formatted_kernel_name"] diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/kernel_filtering/validate.py b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/kernel_filtering/validate.py index abd1f376c0..d4140955e1 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/kernel_filtering/validate.py +++ b/projects/rocprofiler-sdk/tests/rocprofv3/counter-collection/kernel_filtering/validate.py @@ -70,7 +70,7 @@ def validate_json(json_data, counter_name, check_dispatch): counter_collection_data = data["callback_records"]["counter_collection"] dispatch_ids = [] # at present, AQLProfile has bugs when reporting the counters for below architectures - skip_gfx = ("gfx1101", "gfx1102") + skip_gfx = ("gfx1101", "gfx1102", "gfx1150", "gfx1151") def get_kernel_name(kernel_id): return data["kernel_symbols"][kernel_id]["formatted_kernel_name"]