Author: Joseph Huber Date: 2021-12-02T12:35:58-05:00 New Revision: 96ff74a0d5982cb70ac25883f3b0d5bb99947aa9
URL: https://github.com/llvm/llvm-project/commit/96ff74a0d5982cb70ac25883f3b0d5bb99947aa9 DIFF: https://github.com/llvm/llvm-project/commit/96ff74a0d5982cb70ac25883f3b0d5bb99947aa9.diff LOG: [OpenMP] Remove the new runtime default for AMDGPU The new runtime is currently broken for AMD offloading. This patch makes the default the old runtime only for the AMD target. Reviewed By: ronlieb Differential Revision: https://reviews.llvm.org/D114965 Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp clang/lib/Driver/ToolChains/Clang.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 6a1f557968a92..4e6dd20503446 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2442,7 +2442,7 @@ def fno_openmp_assume_teams_oversubscription : Flag<["-"], "fno-openmp-assume-te def fno_openmp_assume_threads_oversubscription : Flag<["-"], "fno-openmp-assume-threads-oversubscription">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>; defm openmp_target_new_runtime: BoolFOption<"openmp-target-new-runtime", - LangOpts<"OpenMPTargetNewRuntime">, DefaultTrue, + LangOpts<"OpenMPTargetNewRuntime">, DefaultFalse, PosFlag<SetTrue, [CC1Option], "Use the new bitcode library for OpenMP offloading">, NegFlag<SetFalse>>; defm openmp_optimistic_collapse : BoolFOption<"openmp-optimistic-collapse", diff --git a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp index f282f04b79311..863e2c597d53a 100644 --- a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp @@ -267,7 +267,7 @@ void AMDGPUOpenMPToolChain::addClangTargetOptions( std::string BitcodeSuffix; if (DriverArgs.hasFlag(options::OPT_fopenmp_target_new_runtime, - options::OPT_fno_openmp_target_new_runtime, true)) + options::OPT_fno_openmp_target_new_runtime, false)) BitcodeSuffix = "new-amdgpu-" + GPUArch; else BitcodeSuffix = "amdgcn-" + GPUArch; diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 8d92c293d83a4..c5aaa067c4f55 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5904,7 +5904,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // runtime. if (Args.hasFlag(options::OPT_fopenmp_target_new_runtime, options::OPT_fno_openmp_target_new_runtime, - /*Default=*/true)) + /*Default=*/!getToolChain().getTriple().isAMDGCN())) CmdArgs.push_back("-fopenmp-target-new-runtime"); // When in OpenMP offloading mode, enable debugging on the device. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits