From c1e714c13cab69e36da2544e96bf5469e286b547 Mon Sep 17 00:00:00 2001 From: Michael D Toguchi Date: Fri, 9 Oct 2020 10:28:28 -0700 Subject: [PATCH] [Driver][SYCL] Correct optimization disabling option for gen When performing AOT for gen, we were passing the wrong optimization disabling option. Update to use -cl-opt-disable --- clang/lib/Driver/ToolChains/SYCL.cpp | 2 +- clang/test/Driver/sycl-offload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/SYCL.cpp b/clang/lib/Driver/ToolChains/SYCL.cpp index c256336d3323b..efe54a0445f23 100644 --- a/clang/lib/Driver/ToolChains/SYCL.cpp +++ b/clang/lib/Driver/ToolChains/SYCL.cpp @@ -510,7 +510,7 @@ static void addImpliedArgs(const llvm::Triple &Triple, if (!A->getOption().matches(options::OPT_g0)) BeArgs.push_back("-g"); if (Args.getLastArg(options::OPT_O0)) - BeArgs.push_back(IsGen ? "-O0" : "-cl-opt-disable"); + BeArgs.push_back("-cl-opt-disable"); if (BeArgs.empty()) return; if (Triple.getSubArch() == llvm::Triple::NoSubArch || diff --git a/clang/test/Driver/sycl-offload.c b/clang/test/Driver/sycl-offload.c index 2f70280daf530..5dee1a8de66f0 100644 --- a/clang/test/Driver/sycl-offload.c +++ b/clang/test/Driver/sycl-offload.c @@ -758,7 +758,7 @@ // RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s // RUN: %clang_cl -### -fsycl -fsycl-targets=spir64_gen-unknown-unknown-sycldevice -Zi -Od -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s -// CHK-TOOLS-IMPLIED-OPTS-GEN: ocloc{{.*}} "-options" "-g -O0" "-DFOO1" "-DFOO2" +// CHK-TOOLS-IMPLIED-OPTS-GEN: ocloc{{.*}} "-options" "-g -cl-opt-disable" "-DFOO1" "-DFOO2" /// Check -Xsycl-target-linker option passing // RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice -Xsycl-target-linker "-DFOO1 -DFOO2" %s 2>&1 \