Author: rampitec Date: Wed Aug 14 13:55:15 2019 New Revision: 368917 URL: http://llvm.org/viewvc/llvm-project?rev=368917&view=rev Log: [AMDGPU] Do not assume a default GCN target
Differential Revision: https://reviews.llvm.org/D66246 Modified: cfe/trunk/lib/Basic/Targets/AMDGPU.cpp cfe/trunk/test/Driver/amdgpu-mcpu.cl Modified: cfe/trunk/lib/Basic/Targets/AMDGPU.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/AMDGPU.cpp?rev=368917&r1=368916&r2=368917&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/AMDGPU.cpp (original) +++ cfe/trunk/lib/Basic/Targets/AMDGPU.cpp Wed Aug 14 13:55:15 2019 @@ -131,9 +131,6 @@ bool AMDGPUTargetInfo::initFeatureMap( // XXX - What does the member GPU mean if device name string passed here? if (isAMDGCN(getTriple())) { - if (CPU.empty()) - CPU = "gfx600"; - switch (llvm::AMDGPU::parseArchAMDGCN(CPU)) { case GK_GFX1012: case GK_GFX1011: @@ -189,7 +186,7 @@ bool AMDGPUTargetInfo::initFeatureMap( case GK_GFX600: break; case GK_NONE: - return false; + break; default: llvm_unreachable("Unhandled GPU!"); } Modified: cfe/trunk/test/Driver/amdgpu-mcpu.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/amdgpu-mcpu.cl?rev=368917&r1=368916&r2=368917&view=diff ============================================================================== --- cfe/trunk/test/Driver/amdgpu-mcpu.cl (original) +++ cfe/trunk/test/Driver/amdgpu-mcpu.cl Wed Aug 14 13:55:15 2019 @@ -52,6 +52,7 @@ // AMDGCN-based processors. // +// RUN: %clang -### -target amdgcn %s 2>&1 | FileCheck --check-prefix=GCNDEFAULT %s // RUN: %clang -### -target amdgcn -mcpu=gfx600 %s 2>&1 | FileCheck --check-prefix=GFX600 %s // RUN: %clang -### -target amdgcn -mcpu=tahiti %s 2>&1 | FileCheck --check-prefix=TAHITI %s // RUN: %clang -### -target amdgcn -mcpu=gfx601 %s 2>&1 | FileCheck --check-prefix=GFX601 %s @@ -90,6 +91,7 @@ // RUN: %clang -### -target amdgcn -mcpu=gfx1011 %s 2>&1 | FileCheck --check-prefix=GFX1011 %s // RUN: %clang -### -target amdgcn -mcpu=gfx1012 %s 2>&1 | FileCheck --check-prefix=GFX1012 %s +// GCNDEFAULT-NOT: -target-cpu // GFX600: "-target-cpu" "gfx600" // TAHITI: "-target-cpu" "tahiti" // GFX601: "-target-cpu" "gfx601" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
