From c2c144ac04c47b0df85dbce4c29a763a05511b7b Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Thu, 7 Nov 2019 11:30:40 +0300 Subject: [PATCH] [HIPIFY][fix] Abandon canCompileHostAndDeviceInOneJob check for --cuda-compile-host-device option [Reason] It turned out that it is not so: 2 jobs are always --- hipify-clang/src/LLVMCompat.cpp | 8 -------- hipify-clang/src/main.cpp | 7 +------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/hipify-clang/src/LLVMCompat.cpp b/hipify-clang/src/LLVMCompat.cpp index b524c41613..604841bcd9 100644 --- a/hipify-clang/src/LLVMCompat.cpp +++ b/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(); diff --git a/hipify-clang/src/main.cpp b/hipify-clang/src/main.cpp index 812ba48197..b4200bd109 100644 --- a/hipify-clang/src/main.cpp +++ b/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));