yaxunl updated this revision to Diff 482240.
yaxunl added a comment.
fix error handling
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D139045/new/
https://reviews.llvm.org/D139045
Files:
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/AMDGPU.h
Index: clang/lib/Driver/ToolChains/AMDGPU.h
===================================================================
--- clang/lib/Driver/ToolChains/AMDGPU.h
+++ clang/lib/Driver/ToolChains/AMDGPU.h
@@ -107,6 +107,9 @@
llvm::Error getSystemGPUArch(const llvm::opt::ArgList &Args,
std::string &GPUArch) const;
+ llvm::Error detectSystemGPUs(const llvm::opt::ArgList &Args,
+ SmallVector<std::string, 1> &GPUArchs) const;
+
protected:
/// Check and diagnose invalid target ID specified by -mcpu.
virtual void checkTargetID(const llvm::opt::ArgList &DriverArgs) const;
@@ -126,8 +129,6 @@
/// Get GPU arch from -mcpu without checking.
StringRef getGPUArch(const llvm::opt::ArgList &DriverArgs) const;
- llvm::Error detectSystemGPUs(const llvm::opt::ArgList &Args,
- SmallVector<std::string, 1> &GPUArchs) const;
};
class LLVM_LIBRARY_VISIBILITY ROCMToolChain : public AMDGPUToolChain {
Index: clang/lib/Driver/Driver.cpp
===================================================================
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -3055,6 +3055,7 @@
}
// Collect all offload arch parameters, removing duplicates.
+ const StringRef NativeArchStr = "native";
std::set<StringRef> GpuArchs;
bool Error = false;
for (Arg *A : Args) {
@@ -3067,6 +3068,17 @@
if (A->getOption().matches(options::OPT_no_offload_arch_EQ) &&
ArchStr == "all") {
GpuArchs.clear();
+ } else if (ArchStr == NativeArchStr &&
+ ToolChains.front()->getTriple().isAMDGPU()) {
+ auto *TC = static_cast<const toolchains::HIPAMDToolChain *>(
+ ToolChains.front());
+ SmallVector<std::string, 1> GPUs;
+ auto Err = TC->detectSystemGPUs(Args, GPUs);
+ if (!Err) {
+ for (auto GPU : GPUs)
+ GpuArchs.insert(Args.MakeArgString(GPU));
+ } else
+ llvm::consumeError(std::move(Err));
} else {
ArchStr = getCanonicalOffloadArch(ArchStr);
if (ArchStr.empty()) {
Index: clang/lib/Driver/ToolChains/AMDGPU.h
===================================================================
--- clang/lib/Driver/ToolChains/AMDGPU.h
+++ clang/lib/Driver/ToolChains/AMDGPU.h
@@ -107,6 +107,9 @@
llvm::Error getSystemGPUArch(const llvm::opt::ArgList &Args,
std::string &GPUArch) const;
+ llvm::Error detectSystemGPUs(const llvm::opt::ArgList &Args,
+ SmallVector<std::string, 1> &GPUArchs) const;
+
protected:
/// Check and diagnose invalid target ID specified by -mcpu.
virtual void checkTargetID(const llvm::opt::ArgList &DriverArgs) const;
@@ -126,8 +129,6 @@
/// Get GPU arch from -mcpu without checking.
StringRef getGPUArch(const llvm::opt::ArgList &DriverArgs) const;
- llvm::Error detectSystemGPUs(const llvm::opt::ArgList &Args,
- SmallVector<std::string, 1> &GPUArchs) const;
};
class LLVM_LIBRARY_VISIBILITY ROCMToolChain : public AMDGPUToolChain {
Index: clang/lib/Driver/Driver.cpp
===================================================================
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -3055,6 +3055,7 @@
}
// Collect all offload arch parameters, removing duplicates.
+ const StringRef NativeArchStr = "native";
std::set<StringRef> GpuArchs;
bool Error = false;
for (Arg *A : Args) {
@@ -3067,6 +3068,17 @@
if (A->getOption().matches(options::OPT_no_offload_arch_EQ) &&
ArchStr == "all") {
GpuArchs.clear();
+ } else if (ArchStr == NativeArchStr &&
+ ToolChains.front()->getTriple().isAMDGPU()) {
+ auto *TC = static_cast<const toolchains::HIPAMDToolChain *>(
+ ToolChains.front());
+ SmallVector<std::string, 1> GPUs;
+ auto Err = TC->detectSystemGPUs(Args, GPUs);
+ if (!Err) {
+ for (auto GPU : GPUs)
+ GpuArchs.insert(Args.MakeArgString(GPU));
+ } else
+ llvm::consumeError(std::move(Err));
} else {
ArchStr = getCanonicalOffloadArch(ArchStr);
if (ArchStr.empty()) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
