From 0cf78a6dfab302b174c0ac3fd08149ee6156cd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20MARTINEZ=20CAAMA=C3=91O?= Date: Fri, 18 Aug 2023 09:56:08 +0200 Subject: [PATCH] Revert "SWDEV-410182: Do not force wave64 for geekbench" This patch did not consider the dicussions in SWDEV-270908 > "we found that in GeekBench5, forcing Wave64 instead of the default > Wave32 compute policy yields big gains in every subtest except one" This reverts commit 10e295819795b3eda96997ceb9bcf93d573f6f0c. Change-Id: Ice1728585b9d1b2c1b36a06cfa0b8c47cb2bfa49 [ROCm/clr commit: 06dcaae6191573e41ed666adf085e4c891bb82ea] --- projects/clr/rocclr/device/pal/palsettings.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/projects/clr/rocclr/device/pal/palsettings.cpp b/projects/clr/rocclr/device/pal/palsettings.cpp index 936bb81cec..41d03af263 100644 --- a/projects/clr/rocclr/device/pal/palsettings.cpp +++ b/projects/clr/rocclr/device/pal/palsettings.cpp @@ -193,6 +193,8 @@ bool Settings::create(const Pal::DeviceProperties& palProp, enableXNACK_ = enableXNACK; hsailExplicitXnack_ = enableXNACK; + bool useWavefront64 = false; + std::string appName = {}; std::string appPathAndName = {}; amd::Os::getAppPathAndFileName(appName, appPathAndName); @@ -213,6 +215,14 @@ bool Settings::create(const Pal::DeviceProperties& palProp, case Pal::AsicRevision::Navi23: case Pal::AsicRevision::Navi22: case Pal::AsicRevision::Navi21: + // set wavefront 64 for Geekbench 5 + { + if (appName == "Geekbench 5.exe" || + appName == "geekbench_x86_64.exe" || + appName == "geekbench5.exe") { + useWavefront64 = true; + } + } // Fall through for Navi1x ... case Pal::AsicRevision::Navi14: case Pal::AsicRevision::Navi12: @@ -232,6 +242,9 @@ bool Settings::create(const Pal::DeviceProperties& palProp, if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) { enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE; } + if (useWavefront64) { + enableWave32Mode_ = 0; + } lcWavefrontSize64_ = !enableWave32Mode_; if (palProp.gfxLevel == Pal::GfxIpLevel::GfxIp10_1) { // GFX10.1 HW doesn't support custom pitch. Enable double copy workaround