From 329ccad8c96bda3f6ccfbb12a40f91e866ec2aee Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 11 Nov 2019 12:06:15 -0500 Subject: [PATCH] P4 to Git Change 2028285 by axie@axie-hip-rocm on 2019/11/11 12:03:24 SWDEV-193973 - [OpenCL][NV21] Add support for Navi21 Add #ifndef OPENCL_MAINLINE around Navi 21 source code. This is to facilitate Open Source preparation. Tests: http://ocltc.amd.com:8111/viewModification.html?modId=128639&personal=true&tab=vcsModificationBuilds ReviewBoard: http://ocltc.amd.com/reviews/r/18267/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#26 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#140 edit [ROCm/clr commit: 131437441e9f9cbff6aab56f5abd9717dcb172b6] --- projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp | 1 - projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp b/projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp index bb76e93c1b..0162ce4268 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocdefs.hpp @@ -48,7 +48,6 @@ const HsaDeviceId HSA_NAVI10_ID = 15; const HsaDeviceId HSA_MI100_ID = 16; const HsaDeviceId HSA_NAVI12_ID = 17; const HsaDeviceId HSA_NAVI14_ID = 18; -const HsaDeviceId HSA_NAVI21_ID = 19; const HsaDeviceId HSA_INVALID_DEVICE_ID = -1; static const AMDDeviceInfo DeviceInfo[] = { diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp index 7affd55112..e1f364d9f9 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp @@ -103,8 +103,6 @@ static HsaDeviceId getHsaDeviceId(hsa_agent_t device, uint32_t& pci_id) { return HSA_NAVI12_ID; case 1012: return HSA_NAVI14_ID; - case 1030: - return HSA_NAVI21_ID; default: return HSA_INVALID_DEVICE_ID; }