From 89355fb586cd5bb57d02eafa230b4f65ee758be0 Mon Sep 17 00:00:00 2001
From: Satyanvesh Dittakavi <Satyanvesh.Dittakavi@amd.com>
Date: Tue, 23 Aug 2022 12:03:54 +0000
Subject: [PATCH] SWDEV-339488 - Address HIPRT tests failure with spaces in the
 include path

Change-Id: Ic9ed57e44fcfdf82a0d066483bc73e1d59c39e30
---
 hipamd/src/hiprtc/hiprtcInternal.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hipamd/src/hiprtc/hiprtcInternal.cpp b/hipamd/src/hiprtc/hiprtcInternal.cpp
index 816a1ca24f..87e247fc6d 100644
--- a/hipamd/src/hiprtc/hiprtcInternal.cpp
+++ b/hipamd/src/hiprtc/hiprtcInternal.cpp
@@ -209,6 +209,17 @@ bool RTCCompileProgram::transformOptions() {
       i = "--offload-arch=" + val;
       continue;
     }
+
+    // Allow spaces after -I as delimiter to match nvrtc, "-I test" will be converted to "-Itest"
+    // Paths starting with leading space are not supported. eg: " test"
+    if (i.find("-I") == 0) {
+      const std::string kWhiteSpace = " \n\r\t\f\v";
+      std::string include_path = i.substr(2);
+      size_t start = include_path.find_first_not_of(kWhiteSpace);
+      if (start != std::string::npos) i = "-I" + include_path.substr(start);
+      continue;
+    }
+
     if (i == "--save-temps") {
       settings_.dumpISA = true;
       continue;