[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Yaxun Liu via Phabricator via cfe-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG91b9bdeb9256: [AMDGPU] Support -mcpu=native for OpenCL 
(authored by yaxunl).
Herald added a subscriber: ldrumm.
Herald added a project: clang.

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D154531

Files:
  clang/include/clang/Basic/DiagnosticDriverKinds.td
  clang/include/clang/Basic/DiagnosticGroups.td
  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
@@ -635,6 +635,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries like
 // libc and the CRT to be skipped.
 def AVRRtlibLinkingQuirks : DiagGroup<"avr-rtlib-linking-quirks">;
Index: clang/include/clang/Basic/DiagnosticDriverKinds.td
===
--- clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -82,6 +82,9 @@
 def err_drv_undetermined_gpu_arch : Error<
   "cannot determine %0 architecture: %1; consider passing it via "
   "'%2'">;
+def warn_drv_multi_gpu_arch : Warning<
+  "multiple %0 architectures are detected: %1; only the first one is used for "
+  "'%2'">, InGroup;
 def err_drv_cuda_version_unsupported : Error<
   "GPU arch %0 is supported by CUDA versions between %1 and %2 (inclusive), "
   "but installation at %3 is %4; use '--cuda-path' to specify a different CUDA 
"


Index: clang/lib/Driver/ToolChains/AMDGPU.cpp
===
--- clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -635,6 +635,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries like
 // libc and the CRT to be skipped.
 def AVRRtlibLinkingQuirks : 

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Yaxun Liu via Phabricator via cfe-commits]

yaxunl updated this revision to Diff 537575.
yaxunl marked an inline comment as done.
yaxunl added a comment.

revised by comments


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

https://reviews.llvm.org/D154531

Files:
  clang/include/clang/Basic/DiagnosticDriverKinds.td
  clang/include/clang/Basic/DiagnosticGroups.td
  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
@@ -634,6 +634,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries like
 // libc and the CRT to be skipped.
 def AVRRtlibLinkingQuirks : DiagGroup<"avr-rtlib-linking-quirks">;
Index: clang/include/clang/Basic/DiagnosticDriverKinds.td
===
--- clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -82,6 +82,9 @@
 def err_drv_undetermined_gpu_arch : Error<
   "cannot determine %0 architecture: %1; consider passing it via "
   "'%2'">;
+def warn_drv_multi_gpu_arch : Warning<
+  "multiple %0 architectures are detected: %1; only the first one is used for "
+  "'%2'">, InGroup;
 def err_drv_cuda_version_unsupported : Error<
   "GPU arch %0 is supported by CUDA versions between %1 and %2 (inclusive), "
   "but installation at %3 is %4; use '--cuda-path' to specify a different CUDA 
"


Index: clang/lib/Driver/ToolChains/AMDGPU.cpp
===
--- clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -634,6 +634,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries like
 // libc and the CRT to be skipped.
 def AVRRtlibLinkingQuirks : DiagGroup<"avr-rtlib-linking-quirks">;
Index: clang/include/clang/Basic/DiagnosticDriverKinds.td
===
--- clang/include/clang/Basic/DiagnosticDriverKinds.td

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Yaxun Liu via Phabricator via cfe-commits]

yaxunl marked an inline comment as done.
yaxunl added inline comments.



Comment at: clang/include/clang/Basic/DiagnosticDriverKinds.td:86
+def warn_drv_multi_gpu_arch : Warning<
+  "multiple %0 architecture are detected: %1; only the first one is used for "
+  "'%2'">, InGroup;

arsenm wrote:
> s/architecture/architectures/
> 
> Maybe should stick to the "device" terminology opencl uses
`multiple devices` is ambiguous since it could mean multiple devices of the 
same GPU architecture. `multiple architectures` is not ambiguous.


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

https://reviews.llvm.org/D154531

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

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Yaxun Liu via Phabricator via cfe-commits]

yaxunl added a comment.

In D154531#4475386 , @MaskRay wrote:

> Seems reasonable. I assume that there isn't a way to add a portable test.

Right. It is difficult to test it with lit tests, but we will test it with 
internal CI.


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

https://reviews.llvm.org/D154531

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

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Matt Arsenault via Phabricator via cfe-commits]

arsenm added inline comments.



Comment at: clang/include/clang/Basic/DiagnosticDriverKinds.td:86
+def warn_drv_multi_gpu_arch : Warning<
+  "multiple %0 architecture are detected: %1; only the first one is used for "
+  "'%2'">, InGroup;

s/architecture/architectures/

Maybe should stick to the "device" terminology opencl uses


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

https://reviews.llvm.org/D154531

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

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Fangrui Song via Phabricator via cfe-commits]

MaskRay added a comment.

Seems reasonable. I assume that there isn't a way to add a portable test.


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

https://reviews.llvm.org/D154531

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

[PATCH] D154531: [AMDGPU] Support -mcpu=native for OpenCL

[Yaxun Liu via Phabricator via cfe-commits]

yaxunl created this revision.
yaxunl added reviewers: tra, arsenm, MaskRay.
Herald added subscribers: kerbowa, Anastasia, tpr, dstuttard, jvesely, kzhuravl.
Herald added a project: All.
yaxunl requested review of this revision.
Herald added a subscriber: wdng.

When -mcpu=native is specified, try detecting GPU
on the system by using amdgpu-arch tool. If it
fails to detect GPU, emit an error about GPU
not detected. If multiple GPUs are detected,
use the first GPU and emit a warning.


https://reviews.llvm.org/D154531

Files:
  clang/include/clang/Basic/DiagnosticDriverKinds.td
  clang/include/clang/Basic/DiagnosticGroups.td
  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
@@ -634,6 +634,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries like
 // libc and the CRT to be skipped.
 def AVRRtlibLinkingQuirks : DiagGroup<"avr-rtlib-linking-quirks">;
Index: clang/include/clang/Basic/DiagnosticDriverKinds.td
===
--- clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -82,6 +82,9 @@
 def err_drv_undetermined_gpu_arch : Error<
   "cannot determine %0 architecture: %1; consider passing it via "
   "'%2'">;
+def warn_drv_multi_gpu_arch : Warning<
+  "multiple %0 architecture are detected: %1; only the first one is used for "
+  "'%2'">, InGroup;
 def err_drv_cuda_version_unsupported : Error<
   "GPU arch %0 is supported by CUDA versions between %1 and %2 (inclusive), "
   "but installation at %3 is %4; use '--cuda-path' to specify a different CUDA 
"


Index: clang/lib/Driver/ToolChains/AMDGPU.cpp
===
--- clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -634,6 +634,27 @@
   for (Arg *A : Args)
 DAL->append(A);
 
+  // Replace -mcpu=native with detected GPU.
+  Arg *LastMCPUArg = DAL->getLastArg(options::OPT_mcpu_EQ);
+  if (LastMCPUArg && StringRef(LastMCPUArg->getValue()) == "native") {
+DAL->eraseArg(options::OPT_mcpu_EQ);
+auto GPUsOrErr = getSystemGPUArchs(Args);
+if (!GPUsOrErr) {
+  getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+  << llvm::Triple::getArchTypeName(getArch())
+  << llvm::toString(GPUsOrErr.takeError()) << "-mcpu";
+} else {
+  auto  = *GPUsOrErr;
+  if (GPUs.size() > 1) {
+getDriver().Diag(diag::warn_drv_multi_gpu_arch)
+<< llvm::Triple::getArchTypeName(getArch())
+<< llvm::join(GPUs, ", ") << "-mcpu";
+  }
+  DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ),
+Args.MakeArgString(GPUs.front()));
+}
+  }
+
   checkTargetID(*DAL);
 
   if (!Args.getLastArgValue(options::OPT_x).equals("cl"))
Index: clang/include/clang/Basic/DiagnosticGroups.td
===
--- clang/include/clang/Basic/DiagnosticGroups.td
+++ clang/include/clang/Basic/DiagnosticGroups.td
@@ -1336,6 +1336,9 @@
 // Warning about mixed HIP and OpenMP compilation / target offloading.
 def HIPOpenMPOffloading: DiagGroup<"hip-omp-target-directives">;
 
+// Warning about multiple GPUs are detected.
+def MultiGPU: DiagGroup<"multi-gpu">;
+
 // Warnings which cause linking of the runtime libraries