Author: Artem Belevich Date: 2021-06-30T14:32:08-07:00 New Revision: cab5f89cfd9efa9166e1362972e460323b8254ef
URL: https://github.com/llvm/llvm-project/commit/cab5f89cfd9efa9166e1362972e460323b8254ef DIFF: https://github.com/llvm/llvm-project/commit/cab5f89cfd9efa9166e1362972e460323b8254ef.diff LOG: [Clang] allow overriding -fbasic-block-sections We should not error out on non-x86 targets if `-fbasic-block-sections=none` is in effect. Also, filter it out for GPU-side compilations, as we do with other options not supported on the GPU. Differential Revision: https://reviews.llvm.org/D105226 Added: Modified: clang/lib/Driver/ToolChains/Clang.cpp clang/test/Driver/fbasic-block-sections.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 98023334d880..9c0922c8497c 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5274,15 +5274,20 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } if (Arg *A = Args.getLastArg(options::OPT_fbasic_block_sections_EQ)) { + StringRef Val = A->getValue(); if (Triple.isX86() && Triple.isOSBinFormatELF()) { - StringRef Val = A->getValue(); if (Val != "all" && Val != "labels" && Val != "none" && !Val.startswith("list=")) D.Diag(diag::err_drv_invalid_value) << A->getAsString(Args) << A->getValue(); else A->render(Args, CmdArgs); - } else { + } else if (Triple.isNVPTX()) { + // Do not pass the option to the GPU compilation. We still want it enabled + // for the host-side compilation, so seeing it here is not an error. + } else if (Val != "none") { + // =none is allowed everywhere. It's useful for overriding the option + // and is the same as not specifying the option. D.Diag(diag::err_drv_unsupported_opt_for_target) << A->getAsString(Args) << TripleStr; } diff --git a/clang/test/Driver/fbasic-block-sections.c b/clang/test/Driver/fbasic-block-sections.c index 6aa030bf27ca..60889fb11530 100644 --- a/clang/test/Driver/fbasic-block-sections.c +++ b/clang/test/Driver/fbasic-block-sections.c @@ -3,11 +3,18 @@ // RUN: %clang -### -target x86_64 -fbasic-block-sections=list=%s %s -S 2>&1 | FileCheck -check-prefix=CHECK-OPT-LIST %s // RUN: %clang -### -target x86_64 -fbasic-block-sections=labels %s -S 2>&1 | FileCheck -check-prefix=CHECK-OPT-LABELS %s // RUN: not %clang -c -target arm-unknown-linux -fbasic-block-sections=all %s -S 2>&1 | FileCheck -check-prefix=CHECK-TRIPLE %s +// RUN: %clang -### -target arm-unknown-linux -fbasic-block-sections=all -fbasic-block-sections=none %s -S 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-NOOPT %s // RUN: not %clang -c -target x86_64-apple-darwin10 -fbasic-block-sections=all %s -S 2>&1 | FileCheck -check-prefix=CHECK-TRIPLE %s // RUN: %clang -### -target x86_64 -fbasic-block-sections=alll %s -S 2>&1 | FileCheck -check-prefix=CHECK-INVALID-VALUE %s // RUN: %clang -### -target x86_64 -fbasic-block-sections=list %s -S 2>&1 | FileCheck -check-prefix=CHECK-INVALID-VALUE %s // RUN: %clang -### -target x86_64 -fbasic-block-sections=list= %s -S 2>&1 | FileCheck -check-prefix=CHECK-OPT-NULL-LIST %s +// RUN: %clang -### -target x86_64 -fbasic-block-sections=none %s -S 2>&1 | FileCheck -check-prefix=CHECK-OPT-NONE %s +// RUN: %clang -### -x cuda -nocudainc -nocudalib -target x86_64 -fbasic-block-sections=all %s -c 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-CUDA %s + // +// CHECK-NOOPT-NOT: -fbasic-block-sections= // CHECK-OPT-NONE: "-fbasic-block-sections=none" // CHECK-OPT-ALL: "-fbasic-block-sections=all" // CHECK-OPT-LIST: "-fbasic-block-sections={{[^ ]*}}fbasic-block-sections.c" @@ -15,3 +22,9 @@ // CHECK-TRIPLE: error: unsupported option '-fbasic-block-sections=all' for target // CHECK-INVALID-VALUE: error: invalid value {{[^ ]*}} in '-fbasic-block-sections={{.*}}' // CHECK-OPT-NULL-LIST: "-fbasic-block-sections=list=" + +// GPU-side compilations should have no -fbasic-block-sections. It should only +// be passed to the host compilation +// CHECK-CUDA-NOT: -fbasic-block-sections= +// CHECK-CUDA: "-cc1" "-triple" "x86_64" +// CHECK-CUDA-SAME: "-fbasic-block-sections=all" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
