[Libomptarget] Remove unused arguments from bitcode compilation
authorJoseph Huber <jhuber6@vols.utk.edu>
Thu, 9 Mar 2023 13:53:47 +0000 (07:53 -0600)
committerJoseph Huber <jhuber6@vols.utk.edu>
Thu, 9 Mar 2023 13:54:36 +0000 (07:54 -0600)
Summary:
We passed `-fopenmp-target=` when we compiled the bitcode, which isn't
necessary since the 15 release. Also adjust an error message.

openmp/libomptarget/DeviceRTL/CMakeLists.txt

index cf9d21a..53da266 100644 (file)
@@ -75,7 +75,7 @@ elseif(LIBOMPTARGET_DEVICE_ARCHITECTURES STREQUAL "auto")
     libomptarget_error_say(
       "Could not find 'amdgpu-arch' and 'nvptx-arch' tools required for 'auto'")
   elseif(NOT LIBOMPTARGET_FOUND_NVIDIA_GPU AND NOT LIBOMPTARGET_FOUND_AMDGPU_GPU)
-    libomptarget_error_say("No AMD or Nvidia found on the system when using 'auto'")
+    libomptarget_error_say("No AMD or NVIDIA GPU found on the system when using 'auto'")
   endif()
   set(LIBOMPTARGET_DEVICE_ARCHITECTURES
       "${LIBOMPTARGET_NVPTX_DETECTED_ARCH_LIST};${LIBOMPTARGET_AMDGPU_DETECTED_ARCH_LIST}")
@@ -273,9 +273,9 @@ add_custom_target(omptarget.devicertl.nvptx)
 add_custom_target(omptarget.devicertl.amdgpu)
 foreach(gpu_arch ${LIBOMPTARGET_DEVICE_ARCHITECTURES})
   if("${gpu_arch}" IN_LIST all_amdgpu_architectures)
-    compileDeviceRTLLibrary(${gpu_arch} amdgpu amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa)
+    compileDeviceRTLLibrary(${gpu_arch} amdgpu amdgcn-amd-amdhsa)
   elseif("${gpu_arch}" IN_LIST all_nvptx_architectures)
-    compileDeviceRTLLibrary(${gpu_arch} nvptx nvptx64-nvidia-cuda -fopenmp-targets=nvptx64-nvidia-cuda --cuda-feature=+ptx61)
+    compileDeviceRTLLibrary(${gpu_arch} nvptx nvptx64-nvidia-cuda --cuda-feature=+ptx61)
   else()
     libomptarget_error_say("Unknown GPU architecture '${gpu_arch}'")
   endif()