Skip to content

Commit cda72c9

Browse files
committedOct 19, 2017
AMDGPU: Parse r600 CPU name early and expose FMAF capability
Improve amdgcn macro test Differential Revision: https://reviews.llvm.org/D38667 llvm-svn: 316181
1 parent 3af5ffb commit cda72c9

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed
 

‎clang/lib/Basic/Targets/AMDGPU.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,20 @@ void AMDGPUTargetInfo::setAddressSpaceMap(bool DefaultIsPrivate) {
308308

309309
AMDGPUTargetInfo::AMDGPUTargetInfo(const llvm::Triple &Triple,
310310
const TargetOptions &Opts)
311-
: TargetInfo(Triple), GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
311+
: TargetInfo(Triple),
312+
GPU(isAMDGCN(Triple) ? GK_GFX6 : parseR600Name(Opts.CPU)),
312313
hasFP64(false), hasFMAF(false), hasLDEXPF(false),
313314
AS(isGenericZero(Triple)) {
314315
if (getTriple().getArch() == llvm::Triple::amdgcn) {
315316
hasFP64 = true;
316317
hasFMAF = true;
317318
hasLDEXPF = true;
318319
}
320+
if (getTriple().getArch() == llvm::Triple::r600) {
321+
if (GPU == GK_EVERGREEN_DOUBLE_OPS || GPU == GK_CAYMAN) {
322+
hasFMAF = true;
323+
}
324+
}
319325
auto IsGenericZero = isGenericZero(Triple);
320326
resetDataLayout(getTriple().getArch() == llvm::Triple::amdgcn
321327
? (IsGenericZero ? DataLayoutStringSIGenericIsZero

‎clang/test/Preprocessor/predefined-arch-macros.c

+10
Original file line numberDiff line numberDiff line change
@@ -2378,10 +2378,20 @@
23782378
// RUN: -target amdgcn-unknown-unknown \
23792379
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDGCN
23802380
// CHECK_AMDGCN: #define __AMDGCN__ 1
2381+
// CHECK_AMDGCN: #define __HAS_FMAF__ 1
2382+
// CHECK_AMDGCN: #define __HAS_FP64__ 1
2383+
// CHECK_AMDGCN: #define __HAS_LDEXPF__ 1
23812384

23822385
// Begin r600 tests ----------------
23832386
//
23842387
// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \
23852388
// RUN: -target r600-unknown-unknown \
23862389
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600
23872390
// CHECK_R600: #define __R600__ 1
2391+
// CHECK_R600-NOT: #define __HAS_FMAF__ 1
2392+
2393+
// RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \
2394+
// RUN: -target r600-unknown-unknown \
2395+
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64
2396+
// CHECK_R600_FP64-DAG: #define __R600__ 1
2397+
// CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1

0 commit comments

Comments
 (0)
Please sign in to comment.