This revision was automatically updated to reflect the committed changes. Closed by commit rG3a1b07506c1f: Define __SPIR__ macro for spir/spir64 targets. (authored by vzakhari). Herald added a project: clang. Herald added a subscriber: cfe-commits.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D80655/new/ https://reviews.llvm.org/D80655 Files: clang/lib/Basic/Targets/SPIR.cpp clang/test/Preprocessor/predefined-macros.c Index: clang/test/Preprocessor/predefined-macros.c =================================================================== --- clang/test/Preprocessor/predefined-macros.c +++ clang/test/Preprocessor/predefined-macros.c @@ -173,7 +173,17 @@ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \ // 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: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP Index: clang/lib/Basic/Targets/SPIR.cpp =================================================================== --- clang/lib/Basic/Targets/SPIR.cpp +++ clang/lib/Basic/Targets/SPIR.cpp @@ -23,10 +23,12 @@ void SPIR32TargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { + SPIRTargetInfo::getTargetDefines(Opts, Builder); DefineStd(Builder, "SPIR32", Opts); } void SPIR64TargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { + SPIRTargetInfo::getTargetDefines(Opts, Builder); DefineStd(Builder, "SPIR64", Opts); }
Index: clang/test/Preprocessor/predefined-macros.c =================================================================== --- clang/test/Preprocessor/predefined-macros.c +++ clang/test/Preprocessor/predefined-macros.c @@ -173,7 +173,17 @@ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \ // 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: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP Index: clang/lib/Basic/Targets/SPIR.cpp =================================================================== --- clang/lib/Basic/Targets/SPIR.cpp +++ clang/lib/Basic/Targets/SPIR.cpp @@ -23,10 +23,12 @@ void SPIR32TargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { + SPIRTargetInfo::getTargetDefines(Opts, Builder); DefineStd(Builder, "SPIR32", Opts); } void SPIR64TargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { + SPIRTargetInfo::getTargetDefines(Opts, Builder); DefineStd(Builder, "SPIR64", Opts); }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits