From bed8383c27a0a7225e6fc7ff59a2cd6388fb4d09 Mon Sep 17 00:00:00 2001 From: Jonathan Hseu Date: Thu, 22 Dec 2016 15:38:30 -0800 Subject: Merge changes from github. Change: 142805270 --- third_party/sycl/crosstool/BUILD.tpl | 2 +- third_party/sycl/crosstool/CROSSTOOL.tpl | 2 +- third_party/sycl/crosstool/computecpp.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/sycl') diff --git a/third_party/sycl/crosstool/BUILD.tpl b/third_party/sycl/crosstool/BUILD.tpl index f539a376c8..cd8df93cd6 100755 --- a/third_party/sycl/crosstool/BUILD.tpl +++ b/third_party/sycl/crosstool/BUILD.tpl @@ -20,7 +20,7 @@ cc_toolchain( objcopy_files = ":empty", static_runtime_libs = [":empty"], strip_files = ":empty", - supports_param_files = 0, + supports_param_files = 1, ) filegroup( diff --git a/third_party/sycl/crosstool/CROSSTOOL.tpl b/third_party/sycl/crosstool/CROSSTOOL.tpl index d767b8ca4a..19b6f3ae32 100755 --- a/third_party/sycl/crosstool/CROSSTOOL.tpl +++ b/third_party/sycl/crosstool/CROSSTOOL.tpl @@ -34,6 +34,7 @@ toolchain { # Use "-std=c++11" for nvcc. For consistency, force both the host compiler # and the device compiler to use "-std=c++11". cxx_flag: "-std=c++11" + linker_flag: "-Wl,-no-as-needed" linker_flag: "-lstdc++" linker_flag: "-B/usr/bin/" @@ -100,4 +101,3 @@ toolchain { compiler_flag: "-DNDEBUG" } } - diff --git a/third_party/sycl/crosstool/computecpp.tpl b/third_party/sycl/crosstool/computecpp.tpl index e90d51bf87..532d7779f9 100755 --- a/third_party/sycl/crosstool/computecpp.tpl +++ b/third_party/sycl/crosstool/computecpp.tpl @@ -45,7 +45,7 @@ def main(): # strip asan for the device computecpp_device_compiler_flags = [flag for flag in compiler_flags if not flag.startswith(('-fsanitize'))] computecpp_device_compiler_flags = ['-sycl-compress-name', '-DTENSORFLOW_USE_SYCL', '-Wno-unused-variable', '-I', COMPUTECPP_INCLUDE, '-isystem', - COMPUTECPP_INCLUDE, '-std=c++11', '-sycl', '-emit-llvm', '-no-serial-memop'] + computecpp_device_compiler_flags + COMPUTECPP_INCLUDE, '-std=c++11', '-sycl', '-emit-llvm', '-no-serial-memop', '-Xclang', '-cl-denorms-are-zero', '-Xclang', '-cl-fp32-correctly-rounded-divide-sqrt'] + computecpp_device_compiler_flags x = subprocess.call([COMPUTECPP_DRIVER] + computecpp_device_compiler_flags ) if(x == 0): -- cgit v1.2.3