Commit 3f76a35b authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r316181: 

------------------------------------------------------------------------
r316181 | jvesely | 2017-10-19 13:40:13 -0700 (Thu, 19 Oct 2017) | 4 lines

AMDGPU: Parse r600 CPU name early and expose FMAF capability

Improve amdgcn macro test
Differential Revision: https://reviews.llvm.org/D38667
------------------------------------------------------------------------

llvm-svn: 319032
parent 2030ade1

clang/lib/Basic/Targets.cpp

+7 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ class AMDGPUTargetInfo final : public TargetInfo { 
public:

  AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)

    : TargetInfo(Triple) ,

      GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),

      GPU(isAMDGCN(Triple) ? GK_GFX6 : parseR600Name(Opts.CPU)),

      hasFP64(false),

      hasFMAF(false),

      hasLDEXPF(false),
@@ -2179,6 +2179,12 @@ public: 
      hasFMAF = true;

      hasLDEXPF = true;

    }

    if (getTriple().getArch() == llvm::Triple::r600) {

      if (GPU == GK_EVERGREEN_DOUBLE_OPS || GPU == GK_CAYMAN) {

        hasFMAF = true;

      }

    }



    auto IsGenericZero = isGenericZero(Triple);

    resetDataLayout(getTriple().getArch() == llvm::Triple::amdgcn ?

                    (IsGenericZero ? DataLayoutStringSIGenericIsZero :

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

+10 −0
Original line number Diff line number Diff line
@@ -2283,6 +2283,9 @@ 
// RUN:     -target amdgcn-unknown-unknown \

// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDGCN

// CHECK_AMDGCN: #define __AMDGCN__ 1

// CHECK_AMDGCN: #define __HAS_FMAF__ 1

// CHECK_AMDGCN: #define __HAS_FP64__ 1

// CHECK_AMDGCN: #define __HAS_LDEXPF__ 1



// Begin r600 tests ----------------

//
@@ -2290,3 +2293,10 @@ 
// RUN:     -target r600-unknown-unknown \

// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_R600

// CHECK_R600: #define __R600__ 1

// CHECK_R600-NOT: #define __HAS_FMAF__ 1



// RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \

// RUN:     -target r600-unknown-unknown \

// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64

// CHECK_R600_FP64-DAG: #define __R600__ 1

// CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1