diff options
2 files changed, 65 insertions, 8 deletions
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch new file mode 100644 index 00000000..c0696652 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From dccea3a4e68c9a4ce069f2f0a2a24df057199db1 Mon Sep 17 00:00:00 2001 | ||
2 | From: haonanya <haonan.yang@intel.com> | ||
3 | Date: Tue, 11 May 2021 11:13:02 +0800 | ||
4 | Subject: [PATCH] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR doesn't | ||
5 | require image support | ||
6 | |||
7 | Upstream-Status: Backport [Taken from opencl-clang patches, https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch] | ||
8 | |||
9 | Signed-off-by: haonanya <haonan.yang@intel.com> | ||
10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
11 | --- | ||
12 | clang/lib/Frontend/InitPreprocessor.cpp | 3 --- | ||
13 | clang/test/Preprocessor/predefined-macros.c | 2 -- | ||
14 | 2 files changed, 5 deletions(-) | ||
15 | |||
16 | diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp | ||
17 | index c64a912ce919..c60972c96e5d 100644 | ||
18 | --- a/clang/lib/Frontend/InitPreprocessor.cpp | ||
19 | +++ b/clang/lib/Frontend/InitPreprocessor.cpp | ||
20 | @@ -1121,9 +1121,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI, | ||
21 | // OpenCL definitions. | ||
22 | if (LangOpts.OpenCL) { | ||
23 | TI.getOpenCLFeatureDefines(LangOpts, Builder); | ||
24 | - | ||
25 | - if (TI.getTriple().isSPIR()) | ||
26 | - Builder.defineMacro("__IMAGE_SUPPORT__"); | ||
27 | } | ||
28 | |||
29 | if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) { | ||
30 | diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c | ||
31 | index e406b9a70570..88606518c7de 100644 | ||
32 | --- a/clang/test/Preprocessor/predefined-macros.c | ||
33 | +++ b/clang/test/Preprocessor/predefined-macros.c | ||
34 | @@ -188,14 +188,12 @@ | ||
35 | |||
36 | // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \ | ||
37 | // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR | ||
38 | -// CHECK-SPIR-DAG: #define __IMAGE_SUPPORT__ 1 | ||
39 | // CHECK-SPIR-DAG: #define __SPIR__ 1 | ||
40 | // CHECK-SPIR-DAG: #define __SPIR32__ 1 | ||
41 | // CHECK-SPIR-NOT: #define __SPIR64__ 1 | ||
42 | |||
43 | // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir64-unknown-unknown \ | ||
44 | // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR64 | ||
45 | -// CHECK-SPIR64-DAG: #define __IMAGE_SUPPORT__ 1 | ||
46 | // CHECK-SPIR64-DAG: #define __SPIR__ 1 | ||
47 | // CHECK-SPIR64-DAG: #define __SPIR64__ 1 | ||
48 | // CHECK-SPIR64-NOT: #define __SPIR32__ 1 | ||
49 | -- | ||
50 | 2.17.1 | ||
51 | |||
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend index 4e2bc535..20bdecfe 100644 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend | |||
@@ -1,13 +1,11 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" |
2 | 2 | ||
3 | SPIRV_BRANCH = "${@bb.utils.contains('LLVMVERSION', '10.0.1', 'llvm_release_100', 'llvm_release_110', d)}" | ||
4 | |||
5 | SPIRV10_SRCREV = "576abae62cecd171992017a4a786e3831221ab8d" | 3 | SPIRV10_SRCREV = "576abae62cecd171992017a4a786e3831221ab8d" |
6 | SPIRV11_SRCREV = "2a8c1e6c9778deaa720a23e08c293006dc5d56fd" | 4 | SPIRV11_SRCREV = "2a8c1e6c9778deaa720a23e08c293006dc5d56fd" |
7 | 5 | ||
8 | SPIRV_SRCREV = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '${SPIRV10_SRCREV}', '${SPIRV11_SRCREV}', d)}" | 6 | SPIRV_SRCREV = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '${SPIRV10_SRCREV}', '${SPIRV11_SRCREV}', d)}" |
9 | 7 | ||
10 | SRC_URI_LLVM10 = " \ | 8 | SRC_URI_LLVM10_PATCHES = " \ |
11 | file://llvm10-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ | 9 | file://llvm10-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ |
12 | file://fix-shared-libs.patch;patchdir=llvm/projects/llvm-spirv \ | 10 | file://fix-shared-libs.patch;patchdir=llvm/projects/llvm-spirv \ |
13 | file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ | 11 | file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ |
@@ -19,17 +17,25 @@ SRC_URI_LLVM10 = " \ | |||
19 | file://0001-Fix-debug-info-of-work-item-builtin-translation-745.patch;patchdir=llvm/projects/llvm-spirv \ | 17 | file://0001-Fix-debug-info-of-work-item-builtin-translation-745.patch;patchdir=llvm/projects/llvm-spirv \ |
20 | " | 18 | " |
21 | 19 | ||
22 | SRC_URI_LLVM11 = " \ | 20 | SRC_URI_LLVM11_PATCHES = " \ |
23 | file://llvm11-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ | 21 | file://llvm11-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ |
24 | file://llvm11-OpenCL-3.0-support.patch \ | 22 | file://llvm11-OpenCL-3.0-support.patch \ |
25 | file://0001-Memory-leak-fix-for-Managed-Static-Mutex.patch \ | 23 | file://0001-Memory-leak-fix-for-Managed-Static-Mutex.patch \ |
26 | file://llvm11-Remove-repo-name-in-LLVM-IR.patch \ | 24 | file://llvm11-Remove-repo-name-in-LLVM-IR.patch \ |
27 | " | 25 | " |
26 | SRC_URI_LLVM12_PATCHES = " \ | ||
27 | file://0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch \ | ||
28 | " | ||
29 | |||
30 | |||
31 | SPIRV_LLVM10_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_100;destsuffix=git/llvm/projects/llvm-spirv;name=spirv" | ||
32 | |||
33 | SPIRV_LLVM11_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_110;destsuffix=git/llvm/projects/llvm-spirv;name=spirv" | ||
28 | 34 | ||
29 | SPIRV_LLVM_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=${SPIRV_BRANCH};destsuffix=git/llvm/projects/llvm-spirv;name=spirv" | ||
30 | 35 | ||
31 | SPIRV_LLVM_PATCHES = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '${SRC_URI_LLVM10}', '${SRC_URI_LLVM11}', d)}" | ||
32 | 36 | ||
37 | SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', ' ${SPIRV_LLVM10_SRC_URI} ${SRC_URI_LLVM10_PATCHES} ', '', d)}" | ||
38 | SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '11.1.0', ' ${SPIRV_LLVM11_SRC_URI} ${SRC_URI_LLVM11_PATCHES} ', '', d)}" | ||
39 | SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}" | ||
33 | 40 | ||
34 | SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', '', ' ${SPIRV_LLVM_SRC_URI} ${SPIRV_LLVM_PATCHES} ', d)}" | 41 | SRCREV_spirv = "${@bb.utils.contains_any('LLVMVERSION', [ '13.0.0', '12.0.0' ], '', '${SPIRV_SRCREV}', d)}" |
35 | SRCREV_spirv = "${@bb.utils.contains('LLVMVERSION', '12.0.0', '', '${SPIRV_SRCREV}', d)}" | ||