Cleanup how to search for ockl.bc & ocml.bc in DeviceRTL/CMakeLists.txt (llvm#814)

Author: ronlieb

offload/DeviceRTL/CMakeLists.txt

@@ -133,47 +133,26 @@ function(compileDeviceRTLLibrary target_name target_triple)
   set(target_bc_flags ${ARGN})
 
   if(${target_name} MATCHES "amdgpu")
-    set(ockl_bc "${CMAKE_BINARY_DIR}/../rocm-device-libs-prefix/src/rocm-device-libs-build/lib/llvm/lib/clang/${LLVM_VERSION_MAJOR}/lib/amdgcn/bitcode/ockl.bc")
-    if(NOT EXISTS ${ockl_bc})
-      message("MISSING ockl_bc:${ockl_bc}")
-      set(ockl_bc "${CMAKE_INSTALL_PREFIX}/../../amdgcn/bitcode/ockl.bc")
-      if(NOT EXISTS ${ockl_bc})
-        message("MISSING ockl_bc:${ockl_bc}")
-        set(ockl_bc "/opt/rocm/amdgcn/bitcode/ockl.bc")
-        if(NOT EXISTS ${ockl_bc})
-          message("MISSING ockl_bc:${ockl_bc}")
-	  message(FATAL_ERROR "Could not find ockl.bc")
-        else()
-	  message("-- FOUND in ROCm ockl_bc:${ockl_bc}")
-        endif()
-      else()
-        message("-- FOUND in install ockl_bc:${ockl_bc}")
+    set(amdbc_dirs
+      "${CMAKE_BINARY_DIR}/../rocm-device-libs-prefix/src/rocm-device-libs-build/lib/llvm/lib/clang/${LLVM_VERSION_MAJOR}/lib/amdgcn/bitcode"
+      "${CMAKE_INSTALL_PREFIX}/../../amdgcn/bitcode"
+      "/opt/rocm/amdgcn/bitcode")
+    foreach(amdbc_dir ${amdbc_dirs})
+      if(EXISTS "${amdbc_dir}/ockl.bc" AND NOT _ockl_bc)
+        set(_ockl_bc ${amdbc_dir}/ockl.bc)
       endif()
-    else()
-      message("-- FOUND in build ockl_bc:${ockl_bc}")
-    endif()
-
-    set(ocml_bc "${CMAKE_BINARY_DIR}/../rocm-device-libs-prefix/src/rocm-device-libs-build/lib/llvm/lib/clang/${LLVM_VERSION_MAJOR}/lib/amdgcn/bitcode/ocml.bc")
-    if(NOT EXISTS ${ocml_bc})
-      message("MISSING ocml_bc:${ocml_bc}")
-      set(ocml_bc "${CMAKE_INSTALL_PREFIX}/../../amdgcn/bitcode/ocml.bc")
-      if(NOT EXISTS ${ocml_bc})
-        message("MISSING ocml_bc:${ocml_bc}")
-        set(ocml_bc "/opt/rocm/amdgcn/bitcode/ocml.bc")
-        if(NOT EXISTS ${ocml_bc})
-          message("MISSING ocml_bc:${ocml_bc}")
-          message(FATAL_ERROR "Could not find ocml.bc")
-        else()
-	  message("-- FOUND in ROCm ocml_bc:${ocml_bc}")
-        endif()
-      else()
-        message("-- FOUND in install ocml_bc:${ocml_bc}")
+      if(EXISTS "${amdbc_dir}/ocml.bc" AND NOT _ocml_bc)
+        set(_ocml_bc ${amdbc_dir}/ocml.bc)
       endif()
-    else()
-      message("-- FOUND in build ocml_bc:${ocml_bc}")
+    endforeach()
+    if(NOT _ockl_bc)
+      message(FATAL_ERROR "Could not find ockl.bc")
+    endif()
+    if(NOT _ocml_bc)
+      message(FATAL_ERROR "Could not find ocml.bc")
     endif()
-    list(APPEND bc_flags -Xclang -mlink-builtin-bitcode -Xclang ${ockl_bc})
-    list(APPEND bc_flags -Xclang -mlink-builtin-bitcode -Xclang ${ocml_bc})
+    list(APPEND bc_flags -Xclang -mlink-builtin-bitcode -Xclang ${_ockl_bc})
+    list(APPEND bc_flags -Xclang -mlink-builtin-bitcode -Xclang ${_ocml_bc})
   endif()
 
   set(bc_files "")