From 3abb1347cfa475d3aaba47766fb922963684bbbf Mon Sep 17 00:00:00 2001 From: German Andryeyev Date: Thu, 21 May 2020 15:18:03 -0400 Subject: [PATCH] Revert "Revert "Reenable cooperative groups"" This reverts commit c6c208099b28f2b1ae95b8d51c77440d7a26ebdf. Reason for revert: Change-Id: I93c45fae27e0a08b199542d44fb0d65fc74ea13c [ROCm/clr commit: fb401bfe6d01b50bb6ddd51956849b074a60cca8] --- projects/clr/rocclr/device/rocm/rocsettings.cpp | 4 ++-- projects/clr/rocclr/utils/flags.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/device/rocm/rocsettings.cpp b/projects/clr/rocclr/device/rocm/rocsettings.cpp index f10e9967e7..8fa006d82b 100644 --- a/projects/clr/rocclr/device/rocm/rocsettings.cpp +++ b/projects/clr/rocclr/device/rocm/rocsettings.cpp @@ -133,8 +133,8 @@ bool Settings::create(bool fullProfile, int gfxipMajor, int gfxipMinor, bool coo // enable subnormals for gfx900 and later if (gfxipMajor >= 9) { singleFpDenorm_ = true; - enableCoopGroups_ &= coop_groups; - enableCoopMultiDeviceGroups_ &= coop_groups; + enableCoopGroups_ = GPU_ENABLE_COOP_GROUPS & coop_groups; + enableCoopMultiDeviceGroups_ = GPU_ENABLE_COOP_GROUPS & coop_groups; } } else { // Also enable AMD double precision extension? diff --git a/projects/clr/rocclr/utils/flags.hpp b/projects/clr/rocclr/utils/flags.hpp index 7cc013dc32..388e355c93 100644 --- a/projects/clr/rocclr/utils/flags.hpp +++ b/projects/clr/rocclr/utils/flags.hpp @@ -196,7 +196,7 @@ release(bool, GPU_ENABLE_LC, true, \ "Enables LC path") \ release(bool, GPU_ENABLE_HW_P2P, false, \ "Enables HW P2P path") \ -release(bool, GPU_ENABLE_COOP_GROUPS, false, \ +release(bool, GPU_ENABLE_COOP_GROUPS, true, \ "Enables cooperative group launch") \ release(uint, GPU_MAX_COMMAND_BUFFERS, 8, \ "The maximum number of command buffers allocated per queue") \