From 1c5ee6410137ce24fddf8ace96a595c8f70115f4 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 14 May 2015 15:28:01 -0400
Subject: [PATCH] P4 to Git Change 1151052 by emankov@em-hsa-amd on 2015/05/14
 15:16:47

	ECR #333753 - Compiler Lib/RT: libutils.h usage removal due to non-API interface

	Utils are to be used only by Compiler Lib itself.

	Testing: pre checkin

	Reviewers: German Andryeyev, Brian Sumner, Yaxun Liu

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#178 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#193 edit
---
 rocclr/compiler/lib/utils/v0_8/libUtils.cpp | 13 -------------
 rocclr/compiler/lib/utils/v0_8/libUtils.h   |  9 ++-------
 rocclr/runtime/device/device.cpp            | 17 ++++++++++++++++-
 rocclr/runtime/device/gpu/gpuprogram.cpp    | 11 ++++++++++-
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
index 8aab1432c2..963b5ab158 100644
--- a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
+++ b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
@@ -846,16 +846,3 @@ convertBIF30ToBIF21(aclBinary *src) {
   }
   return dst;
 }
-
-#if !defined(BCMAG)
-#define BCMAG  "BC"
-#define SBCMAG 2
-#endif
-bool
-isBcMagic(const char* p)
-{
-    if (p==NULL || strncmp(p, BCMAG, SBCMAG) != 0) {
-        return false;
-    }
-    return true;
-}
diff --git a/rocclr/compiler/lib/utils/v0_8/libUtils.h b/rocclr/compiler/lib/utils/v0_8/libUtils.h
index 66d2b4252e..d90ee94a2e 100644
--- a/rocclr/compiler/lib/utils/v0_8/libUtils.h
+++ b/rocclr/compiler/lib/utils/v0_8/libUtils.h
@@ -146,15 +146,10 @@ aclutAlloc(const aclCompilerOptions *bin);
 FreeFunc
 aclutFree(const aclCompilerOptions *bin);
 
-// Helper predicate
-// returns true if p starts with bit code signature.
-bool
-isBcMagic(const char* p);
-
 inline bool is64BitTarget(const aclTargetInfo& target)
 {
-  return (target.arch_id == aclX64 || 
-          target.arch_id == aclAMDIL64 || 
+  return (target.arch_id == aclX64 ||
+          target.arch_id == aclAMDIL64 ||
           target.arch_id == aclHSAIL64);
 }
 
diff --git a/rocclr/runtime/device/device.cpp b/rocclr/runtime/device/device.cpp
index c698e2fd02..0b8d9b6ef9 100644
--- a/rocclr/runtime/device/device.cpp
+++ b/rocclr/runtime/device/device.cpp
@@ -31,7 +31,6 @@ extern void DeviceUnload();
 #include "blowfish/oclcrypt.hpp"
 #endif
 
-#include "../utils/libUtils.h"
 #include "utils/bif_section_labels.hpp"
 
 #include <vector>
@@ -42,6 +41,21 @@ extern void DeviceUnload();
 #include <fstream>
 #include <set>
 
+#if !defined(BCMAG)
+#define BCMAG  "BC"
+#define SBCMAG 2
+#endif
+// Helper predicate returns true if p starts with bit code signature.
+// TODO: Move it into Compiler Lib back in new 1_0 API
+inline static bool
+isBcMagic(const char* p)
+{
+    if (p==NULL || strncmp(p, BCMAG, SBCMAG) != 0) {
+        return false;
+    }
+    return true;
+}
+
 namespace device {
 extern const char* BlitSourceCode;
 }
@@ -238,6 +252,7 @@ Device::~Device()
     }
 }
 
+// TODO: Move it into Compiler Lib in new 1_0 API
 bool
 Device::verifyBinaryImage( const void* image, size_t size) const
 {
diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp
index 46702cd818..cd38fbae9c 100644
--- a/rocclr/runtime/device/gpu/gpuprogram.cpp
+++ b/rocclr/runtime/device/gpu/gpuprogram.cpp
@@ -15,7 +15,6 @@
 #include <sstream>
 #include <cstdio>
 #include "utils/options.hpp"
-#include "utils/libUtils.h"
 #include "hsa.h"
 #include "hsa_ext_image.h"
 
@@ -2118,6 +2117,16 @@ HSAILProgram::getNextCompilationStageFromBinary(amd::option::Options* options) {
     return continueCompileFrom;
 }
 
+inline static std::vector<std::string>
+splitSpaceSeparatedString(char *str)
+{
+  std::string s(str);
+  std::stringstream ss(s);
+  std::istream_iterator<std::string> beg(ss), end;
+  std::vector<std::string> vec(beg, end);
+  return vec;
+}
+
 bool
 HSAILProgram::linkImpl(amd::option::Options* options)
 {