Add more non-priv PMC blocks to GFX8

This patch adds more non-privileged PMC blocks to GFX8 products: gfx801,
gfx803, and gfx803. Most of them have the same counter IDs on the same
block. For certain blocks when the product doesn't have the same counter
IDs, gfx8_xx_ is used to represent the product.

Change-Id: I059913c974bf2eb875fd1cf6f8b0d8c9c9bd7c14
Signed-off-by: Amber Lin <Amber.Lin@amd.com>


[ROCm/ROCR-Runtime commit: ed4a22e0d3]
Этот коммит содержится в:
Amber Lin
2017-04-25 11:30:28 -04:00
родитель edd6771ef1
Коммит d4a47bae3e
+633
Просмотреть файл
@@ -48,11 +48,42 @@ static uint32_t gfx7_cb_counter_ids[] = {
213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225
};
static uint32_t gfx8_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, 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, 395
};
/****** 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
};
static uint32_t gfx8_cpf_counter_ids[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
};
/****** 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,
@@ -60,6 +91,12 @@ static uint32_t gfx7_cpg_counter_ids[] = {
42, 43, 44, 45
};
static uint32_t gfx8_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, 46, 47, 48
};
/****** 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,
@@ -78,6 +115,7 @@ static uint32_t gfx7_db_counter_ids[] = {
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
};
/* gfx8_db_counter_ids are the same as gfx7_db_counter_ids */
/****** GDS ******/
static uint32_t gfx7_gds_counter_ids[] = {
@@ -89,23 +127,31 @@ static uint32_t gfx7_gds_counter_ids[] = {
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
117, 118, 119, 120
};
/* gfx8_gds_counter_ids are the same as gfx7_gds_counter_ids */
/****** 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
};
/* gfx8_grbm_counter_ids are the same as gfx7_grbm_counter_ids */
/****** GRBMSE ******/
static uint32_t gfx7_grbmse_counter_ids[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
};
/* gfx8_grbmse_counter_ids are the same as gfx7_grbmse_counter_ids */
/****** 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
};
static uint32_t gfx8_ia_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
};
/****** 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,
@@ -134,6 +180,33 @@ static uint32_t gfx7_pasc_counter_ids[] = {
389, 390, 391, 392, 393, 394
};
static uint32_t gfx8_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, 395, 396
};
/****** 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,
@@ -146,6 +219,7 @@ static uint32_t gfx7_pasu_counter_ids[] = {
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
149, 150, 151, 152
};
/* gfx8_pasu_counter_ids are the same as gfx7_pasu_counter_ids */
/****** SPI ******/
static uint32_t gfx7_spi_counter_ids[] = {
@@ -162,6 +236,20 @@ static uint32_t gfx7_spi_counter_ids[] = {
181, 182, 183, 184, 185
};
static uint32_t gfx8_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, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196
};
/****** SQ ******/
/* Unused counters - 163-167 */
static uint32_t gfx7_sq_counter_ids[] = {
@@ -253,11 +341,17 @@ 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
};
static uint32_t gfx8_srbm_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
};
/****** 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
};
/* gfx8_sx_counter_ids are the same as gfx7_sx_counter_ids */
/****** TA ******/
static uint32_t gfx7_ta_counter_ids[] = {
@@ -269,6 +363,16 @@ static uint32_t gfx7_ta_counter_ids[] = {
101, 102, 103, 104, 105, 106, 107, 108, 109, 110
};
static uint32_t gfx8_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, 111, 112, 113, 114, 115, 116,
117, 118
};
/****** 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,
@@ -292,6 +396,36 @@ static uint32_t gfx7_tcc_counter_ids[] = {
149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 159
};
static uint32_t gfx8_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, 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, 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
};
static uint32_t gfx8_cz_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, 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, 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
};
/****** 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,
@@ -305,6 +439,20 @@ static uint32_t gfx7_tcp_counter_ids[] = {
149, 150, 151, 152, 153
};
static uint32_t gfx8_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, 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
};
/****** 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,
@@ -313,6 +461,7 @@ static uint32_t gfx7_tcs_counter_ids[] = {
104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127
};
/* gfx8 doesn't have TCS */
/****** TD ******/
static uint32_t gfx7_td_counter_ids[] = {
@@ -320,6 +469,7 @@ static uint32_t gfx7_td_counter_ids[] = {
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
};
/* gfx8_td_counter_ids are the same as gfx7_td_counter_ids */
/****** VGT ******/
static uint32_t gfx7_vgt_counter_ids[] = {
@@ -333,11 +483,38 @@ static uint32_t gfx7_vgt_counter_ids[] = {
133, 134, 135, 136, 137, 138, 139
};
static uint32_t gfx8_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, 140, 141, 142, 143, 144, 145
};
static uint32_t gfx8_pl_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, 140, 141, 142, 143, 144, 145, 146
};
/****** WD ******/
static uint32_t gfx7_wd_counter_ids[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9
};
static uint32_t gfx8_wd_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
};
static struct perf_counter_block kaveri_blocks[PERFCOUNTER_BLOCKID__MAX] = {
[PERFCOUNTER_BLOCKID__SQ] = {
.num_of_slots = 8,
@@ -529,6 +706,102 @@ static struct perf_counter_block hawaii_blocks[PERFCOUNTER_BLOCKID__MAX] = {
};
static struct perf_counter_block carrizo_blocks[PERFCOUNTER_BLOCKID__MAX] = {
[PERFCOUNTER_BLOCKID__CB] = {
.num_of_slots = 7,
.num_of_counters = sizeof(gfx8_cb_counter_ids) /
sizeof(*gfx8_cb_counter_ids),
.counter_ids = gfx8_cb_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPF] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpf_counter_ids) /
sizeof(*gfx8_cpf_counter_ids),
.counter_ids = gfx8_cpf_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPG] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpg_counter_ids) /
sizeof(*gfx8_cpg_counter_ids),
.counter_ids = gfx8_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(gfx8_ia_counter_ids) /
sizeof(*gfx8_ia_counter_ids),
.counter_ids = gfx8_ia_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__PASC] = {
.num_of_slots = 11,
.num_of_counters = sizeof(gfx8_pasc_counter_ids) /
sizeof(*gfx8_pasc_counter_ids),
.counter_ids = gfx8_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(gfx8_spi_counter_ids) /
sizeof(*gfx8_spi_counter_ids),
.counter_ids = gfx8_spi_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SRBM] = {
.num_of_slots = 2,
.num_of_counters = sizeof(gfx8_srbm_counter_ids) /
sizeof(*gfx8_srbm_counter_ids),
.counter_ids = gfx8_srbm_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SQ] = {
.num_of_slots = 8,
.num_of_counters = sizeof(gfx8_sq_counter_ids) /
@@ -537,6 +810,22 @@ static struct perf_counter_block carrizo_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.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(gfx8_ta_counter_ids) /
sizeof(*gfx8_ta_counter_ids),
.counter_ids = gfx8_ta_counter_ids,
.counter_size_in_bits = 64,
.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
@@ -548,9 +837,145 @@ static struct perf_counter_block carrizo_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCC] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_cz_tcc_counter_ids) /
sizeof(*gfx8_cz_tcc_counter_ids),
.counter_ids = gfx8_cz_tcc_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCP] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_tcp_counter_ids) /
sizeof(*gfx8_tcp_counter_ids),
.counter_ids = gfx8_tcp_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(gfx8_vgt_counter_ids) /
sizeof(*gfx8_vgt_counter_ids),
.counter_ids = gfx8_vgt_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__WD] = {
.num_of_slots = 4,
.num_of_counters = sizeof(gfx8_wd_counter_ids) /
sizeof(*gfx8_wd_counter_ids),
.counter_ids = gfx8_wd_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
};
static struct perf_counter_block fiji_blocks[PERFCOUNTER_BLOCKID__MAX] = {
[PERFCOUNTER_BLOCKID__CB] = {
.num_of_slots = 7,
.num_of_counters = sizeof(gfx8_cb_counter_ids) /
sizeof(*gfx8_cb_counter_ids),
.counter_ids = gfx8_cb_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPF] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpf_counter_ids) /
sizeof(*gfx8_cpf_counter_ids),
.counter_ids = gfx8_cpf_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPG] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpg_counter_ids) /
sizeof(*gfx8_cpg_counter_ids),
.counter_ids = gfx8_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(gfx8_ia_counter_ids) /
sizeof(*gfx8_ia_counter_ids),
.counter_ids = gfx8_ia_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__PASC] = {
.num_of_slots = 11,
.num_of_counters = sizeof(gfx8_pasc_counter_ids) /
sizeof(*gfx8_pasc_counter_ids),
.counter_ids = gfx8_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(gfx8_spi_counter_ids) /
sizeof(*gfx8_spi_counter_ids),
.counter_ids = gfx8_spi_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SRBM] = {
.num_of_slots = 2,
.num_of_counters = sizeof(gfx8_srbm_counter_ids) /
sizeof(*gfx8_srbm_counter_ids),
.counter_ids = gfx8_srbm_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SQ] = {
.num_of_slots = 8,
.num_of_counters = sizeof(gfx8_sq_counter_ids) /
@@ -559,6 +984,22 @@ static struct perf_counter_block fiji_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.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(gfx8_ta_counter_ids) /
sizeof(*gfx8_ta_counter_ids),
.counter_ids = gfx8_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(gfx8_tca_counter_ids) /
@@ -567,9 +1008,137 @@ static struct perf_counter_block fiji_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCC] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_tcc_counter_ids) /
sizeof(*gfx8_tcc_counter_ids),
.counter_ids = gfx8_tcc_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCP] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_tcp_counter_ids) /
sizeof(*gfx8_tcp_counter_ids),
.counter_ids = gfx8_tcp_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(gfx8_vgt_counter_ids) /
sizeof(*gfx8_vgt_counter_ids),
.counter_ids = gfx8_vgt_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__WD] = {
.num_of_slots = 4,
.num_of_counters = sizeof(gfx8_wd_counter_ids) /
sizeof(*gfx8_wd_counter_ids),
.counter_ids = gfx8_wd_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
};
static struct perf_counter_block polaris_blocks[PERFCOUNTER_BLOCKID__MAX] = {
[PERFCOUNTER_BLOCKID__CB] = {
.num_of_slots = 7,
.num_of_counters = sizeof(gfx8_cb_counter_ids) /
sizeof(*gfx8_cb_counter_ids),
.counter_ids = gfx8_cb_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPF] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpf_counter_ids) /
sizeof(*gfx8_cpf_counter_ids),
.counter_ids = gfx8_cpf_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__CPG] = {
.num_of_slots = 5,
.num_of_counters = sizeof(gfx8_cpg_counter_ids) /
sizeof(*gfx8_cpg_counter_ids),
.counter_ids = gfx8_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(gfx8_ia_counter_ids) /
sizeof(*gfx8_ia_counter_ids),
.counter_ids = gfx8_ia_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__PASC] = {
.num_of_slots = 11,
.num_of_counters = sizeof(gfx8_pasc_counter_ids) /
sizeof(*gfx8_pasc_counter_ids),
.counter_ids = gfx8_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(gfx8_spi_counter_ids) /
sizeof(*gfx8_spi_counter_ids),
.counter_ids = gfx8_spi_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SQ] = {
.num_of_slots = 8,
.num_of_counters = sizeof(gfx8_pl_sq_counter_ids) /
@@ -578,6 +1147,30 @@ static struct perf_counter_block polaris_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__SRBM] = {
.num_of_slots = 2,
.num_of_counters = sizeof(gfx8_srbm_counter_ids) /
sizeof(*gfx8_srbm_counter_ids),
.counter_ids = gfx8_srbm_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(gfx8_ta_counter_ids) /
sizeof(*gfx8_ta_counter_ids),
.counter_ids = gfx8_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(gfx8_tca_counter_ids) /
@@ -586,6 +1179,46 @@ static struct perf_counter_block polaris_blocks[PERFCOUNTER_BLOCKID__MAX] = {
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCC] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_tcc_counter_ids) /
sizeof(*gfx8_tcc_counter_ids),
.counter_ids = gfx8_tcc_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__TCP] = {
.num_of_slots = 10,
.num_of_counters = sizeof(gfx8_tcp_counter_ids) /
sizeof(*gfx8_tcp_counter_ids),
.counter_ids = gfx8_tcp_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(gfx8_pl_vgt_counter_ids) /
sizeof(*gfx8_pl_vgt_counter_ids),
.counter_ids = gfx8_pl_vgt_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
[PERFCOUNTER_BLOCKID__WD] = {
.num_of_slots = 4,
.num_of_counters = sizeof(gfx8_wd_counter_ids) /
sizeof(*gfx8_wd_counter_ids),
.counter_ids = gfx8_wd_counter_ids,
.counter_size_in_bits = 64,
.counter_mask = BITMASK(64)
},
};
static struct perf_counter_block vega_blocks[PERFCOUNTER_BLOCKID__MAX] = {