From a37c95d7edf63a00241a27a38b72470476ed67eb Mon Sep 17 00:00:00 2001
From: Jaydeep Patel <jaydeepkumar.patel@amd.com>
Date: Thu, 7 Sep 2023 05:20:10 +0000
Subject: [PATCH] SWDEV-418038 - Drop GPU_ENABLE_WAVE32_MODE from RTC.

Change-Id: Iac11f26714e8b3bae14cbf69933ef7c8c8be47da
---
 hipamd/src/CMakeLists.txt            |  1 -
 hipamd/src/hiprtc/CMakeLists.txt     |  3 ---
 hipamd/src/hiprtc/hiprtcInternal.cpp | 19 -------------------
 3 files changed, 23 deletions(-)

diff --git a/hipamd/src/CMakeLists.txt b/hipamd/src/CMakeLists.txt
index 00041e1510..bd791e2774 100644
--- a/hipamd/src/CMakeLists.txt
+++ b/hipamd/src/CMakeLists.txt
@@ -188,7 +188,6 @@ endif()
 
 set(HIPRTC_OBJECTS)
 # Add hiprtc
-set(FIXME_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/amdhip64.dir)
 add_subdirectory(hiprtc)
 
 if(NOT WIN32)
diff --git a/hipamd/src/hiprtc/CMakeLists.txt b/hipamd/src/hiprtc/CMakeLists.txt
index c2c406e5b1..8bafd2ece2 100644
--- a/hipamd/src/hiprtc/CMakeLists.txt
+++ b/hipamd/src/hiprtc/CMakeLists.txt
@@ -95,9 +95,6 @@ if(BUILD_SHARED_LIBS)
   endif()
 endif()
 
-target_link_libraries(hiprtc PRIVATE ${FIXME_DIR}/fixme.cpp${CMAKE_CXX_OUTPUT_EXTENSION})
-add_dependencies(hiprtc amdhip64)
-
 if(WIN32)
   target_link_libraries(hiprtc PRIVATE Dbghelp.lib)
 endif()
diff --git a/hipamd/src/hiprtc/hiprtcInternal.cpp b/hipamd/src/hiprtc/hiprtcInternal.cpp
index 26a24bc758..9910409784 100644
--- a/hipamd/src/hiprtc/hiprtcInternal.cpp
+++ b/hipamd/src/hiprtc/hiprtcInternal.cpp
@@ -273,14 +273,6 @@ bool RTCCompileProgram::transformOptions(std::vector<std::string>& compile_optio
   return findIsa();
 }
 
-static inline uint getArchMajorVersion(std::string &isa) {
-  if (const amd::Isa *isaIter = amd::Isa::findIsa(isa.data())) {
-    return isaIter->versionMajor();
-  }
-
-  return static_cast<uint>(-1);
-}
-
 amd::Monitor RTCProgram::lock_("HIPRTC Program", true);
 
 bool RTCCompileProgram::compile(const std::vector<std::string>& options, bool fgpu_rdc) {
@@ -306,17 +298,6 @@ bool RTCCompileProgram::compile(const std::vector<std::string>& options, bool fg
     return false;
   }
 
-  // Decide whether to enable wave64 compilation
-  auto majorVer = getArchMajorVersion(isa_);
-  if (majorVer <= 9 || !GPU_ENABLE_WAVE32_MODE) {
-    if (majorVer > 9) {
-       LogWarning("Wavefront size 64 is experimental for gfx10 and above. Warp "
-                  "functions may not work");
-    }
-    compileOpts.push_back("-mwavefrontsize64");
-    link_options_.push_back("wavefrontsize64");
-  }
-
   if (!compileToBitCode(compile_input_, isa_, compileOpts, build_log_, LLVMBitcode_)) {
     LogError("Error in hiprtc: unable to compile source to bitcode");
     return false;