This is an archive of the discontinued LLVM Phabricator instance.

Differential D80655

Define __SPIR__ macro for spir/spir64 targets.
ClosedPublic

Authored by vzakhari on May 27 2020, 12:38 PM.

Details

Reviewers
erichkeane
rsmith
Commits
rG3a1b07506c1f: Define __SPIR__ macro for spir/spir64 targets.
Summary

SPIR macro definition was missing for spir/spir64 targets.

Diff Detail

Event Timeline

vzakhari created this revision.May 27 2020, 12:38 PM
erichkeane accepted this revision.May 27 2020, 12:41 PM
This revision is now accepted and ready to land.May 27 2020, 12:41 PM
Closed by commit rG3a1b07506c1f: Define __SPIR__ macro for spir/spir64 targets. (authored by vzakhari). · Explain WhyJun 3 2020, 12:40 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJun 3 2020, 12:40 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
2 lines
test/
Preprocessor/
12 lines

Diff 266627

clang/lib/Basic/Targets/SPIR.cpp

Show All 17 Lines
void SPIRTargetInfo::getTargetDefines(const LangOptions &Opts, void SPIRTargetInfo::getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const { MacroBuilder &Builder) const {
DefineStd(Builder, "SPIR", Opts); DefineStd(Builder, "SPIR", Opts);
} }
void SPIR32TargetInfo::getTargetDefines(const LangOptions &Opts, void SPIR32TargetInfo::getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const { MacroBuilder &Builder) const {
SPIRTargetInfo::getTargetDefines(Opts, Builder);
DefineStd(Builder, "SPIR32", Opts); DefineStd(Builder, "SPIR32", Opts);
} }
void SPIR64TargetInfo::getTargetDefines(const LangOptions &Opts, void SPIR64TargetInfo::getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const { MacroBuilder &Builder) const {
SPIRTargetInfo::getTargetDefines(Opts, Builder);
DefineStd(Builder, "SPIR64", Opts); DefineStd(Builder, "SPIR64", Opts);
} }

clang/test/Preprocessor/predefined-macros.c

Show First 20 Lines • Show All 167 Lines • ▼ Show 20 Lines
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_DEVICE 2 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_DEVICE 2
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
// RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR
// CHECK-SPIR: #define __IMAGE_SUPPORT__ 1 // CHECK-SPIR-DAG: #define __IMAGE_SUPPORT__ 1
// CHECK-SPIR-DAG: #define __SPIR__ 1
// CHECK-SPIR-DAG: #define __SPIR32__ 1
// CHECK-SPIR-NOT: #define __SPIR64__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir64-unknown-unknown \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR64
// CHECK-SPIR64-DAG: #define __IMAGE_SUPPORT__ 1
// CHECK-SPIR64-DAG: #define __SPIR__ 1
// CHECK-SPIR64-DAG: #define __SPIR64__ 1
// CHECK-SPIR64-NOT: #define __SPIR32__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \ // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP
// CHECK-HIP-NOT: #define __CUDA_ARCH__ // CHECK-HIP-NOT: #define __CUDA_ARCH__
// CHECK-HIP: #define __HIPCC__ 1 // CHECK-HIP: #define __HIPCC__ 1
// CHECK-HIP-NOT: #define __HIP_DEVICE_COMPILE__ 1 // CHECK-HIP-NOT: #define __HIP_DEVICE_COMPILE__ 1
// CHECK-HIP: #define __HIP__ 1 // CHECK-HIP: #define __HIP__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \ // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
// RUN: -fcuda-is-device \ // RUN: -fcuda-is-device \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV
// CHECK-HIP-DEV-NOT: #define __CUDA_ARCH__ // CHECK-HIP-DEV-NOT: #define __CUDA_ARCH__
// CHECK-HIP-DEV: #define __HIPCC__ 1 // CHECK-HIP-DEV: #define __HIPCC__ 1
// CHECK-HIP-DEV: #define __HIP_DEVICE_COMPILE__ 1 // CHECK-HIP-DEV: #define __HIP_DEVICE_COMPILE__ 1
// CHECK-HIP-DEV: #define __HIP__ 1 // CHECK-HIP-DEV: #define __HIP__ 1