From c250a1384965fe3aeef8a6994e4a4e13dda80007 Mon Sep 17 00:00:00 2001
From: Jatin Chaudhary <jatin.chaudhary@amd.com>
Date: Wed, 18 Aug 2021 04:27:26 -0700
Subject: [PATCH] SWDEV-297217 - Append user options after default options

Change-Id: I1bdd309f98997f805357baa5d3ff36063797460c
---
 hipamd/src/hip_rtc.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hipamd/src/hip_rtc.cpp b/hipamd/src/hip_rtc.cpp
index 3901925c98..f13a7c718c 100644
--- a/hipamd/src/hip_rtc.cpp
+++ b/hipamd/src/hip_rtc.cpp
@@ -244,7 +244,8 @@ hiprtcResult hiprtcCompileProgram(hiprtcProgram prog, int numOptions, const char
   amd::Program* program = as_amd(reinterpret_cast<cl_program>(prog));
 
   std::ostringstream ostrstr;
-  std::vector<std::string> oarr(&options[0], &options[numOptions]);
+  std::vector<std::string> oarr;
+  oarr.reserve(numOptions + 12);
 
   const std::string hipVerOpt{"--hip-version=" + std::to_string(HIP_VERSION_MAJOR) + '.' +
                               std::to_string(HIP_VERSION_MINOR) + '.' +
@@ -269,6 +270,9 @@ hiprtcResult hiprtcCompileProgram(hiprtcProgram prog, int numOptions, const char
 #endif
 #endif
 
+  // Append the rest of options
+  oarr.insert(oarr.end(), &options[0], &options[numOptions]);
+
   transformOptions(oarr, program);
   std::copy(oarr.begin(), oarr.end(), std::ostream_iterator<std::string>(ostrstr, " "));