From 8336387e41ebfbe0e01bde4ea0300c56c1808955 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 19 Jul 2016 19:28:51 -0400 Subject: [PATCH] P4 to Git Change 1293264 by facao@fan_hsa_workspace1 on 2016/07/19 18:52:20 SWDEV-33375 - Add device id to support Ellesmere and Baffin cards. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#2 edit --- rocclr/runtime/device/rocm/rocdefs.hpp | 6 +++++- rocclr/runtime/device/rocm/rocdevice.cpp | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/rocm/rocdefs.hpp b/rocclr/runtime/device/rocm/rocdefs.hpp index b3f37ecd1e..d94a10a1d7 100644 --- a/rocclr/runtime/device/rocm/rocdefs.hpp +++ b/rocclr/runtime/device/rocm/rocdefs.hpp @@ -27,6 +27,8 @@ const HsaDeviceId HSA_CARRIZO_ID = 3; const HsaDeviceId HSA_ICELAND_ID = 4; const HsaDeviceId HSA_FIJI_ID = 5; const HsaDeviceId HSA_HAWAII_ID = 6; +const HsaDeviceId HSA_ELLESMERE_ID = 7; +const HsaDeviceId HSA_BAFFIN_ID = 8; const HsaDeviceId HSA_INVALID_DEVICE_ID = -1; static const AMDDeviceInfo DeviceInfo[] = { @@ -37,7 +39,9 @@ static const AMDDeviceInfo DeviceInfo[] = { /* TARGET_CARRIZO */ {HSA_CARRIZO_ID, "Carrizo", "Carrizo", 4, 16, 1, 256, 64 * Ki, 32, 0}, /* TARGET_ICELAND */ {HSA_ICELAND_ID, "Topaz", "Topaz", 4, 16, 1, 256, 64 * Ki, 32, 0}, /* TARGET_FIJI */ {HSA_FIJI_ID, "Fiji", "Fiji", 4, 16, 1, 256, 64 * Ki, 32, 0 }, - /* TARGET HAWAII */ {HSA_HAWAII_ID, "Hawaii", "Hawaii", 4, 16, 1, 256, 64 * Ki, 32, 0 } + /* TARGET HAWAII */ {HSA_HAWAII_ID, "Hawaii", "Hawaii", 4, 16, 1, 256, 64 * Ki, 32, 0 }, + /* TARGET ELLESMERE */ {HSA_ELLESMERE_ID, "Ellesmere", "Ellesmere", 4, 16, 1, 256, 64 * Ki, 32, 0 }, + /* TARGET BAFFIN */ {HSA_BAFFIN_ID, "Baffin", "Baffin", 4, 16, 1, 256, 64 * Ki, 32, 0 } }; } diff --git a/rocclr/runtime/device/rocm/rocdevice.cpp b/rocclr/runtime/device/rocm/rocdevice.cpp index 52005c7eef..71a0f7d1c5 100644 --- a/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/rocclr/runtime/device/rocm/rocdevice.cpp @@ -120,6 +120,29 @@ static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) { case DEVICE_ID_CI_HAWAII_P_67B9: case DEVICE_ID_CI_HAWAII_P_67BE: return HSA_HAWAII_ID; + case DEVICE_ID_VI_ELLESMERE_P_67C0: + case DEVICE_ID_VI_ELLESMERE_P_67C1: + case DEVICE_ID_VI_ELLESMERE_P_67C2: + case DEVICE_ID_VI_ELLESMERE_P_67C4: + case DEVICE_ID_VI_ELLESMERE_P_67C7: + case DEVICE_ID_VI_ELLESMERE_P_67DF: + case DEVICE_ID_VI_ELLESMERE_P_67D0: + case DEVICE_ID_VI_ELLESMERE_P_67C8: + case DEVICE_ID_VI_ELLESMERE_P_67C9: + case DEVICE_ID_VI_ELLESMERE_P_67CA: + case DEVICE_ID_VI_ELLESMERE_P_67CC: + case DEVICE_ID_VI_ELLESMERE_P_67CF: + return HSA_ELLESMERE_ID; + case DEVICE_ID_VI_BAFFIN_M_67E0: + case DEVICE_ID_VI_BAFFIN_M_67E3: + case DEVICE_ID_VI_BAFFIN_M_67E8: + case DEVICE_ID_VI_BAFFIN_M_67EB: + case DEVICE_ID_VI_BAFFIN_M_67EF: + case DEVICE_ID_VI_BAFFIN_M_67FF: + case DEVICE_ID_VI_BAFFIN_M_67E1: + case DEVICE_ID_VI_BAFFIN_M_67E7: + case DEVICE_ID_VI_BAFFIN_M_67E9: + return HSA_BAFFIN_ID; default: return HSA_INVALID_DEVICE_ID; }