From 49369f08519be2c8643736c5611c9cd77ce47b93 Mon Sep 17 00:00:00 2001
From: Jatin Chaudhary <JatinJaikishan.Chaudhary@amd.com>
Date: Wed, 6 Dec 2023 13:52:45 +0000
Subject: [PATCH] SWDEV-436233 - fix the cumode in hiprtc

cumode should be active when wgp mode is off

Change-Id: I12f2e55d942ddeb0fb4470de7abc3caff1f430f7
---
 CHANGELOG.md                         | 5 +++++
 hipamd/src/hiprtc/hiprtcInternal.cpp | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9299b0b5e2..94de4f51df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Full documentation for HIP is available at [docs.amd.com](https://docs.amd.com/)
 
+## HIP 6.1 (For ROCm 6.1)
+
+### Changed
+- HIPRTC now assumes WGP mode for gfx10+. CU mode can be enabled by passing `-mcumode` to the compile options from `hiprtcCompileProgram`.
+
 ## (Unreleased) HIP 6.0 (For ROCm 6.0)
 ### Optimizations
 
diff --git a/hipamd/src/hiprtc/hiprtcInternal.cpp b/hipamd/src/hiprtc/hiprtcInternal.cpp
index 9dfbb2caff..46a034c828 100644
--- a/hipamd/src/hiprtc/hiprtcInternal.cpp
+++ b/hipamd/src/hiprtc/hiprtcInternal.cpp
@@ -149,7 +149,9 @@ RTCCompileProgram::RTCCompileProgram(std::string name_) : RTCProgram(name_), fgp
   compile_options_.reserve(20);  // count of options below
   compile_options_.push_back("-O3");
 
-  if (GPU_ENABLE_WGP_MODE) compile_options_.push_back("-mcumode");
+  if (!(GPU_ENABLE_WGP_MODE)) {
+    compile_options_.push_back("-mcumode");
+  }
 
   compile_options_.push_back(hipVerOpt);
   compile_options_.push_back(hipVerMajor);