commit ecbaed0f37a6c673534449e408b0953d1915c164
author Joseph Huber <jhuber6@vols.utk.edu> Thu Dec 02 12:28:21 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Thu Dec 02 09:42:12 2021 -0800
tree 248ec924506d6e4c172a02d95f3eb2f13bea267c
parent 689c5072421ba0faad47c31c9c774a635587bc42

[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

GitOrigin-RevId: 96ff74a0d5982cb70ac25883f3b0d5bb99947aa9

include/clang/Driver/Options.td

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 6a1f557..4e6dd20 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -2442,7 +2442,7 @@
 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",

lib/Driver/ToolChains/AMDGPUOpenMP.cpp

diff --git a/lib/Driver/ToolChains/AMDGPUOpenMP.cpp b/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
index f282f04..863e2c5 100644
--- a/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
+++ b/lib/Driver/ToolChains/AMDGPUOpenMP.cpp
@@ -267,7 +267,7 @@
 
   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;

lib/Driver/ToolChains/Clang.cpp

diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp
index 8d92c29..c5aaa06 100644
--- a/lib/Driver/ToolChains/Clang.cpp
+++ b/lib/Driver/ToolChains/Clang.cpp
@@ -5904,7 +5904,7 @@
       // 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.