Skip to content

Commit bd4a460

Browse files
Revert "[SYCL][Driver] Force precise division rounding for precise model (#12173)
This commit reverts #12107 and the follow-up patch due to unforeseen consequences of the new flag.
1 parent e61ad3b commit bd4a460

File tree

4 files changed

+0
-63
lines changed

4 files changed

+0
-63
lines changed

clang/lib/Driver/ToolChains/SYCL.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,11 +1247,6 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
12471247
if (Arg *A = Args.getLastArg(options::OPT_O_Group))
12481248
if (A->getOption().matches(options::OPT_O0))
12491249
BeArgs.push_back("-cl-opt-disable");
1250-
// In precise floating-point mode we pass the OpenCL flag forcing division to
1251-
// be correctly rounded.
1252-
if (Arg *A = Args.getLastArg(options::OPT_ffp_model_EQ))
1253-
if (StringRef{A->getValue()}.equals("precise"))
1254-
BeArgs.push_back("-cl-fp32-correctly-rounded-divide-sqrt");
12551250
StringRef RegAllocModeOptName = "-ftarget-register-alloc-mode=";
12561251
if (Arg *A = Args.getLastArg(options::OPT_ftarget_register_alloc_mode_EQ)) {
12571252
StringRef RegAllocModeVal = A->getValue(0);

clang/test/Driver/sycl-offload-aot.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,6 @@
220220
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s
221221
// CHK-TOOLS-IMPLIED-OPTS-GEN: ocloc{{.*}} "-options" "-g -cl-opt-disable" "-DFOO1" "-DFOO2"
222222

223-
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga-unknown-unknown -ffp-model=precise -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
224-
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-ROUNDING-FPGA %s
225-
// CHK-TOOLS-IMPLIED-ROUNDING-FPGA: opencl-aot{{.*}} "--bo=-cl-fp32-correctly-rounded-divide-sqrt" "-DFOO1" "-DFOO2"
226-
227-
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown -ffp-model=precise -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
228-
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-ROUNDING-CPU %s
229-
// CHK-TOOLS-IMPLIED-ROUNDING-CPU: opencl-aot{{.*}} "--bo=-cl-fp32-correctly-rounded-divide-sqrt" "-DFOO1" "-DFOO2"
230-
231-
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen-unknown-unknown -ffp-model=precise -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
232-
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-ROUNDING-GEN %s
233-
// CHK-TOOLS-IMPLIED-ROUNDING-GEN: ocloc{{.*}} "-options" "-cl-fp32-correctly-rounded-divide-sqrt" "-DFOO1" "-DFOO2"
234-
235223
/// Check -Xsycl-target-linker option passing
236224
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga-unknown-unknown -Xshardware -Xsycl-target-linker "-DFOO1 -DFOO2" %s 2>&1 \
237225
// RUN: | FileCheck -check-prefix=CHK-TOOLS-FPGA-OPTS2 %s

clang/test/Driver/sycl-offload.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,6 @@
424424
// CHK-TOOLS-IMPLIED-OPTS-O0-NOT: clang-offload-wrapper{{.*}} "-compile-opts={{.*}}-cl-opt-disable"
425425
// CHK-TOOLS-IMPLIED-OPTS-O2-NOT: clang-offload-wrapper{{.*}} "-compile-opts={{.*}}-cl-opt-disable"
426426

427-
/// Check for implied options (-ffp-model=precise)
428-
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64 -ffp-model=precise %s 2>&1 \
429-
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-ROUNDING %s
430-
// CHK-TOOLS-IMPLIED-ROUNDING: clang-offload-wrapper{{.*}} "-compile-opts={{.*}}-cl-fp32-correctly-rounded-divide-sqrt
431-
432427
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64-unknown-unknown -Xsycl-target-linker "-DFOO1 -DFOO2" %s 2>&1 \
433428
// RUN: | FileCheck -check-prefix=CHK-TOOLS-OPTS2 %s
434429
// CHK-TOOLS-OPTS2: clang-offload-wrapper{{.*}} "-link-opts=-DFOO1 -DFOO2"

sycl/test-e2e/Basic/float_division_precise.cpp

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)