Author: Scott Linder Date: 2019-11-14T11:51:11-05:00 New Revision: c9de002a2cf02b1a00abe5caaa05fd722583218a
URL: https://github.com/llvm/llvm-project/commit/c9de002a2cf02b1a00abe5caaa05fd722583218a DIFF: https://github.com/llvm/llvm-project/commit/c9de002a2cf02b1a00abe5caaa05fd722583218a.diff LOG: [AMDGPU][HIP] Change default DWARF version to 4 Summary: Tooling around DWARF 5 is still not mature enough for this to be a sane default, and the AMDGPU and HIP toolchains should agree on a single default. Subscribers: kzhuravl, jvesely, wdng, nhaehnle, yaxunl, aprantl, dstuttard, tpr, t-tye, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D70191 Added: clang/test/Driver/hip-toolchain-dwarf.hip Modified: clang/lib/Driver/ToolChains/AMDGPU.h clang/lib/Driver/ToolChains/HIP.h clang/test/Driver/amdgpu-toolchain.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/AMDGPU.h b/clang/lib/Driver/ToolChains/AMDGPU.h index 5585cc534861..f4c78bea5cc9 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.h +++ b/clang/lib/Driver/ToolChains/AMDGPU.h @@ -55,7 +55,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUToolChain : public Generic_ELF { public: AMDGPUToolChain(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); - unsigned GetDefaultDwarfVersion() const override { return 5; } + unsigned GetDefaultDwarfVersion() const override { return 4; } bool IsIntegratedAssemblerDefault() const override { return true; } bool IsMathErrnoDefault() const override { return false; } diff --git a/clang/lib/Driver/ToolChains/HIP.h b/clang/lib/Driver/ToolChains/HIP.h index 2d146ce5cc6f..c4f944e458bf 100644 --- a/clang/lib/Driver/ToolChains/HIP.h +++ b/clang/lib/Driver/ToolChains/HIP.h @@ -113,7 +113,7 @@ class LLVM_LIBRARY_VISIBILITY HIPToolChain : public ToolChain { computeMSVCVersion(const Driver *D, const llvm::opt::ArgList &Args) const override; - unsigned GetDefaultDwarfVersion() const override { return 2; } + unsigned GetDefaultDwarfVersion() const override { return 4; } const ToolChain &HostTC; diff --git a/clang/test/Driver/amdgpu-toolchain.c b/clang/test/Driver/amdgpu-toolchain.c index e51b7b53170c..c058ef249ef2 100644 --- a/clang/test/Driver/amdgpu-toolchain.c +++ b/clang/test/Driver/amdgpu-toolchain.c @@ -8,4 +8,4 @@ // AS_LINK: clang{{.*}} "-cc1as" // AS_LINK: ld.lld{{.*}} "-shared" -// DWARF_VER: "-dwarf-version=5" +// DWARF_VER: "-dwarf-version=4" diff --git a/clang/test/Driver/hip-toolchain-dwarf.hip b/clang/test/Driver/hip-toolchain-dwarf.hip new file mode 100644 index 000000000000..44d66fe52e04 --- /dev/null +++ b/clang/test/Driver/hip-toolchain-dwarf.hip @@ -0,0 +1,9 @@ +// REQUIRES: clang-driver +// REQUIRES: x86-registered-target +// REQUIRES: amdgpu-registered-target + +// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \ +// RUN: -x hip --cuda-gpu-arch=gfx803 %s \ +// RUN: -Xarch_gfx803 -g 2>&1 | FileCheck %s -check-prefix=DWARF_VER + +// DWARF_VER: "-dwarf-version=4" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
