From f8d007fadbec7f2701caf5474fcaeb06a0dcaddd Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Thu, 12 Nov 2020 10:48:07 -0500 Subject: [PATCH] [PAL] Navi23 support Change-Id: I10bb0653746060bd83ca7feda10fdafc07ced845 [ROCm/clr commit: 026baec57ba4e589263e59f2620c443515c861a2] --- projects/clr/rocclr/device/pal/paldefs.hpp | 2 ++ projects/clr/rocclr/device/pal/paldevice.cpp | 2 +- projects/clr/rocclr/device/pal/palsettings.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/device/pal/paldefs.hpp b/projects/clr/rocclr/device/pal/paldefs.hpp index 8e378f2ce7..c865b45252 100644 --- a/projects/clr/rocclr/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/device/pal/paldefs.hpp @@ -201,6 +201,8 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = { /* Navi21 XNACK */ UnknownDevice, /* Navi22 */ {"gfx1031", "gfx1031", 32, 256, 32, 1031, 1031, false, Pal::AsicRevision::Navi22}, /* Navi22 XNACK */ UnknownDevice, + /* Navi23 */ {"gfx1032", "gfx1032", 32, 256, 32, 1032, 1032, false, Pal::AsicRevision::Navi23}, + /* Navi23 XNACK */ UnknownDevice, }; // Supported OpenCL versions diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp index aaed9ee4e1..d238f00d52 100644 --- a/projects/clr/rocclr/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/device/pal/paldevice.cpp @@ -264,7 +264,7 @@ bool NullDevice::init() { revision = Pal::AsicRevision::Navi22; break; case 1032: - ShouldNotReachHere(); + revision = Pal::AsicRevision::Navi23; break; case 1033: ShouldNotReachHere(); diff --git a/projects/clr/rocclr/device/pal/palsettings.cpp b/projects/clr/rocclr/device/pal/palsettings.cpp index 1d60395377..efa0e03c80 100644 --- a/projects/clr/rocclr/device/pal/palsettings.cpp +++ b/projects/clr/rocclr/device/pal/palsettings.cpp @@ -203,6 +203,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp, } switch (palProp.revision) { + case Pal::AsicRevision::Navi23: case Pal::AsicRevision::Navi22: case Pal::AsicRevision::Navi21: case Pal::AsicRevision::Navi14: