Applied remarks

Author: DominikAdamski

clang/lib/Driver/ToolChains/Flang.cpp

@@ -344,8 +344,18 @@ void Flang::AddAMDGPUTargetArgs(const ArgList &Args,
   }
 
   // Check ROCm path if specified
+  if (!Args.getLastArg(options::OPT_rocm_path_EQ))
+    return;
+
+  // If ROCm path is specified, check correctness of the path
   const ToolChain &TC = getToolChain();
-  TC.getDeviceLibs(Args);
+  std::string HIPVersion;
+  llvm::raw_string_ostream HIPInfo(HIPVersion);
+  TC.printVerboseInfo(HIPInfo);
+  llvm::StringRef HIPInfoStrRef(HIPInfo.str());
+  if (!HIPInfoStrRef.contains("Found HIP installation") &&
+      !Args.getLastArg(options::OPT_nogpulib))
+    TC.getDriver().Diag(diag::err_drv_no_rocm_device_lib) << 0;
 }
 
 void Flang::addTargetOptions(const ArgList &Args,

flang/test/Driver/omp-driver-offload.f90

@@ -202,10 +202,9 @@
 ! RUN:   | FileCheck --check-prefix=NO-LIBC-GPU-AMDGPU %s
 ! NO-LIBC-GPU-AMDGPU-NOT: "-lcgpu-amdgpu"
 
-! RUN:   rm -rf %t/Inputs
 ! RUN:   not %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp  \
 ! RUN:      --offload-arch=gfx900 \
-! RUN:      --rocm-path=%t/Inputs/rocm %s 2>&1 \
+! RUN:      --rocm-path=%S/Inputs/rocm %s 2>&1 \
 ! RUN:   | FileCheck --check-prefix=ROCM-PATH-NOT-FOUND %s
 ! ROCM-PATH-NOT-FOUND: error: cannot find ROCm device library;
 
@@ -214,7 +213,7 @@
 ! RUN:   cp -r %S/../../../clang/test/Driver/Inputs/rocm %t/Inputs
 ! RUN:   mkdir -p %t/Inputs/rocm/share/hip
 ! RUN:   mkdir -p %t/Inputs/rocm/hip
-! RUN: mv %t/Inputs/rocm/bin/.hipVersion %t/Inputs/rocm/share/hip/version
+! RUN:   mv %t/Inputs/rocm/bin/.hipVersion %t/Inputs/rocm/share/hip/version
 
 ! RUN:   %flang -### -v --target=x86_64-unknown-linux-gnu -fopenmp  \
 ! RUN:      --offload-arch=gfx900 \