From 11e5bba0b97d2b75397954fc780c29ed5a8c75e1 Mon Sep 17 00:00:00 2001 From: "Lu, John" Date: Mon, 15 Jul 2024 17:33:36 -0700 Subject: [PATCH] Do not add new option Signed-off-by: Lu, John --- clang/include/clang/Driver/Options.td | 4 ---- clang/lib/Driver/ToolChains/Clang.cpp | 5 ----- clang/test/Driver/sycl-offload.cpp | 2 -- 3 files changed, 11 deletions(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index f559c2a48a937..b18ea5e881309 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -4188,10 +4188,6 @@ def fsycl_remove_unused_external_funcs : Flag<["-"], "fsycl-remove-unused-extern Group, HelpText<"Allow removal of unused `SYCL_EXTERNAL` functions (default)">; def fno_sycl_remove_unused_external_funcs : Flag<["-"], "fno-sycl-remove-unused-external-funcs">, Group, HelpText<"Prevent removal of unused `SYCL_EXTERNAL` functions">; -def fsycl_allow_split_with_dependencies : Flag<["-"], "fsycl-allow-split-with-dependencies">, - Group, HelpText<"Allow dependencies between device code images">; -def fno_sycl_allow_split_with_dependencies : Flag<["-"], "fno-sycl-allow-split-with-dependencies">, - Group, HelpText<"Do not allow dependencies between device code images (default)">; def fsave_optimization_record : Flag<["-"], "fsave-optimization-record">, Visibility<[ClangOption, FlangOption]>, diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 42bcab9438b80..228e13a93f51d 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -10713,11 +10713,6 @@ static void addArgs(ArgStringList &DstArgs, const llvm::opt::ArgList &Alloc, } static bool supportDynamicLinking(const llvm::opt::ArgList &TCArgs) { - if (TCArgs.hasFlag(options::OPT_fsycl_allow_split_with_dependencies, - options::OPT_fno_sycl_allow_split_with_dependencies, - false)) - return true; - // TODO: Return true if -shared seen when SYCL RT supports dynamic linking return false; } diff --git a/clang/test/Driver/sycl-offload.cpp b/clang/test/Driver/sycl-offload.cpp index 37f41b2a6efaa..82daf0b8e7950 100644 --- a/clang/test/Driver/sycl-offload.cpp +++ b/clang/test/Driver/sycl-offload.cpp @@ -184,8 +184,6 @@ // TODO: Enable when SYCL RT supports dynamic linking // RUNx: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga -shared %s 2>&1 | FileCheck -check-prefix=CHECK_SYCL_POST_LINK_SHARED_PASS %s // RUNx: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen -shared %s 2>&1 | FileCheck -check-prefix=CHECK_SYCL_POST_LINK_SHARED_PASS %s -// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga -fsycl-allow-split-with-dependencies %s 2>&1 | FileCheck -check-prefix=CHECK_SYCL_POST_LINK_SHARED_PASS %s -// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen -fsycl-allow-split-with-dependencies %s 2>&1 | FileCheck -check-prefix=CHECK_SYCL_POST_LINK_SHARED_PASS %s // CHECK_SYCL_POST_LINK_SHARED_PASS: sycl-post-link{{.*}}support-dynamic-linking // RUNx: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen %s 2>&1 | FileCheck -check-prefix=CHECK_SYCL_POST_LINK_SHARED_NO_PASS %s // CHECK_SYCL_POST_LINK_SHARED_NO_PASS-NOT: sycl-post-link{{.*}}support-dynamic-linking