Merge pull request #1641 from emankov/hipify

[HIPIFY][fix] Abandon canCompileHostAndDeviceInOneJob check for --cuda-compile-host-device option

hipamd/hipify-clang/src/LLVMCompat.cpp

@@ -127,14 +127,6 @@ bool pragma_once_outside_header() {
 #endif
 }
 
-bool canCompileHostAndDeviceInOneJob() {
-#if LLVM_VERSION_MAJOR > 9 && defined(_WIN32)
-  return true;
-#else
-  return false;
-#endif
-}
-
 void RetainExcludedConditionalBlocks(clang::CompilerInstance &CI) {
 #if LLVM_VERSION_MAJOR > 9
   clang::PreprocessorOptions &PPOpts = CI.getPreprocessorOpts();

hipamd/hipify-clang/src/LLVMCompat.h

@@ -85,8 +85,6 @@ std::error_code real_path(const Twine &path, SmallVectorImpl<char> &output,
 
 bool pragma_once_outside_header();
 
-bool canCompileHostAndDeviceInOneJob();
-
 void RetainExcludedConditionalBlocks(clang::CompilerInstance &CI);
 
 bool CheckCompatibility();

hipamd/hipify-clang/src/main.cpp

@@ -226,12 +226,7 @@ int main(int argc, const char **argv) {
     if (llcompat::pragma_once_outside_header()) {
       Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-Wno-pragma-once-outside-header", ct::ArgumentInsertPosition::BEGIN));
     }
-    if (llcompat::canCompileHostAndDeviceInOneJob()) {
-      Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("--cuda-compile-host-device", ct::ArgumentInsertPosition::BEGIN));
-    }
-    else {
-      Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("--cuda-host-only", ct::ArgumentInsertPosition::BEGIN));
-    }
+    Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("--cuda-host-only", ct::ArgumentInsertPosition::BEGIN));
     if (!CudaGpuArch.empty()) {
       std::string sCudaGpuArch = "--cuda-gpu-arch=" + CudaGpuArch;
       Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(sCudaGpuArch.c_str(), ct::ArgumentInsertPosition::BEGIN));