From 6c612d8ce7dc570d52dc384b68229d1d219336ca Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Thu, 10 Jun 2021 16:00:15 -0400 Subject: [PATCH] SWDEV-274815 - [PAL] Navi24 support Change-Id: I934797bda471618c3f69484a1552b37345ae638b [ROCm/clr commit: f6c00765e7876d669baa8479b69b07215261e611] --- projects/clr/rocclr/device/device.cpp | 4 ++-- projects/clr/rocclr/device/pal/paldevice.cpp | 1 + projects/clr/rocclr/device/pal/palsettings.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/device/device.cpp b/projects/clr/rocclr/device/device.cpp index bec70e6142..07dbbb49ce 100644 --- a/projects/clr/rocclr/device/device.cpp +++ b/projects/clr/rocclr/device/device.cpp @@ -185,8 +185,8 @@ std::pair Isa::supportedIsas() { {"gfx1030", "gfx1030", true, true, false, 10, 3, 0, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, {"gfx1031", "gfx1031", true, true, false, 10, 3, 1, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, {"gfx1032", "gfx1032", true, true, false, 10, 3, 2, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, - {"gfx1033", "gfx1033", true, false, false, 10, 3, 3, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, - {"gfx1034", "gfx1034", true, false, false, 10, 3, 4, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32} + {"gfx1033", "gfx1033", true, false, false, 10, 3, 3, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, + {"gfx1034", "gfx1034", true, true, false, 10, 3, 4, NONE, NONE, 2, 32, 1, 256, 64 * Ki, 32}, }; return std::make_pair(std::begin(supportedIsas_), std::end(supportedIsas_)); } diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp index dbb73c0fbb..f2d7e7af28 100644 --- a/projects/clr/rocclr/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/device/pal/paldevice.cpp @@ -101,6 +101,7 @@ static constexpr PalDevice supportedPalDevices[] = { {10, 3, 0, Pal::GfxIpLevel::GfxIp10_3, "gfx1030", Pal::AsicRevision::Navi21}, {10, 3, 1, Pal::GfxIpLevel::GfxIp10_3, "gfx1031", Pal::AsicRevision::Navi22}, {10, 3, 2, Pal::GfxIpLevel::GfxIp10_3, "gfx1032", Pal::AsicRevision::Navi23}, + {10, 3, 4, Pal::GfxIpLevel::GfxIp10_3, "gfx1034", Pal::AsicRevision::Navi24}, }; static std::tuple findIsa(Pal::AsicRevision asicRevision, diff --git a/projects/clr/rocclr/device/pal/palsettings.cpp b/projects/clr/rocclr/device/pal/palsettings.cpp index 5bb6585299..315b63eb63 100644 --- a/projects/clr/rocclr/device/pal/palsettings.cpp +++ b/projects/clr/rocclr/device/pal/palsettings.cpp @@ -202,6 +202,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp, case Pal::AsicRevision::Navi12: case Pal::AsicRevision::Navi10: case Pal::AsicRevision::Navi10_A0: + case Pal::AsicRevision::Navi24: case Pal::AsicRevision::Navi23: case Pal::AsicRevision::Navi22: case Pal::AsicRevision::Navi21: