diff --git a/src/pmc_table.c b/src/pmc_table.c index 3036189131..1e184cb4cb 100644 --- a/src/pmc_table.c +++ b/src/pmc_table.c @@ -93,6 +93,28 @@ static uint32_t gfx8_pl_sq_counter_ids[] = { 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295 }; +static uint32_t gfx9_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, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, +173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 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 +}; + static struct perf_counter_block kaveri_blocks[PERFCOUNTER_BLOCKID__MAX] = { [PERFCOUNTER_BLOCKID__SQ] = { .num_of_slots = 8, @@ -148,6 +170,17 @@ static struct perf_counter_block polaris_blocks[PERFCOUNTER_BLOCKID__MAX] = { }, }; +static struct perf_counter_block vega_blocks[PERFCOUNTER_BLOCKID__MAX] = { + [PERFCOUNTER_BLOCKID__SQ] = { + .num_of_slots = 16, + .num_of_counters = sizeof(gfx9_sq_counter_ids) / + sizeof(*gfx9_sq_counter_ids), + .counter_ids = gfx9_sq_counter_ids, + .counter_size_in_bits = 64, + .counter_mask = BITMASK(64) + }, +}; + /* Current APUs only have one IOMMU. If NUMA is introduced to APUs, we'll need * to expand the struct here to an array. */ @@ -307,6 +340,9 @@ get_block_properties(uint32_t node_id, case CHIP_POLARIS11: *block = polaris_blocks[block_id]; break; + case CHIP_VEGA10: + *block = vega_blocks[block_id]; + break; default: return HSAKMT_STATUS_INVALID_PARAMETER; }