Remove unneeded headers search code

CM_INCLUDE_DIR is handled in FEWrapper.
Without it, headers are taked from FE wrapper itself.

Author: aus-intel

IGC/AdaptorOCL/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp

@@ -63,10 +63,8 @@ IN THE SOFTWARE.
 #endif // defined( _DEBUG ) || defined( _INTERNAL )
 #if defined(IGC_VC_ENABLED)
 #include "Frontend.h"
-
 #if defined(_WIN32)
 #include <Windows.h>
-#include <llvm/Support/ConvertUTF.h>
 #include "inc/common/DriverStore.h"
 #endif
 #endif // defined(IGC_VC_ENABLED)
@@ -75,38 +73,6 @@ IN THE SOFTWARE.
 
 #include <memory>
 
-#if defined(__linux__)
-#include <dlfcn.h>
-#else
-#include <Windows.h>
-
-static std::string encode_asA(const std::wstring& wstr) {
-    if (wstr.empty())
-        return {};
-    int inputSize = static_cast<int>(wstr.size());
-    int sizeNeeded = WideCharToMultiByte(CP_ACP, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
-    if (sizeNeeded == 0)
-        return {};
-    std::string strTo(sizeNeeded, 0);
-    if (WideCharToMultiByte(CP_ACP, 0, &wstr[0], inputSize, &strTo[0], sizeNeeded, NULL, NULL) == 0)
-        return {};
-    return strTo;
-}
-static std::wstring encode_asW(const std::string& str) {
-    if (str.empty())
-        return {};
-    int inputSize = static_cast<int>(str.size());
-    int sizeNeeded = MultiByteToWideChar(CP_ACP, 0, &str[0], inputSize, NULL, 0);
-    if (sizeNeeded == 0)
-        return {};
-    std::wstring wstrTo(sizeNeeded, 0);
-    if (MultiByteToWideChar(CP_ACP, 0, &str[0], inputSize, &wstrTo[0], sizeNeeded) == 0)
-        return {};
-    return wstrTo;
-}
-
-#endif
-
 namespace IGC {
 
 OclTranslationOutputBase *
@@ -142,58 +108,6 @@ llvm::Optional<std::vector<char>> readBinaryFile(const std::string& fileName) {
 
 #if defined(IGC_VC_ENABLED)
 
-static std::string detectCmIncludes(llvm::sys::DynamicLibrary &LibInfo) {
-#if defined(__linux__)
-#define GetFunctionNameAsStr(s) ((void)s, #s);
-  const char *SymName = GetFunctionNameAsStr(IntelCMClangFECompile);
-  void *FAddr = LibInfo.getAddressOfSymbol(SymName);
-#undef GetFunctionNameAsStr
-  // currently Linux does not require header detection facilities
-
-  Dl_info DlInfo;
-  if (!dladdr(FAddr, &DlInfo))
-    return {};
-
-  auto IncludeRoot = llvm::sys::path::parent_path(
-          llvm::sys::path::parent_path(
-                  llvm::sys::path::parent_path(DlInfo.dli_fname)));
-  llvm::SmallVector<char, 1024> PathData(IncludeRoot.begin(),
-                                         IncludeRoot.end());
-#else
-  (void)LibInfo;
-  // Strictly speaking, FE name may not in the correct encoding.
-  // But here we assume that it is ;).
-  std::wstring FeName = encode_asW(CMFE_WRAPPER_NAME);
-  HMODULE FE_LIB_HANDLER = GetModuleHandleW(FeName.c_str());
-  if (FE_LIB_HANDLER == NULL)
-    return {};
-
-  // this means that functions succeeded, but the path may be incomplete
-  // won't bother figuring this out programmatically
-  const size_t MAX_WINDOWS_PATH_LENGTH = 32767;
-  std::vector<wchar_t> buffer(MAX_WINDOWS_PATH_LENGTH);
-  // so portable... so usefull
-  auto Res = GetModuleFileNameW(FE_LIB_HANDLER, buffer.data(), buffer.size());
-  if (Res == buffer.size()) // don't want to mess with that - bail out
-    return {};
-  if (Res == 0) // if function indicates an error - bail out
-    return {};
-  buffer.push_back(0); // zero-terminate the data
-  auto LibPath = encode_asA(std::wstring(buffer.data()));
-  auto ParentPath = llvm::sys::path::parent_path(LibPath).str();
-  llvm::SmallVector<char, MAX_PATH> PathData(ParentPath.begin(),
-                                             ParentPath.end());
-#endif
-  llvm::sys::path::append(PathData, "include", "cm", "cm.h");
-  llvm::StringRef CMHeaderPath(PathData.begin(), PathData.size());
-  if (llvm::sys::fs::exists(CMHeaderPath)) {
-    return llvm::sys::path::parent_path(
-               llvm::sys::path::parent_path(CMHeaderPath))
-        .str();
-  }
-  return {};
-}
-
 using InvocationInfo = IGC::AdaptorCM::Frontend::IDriverInvocation;
 using PathT = llvm::SmallVector<char, 1024>;
 
@@ -331,19 +245,6 @@ static std::vector<const char*>
         result.push_back(stringSaver.save("-march=" + cmfeDefaultArch).data());
     }
 
-    llvm::StringRef FeIncludesPath;
-    auto auxIncludes = llvm::sys::Process::GetEnv("CM_INCLUDE_DIR");
-    if (auxIncludes) {
-        FeIncludesPath = stringSaver.save(auxIncludes.getValue());
-    } else {
-        auto IncludePath = detectCmIncludes(LibInfo);
-        if (!IncludePath.empty())
-            FeIncludesPath = stringSaver.save(IncludePath);
-    }
-    if (!FeIncludesPath.empty()) {
-        result.push_back(stringSaver.save("-isystem").data());
-        result.push_back(FeIncludesPath.data());
-    }
     result.insert(result.end(), userArgs.begin(), userArgs.end());
 
     auto ExtraCMOpts = llvm::sys::Process::GetEnv("IGC_ExtraCMOptions");