[openmp] Always pass valid triple to openmp-targets when using newRTL

[JonChesterfield]

Summary

Previously, we sometimes pass fopenmp-targets=nvptx64-nvidia-cuda-newRTL

[jhuber6]

LGTM

[tianshilei1992]

Wait. Why does this even happen?

[jhuber6]

In D117715#3256040, @tianshilei1992 wrote:

Wait. Why does this even happen?

There were test strings for different architectures, one was testing nvptx64-nvidia-cuda-newRTL which was just copied directly into the triple without realizing it still had the newRTL

[JonChesterfield]

The libomptarget_target gets used as-is in two of the substitutions for forming an fopenmp-target string, and that variable was also used as a convenient way to run the tests under old and new rtl (the plugin/cuda and plugin/amdgpu cmake are responsible for enabling these tests and each appended both their normal triple and a second one with -newRTL appended as a way of switching on both tests, I've put a comment by the remainder of this.

All this comes under the heading of debt that disappears when we go back to using a single device runtime. In this particular instance, it's on me for (ab)using the triple string in that way from CMake without realising it was used like this by the test runner.

openmp/libomptarget/test/lit.cfg

105

rest of hack here

[tianshilei1992]

Oh, so we are using two "architectures" to trigger two tests.

openmp/libomptarget/test/lit.cfg

else: # Unices
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
     if config.cuda_libdir:
         config.test_flags += " -Wl,-rpath," + config.cuda_libdir
     if config.libomptarget_current_target.startswith('amdgcn'):
         config.test_flags += " --libomptarget-amdgcn-bc-path=" + config.library_dir
     if config.libomptarget_current_target.startswith('nvptx'):
         config.test_flags += " --libomptarget-nvptx-bc-path=" + config.library_dir
     if config.libomptarget_current_target.endswith('-newRTL'):
         config.test_flags += " -fopenmp-target-new-runtime"
     else:
         config.test_flags += " -fno-openmp-target-new-runtime"
 
+def remove_newRTL_suffix_if_present(name):
+    if name.endswith('-newRTL'):
+        return name[:-7]
+    else:
+        return name
+
 # substitutions
 # - for targets that exist in the system create the actual command.
 # - for valid targets that do not exist in the system, return false, so that the
 #   same test can be used for different targets.
 
 # Scan all the valid targets.
 for libomptarget_target in config.libomptarget_all_targets:
     # Is this target in the current system? If so create a compile, run and test
if libomptarget_target == config.libomptarget_current_target:
             "%clang-" + libomptarget_target + " %s -o %t"))
         config.substitutions.append(("%libomptarget-run-" + \
             libomptarget_target, \
             "%t"))
         config.substitutions.append(("%libomptarget-run-fail-" + \
             libomptarget_target, \
             "%not --crash %t"))
         config.substitutions.append(("%clangxx-" + libomptarget_target, \
-            "%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" + libomptarget_target))
+                                     "%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
+                                     remove_newRTL_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%clang-" + libomptarget_target, \
-            "%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" + libomptarget_target))
+                                     "%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
+                                     remove_newRTL_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%fcheck-" + libomptarget_target, \
             config.libomptarget_filecheck + " %s"))
     else:
         config.substitutions.append(("%libomptarget-compile-run-and-check-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compilexx-run-and-check-" + \
             libomptarget_target, \