Add more non-priv PMC blocks to gfx70x/GFX7
HSA Thunk Spec was updated to include more non-privileged blocks for profiling. This patch adds those newly added non-privileged blocks for gfx70x. Signed-off-by: Amber Lin <Amber.Lin@amd.com> Change-Id: Id745ac236c871e8e61a128a2460784f9c9c354b6
This commit is contained in:
Amber Lin
@@ -177,12 +177,72 @@ static int blockid2uuid(enum perf_block_id block_id, HSA_UUID *uuid)
|
||||
int rc = 0;
|
||||
|
||||
switch (block_id) {
|
||||
case PERFCOUNTER_BLOCKID__CB:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_CB;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__CPF:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_CPF;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__CPG:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_CPG;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__GDS:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_GDS;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__GRBM:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_GRBM;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__GRBMSE:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_GRBMSE;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__IA:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_IA;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__MC:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_MC;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__PASC:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_PASC;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__PASU:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_PASU;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__SPI:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_SPI;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__SRBM:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_SRBM;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__SQ:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_SQ;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__SX:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_SX;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TA:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TA;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TCA:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TCA;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TCC:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TCC;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TCP:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TCP;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TCS:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TCS;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__TD:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_TD;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__VGT:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_VGT;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__WD:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_WD;
|
||||
break;
|
||||
case PERFCOUNTER_BLOCKID__IOMMUV2:
|
||||
*uuid = HSA_PROFILEBLOCK_AMD_IOMMUV2;
|
||||
break;
|
||||
|
||||
+418
-45
@@ -31,27 +31,155 @@
|
||||
#include "libhsakmt.h"
|
||||
#include "pmc_table.h"
|
||||
|
||||
/* Unused counters - 163-167 */
|
||||
static uint32_t gfx7_sq_counter_ids[] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
|
||||
23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
|
||||
43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
|
||||
63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
|
||||
83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
|
||||
102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
|
||||
118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
|
||||
134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
|
||||
150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 168, 169, 170,
|
||||
171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
|
||||
187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
|
||||
203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
|
||||
219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
|
||||
235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250
|
||||
/****** CB ******/
|
||||
static uint32_t gfx7_cb_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
|
||||
165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
|
||||
181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
|
||||
197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
|
||||
213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225
|
||||
};
|
||||
|
||||
static uint32_t gfx7_tca_counter_ids[] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
|
||||
23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38
|
||||
/****** CPF ******/
|
||||
static uint32_t gfx7_cpf_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
|
||||
};
|
||||
|
||||
/****** CPG ******/
|
||||
static uint32_t gfx7_cpg_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45
|
||||
};
|
||||
|
||||
/****** DB ******/
|
||||
static uint32_t gfx7_db_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
|
||||
165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
|
||||
181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
|
||||
197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
|
||||
213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
|
||||
229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
|
||||
245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256
|
||||
};
|
||||
|
||||
/****** GDS ******/
|
||||
static uint32_t gfx7_gds_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120
|
||||
};
|
||||
|
||||
/****** GRBM ******/
|
||||
static uint32_t gfx7_grbm_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33
|
||||
};
|
||||
|
||||
/****** GRBMSE ******/
|
||||
static uint32_t gfx7_grbmse_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
|
||||
};
|
||||
|
||||
/****** IA ******/
|
||||
static uint32_t gfx7_ia_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
|
||||
};
|
||||
|
||||
/****** PASC ******/
|
||||
static uint32_t gfx7_pasc_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
|
||||
165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
|
||||
181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
|
||||
197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
|
||||
213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
|
||||
229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
|
||||
245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260,
|
||||
261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
|
||||
277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
|
||||
293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
|
||||
309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
|
||||
325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
|
||||
341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356,
|
||||
357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372,
|
||||
373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
|
||||
389, 390, 391, 392, 393, 394
|
||||
};
|
||||
|
||||
/****** PASU ******/
|
||||
static uint32_t gfx7_pasu_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152
|
||||
};
|
||||
|
||||
/****** SPI ******/
|
||||
static uint32_t gfx7_spi_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
|
||||
165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
|
||||
181, 182, 183, 184, 185
|
||||
};
|
||||
|
||||
/****** SQ ******/
|
||||
/* Unused counters - 163-167 */
|
||||
static uint32_t gfx7_sq_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 168, 169,
|
||||
170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
|
||||
186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
|
||||
202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
|
||||
218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
|
||||
234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
|
||||
250
|
||||
};
|
||||
|
||||
/* Unused counters - 166, 292 - 297 */
|
||||
@@ -75,11 +203,6 @@ static uint32_t gfx8_sq_counter_ids[] = {
|
||||
279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 298
|
||||
};
|
||||
|
||||
static uint32_t gfx8_tca_counter_ids[] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
|
||||
23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34
|
||||
};
|
||||
|
||||
/* Polaris 10/11 have the same SQ cpunter IDs but different from other gfx8's. */
|
||||
/* Unused counters - 167 and 275 are *_DUMMY_LAST */
|
||||
static uint32_t gfx8_pl_sq_counter_ids[] = {
|
||||
@@ -125,6 +248,96 @@ static uint32_t gfx9_sq_counter_ids[] = {
|
||||
364, 365, 366, 367, 368, 369, 370, 371, 372
|
||||
};
|
||||
|
||||
/****** SRBM ******/
|
||||
static uint32_t gfx7_srbm_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18
|
||||
};
|
||||
|
||||
/****** SX ******/
|
||||
static uint32_t gfx7_sx_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33
|
||||
};
|
||||
|
||||
/****** TA ******/
|
||||
static uint32_t gfx7_ta_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110
|
||||
};
|
||||
|
||||
/****** TCA ******/
|
||||
static uint32_t gfx7_tca_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38
|
||||
};
|
||||
|
||||
static uint32_t gfx8_tca_counter_ids[] = {
|
||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
|
||||
23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34
|
||||
};
|
||||
|
||||
/****** TCC ******/
|
||||
static uint32_t gfx7_tcc_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
|
||||
81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 159
|
||||
};
|
||||
|
||||
/****** TCP ******/
|
||||
static uint32_t gfx7_tcp_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
|
||||
149, 150, 151, 152, 153
|
||||
};
|
||||
|
||||
/****** TCS ******/
|
||||
static uint32_t gfx7_tcs_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 64,
|
||||
65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
|
||||
85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
|
||||
104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
|
||||
120, 121, 122, 123, 124, 125, 126, 127
|
||||
};
|
||||
|
||||
/****** TD ******/
|
||||
static uint32_t gfx7_td_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54
|
||||
};
|
||||
|
||||
/****** VGT ******/
|
||||
static uint32_t gfx7_vgt_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
|
||||
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
|
||||
62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
|
||||
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
|
||||
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
|
||||
117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139
|
||||
};
|
||||
|
||||
/****** WD ******/
|
||||
static uint32_t gfx7_wd_counter_ids[] = {
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9
|
||||
};
|
||||
|
||||
static struct perf_counter_block kaveri_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
[PERFCOUNTER_BLOCKID__SQ] = {
|
||||
.num_of_slots = 8,
|
||||
@@ -136,6 +349,185 @@ static struct perf_counter_block kaveri_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct perf_counter_block hawaii_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
[PERFCOUNTER_BLOCKID__CB] = {
|
||||
.num_of_slots = 7,
|
||||
.num_of_counters = sizeof(gfx7_cb_counter_ids) /
|
||||
sizeof(*gfx7_cb_counter_ids),
|
||||
.counter_ids = gfx7_cb_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__CPF] = {
|
||||
.num_of_slots = 5,
|
||||
.num_of_counters = sizeof(gfx7_cpf_counter_ids) /
|
||||
sizeof(*gfx7_cpf_counter_ids),
|
||||
.counter_ids = gfx7_cpf_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__CPG] = {
|
||||
.num_of_slots = 5,
|
||||
.num_of_counters = sizeof(gfx7_cpg_counter_ids) /
|
||||
sizeof(*gfx7_cpg_counter_ids),
|
||||
.counter_ids = gfx7_cpg_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__DB] = {
|
||||
.num_of_slots = 12,
|
||||
.num_of_counters = sizeof(gfx7_db_counter_ids) /
|
||||
sizeof(*gfx7_db_counter_ids),
|
||||
.counter_ids = gfx7_db_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__GDS] = {
|
||||
.num_of_slots = 4,
|
||||
.num_of_counters = sizeof(gfx7_gds_counter_ids) /
|
||||
sizeof(*gfx7_gds_counter_ids),
|
||||
.counter_ids = gfx7_gds_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__GRBM] = {
|
||||
.num_of_slots = 2,
|
||||
.num_of_counters = sizeof(gfx7_grbm_counter_ids) /
|
||||
sizeof(*gfx7_grbm_counter_ids),
|
||||
.counter_ids = gfx7_grbm_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__GRBMSE] = {
|
||||
.num_of_slots = 1,
|
||||
.num_of_counters = sizeof(gfx7_grbmse_counter_ids) /
|
||||
sizeof(*gfx7_grbmse_counter_ids),
|
||||
.counter_ids = gfx7_grbmse_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__IA] = {
|
||||
.num_of_slots = 7,
|
||||
.num_of_counters = sizeof(gfx7_ia_counter_ids) /
|
||||
sizeof(*gfx7_ia_counter_ids),
|
||||
.counter_ids = gfx7_ia_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__PASC] = {
|
||||
.num_of_slots = 11,
|
||||
.num_of_counters = sizeof(gfx7_pasc_counter_ids) /
|
||||
sizeof(*gfx7_pasc_counter_ids),
|
||||
.counter_ids = gfx7_pasc_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__PASU] = {
|
||||
.num_of_slots = 10,
|
||||
.num_of_counters = sizeof(gfx7_pasu_counter_ids) /
|
||||
sizeof(*gfx7_pasu_counter_ids),
|
||||
.counter_ids = gfx7_pasu_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__SPI] = {
|
||||
.num_of_slots = 4,
|
||||
.num_of_counters = sizeof(gfx7_spi_counter_ids) /
|
||||
sizeof(*gfx7_spi_counter_ids),
|
||||
.counter_ids = gfx7_spi_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__SRBM] = {
|
||||
.num_of_slots = 2,
|
||||
.num_of_counters = sizeof(gfx7_srbm_counter_ids) /
|
||||
sizeof(*gfx7_srbm_counter_ids),
|
||||
.counter_ids = gfx7_srbm_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__SQ] = {
|
||||
.num_of_slots = 8,
|
||||
.num_of_counters = sizeof(gfx7_sq_counter_ids) /
|
||||
sizeof(*gfx7_sq_counter_ids),
|
||||
.counter_ids = gfx7_sq_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__SX] = {
|
||||
.num_of_slots = 4,
|
||||
.num_of_counters = sizeof(gfx7_sx_counter_ids) /
|
||||
sizeof(*gfx7_sx_counter_ids),
|
||||
.counter_ids = gfx7_sx_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TA] = {
|
||||
.num_of_slots = 6,
|
||||
.num_of_counters = sizeof(gfx7_ta_counter_ids) /
|
||||
sizeof(*gfx7_ta_counter_ids),
|
||||
.counter_ids = gfx7_ta_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCA] = {
|
||||
.num_of_slots = 10, /* same as CZ */
|
||||
.num_of_counters = sizeof(gfx7_tca_counter_ids) /
|
||||
sizeof(*gfx7_tca_counter_ids),
|
||||
.counter_ids = gfx7_tca_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCC] = {
|
||||
.num_of_slots = 10,
|
||||
.num_of_counters = sizeof(gfx7_tcc_counter_ids) /
|
||||
sizeof(*gfx7_tcc_counter_ids),
|
||||
.counter_ids = gfx7_tcc_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCP] = {
|
||||
.num_of_slots = 10,
|
||||
.num_of_counters = sizeof(gfx7_tcp_counter_ids) /
|
||||
sizeof(*gfx7_tcp_counter_ids),
|
||||
.counter_ids = gfx7_tcp_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCS] = {
|
||||
.num_of_slots = 7,
|
||||
.num_of_counters = sizeof(gfx7_tcs_counter_ids) /
|
||||
sizeof(*gfx7_tcs_counter_ids),
|
||||
.counter_ids = gfx7_tcs_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TD] = {
|
||||
.num_of_slots = 6,
|
||||
.num_of_counters = sizeof(gfx7_td_counter_ids) /
|
||||
sizeof(*gfx7_td_counter_ids),
|
||||
.counter_ids = gfx7_td_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__VGT] = {
|
||||
.num_of_slots = 10,
|
||||
.num_of_counters = sizeof(gfx7_vgt_counter_ids) /
|
||||
sizeof(*gfx7_vgt_counter_ids),
|
||||
.counter_ids = gfx7_vgt_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__WD] = {
|
||||
.num_of_slots = 4,
|
||||
.num_of_counters = sizeof(gfx7_wd_counter_ids) /
|
||||
sizeof(*gfx7_wd_counter_ids),
|
||||
.counter_ids = gfx7_wd_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
};
|
||||
|
||||
static struct perf_counter_block carrizo_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
[PERFCOUNTER_BLOCKID__SQ] = {
|
||||
.num_of_slots = 8,
|
||||
@@ -146,8 +538,8 @@ static struct perf_counter_block carrizo_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCA] = {
|
||||
/* PMC0: PERF_SEL~PERF_SEL3, PMC1: PERF_SEL~PERF_SEL3, PMC2: PERF_SEL
|
||||
* PMC3: PERF_SEL. So 10 PERF_SELs in total
|
||||
/* PMC0: PERF_SEL~PERF_SEL3, PMC1: PERF_SEL~PERF_SEL3,
|
||||
* PMC2: PERF_SEL, PMC3: PERF_SEL. So 10 PERF_SELs in total
|
||||
*/
|
||||
.num_of_slots = 10,
|
||||
.num_of_counters = sizeof(gfx8_tca_counter_ids) /
|
||||
@@ -177,25 +569,6 @@ static struct perf_counter_block fiji_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct perf_counter_block hawaii_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
[PERFCOUNTER_BLOCKID__SQ] = {
|
||||
.num_of_slots = 8,
|
||||
.num_of_counters = sizeof(gfx7_sq_counter_ids) /
|
||||
sizeof(*gfx7_sq_counter_ids),
|
||||
.counter_ids = gfx7_sq_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
[PERFCOUNTER_BLOCKID__TCA] = {
|
||||
.num_of_slots = 10, /* same as CZ */
|
||||
.num_of_counters = sizeof(gfx7_tca_counter_ids) /
|
||||
sizeof(*gfx7_tca_counter_ids),
|
||||
.counter_ids = gfx7_tca_counter_ids,
|
||||
.counter_size_in_bits = 64,
|
||||
.counter_mask = BITMASK(64)
|
||||
},
|
||||
};
|
||||
|
||||
static struct perf_counter_block polaris_blocks[PERFCOUNTER_BLOCKID__MAX] = {
|
||||
[PERFCOUNTER_BLOCKID__SQ] = {
|
||||
.num_of_slots = 8,
|
||||
|
||||
+25
-1
@@ -30,8 +30,32 @@
|
||||
|
||||
enum perf_block_id {
|
||||
PERFCOUNTER_BLOCKID__FIRST = 0,
|
||||
PERFCOUNTER_BLOCKID__SQ = PERFCOUNTER_BLOCKID__FIRST,
|
||||
/* non-privileged */
|
||||
PERFCOUNTER_BLOCKID__CB = PERFCOUNTER_BLOCKID__FIRST,
|
||||
PERFCOUNTER_BLOCKID__CPC,
|
||||
PERFCOUNTER_BLOCKID__CPF,
|
||||
PERFCOUNTER_BLOCKID__CPG,
|
||||
PERFCOUNTER_BLOCKID__DB,
|
||||
PERFCOUNTER_BLOCKID__GDS,
|
||||
PERFCOUNTER_BLOCKID__GRBM,
|
||||
PERFCOUNTER_BLOCKID__GRBMSE,
|
||||
PERFCOUNTER_BLOCKID__IA,
|
||||
PERFCOUNTER_BLOCKID__MC,
|
||||
PERFCOUNTER_BLOCKID__PASC,
|
||||
PERFCOUNTER_BLOCKID__PASU,
|
||||
PERFCOUNTER_BLOCKID__SPI,
|
||||
PERFCOUNTER_BLOCKID__SRBM,
|
||||
PERFCOUNTER_BLOCKID__SQ,
|
||||
PERFCOUNTER_BLOCKID__SX,
|
||||
PERFCOUNTER_BLOCKID__TA,
|
||||
PERFCOUNTER_BLOCKID__TCA,
|
||||
PERFCOUNTER_BLOCKID__TCC,
|
||||
PERFCOUNTER_BLOCKID__TCP,
|
||||
PERFCOUNTER_BLOCKID__TCS,
|
||||
PERFCOUNTER_BLOCKID__TD,
|
||||
PERFCOUNTER_BLOCKID__VGT,
|
||||
PERFCOUNTER_BLOCKID__WD,
|
||||
/* privileged */
|
||||
PERFCOUNTER_BLOCKID__IOMMUV2,
|
||||
PERFCOUNTER_BLOCKID__MAX
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user