From ba21f080b15728bf4a742aa16aac5a341521ce33 Mon Sep 17 00:00:00 2001 From: Junyan He Date: Fri, 5 Sep 2014 16:54:27 +0800 Subject: [PATCH] Add uncompatible PCH Options to avoid compiling failure. Signed-off-by: Junyan He Reviewed-by: Zhigang Gong --- backend/src/backend/program.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp index 98e8a34..8c41d5e 100644 --- a/backend/src/backend/program.cpp +++ b/backend/src/backend/program.cpp @@ -628,6 +628,7 @@ namespace gbe { std::istringstream idirs(dirs); std::string pchFileName; bool findPCH = false; + bool invalidPCH = false; size_t start = 0, end = 0; std::string hdirs = OCL_HEADER_FILE_DIR; @@ -652,6 +653,10 @@ namespace gbe { std::string optionStr(str); const std::string unsupportedOptions("-cl-denorms-are-zero, -cl-strict-aliasing, -cl-opt-disable," "-cl-no-signed-zeros, -cl-fp32-correctly-rounded-divide-sqrt"); + + const std::string uncompatiblePCHOptions = ("-cl-single-precision-constant, -cl-fast-relaxed-math"); + const std::string fastMathOption = ("-cl-fast-relaxed-math"); + while (end != std::string::npos) { end = optionStr.find(' ', start); std::string str = optionStr.substr(start, end - start); @@ -662,6 +667,14 @@ namespace gbe { if(unsupportedOptions.find(str) != std::string::npos) continue; + if (uncompatiblePCHOptions.find(str) != std::string::npos) + invalidPCH = true; + + if (fastMathOption.find(str) != std::string::npos) { + clOpt.push_back("-D"); + clOpt.push_back("__FAST_RELAXED_MATH__=1"); + } + clOpt.push_back(str); } free(str); @@ -687,7 +700,7 @@ namespace gbe { FILE *clFile = fdopen(clFd, "w"); FATAL_IF(clFile == NULL, "Failed to open temporary file"); - if (!findPCH) { + if (!findPCH || invalidPCH) { clOpt.push_back("-include"); clOpt.push_back("ocl.h"); } else { -- 2.7.4