This is an archive of the discontinued LLVM Phabricator instance.

Differential D17519

AMDGPU: Fix broken/confusing predefined macro
ClosedPublic

Authored by arsenm on Feb 22 2016, 12:14 PM.

Details

Reviewers
• tstellarAMD
Summary

amdgcn should not be defining R600

Diff Detail

Event Timeline

arsenm updated this revision to Diff 48717.Feb 22 2016, 12:14 PM
arsenm retitled this revision from to AMDGPU: Fix broken/confusing predefined macro.
arsenm updated this object.
arsenm added a reviewer: • tstellarAMD.
arsenm added a subscriber: cfe-commits.
• tstellarAMD accepted this revision.Feb 24 2016, 7:03 PM
• tstellarAMD edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Feb 24 2016, 7:03 PM
arsenm closed this revision.Feb 27 2016, 1:11 AM

r262124

Revision Contents

PathSize
lib/
Basic/
6 lines
test/
Preprocessor/
14 lines

Diff 48717

lib/Basic/Targets.cpp

Show First 20 Lines • Show All 1,872 Lines • ▼ Show 20 Linespublic:
ArrayRef<Builtin::Info> getTargetBuiltins() const override { ArrayRef<Builtin::Info> getTargetBuiltins() const override {
return llvm::makeArrayRef(BuiltinInfo, return llvm::makeArrayRef(BuiltinInfo,
clang::AMDGPU::LastTSBuiltin - Builtin::FirstTSBuiltin); clang::AMDGPU::LastTSBuiltin - Builtin::FirstTSBuiltin);
} }
void getTargetDefines(const LangOptions &Opts, void getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const override { MacroBuilder &Builder) const override {
if (getTriple().getArch() == llvm::Triple::amdgcn)
Builder.defineMacro("__AMDGCN__");
else
Builder.defineMacro("__R600__"); Builder.defineMacro("__R600__");
if (hasFMAF) if (hasFMAF)
Builder.defineMacro("__HAS_FMAF__"); Builder.defineMacro("__HAS_FMAF__");
if (hasLDEXPF) if (hasLDEXPF)
Builder.defineMacro("__HAS_LDEXPF__"); Builder.defineMacro("__HAS_LDEXPF__");
if (hasFP64 && Opts.OpenCL) if (hasFP64 && Opts.OpenCL)
Builder.defineMacro("cl_khr_fp64"); Builder.defineMacro("cl_khr_fp64");
if (Opts.OpenCL) { if (Opts.OpenCL) {
if (GPU >= GK_NORTHERN_ISLANDS) { if (GPU >= GK_NORTHERN_ISLANDS) {
▲ Show 20 Lines • Show All 6,162 Lines • Show Last 20 Lines

test/Preprocessor/predefined-arch-macros.c

Show First 20 Lines • Show All 1,818 Lines • ▼ Show 20 Lines
// RUN: %clang -fzvector -E -dM %s -o - 2>&1 \ // RUN: %clang -fzvector -E -dM %s -o - 2>&1 \
// RUN: -target s390x-unknown-linux \ // RUN: -target s390x-unknown-linux \
// RUN: | FileCheck %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR // RUN: | FileCheck %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR
// RUN: %clang -mzvector -E -dM %s -o - 2>&1 \ // RUN: %clang -mzvector -E -dM %s -o - 2>&1 \
// RUN: -target s390x-unknown-linux \ // RUN: -target s390x-unknown-linux \
// RUN: | FileCheck %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR // RUN: | FileCheck %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR
// //
// CHECK_SYSTEMZ_ZVECTOR: #define __VEC__ 10301 // CHECK_SYSTEMZ_ZVECTOR: #define __VEC__ 10301
// Begin amdgcn tests ----------------
//
// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \
// RUN: -target amdgcn-unknown-unknown \
// RUN: | FileCheck %s -check-prefix=CHECK_AMDGCN
// CHECK_AMDGCN: #define __AMDGCN__ 1
// Begin r600 tests ----------------
//
// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \
// RUN: -target r600-unknown-unknown \
// RUN: | FileCheck %s -check-prefix=CHECK_R600
// CHECK_R600: #define __R600__ 1