AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libhsakmt: add gfx90c support for thunk

Browse Source 
This patch adds the support for gfx90c apu. So far we treat it as "dgpu" and
gfx900. Will update hsa gfxip table while the isa/llvm is implemented on gfx90c.

Change-Id: I6ef164bf3e751fe6dd6287cac212a500dce84b1a
Signed-off-by: Huang Rui <ray.huang@amd.com>


[ROCm/ROCR-Runtime commit: fdba74c2fb]
This commit is contained in:
Huang Rui
2019-11-12 14:32:19 +08:00
committed by Ray Huang
parent 5b008cefc8
commit d0c78bf4d5
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/src/libhsakmt.h
+5 -4
View File
@@ -122,10 +122,11 @@ enum asic_family_type {
CHIP_VEGA12, /* 10 */ CHIP_VEGA12, /* 10 */
CHIP_VEGA20, /* 11 */ CHIP_VEGA20, /* 11 */
CHIP_RAVEN, /* 12 */ CHIP_RAVEN, /* 12 */
CHIP_ARCTURUS, /* 13 */ CHIP_RENOIR, /* 13 */
CHIP_NAVI10, /* 14 */ CHIP_ARCTURUS, /* 14 */
CHIP_NAVI12, /* 15 */ CHIP_NAVI10, /* 15 */
CHIP_NAVI14, /* 16 */ CHIP_NAVI12, /* 16 */
CHIP_NAVI14, /* 17 */
CHIP_LAST CHIP_LAST
}; };
projects/rocr-runtime/src/pmc_table.c
+1
View File
@@ -2126,6 +2126,7 @@ HSAKMT_STATUS get_block_properties(uint32_t node_id,
case CHIP_VEGA12: case CHIP_VEGA12:
case CHIP_VEGA20: case CHIP_VEGA20:
case CHIP_RAVEN: case CHIP_RAVEN:
case CHIP_RENOIR:
case CHIP_ARCTURUS: case CHIP_ARCTURUS:
*block = vega_blocks[block_id]; *block = vega_blocks[block_id];
break; break;
projects/rocr-runtime/src/queues.c
+7
View File
@@ -128,6 +128,12 @@ const struct device_info raven_device_info = {
.doorbell_size = DOORBELL_SIZE_GFX9, .doorbell_size = DOORBELL_SIZE_GFX9,
}; };
const struct device_info renoir_device_info = {
.asic_family = CHIP_RENOIR,
.eop_buffer_size = 4096,
.doorbell_size = DOORBELL_SIZE_GFX9,
};
const struct device_info vega20_device_info = { const struct device_info vega20_device_info = {
.asic_family = CHIP_VEGA20, .asic_family = CHIP_VEGA20,
.eop_buffer_size = 4096, .eop_buffer_size = 4096,
@@ -172,6 +178,7 @@ static const struct device_info *dev_lookup_table[] = {
[CHIP_VEGA12] = &vega12_device_info, [CHIP_VEGA12] = &vega12_device_info,
[CHIP_VEGA20] = &vega20_device_info, [CHIP_VEGA20] = &vega20_device_info,
[CHIP_RAVEN] = &raven_device_info, [CHIP_RAVEN] = &raven_device_info,
[CHIP_RENOIR] = &renoir_device_info,
[CHIP_ARCTURUS] = &arcturus_device_info, [CHIP_ARCTURUS] = &arcturus_device_info,
[CHIP_NAVI10] = &navi10_device_info, [CHIP_NAVI10] = &navi10_device_info,
[CHIP_NAVI12] = &navi12_device_info, [CHIP_NAVI12] = &navi12_device_info,
projects/rocr-runtime/src/topology.c
+2
View File
@@ -207,6 +207,8 @@ static const struct hsa_gfxip_table gfxip_lookup_table[] = {
/* Raven */ /* Raven */
{ 0x15DD, 9, 0, 2, 0, "Raven", CHIP_RAVEN }, { 0x15DD, 9, 0, 2, 0, "Raven", CHIP_RAVEN },
{ 0x15D8, 9, 0, 2, 0, "Raven", CHIP_RAVEN }, { 0x15D8, 9, 0, 2, 0, "Raven", CHIP_RAVEN },
/* Renoir */
{ 0x1636, 9, 0, 0, 1, "Renoir", CHIP_RENOIR },
/* Vega20 */ /* Vega20 */
{ 0x66A0, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, { 0x66A0, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 },
{ 0x66A1, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 }, { 0x66A1, 9, 0, 6, 1, "Vega20", CHIP_VEGA20 },
projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+5
View File
@@ -180,6 +180,11 @@ FILTER[raven]=\
"KFDQMTest.QueueLatency:"\ "KFDQMTest.QueueLatency:"\
"KFDQMTest.SdmaEventInterrupt" "KFDQMTest.SdmaEventInterrupt"
FILTER[renoir]=\
"$BLACKLIST_ALL_ASICS:"\
"KFDQMTest.QueueLatency:"\
"KFDQMTest.SdmaEventInterrupt"
# KFDExceptionTest.* (KFD-435) # KFDExceptionTest.* (KFD-435)
# KFDEvictTest.BurstyTest (KFD-425) # KFDEvictTest.BurstyTest (KFD-425)
FILTER[arcturus]=\ FILTER[arcturus]=\