[PATCH] D149110: [HIP] Detect HIP for Ubuntu, Mint, Gentoo, etc.

[Cory Bloor via Phabricator via cfe-commits]

cgmb created this revision.
cgmb added reviewers: scchan, tra, yaxunl.
Herald added subscribers: kosarev, kerbowa, jvesely.
Herald added a project: All.
cgmb published this revision for review.
cgmb added a comment.
Herald added subscribers: cfe-commits, MaskRay.
Herald added a project: clang.

Ubuntu Lunar (23.04) has released, which is the first version of Ubuntu with 
ROCm support in the universe repos. With respect to ROCm, it is basically a 
snapshot of Debian Sid. However, since LLVM detects HIP package differently on 
Ubuntu than on Debian, there are additional flags required on Ubuntu that are 
not needed on Debian. This patch removes the differences in behaviour between 
distros. An alternative approach would be just to add `|| Dist.IsGentoo() || 
Dist.IsUbuntu()` to the existing check, but that may still fail on 
Ubuntu-derived distros such as Linux Mint.


HIP may be installed into /usr or /usr/local on a variety of Linux
operating systems. It may become unwieldy to list them all.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D149110

Files:
  clang/lib/Driver/ToolChains/AMDGPU.cpp


Index: clang/lib/Driver/ToolChains/AMDGPU.cpp
===
--- clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -11,7 +11,6 @@
 #include "clang/Basic/TargetID.h"
 #include "clang/Config/config.h"
 #include "clang/Driver/Compilation.h"
-#include "clang/Driver/Distro.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/InputInfo.h"
 #include "clang/Driver/Options.h"
@@ -309,13 +308,10 @@
 ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
 /*StrictChecking=*/true);
 
-  Distro Dist(D.getVFS(), llvm::Triple(llvm::sys::getProcessTriple()));
-  if (Dist.IsDebian() || Dist.IsRedhat()) {
-ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
-/*StrictChecking=*/true);
-ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
-/*StrictChecking=*/true);
-  }
+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
+  /*StrictChecking=*/true);
+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
+  /*StrictChecking=*/true);
 
   DoPrintROCmSearchDirs();
   return ROCmSearchDirs;


Index: clang/lib/Driver/ToolChains/AMDGPU.cpp
===
--- clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -11,7 +11,6 @@
 #include "clang/Basic/TargetID.h"
 #include "clang/Config/config.h"
 #include "clang/Driver/Compilation.h"
-#include "clang/Driver/Distro.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/InputInfo.h"
 #include "clang/Driver/Options.h"
@@ -309,13 +308,10 @@
 ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
 /*StrictChecking=*/true);
 
-  Distro Dist(D.getVFS(), llvm::Triple(llvm::sys::getProcessTriple()));
-  if (Dist.IsDebian() || Dist.IsRedhat()) {
-ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
-/*StrictChecking=*/true);
-ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
-/*StrictChecking=*/true);
-  }
+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local",
+  /*StrictChecking=*/true);
+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr",
+  /*StrictChecking=*/true);
 
   DoPrintROCmSearchDirs();
   return ROCmSearchDirs;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D149110: [HIP] Detect HIP for Ubuntu, Mint, Gentoo, etc.

[Cory Bloor via Phabricator via cfe-commits]

cgmb added a comment.

As far as I know, I cannot commit this change myself as I do not have write 
access for LLVM trunk. Please feel free to submit this change for me once it 
has all necessary approvals.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D149110/new/

https://reviews.llvm.org/D149110

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits