67 files changed, 1298 insertions, 6972 deletions

diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
index ee39f51b..2fa3f627 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
@@ -3,7 +3,7 @@ SUMMARY  = "Deep Neural Network Library"
 DESCRIPTION = "This software is a user mode library that accelerates\
 deep-learning applications and frameworks on Intel architecture."
 LICENSE  = "Apache-2.0 & BSD-3-Clause & BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
                     file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
                     file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
                     file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
@@ -12,9 +12,11 @@ SECTION = "lib"
 
 inherit pkgconfig cmake ptest
 
+DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
+
 S = "${WORKDIR}/git"
-SRCREV = "58be3660fb57c4c4a3d306730e849237d1271572"
-SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.6;protocol=https \
+SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78"
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
            file://run-ptest \
            "
 
@@ -32,10 +34,11 @@ EXTRA_OECMAKE += " \
                    -DDNNL_CPU_RUNTIME=OMP \
                    -DDNNL_ARCH_OPT_FLAGS="" \
                    -DCMAKE_SKIP_RPATH=ON \
+                   -DONEDNN_BUILD_GRAPH=OFF \
                    "
 
 PACKAGECONFIG ??= "gpu"
-PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
+PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-icd, intel-compute-runtime"
 
 do_install:append () {
     install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
deleted file mode 100644
index 4e25420c..00000000
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b9bc0df996d1e65fd70d5eb2d40866693f23bb67 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Thu, 24 Jun 2021 17:53:27 +0800
-Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef88317e..7507d6a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -281,7 +281,7 @@ if (WASM_ENABLED)
-     list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
- 
--set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang-cpp)
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
- 
- if (X86_ENABLED)
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch
deleted file mode 100644
index 00f3607a..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3632f727dfd786a8eca50bd01219669bbe7b0df9 Mon Sep 17 00:00:00 2001
-From: haonanya <haonan.yang@intel.com>
-Date: Tue, 11 May 2021 11:13:02 +0800
-Subject: [PATCH 1/3] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR
- doesn't require image support
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: haonanya <haonan.yang@intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- clang/lib/Frontend/InitPreprocessor.cpp     | 3 ---
- clang/test/Preprocessor/predefined-macros.c | 2 --
- 2 files changed, 5 deletions(-)
-
-diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
-index c64a912ce919..c60972c96e5d 100644
---- a/clang/lib/Frontend/InitPreprocessor.cpp
-+++ b/clang/lib/Frontend/InitPreprocessor.cpp
-@@ -1121,9 +1121,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
-   // OpenCL definitions.
-   if (LangOpts.OpenCL) {
-     TI.getOpenCLFeatureDefines(LangOpts, Builder);
--
--    if (TI.getTriple().isSPIR())
--      Builder.defineMacro("__IMAGE_SUPPORT__");
-   }
- 
-   if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) {
-diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c
-index e406b9a70570..88606518c7de 100644
---- a/clang/test/Preprocessor/predefined-macros.c
-+++ b/clang/test/Preprocessor/predefined-macros.c
-@@ -188,14 +188,12 @@
- 
- // 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-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
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch
deleted file mode 100644
index 497db4f5..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 60854c328d8729b2ef10b9bb4dcbcc282f43c5e7 Mon Sep 17 00:00:00 2001
-From: Raphael Isemann <teemperor@gmail.com>
-Date: Thu, 1 Apr 2021 18:41:44 +0200
-Subject: [PATCH] Avoid calling ParseCommandLineOptions in BackendUtil if
- possible
-
-Calling `ParseCommandLineOptions` should only be called from `main` as the
-CommandLine setup code isn't thread-safe. As BackendUtil is part of the
-generic Clang FrontendAction logic, a process which has several threads executing
-Clang FrontendActions will randomly crash in the unsafe setup code.
-
-This patch avoids calling the function unless either the debug-pass option or
-limit-float-precision option is set. Without these two options set the
-`ParseCommandLineOptions` call doesn't do anything beside parsing
-the command line `clang` which doesn't set any options.
-
-See also D99652 where LLDB received a workaround for this crash.
-
-Reviewed By: JDevlieghere
-
-Differential Revision: https://reviews.llvm.org/D99740
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/60854c328d8729b2ef10b9bb4dcbcc282f43c5e7]
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-
----
- clang/lib/CodeGen/BackendUtil.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
-index 41eafd13d97c..00d92e7beadd 100644
---- a/clang/lib/CodeGen/BackendUtil.cpp
-+++ b/clang/lib/CodeGen/BackendUtil.cpp
-@@ -871,7 +871,15 @@ static void setCommandLineOpts(const CodeGenOptions &CodeGenOpts) {
-     BackendArgs.push_back("-limit-float-precision");
-     BackendArgs.push_back(CodeGenOpts.LimitFloatPrecision.c_str());
-   }
-+  // Check for the default "clang" invocation that won't set any cl::opt values.
-+  // Skip trying to parse the command line invocation to avoid the issues
-+  // described below.
-+  if (BackendArgs.size() == 1)
-+    return;
-   BackendArgs.push_back(nullptr);
-+  // FIXME: The command line parser below is not thread-safe and shares a global
-+  // state, so this call might crash or overwrite the options of another Clang
-+  // instance in the same process.
-   llvm::cl::ParseCommandLineOptions(BackendArgs.size() - 1,
-                                     BackendArgs.data());
- }
--- 
-2.29.2
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch
deleted file mode 100644
index c609b08b..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch
+++ /dev/null
@@ -1,561 +0,0 @@
-From 85505bdb386a426310c1fb0a845780beeeec4353 Mon Sep 17 00:00:00 2001
-From: haonanya <haonan.yang@intel.com>
-Date: Wed, 9 Feb 2022 09:16:35 +0800
-Subject: [PATCH] Support cl_ext_float_atomics
-
-This backports https://reviews.llvm.org/D106343 and https://reviews.llvm.org/D109740
-
-Signed-off-by: haonanya <haonan.yang@intel.com>
-
-Upstream-Status: Backport
-
-https://github.com/llvm/llvm-project/commit/d353d1c50112a1cb315eccdab18ce7bd1563cd06
-https://github.com/llvm/llvm-project/commit/544d89e847d42ce8856296752b0fb279aa89aace
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-
----
- clang/lib/Headers/opencl-c-base.h     |  19 ++
- clang/lib/Headers/opencl-c.h          | 378 ++++++++++++++++++++++++++
- clang/lib/Sema/Sema.cpp               |   3 +
- clang/test/Headers/opencl-c-header.cl |  84 ++++++
- 4 files changed, 484 insertions(+)
-
-diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
-index e8dcd70377e5..d94d64372dbb 100644
---- a/clang/lib/Headers/opencl-c-base.h
-+++ b/clang/lib/Headers/opencl-c-base.h
-@@ -21,6 +21,25 @@
- #define cl_khr_subgroup_shuffle 1
- #define cl_khr_subgroup_shuffle_relative 1
- #define cl_khr_subgroup_clustered_reduce 1
-+#define cl_ext_float_atomics
-+#ifdef cl_khr_fp16
-+#define __opencl_c_ext_fp16_global_atomic_load_store 1
-+#define __opencl_c_ext_fp16_local_atomic_load_store 1
-+#define __opencl_c_ext_fp16_global_atomic_add 1
-+#define __opencl_c_ext_fp16_local_atomic_add 1
-+#define __opencl_c_ext_fp16_global_atomic_min_max 1
-+#define __opencl_c_ext_fp16_local_atomic_min_max 1
-+#endif
-+#ifdef cl_khr_fp64
-+#define __opencl_c_ext_fp64_global_atomic_add 1
-+#define __opencl_c_ext_fp64_local_atomic_add 1
-+#define __opencl_c_ext_fp64_global_atomic_min_max 1
-+#define __opencl_c_ext_fp64_local_atomic_min_max 1
-+#endif
-+#define __opencl_c_ext_fp32_global_atomic_add 1
-+#define __opencl_c_ext_fp32_local_atomic_add 1
-+#define __opencl_c_ext_fp32_global_atomic_min_max 1
-+#define __opencl_c_ext_fp32_local_atomic_min_max 1
- #endif // defined(__SPIR__)
- #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index ab665628c8e1..584db7e81e04 100644
---- a/clang/lib/Headers/opencl-c.h
-+++ b/clang/lib/Headers/opencl-c.h
-@@ -13531,6 +13531,384 @@ intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uint
- intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder, memory_scope scope);
- #endif
- 
-+// The functionality added by cl_ext_float_atomics extension
-+#if defined(cl_ext_float_atomics)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_load_store)
-+void __ovld atomic_store(volatile __global atomic_half *object, half operand);
-+void __ovld atomic_store_explicit(volatile __global atomic_half *object,
-+                                  half operand, memory_order order);
-+void __ovld atomic_store_explicit(volatile __global atomic_half *object,
-+                                  half operand, memory_order order,
-+                                  memory_scope scope);
-+half __ovld atomic_load(volatile __global atomic_half *object);
-+half __ovld atomic_load_explicit(volatile __global atomic_half *object,
-+                                 memory_order order);
-+half __ovld atomic_load_explicit(volatile __global atomic_half *object,
-+                                 memory_order order, memory_scope scope);
-+half __ovld atomic_exchange(volatile __global atomic_half *object,
-+                            half operand);
-+half __ovld atomic_exchange_explicit(volatile __global atomic_half *object,
-+                                     half operand, memory_order order);
-+half __ovld atomic_exchange_explicit(volatile __global atomic_half *object,
-+                                     half operand, memory_order order,
-+                                     memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_load_store)
-+
-+#if defined(__opencl_c_ext_fp16_local_atomic_load_store)
-+void __ovld atomic_store(volatile __local atomic_half *object, half operand);
-+void __ovld atomic_store_explicit(volatile __local atomic_half *object,
-+                                  half operand, memory_order order);
-+void __ovld atomic_store_explicit(volatile __local atomic_half *object,
-+                                  half operand, memory_order order,
-+                                  memory_scope scope);
-+half __ovld atomic_load(volatile __local atomic_half *object);
-+half __ovld atomic_load_explicit(volatile __local atomic_half *object,
-+                                 memory_order order);
-+half __ovld atomic_load_explicit(volatile __local atomic_half *object,
-+                                 memory_order order, memory_scope scope);
-+half __ovld atomic_exchange(volatile __local atomic_half *object, half operand);
-+half __ovld atomic_exchange_explicit(volatile __local atomic_half *object,
-+                                     half operand, memory_order order);
-+half __ovld atomic_exchange_explicit(volatile __local atomic_half *object,
-+                                     half operand, memory_order order,
-+                                     memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_local_atomic_load_store)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_load_store) &&                   \
-+    defined(__opencl_c_ext_fp16_local_atomic_load_store)
-+void __ovld atomic_store(volatile atomic_half *object, half operand);
-+void __ovld atomic_store_explicit(volatile atomic_half *object, half operand,
-+                                  memory_order order);
-+void __ovld atomic_store_explicit(volatile atomic_half *object, half operand,
-+                                  memory_order order, memory_scope scope);
-+half __ovld atomic_load(volatile atomic_half *object);
-+half __ovld atomic_load_explicit(volatile atomic_half *object,
-+                                 memory_order order);
-+half __ovld atomic_load_explicit(volatile atomic_half *object,
-+                                 memory_order order, memory_scope scope);
-+half __ovld atomic_exchange(volatile atomic_half *object, half operand);
-+half __ovld atomic_exchange_explicit(volatile atomic_half *object, half operand,
-+                                     memory_order order);
-+half __ovld atomic_exchange_explicit(volatile atomic_half *object, half operand,
-+                                     memory_order order, memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_load_store) &&
-+       // defined(__opencl_c_ext_fp16_local_atomic_load_store)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_min_max)
-+half __ovld atomic_fetch_min(volatile __global atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_max(volatile __global atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_min_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_max_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_min_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_max_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp16_local_atomic_min_max)
-+half __ovld atomic_fetch_min(volatile __local atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_max(volatile __local atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_min_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_max_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_min_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_max_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_local_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_min_max) &&                      \
-+    defined(__opencl_c_ext_fp16_local_atomic_min_max)
-+half __ovld atomic_fetch_min(volatile atomic_half *object, half operand);
-+half __ovld atomic_fetch_max(volatile atomic_half *object, half operand);
-+half __ovld atomic_fetch_min_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_max_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_min_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_max_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_min_max) &&                \
-+    defined(__opencl_c_ext_fp16_local_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_max(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_min_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_global_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_max(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_min_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_min_max) &&                      \
-+    defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+float __ovld atomic_fetch_min(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_max(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_min_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_max_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_min_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_max_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_global_atomic_min_max) &&                \
-+    defined(__opencl_c_ext_fp32_local_atomic_min_max)
-+
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#if defined(__opencl_c_ext_fp64_global_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_max(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_min_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_global_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_max(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_min_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+
-+#if defined(__opencl_c_ext_fp64_global_atomic_min_max) &&                      \
-+    defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+double __ovld atomic_fetch_min(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_max(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_min_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_max_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_min_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_max_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_global_atomic_min_max) &&                \
-+    defined(__opencl_c_ext_fp64_local_atomic_min_max)
-+#endif // defined(cl_khr_int64_base_atomics) &&
-+       // defined(cl_khr_int64_extended_atomics)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_add)
-+half __ovld atomic_fetch_add(volatile __global atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_sub(volatile __global atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_add_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_sub_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_add_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_sub_explicit(volatile __global atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp16_local_atomic_add)
-+half __ovld atomic_fetch_add(volatile __local atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_sub(volatile __local atomic_half *object,
-+                             half operand);
-+half __ovld atomic_fetch_add_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_sub_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_add_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_sub_explicit(volatile __local atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_local_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp16_global_atomic_add) &&                          \
-+    defined(__opencl_c_ext_fp16_local_atomic_add)
-+half __ovld atomic_fetch_add(volatile atomic_half *object, half operand);
-+half __ovld atomic_fetch_sub(volatile atomic_half *object, half operand);
-+half __ovld atomic_fetch_add_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_sub_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order);
-+half __ovld atomic_fetch_add_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+half __ovld atomic_fetch_sub_explicit(volatile atomic_half *object,
-+                                      half operand, memory_order order,
-+                                      memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp16_global_atomic_add) &&                    \
-+    defined(__opencl_c_ext_fp16_local_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_add)
-+float __ovld atomic_fetch_add(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_sub(volatile __global atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_add_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile __global atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_global_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp32_local_atomic_add)
-+float __ovld atomic_fetch_add(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_sub(volatile __local atomic_float *object,
-+                              float operand);
-+float __ovld atomic_fetch_add_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile __local atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_local_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp32_global_atomic_add) &&                          \
-+    defined(__opencl_c_ext_fp32_local_atomic_add)
-+float __ovld atomic_fetch_add(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_sub(volatile atomic_float *object, float operand);
-+float __ovld atomic_fetch_add_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_sub_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order);
-+float __ovld atomic_fetch_add_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+float __ovld atomic_fetch_sub_explicit(volatile atomic_float *object,
-+                                       float operand, memory_order order,
-+                                       memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp32_global_atomic_add) &&                    \
-+    defined(__opencl_c_ext_fp32_local_atomic_add)
-+
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#if defined(__opencl_c_ext_fp64_global_atomic_add)
-+double __ovld atomic_fetch_add(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_sub(volatile __global atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_add_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile __global atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_global_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp64_local_atomic_add)
-+double __ovld atomic_fetch_add(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_sub(volatile __local atomic_double *object,
-+                               double operand);
-+double __ovld atomic_fetch_add_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile __local atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_local_atomic_add)
-+
-+#if defined(__opencl_c_ext_fp64_global_atomic_add) &&                          \
-+    defined(__opencl_c_ext_fp64_local_atomic_add)
-+double __ovld atomic_fetch_add(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_sub(volatile atomic_double *object, double operand);
-+double __ovld atomic_fetch_add_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order);
-+double __ovld atomic_fetch_add_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
-+                                        double operand, memory_order order,
-+                                        memory_scope scope);
-+#endif // defined(__opencl_c_ext_fp64_global_atomic_add) &&                    \
-+    defined(__opencl_c_ext_fp64_local_atomic_add)
-+#endif // defined(cl_khr_int64_base_atomics) &&
-+       // defined(cl_khr_int64_extended_atomics)
-+
-+#endif // cl_ext_float_atomics
-+
- // atomic_store()
- 
- void __ovld atomic_store(volatile atomic_int *object, int desired);
-diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
-index 450f9c020f7f..a91291c7af38 100644
---- a/clang/lib/Sema/Sema.cpp
-+++ b/clang/lib/Sema/Sema.cpp
-@@ -313,6 +313,9 @@ void Sema::Initialize() {
-       addImplicitTypedef("atomic_long", AtomicLongT);
-       auto AtomicULongT = Context.getAtomicType(Context.UnsignedLongTy);
-       addImplicitTypedef("atomic_ulong", AtomicULongT);
-+      auto AtomicHalfT = Context.getAtomicType(Context.HalfTy);
-+      addImplicitTypedef("atomic_half", AtomicHalfT);
-+      setOpenCLExtensionForType(AtomicHalfT, "cl_khr_fp16");
-       addImplicitTypedef("atomic_float",
-                          Context.getAtomicType(Context.FloatTy));
-       auto AtomicDoubleT = Context.getAtomicType(Context.DoubleTy);
-diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
-index 13a3b62481ec..443f682c711a 100644
---- a/clang/test/Headers/opencl-c-header.cl
-+++ b/clang/test/Headers/opencl-c-header.cl
-@@ -124,6 +124,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #if cl_khr_subgroup_clustered_reduce != 1
- #error "Incorrectly defined cl_khr_subgroup_clustered_reduce"
- #endif
-+#if __opencl_c_ext_fp16_global_atomic_load_store != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_load_store"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_load_store != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_load_store"
-+#endif
-+#if __opencl_c_ext_fp16_global_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp32_global_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp64_global_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp64_global_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp32_local_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp64_local_atomic_add != 1
-+#error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_add"
-+#endif
-+#if __opencl_c_ext_fp16_global_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp32_global_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp64_global_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp64_global_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp16_local_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp32_local_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_min_max"
-+#endif
-+#if __opencl_c_ext_fp64_local_atomic_min_max != 1
-+#error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_min_max"
-+#endif
- 
- #else
- 
-@@ -148,6 +190,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #ifdef cl_khr_subgroup_clustered_reduce
- #error "Incorrect cl_khr_subgroup_clustered_reduce define"
- #endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_load_store
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_load_store defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_load_store
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_load_store defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp32_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_global_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp64_global_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp32_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_local_atomic_add
-+#error "Incorrectly __opencl_c_ext_fp64_local_atomic_add defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp16_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp32_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_global_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp64_global_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp16_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp16_local_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp32_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp32_local_atomic_min_max defined"
-+#endif
-+#ifdef __opencl_c_ext_fp64_local_atomic_min_max
-+#error "Incorrectly __opencl_c_ext_fp64_local_atomic_min_max defined"
-+#endif
- 
- #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
--- 
-2.29.2
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
deleted file mode 100644
index fb15d19c..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0c4ba4947d1630f2e13fc260399f0892b2c9b323 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Fri, 27 Aug 2021 10:55:13 +0800
-Subject: [PATCH 1/2] This patch is needed for ISPC for Gen only
-
-1. Transformation of add to or is not safe for VC backend.
-2. bswap intrinsics is not supported in VC backend yet.
-
-Upstream-Status: Backport [Taken from ispc, https://github.com/ispc/ispc/blob/v1.16.1/llvm_patches/12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp  | 10 +++++++---
- .../lib/Transforms/InstCombine/InstCombineAndOrXor.cpp |  9 ++++++---
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-index bacb8689892a..f3d0120db256 100644
---- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
-@@ -15,6 +15,7 @@
- #include "llvm/ADT/APInt.h"
- #include "llvm/ADT/STLExtras.h"
- #include "llvm/ADT/SmallVector.h"
-+#include "llvm/ADT/Triple.h"
- #include "llvm/Analysis/InstructionSimplify.h"
- #include "llvm/Analysis/ValueTracking.h"
- #include "llvm/IR/Constant.h"
-@@ -1363,9 +1364,12 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
-     }
-   }
- 
--  // A+B --> A|B iff A and B have no bits set in common.
--  if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
--    return BinaryOperator::CreateOr(LHS, RHS);
-+  // Disable this transformation for ISPC SPIR-V
-+  if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
-+    // A+B --> A|B iff A and B have no bits set in common.
-+    if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
-+      return BinaryOperator::CreateOr(LHS, RHS);
-+  }
- 
-   // add (select X 0 (sub n A)) A  -->  select X A n
-   {
-diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-index 68c4156af2c4..b145b863ca84 100644
---- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-+++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
-@@ -2584,9 +2584,12 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
-   if (Instruction *FoldedLogic = foldBinOpIntoSelectOrPhi(I))
-     return FoldedLogic;
- 
--  if (Instruction *BSwap = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
--                                                  /*MatchBitReversals*/ false))
--    return BSwap;
-+  // Disable this transformation for ISPC SPIR-V
-+  if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
-+    if (Instruction *BSwap = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
-+                                                    /*MatchBitReversals*/ false))
-+      return BSwap;
-+  }
- 
-   if (Instruction *Funnel = matchFunnelShift(I, *this))
-     return Funnel;
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0005-ispc-12_0_fix_for_2111.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0005-ispc-12_0_fix_for_2111.patch
deleted file mode 100644
index 4951a63d..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0005-ispc-12_0_fix_for_2111.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 913e07ea5acf2148e3748b45ddfe3fac3b2d051c Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Fri, 27 Aug 2021 10:56:57 +0800
-Subject: [PATCH 2/2] This patch is a fix for #2111
-
-It ensures that shuffle is lowered for this particular case correctly.
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/9ab99f773fec7da4183495a3fdc655a797d3bea2]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- llvm/lib/Target/X86/X86ISelLowering.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
-index 6b816c710f98..3121b0e818ac 100644
---- a/llvm/lib/Target/X86/X86ISelLowering.cpp
-+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
-@@ -43192,9 +43192,10 @@ static SDValue combineHorizOpWithShuffle(SDNode *N, SelectionDAG &DAG,
-           ShuffleVectorSDNode::commuteMask(ShuffleMask1);
-         }
-         if ((Op00 == Op10) && (Op01 == Op11)) {
--          SmallVector<int, 4> ShuffleMask;
--          ShuffleMask.append(ShuffleMask0.begin(), ShuffleMask0.end());
--          ShuffleMask.append(ShuffleMask1.begin(), ShuffleMask1.end());
-+          const int Map[4] = {0, 2, 1, 3};
-+          SmallVector<int, 4> ShuffleMask(
-+            {Map[ShuffleMask0[0]], Map[ShuffleMask1[0]], Map[ShuffleMask0[1]],
-+             Map[ShuffleMask1[1]]});
-           SDLoc DL(N);
-           MVT ShufVT = VT.isFloatingPoint() ? MVT::v4f64 : MVT::v4i64;
-           SDValue Res = DAG.getNode(Opcode, DL, VT, Op00, Op01);
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch
deleted file mode 100644
index 25174047..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 54802abece1e4742050795162e3a773f0e143aa3 Mon Sep 17 00:00:00 2001
-From: haonanya <haonan.yang@intel.com>
-Date: Fri, 24 Dec 2021 15:27:46 +0800
-Subject: [PATCH] [OpenCL] Add cl_khr_integer_dot_product
-
-This is backporting of https://reviews.llvm.org/D106434
-Add the builtins defined by Section 42 "Integer dot product" in the OpenCL
-Extension Specification.
-
-See https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_Ext.html#cl_khr_integer_dot_product
-
-Signed-off-by: haonanya <haonan.yang@intel.com>
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/989bedec7a6ae95a0db865f23677047f78dc9257]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- clang/lib/Headers/opencl-c-base.h     |  3 +++
- clang/lib/Headers/opencl-c.h          | 24 ++++++++++++++++++++++++
- clang/lib/Sema/OpenCLBuiltins.td      | 25 +++++++++++++++++++++++++
- clang/test/Headers/opencl-c-header.cl | 18 ++++++++++++++++++
- 4 files changed, 70 insertions(+)
-
-diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
-index d94d64372dbb..b55d9601a452 100644
---- a/clang/lib/Headers/opencl-c-base.h
-+++ b/clang/lib/Headers/opencl-c-base.h
-@@ -40,6 +40,9 @@
- #define __opencl_c_ext_fp32_local_atomic_add 1
- #define __opencl_c_ext_fp32_global_atomic_min_max 1
- #define __opencl_c_ext_fp32_local_atomic_min_max 1
-+#define cl_khr_integer_dot_product 1
-+#define __opencl_c_integer_dot_product_input_4x8bit 1
-+#define __opencl_c_integer_dot_product_input_4x8bit_packed 1
- #endif // defined(__SPIR__)
- #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index 501a04f6e82b..50dcc03955cb 100644
---- a/clang/lib/Headers/opencl-c.h
-+++ b/clang/lib/Headers/opencl-c.h
-@@ -16362,6 +16362,30 @@ double  __ovld sub_group_clustered_reduce_max( double value, uint clustersize );
- 
- #endif // cl_khr_subgroup_clustered_reduce
- 
-+#if defined(__opencl_c_integer_dot_product_input_4x8bit)
-+uint __ovld __cnfn dot(uchar4, uchar4);
-+int __ovld __cnfn dot(char4, char4);
-+int __ovld __cnfn dot(uchar4, char4);
-+int __ovld __cnfn dot(char4, uchar4);
-+
-+uint __ovld __cnfn dot_acc_sat(uchar4, uchar4, uint);
-+int __ovld __cnfn dot_acc_sat(char4, char4, int);
-+int __ovld __cnfn dot_acc_sat(uchar4, char4, int);
-+int __ovld __cnfn dot_acc_sat(char4, uchar4, int);
-+#endif // __opencl_c_integer_dot_product_input_4x8bit
-+
-+#if defined(__opencl_c_integer_dot_product_input_4x8bit_packed)
-+uint __ovld __cnfn dot_4x8packed_uu_uint(uint, uint);
-+int __ovld __cnfn dot_4x8packed_ss_int(uint, uint);
-+int __ovld __cnfn dot_4x8packed_us_int(uint, uint);
-+int __ovld __cnfn dot_4x8packed_su_int(uint, uint);
-+
-+uint __ovld __cnfn dot_acc_sat_4x8packed_uu_uint(uint, uint, uint);
-+int __ovld __cnfn dot_acc_sat_4x8packed_ss_int(uint, uint, int);
-+int __ovld __cnfn dot_acc_sat_4x8packed_us_int(uint, uint, int);
-+int __ovld __cnfn dot_acc_sat_4x8packed_su_int(uint, uint, int);
-+#endif // __opencl_c_integer_dot_product_input_4x8bit_packed
-+
- #if defined(cl_intel_subgroups)
- // Intel-Specific Sub Group Functions
- float   __ovld __conv intel_sub_group_shuffle( float  x, uint c );
-diff --git a/clang/lib/Sema/OpenCLBuiltins.td b/clang/lib/Sema/OpenCLBuiltins.td
-index 745363a6b43f..3c5f8821063d 100644
---- a/clang/lib/Sema/OpenCLBuiltins.td
-+++ b/clang/lib/Sema/OpenCLBuiltins.td
-@@ -1482,6 +1482,31 @@ let Extension = FuncExtKhrSubgroups in {
-   }
- }
- 
-+// Section 42.3 - cl_khr_integer_dot_product
-+let Extension = FunctionExtension<"__opencl_c_integer_dot_product_input_4x8bit"> in {
-+  def : Builtin<"dot", [UInt, VectorType<UChar, 4>, VectorType<UChar, 4>], Attr.Const>;
-+  def : Builtin<"dot", [Int, VectorType<Char, 4>, VectorType<Char, 4>], Attr.Const>;
-+  def : Builtin<"dot", [Int, VectorType<UChar, 4>, VectorType<Char, 4>], Attr.Const>;
-+  def : Builtin<"dot", [Int, VectorType<Char, 4>, VectorType<UChar, 4>], Attr.Const>;
-+
-+  def : Builtin<"dot_acc_sat", [UInt, VectorType<UChar, 4>, VectorType<UChar, 4>, UInt], Attr.Const>;
-+  def : Builtin<"dot_acc_sat", [Int, VectorType<Char, 4>, VectorType<Char, 4>, Int], Attr.Const>;
-+  def : Builtin<"dot_acc_sat", [Int, VectorType<UChar, 4>, VectorType<Char, 4>, Int], Attr.Const>;
-+  def : Builtin<"dot_acc_sat", [Int, VectorType<Char, 4>, VectorType<UChar, 4>, Int], Attr.Const>;
-+}
-+
-+let Extension = FunctionExtension<"__opencl_c_integer_dot_product_input_4x8bit_packed"> in {
-+  def : Builtin<"dot_4x8packed_uu_uint", [UInt, UInt, UInt], Attr.Const>;
-+  def : Builtin<"dot_4x8packed_ss_int", [Int, UInt, UInt], Attr.Const>;
-+  def : Builtin<"dot_4x8packed_us_int", [Int, UInt, UInt], Attr.Const>;
-+  def : Builtin<"dot_4x8packed_su_int", [Int, UInt, UInt], Attr.Const>;
-+
-+  def : Builtin<"dot_acc_sat_4x8packed_uu_uint", [UInt, UInt, UInt, UInt], Attr.Const>;
-+  def : Builtin<"dot_acc_sat_4x8packed_ss_int", [Int, UInt, UInt, Int], Attr.Const>;
-+  def : Builtin<"dot_acc_sat_4x8packed_us_int", [Int, UInt, UInt, Int], Attr.Const>;
-+  def : Builtin<"dot_acc_sat_4x8packed_su_int", [Int, UInt, UInt, Int], Attr.Const>;
-+}
-+
- //--------------------------------------------------------------------
- // Arm extensions.
- let Extension = ArmIntegerDotProductInt8 in {
-diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
-index 443f682c711a..184eefd9f9c3 100644
---- a/clang/test/Headers/opencl-c-header.cl
-+++ b/clang/test/Headers/opencl-c-header.cl
-@@ -166,6 +166,15 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #if __opencl_c_ext_fp64_local_atomic_min_max != 1
- #error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_min_max"
- #endif
-+#if cl_khr_integer_dot_product != 1
-+#error "Incorrectly defined cl_khr_integer_dot_product"
-+#endif
-+#if __opencl_c_integer_dot_product_input_4x8bit != 1
-+#error "Incorrectly defined __opencl_c_integer_dot_product_input_4x8bit"
-+#endif
-+#if __opencl_c_integer_dot_product_input_4x8bit_packed != 1
-+#error "Incorrectly defined __opencl_c_integer_dot_product_input_4x8bit_packed"
-+#endif
- 
- #else
- 
-@@ -232,6 +241,15 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- #ifdef __opencl_c_ext_fp64_local_atomic_min_max
- #error "Incorrectly __opencl_c_ext_fp64_local_atomic_min_max defined"
- #endif
-+#ifdef cl_khr_integer_dot_product
-+#error "Incorrect cl_khr_integer_dot_product define"
-+#endif
-+#ifdef __opencl_c_integer_dot_product_input_4x8bit
-+#error "Incorrect __opencl_c_integer_dot_product_input_4x8bit define"
-+#endif
-+#ifdef __opencl_c_integer_dot_product_input_4x8bit_packed
-+#error "Incorrect __opencl_c_integer_dot_product_input_4x8bit_packed define"
-+#endif
- 
- #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0007-OpenCL-3.0-support.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0007-OpenCL-3.0-support.patch
deleted file mode 100644
index 567db40d..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0007-OpenCL-3.0-support.patch
+++ /dev/null
@@ -1,4628 +0,0 @@
-From cc23dafd55bfe102e490c719f8b088e6b2a52561 Mon Sep 17 00:00:00 2001
-From: Haonan Yang <haonan.yang@intel.com>
-Date: Fri, 15 Apr 2022 15:52:37 +0800
-Subject: [PATCH] OpenCL 3.0 support
-
-Signed-off-by: Haonan Yang <haonan.yang@intel.com>
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- clang/docs/OpenCLSupport.rst                  |  19 +-
- .../clang/Basic/DiagnosticCommonKinds.td      |  10 +
- clang/include/clang/Basic/DiagnosticGroups.td |   2 +
- .../clang/Basic/DiagnosticParseKinds.td       |   5 +-
- .../clang/Basic/DiagnosticSemaKinds.td        |  13 +-
- clang/include/clang/Basic/LangOptions.def     |   2 +
- .../include/clang/Basic/OpenCLExtensions.def  |  82 +--
- clang/include/clang/Basic/OpenCLOptions.h     |  71 ++-
- clang/include/clang/Basic/TargetInfo.h        |  18 +-
- clang/include/clang/Sema/Overload.h           |   3 -
- clang/include/clang/Sema/Sema.h               |  82 ---
- clang/include/clang/Serialization/ASTWriter.h |   2 -
- clang/lib/Basic/OpenCLOptions.cpp             | 103 +++-
- clang/lib/Basic/TargetInfo.cpp                |  26 +
- clang/lib/Basic/Targets.cpp                   |  43 +-
- clang/lib/Basic/Targets/AMDGPU.h              |   6 +-
- clang/lib/Basic/Targets/NVPTX.h               |   1 +
- clang/lib/Basic/Targets/X86.cpp               |  10 +-
- clang/lib/Frontend/CompilerInstance.cpp       |   5 +
- clang/lib/Frontend/CompilerInvocation.cpp     |   3 +
- clang/lib/Frontend/InitPreprocessor.cpp       |  25 +-
- clang/lib/Headers/opencl-c-base.h             |  15 +
- clang/lib/Headers/opencl-c.h                  | 493 ++++++++++--------
- clang/lib/Parse/ParseDecl.cpp                 |  16 +-
- clang/lib/Parse/ParsePragma.cpp               |  17 +-
- clang/lib/Parse/Parser.cpp                    |   2 -
- clang/lib/Sema/DeclSpec.cpp                   |   3 +-
- clang/lib/Sema/Sema.cpp                       | 185 ++-----
- clang/lib/Sema/SemaCast.cpp                   |   4 +-
- clang/lib/Sema/SemaChecking.cpp               |   3 +-
- clang/lib/Sema/SemaDecl.cpp                   |  36 +-
- clang/lib/Sema/SemaDeclAttr.cpp               |  17 +-
- clang/lib/Sema/SemaExpr.cpp                   |  26 +-
- clang/lib/Sema/SemaInit.cpp                   |   8 +-
- clang/lib/Sema/SemaLookup.cpp                 |  22 +-
- clang/lib/Sema/SemaOverload.cpp               |  17 -
- clang/lib/Sema/SemaType.cpp                   |  56 +-
- clang/lib/Serialization/ASTReader.cpp         |  27 +-
- clang/lib/Serialization/ASTWriter.cpp         |  71 +--
- .../CodeGenOpenCL/addr-space-struct-arg.cl    |   6 +-
- .../address-spaces-conversions.cl             |   2 +
- .../CodeGenOpenCL/address-spaces-mangling.cl  |   6 +-
- clang/test/CodeGenOpenCL/address-spaces.cl    |   4 +
- .../CodeGenOpenCL/amdgpu-sizeof-alignof.cl    |  21 +-
- .../CodeGenOpenCL/arm-integer-dot-product.cl  |  11 +-
- clang/test/CodeGenOpenCL/extension-begin.cl   |  25 -
- clang/test/CodeGenOpenCL/overload.cl          |   1 +
- clang/test/CodeGenOpenCL/printf.cl            |   6 +-
- clang/test/Headers/opencl-c-header.cl         |  84 +++
- clang/test/Misc/nvptx.unsupported_core.cl     |   7 +
- clang/test/Misc/warning-flags.c               |   2 +-
- clang/test/Parser/opencl-atomics-cl20.cl      | 104 ++--
- clang/test/SemaOpenCL/access-qualifier.cl     |  40 +-
- .../address-spaces-conversions-cl2.0.cl       |   3 +
- clang/test/SemaOpenCL/address-spaces.cl       |   1 +
- .../SemaOpenCL/arm-integer-dot-product.cl     |  42 +-
- .../SemaOpenCL/cl20-device-side-enqueue.cl    |   4 +-
- clang/test/SemaOpenCL/extension-begin.cl      |  28 +-
- clang/test/SemaOpenCL/extension-begin.h       |   9 +-
- clang/test/SemaOpenCL/extension-version.cl    |  62 ++-
- clang/test/SemaOpenCL/extensions.cl           |  71 ++-
- .../SemaOpenCL/fdeclare-opencl-builtins.cl    |  27 +-
- clang/test/SemaOpenCL/features.cl             |  48 ++
- .../intel-subgroup-avc-ext-types.cl           |  69 ++-
- clang/test/SemaOpenCL/storageclass.cl         | 234 ++++++++-
- clang/test/SemaOpenCL/unsupported-image.cl    |  69 +++
- 66 files changed, 1502 insertions(+), 1033 deletions(-)
- delete mode 100644 clang/test/CodeGenOpenCL/extension-begin.cl
- create mode 100644 clang/test/Misc/nvptx.unsupported_core.cl
- create mode 100644 clang/test/SemaOpenCL/features.cl
- create mode 100644 clang/test/SemaOpenCL/unsupported-image.cl
-
-diff --git a/clang/docs/OpenCLSupport.rst b/clang/docs/OpenCLSupport.rst
-index 0eaf0f300ee4..cba2539a6d11 100644
---- a/clang/docs/OpenCLSupport.rst
-+++ b/clang/docs/OpenCLSupport.rst
-@@ -61,7 +61,24 @@ Missing features or with limited support
- 
- .. _opencl_300:
- 
--OpenCL 3.0 Implementation Status
-+OpenCL C 3.0 Usage
-+================================
-+
-+OpenCL C 3.0 language standard makes most OpenCL C 2.0 features optional. Optional
-+functionality in OpenCL C 3.0 is indicated with the presence of feature-test macros
-+(list of feature-test macros is `here <https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_C.html#features>`_).
-+Command-line flag :ref:`-cl-ext <opencl_cl_ext>` can be used to override features supported by a target.
-+
-+For cases when there is an associated extension for a specific feature (fp64 and 3d image writes)
-+user should specify both (extension and feature) in command-line flag:
-+
-+   .. code-block:: console
-+
-+     $ clang -cc1 -cl-std=CL3.0 -cl-ext=+cl_khr_fp64,+__opencl_c_fp64 ...
-+     $ clang -cc1 -cl-std=CL3.0 -cl-ext=-cl_khr_fp64,-__opencl_c_fp64 ...
-+
-+
-+OpenCL C 3.0 Implementation Status
- ================================
- 
- The following table provides an overview of features in OpenCL C 3.0 and their
-diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td
-index a4f96a97991e..734701ce9d9d 100644
---- a/clang/include/clang/Basic/DiagnosticCommonKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td
-@@ -347,4 +347,14 @@ def note_suggest_disabling_all_checkers : Note<
- def warn_poison_system_directories : Warning <
-   "include location '%0' is unsafe for cross-compilation">,
-   InGroup<DiagGroup<"poison-system-directories">>, DefaultIgnore;
-+
-+def warn_opencl_unsupported_core_feature : Warning<
-+  "%0 is a core feature in %select{OpenCL C|C++ for OpenCL}1 version %2 but not supported on this target">,
-+  InGroup<OpenCLCoreFeaturesDiagGroup>, DefaultIgnore;
-+
-+def err_opencl_extension_and_feature_differs : Error<
-+  "options %0 and %1 are set to different values">;
-+
-+def err_opencl_feature_requires : Error<
-+  "feature %0 requires support of %1 feature">;
- }
-diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
-index 04ba89aa457e..93099dd19a80 100644
---- a/clang/include/clang/Basic/DiagnosticGroups.td
-+++ b/clang/include/clang/Basic/DiagnosticGroups.td
-@@ -1247,3 +1247,5 @@ in addition with the pragmas or -fmax-tokens flag to get any warnings.
- def WebAssemblyExceptionSpec : DiagGroup<"wasm-exception-spec">;
- 
- def RTTI : DiagGroup<"rtti">;
-+
-+def OpenCLCoreFeaturesDiagGroup : DiagGroup<"pedantic-core-features">;
-diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
-index 0ed80a481e78..5887cc81e32a 100644
---- a/clang/include/clang/Basic/DiagnosticParseKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
-@@ -1228,14 +1228,13 @@ def warn_pragma_expected_colon : Warning<
-   "missing ':' after %0 - ignoring">, InGroup<IgnoredPragmas>;
- def warn_pragma_expected_predicate : Warning<
-   "expected %select{'enable', 'disable', 'begin' or 'end'|'disable'}0 - ignoring">, InGroup<IgnoredPragmas>;
--def warn_pragma_begin_end_mismatch : Warning<
--  "OpenCL extension end directive mismatches begin directive - ignoring">, InGroup<IgnoredPragmas>;
- def warn_pragma_unknown_extension : Warning<
-   "unknown OpenCL extension %0 - ignoring">, InGroup<IgnoredPragmas>;
- def warn_pragma_unsupported_extension : Warning<
-   "unsupported OpenCL extension %0 - ignoring">, InGroup<IgnoredPragmas>;
- def warn_pragma_extension_is_core : Warning<
--  "OpenCL extension %0 is core feature or supported optional core feature - ignoring">, InGroup<DiagGroup<"pedantic-core-features">>, DefaultIgnore;
-+  "OpenCL extension %0 is core feature or supported optional core feature - ignoring">,
-+  InGroup<OpenCLCoreFeaturesDiagGroup>, DefaultIgnore;
- 
- // OpenCL errors.
- def err_opencl_taking_function_address_parser : Error<
-diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
-index 67c59f3ca09a..7d45654f5ea2 100644
---- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
-@@ -118,7 +118,8 @@ def warn_float_underflow : Warning<
-   "magnitude of floating-point constant too small for type %0; minimum is %1">,
-   InGroup<LiteralRange>;
- def warn_double_const_requires_fp64 : Warning<
--  "double precision constant requires cl_khr_fp64, casting to single precision">;
-+  "double precision constant requires %select{cl_khr_fp64|cl_khr_fp64 and __opencl_c_fp64}0, "
-+  "casting to single precision">;
- def err_half_const_requires_fp16 : Error<
-   "half precision constant requires cl_khr_fp16">;
- 
-@@ -4279,8 +4280,6 @@ def warn_diagnose_if_succeeded : Warning<"%0">, InGroup<UserDefinedWarnings>,
-     ShowInSystemHeader;
- def note_ovl_candidate_disabled_by_function_cond_attr : Note<
-     "candidate disabled: %0">;
--def note_ovl_candidate_disabled_by_extension : Note<
--    "candidate unavailable as it requires OpenCL extension '%0' to be enabled">;
- def err_addrof_function_disabled_by_enable_if_attr : Error<
-     "cannot take address of function %0 because it has one or more "
-     "non-tautological enable_if conditions">;
-@@ -9892,7 +9891,10 @@ def warn_opencl_attr_deprecated_ignored : Warning <
- def err_opencl_variadic_function : Error<
-   "invalid prototype, variadic arguments are not allowed in OpenCL">;
- def err_opencl_requires_extension : Error<
--  "use of %select{type|declaration}0 %1 requires %2 extension to be enabled">;
-+  "use of %select{type|declaration}0 %1 requires %2 support">;
-+def ext_opencl_double_without_pragma : Extension<
-+  "Clang permits use of type 'double' regardless pragma if 'cl_khr_fp64' is"
-+  " supported">;
- def warn_opencl_generic_address_space_arg : Warning<
-   "passing non-generic address space pointer to %0"
-   " may cause dynamic conversion affecting performance">,
-@@ -9912,7 +9914,8 @@ def err_opencl_builtin_pipe_invalid_access_modifier : Error<
- def err_opencl_invalid_access_qualifier : Error<
-   "access qualifier can only be used for pipe and image type">;
- def err_opencl_invalid_read_write : Error<
--  "access qualifier %0 can not be used for %1 %select{|prior to OpenCL version 2.0}2">;
-+   "access qualifier %0 can not be used for %1 %select{|prior to OpenCL C version 2.0 or in version 3.0 "
-+  "and without __opencl_c_read_write_images feature}2">;
- def err_opencl_multiple_access_qualifiers : Error<
-   "multiple access qualifiers">;
- def note_opencl_typedef_access_qualifier : Note<
-diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def
-index c01f0cca9c9c..d41ef34ad5df 100644
---- a/clang/include/clang/Basic/LangOptions.def
-+++ b/clang/include/clang/Basic/LangOptions.def
-@@ -215,6 +215,8 @@ LANGOPT(OpenCL            , 1, 0, "OpenCL")
- LANGOPT(OpenCLVersion     , 32, 0, "OpenCL C version")
- LANGOPT(OpenCLCPlusPlus   , 1, 0, "C++ for OpenCL")
- LANGOPT(OpenCLCPlusPlusVersion     , 32, 0, "C++ for OpenCL version")
-+LANGOPT(OpenCLPipe               , 1, 0, "OpenCL pipe keyword")
-+LANGOPT(OpenCLGenericAddressSpace, 1, 0, "OpenCL generic keyword")
- LANGOPT(NativeHalfType    , 1, 0, "Native half type support")
- LANGOPT(NativeHalfArgsAndReturns, 1, 0, "Native half args and returns")
- LANGOPT(HalfArgsAndReturns, 1, 0, "half args and returns")
-diff --git a/clang/include/clang/Basic/OpenCLExtensions.def b/clang/include/clang/Basic/OpenCLExtensions.def
-index 801916c3ab94..c5352dadc0de 100644
---- a/clang/include/clang/Basic/OpenCLExtensions.def
-+++ b/clang/include/clang/Basic/OpenCLExtensions.def
-@@ -16,8 +16,12 @@
- // If extensions are to be enumerated with information about whether
- // an extension is core or optional core and minimum OpenCL version
- // when an extension becomes available,
--// define OPENCL_GENERIC_EXTENSION(ext, avail, core, opt) where
-+// define OPENCL_GENERIC_EXTENSION(ext, pragma, avail, core, opt) where
- //   ext - name of the extension or optional core feature.
-+//   pragma - true if extension needs pragmas or false otherwise.
-+//            NOTE: extension pragma without any documentation detailing
-+//            its behavior explicitly is deprecated. Therefore the default
-+//            value is false.
- //   avail - minimum OpenCL version supporting it.
- //   core - OpenCL versions mask when the extension becomes core feature.
- //          0U indicates not a core feature.
-@@ -50,55 +54,67 @@
- #endif // OPENCL_GENERIC_EXTENSION
- 
- // Declaration helpers
--#define OPENCL_EXTENSION(ext, avail) OPENCL_GENERIC_EXTENSION(ext, avail, 0U, 0U)
--#define OPENCL_COREFEATURE(ext, avail, core)  OPENCL_GENERIC_EXTENSION(ext, avail, core, 0U)
--#define OPENCL_OPTIONALCOREFEATURE(ext, avail, opt) OPENCL_GENERIC_EXTENSION(ext, avail, 0U, opt)
-+#define OPENCL_EXTENSION(ext, pragma, avail) OPENCL_GENERIC_EXTENSION(ext, pragma, avail, 0U, 0U)
-+#define OPENCL_COREFEATURE(ext, pragma, avail, core)  OPENCL_GENERIC_EXTENSION(ext, pragma, avail, core, 0U)
-+#define OPENCL_OPTIONALCOREFEATURE(ext, pragma, avail, opt) OPENCL_GENERIC_EXTENSION(ext, pragma, avail, 0U, opt)
- 
- // OpenCL 1.0.
--OPENCL_COREFEATURE(cl_khr_byte_addressable_store, 100, OCL_C_11P)
--OPENCL_COREFEATURE(cl_khr_global_int32_base_atomics, 100, OCL_C_11P)
--OPENCL_COREFEATURE(cl_khr_global_int32_extended_atomics, 100, OCL_C_11P)
--OPENCL_COREFEATURE(cl_khr_local_int32_base_atomics, 100, OCL_C_11P)
--OPENCL_COREFEATURE(cl_khr_local_int32_extended_atomics, 100, OCL_C_11P)
--OPENCL_OPTIONALCOREFEATURE(cl_khr_fp64, 100, OCL_C_12P)
--OPENCL_EXTENSION(cl_khr_fp16, 100)
--OPENCL_EXTENSION(cl_khr_int64_base_atomics, 100)
--OPENCL_EXTENSION(cl_khr_int64_extended_atomics, 100)
--OPENCL_GENERIC_EXTENSION(cl_khr_3d_image_writes, 100, OCL_C_20, OCL_C_30)
-+OPENCL_COREFEATURE(cl_khr_byte_addressable_store, true, 100, OCL_C_11P)
-+OPENCL_COREFEATURE(cl_khr_global_int32_base_atomics, true, 100, OCL_C_11P)
-+OPENCL_COREFEATURE(cl_khr_global_int32_extended_atomics, true, 100, OCL_C_11P)
-+OPENCL_COREFEATURE(cl_khr_local_int32_base_atomics, true, 100, OCL_C_11P)
-+OPENCL_COREFEATURE(cl_khr_local_int32_extended_atomics, true, 100, OCL_C_11P)
-+OPENCL_OPTIONALCOREFEATURE(cl_khr_fp64, true, 100, OCL_C_12P)
-+OPENCL_EXTENSION(cl_khr_fp16, true, 100)
-+OPENCL_EXTENSION(cl_khr_int64_base_atomics, true, 100)
-+OPENCL_EXTENSION(cl_khr_int64_extended_atomics, true, 100)
-+OPENCL_COREFEATURE(cl_khr_3d_image_writes, true, 100, OCL_C_20)
- 
- // EMBEDDED_PROFILE
--OPENCL_EXTENSION(cles_khr_int64, 110)
-+OPENCL_EXTENSION(cles_khr_int64, true, 110)
- 
- // OpenCL 1.2.
--OPENCL_EXTENSION(cl_khr_depth_images, 120)
--OPENCL_EXTENSION(cl_khr_gl_msaa_sharing, 120)
-+OPENCL_EXTENSION(cl_khr_depth_images, true, 120)
-+OPENCL_EXTENSION(cl_khr_gl_msaa_sharing,true, 120)
- 
- // OpenCL 2.0.
--OPENCL_EXTENSION(cl_khr_mipmap_image, 200)
--OPENCL_EXTENSION(cl_khr_mipmap_image_writes, 200)
--OPENCL_EXTENSION(cl_khr_srgb_image_writes, 200)
--OPENCL_EXTENSION(cl_khr_subgroups, 200)
-+OPENCL_EXTENSION(cl_khr_mipmap_image, true, 200)
-+OPENCL_EXTENSION(cl_khr_mipmap_image_writes, true, 200)
-+OPENCL_EXTENSION(cl_khr_srgb_image_writes, true, 200)
-+OPENCL_EXTENSION(cl_khr_subgroups, true, 200)
- 
- // Clang Extensions.
--OPENCL_EXTENSION(cl_clang_storage_class_specifiers, 100)
--OPENCL_EXTENSION(__cl_clang_function_pointers, 100)
--OPENCL_EXTENSION(__cl_clang_variadic_functions, 100)
-+OPENCL_EXTENSION(cl_clang_storage_class_specifiers, true, 100)
-+OPENCL_EXTENSION(__cl_clang_function_pointers, true, 100)
-+OPENCL_EXTENSION(__cl_clang_variadic_functions, true, 100)
- 
- // AMD OpenCL extensions
--OPENCL_EXTENSION(cl_amd_media_ops, 100)
--OPENCL_EXTENSION(cl_amd_media_ops2, 100)
-+OPENCL_EXTENSION(cl_amd_media_ops, true, 100)
-+OPENCL_EXTENSION(cl_amd_media_ops2, true, 100)
- 
- // ARM OpenCL extensions
--OPENCL_EXTENSION(cl_arm_integer_dot_product_int8, 120)
--OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_int8, 120)
--OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_int16, 120)
--OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_saturate_int8, 120)
-+OPENCL_EXTENSION(cl_arm_integer_dot_product_int8, true, 120)
-+OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_int8, true, 120)
-+OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_int16, true, 120)
-+OPENCL_EXTENSION(cl_arm_integer_dot_product_accumulate_saturate_int8, true, 120)
- 
- // Intel OpenCL extensions
--OPENCL_EXTENSION(cl_intel_subgroups, 120)
--OPENCL_EXTENSION(cl_intel_subgroups_short, 120)
--OPENCL_EXTENSION(cl_intel_device_side_avc_motion_estimation, 120)
-+OPENCL_EXTENSION(cl_intel_subgroups, true, 120)
-+OPENCL_EXTENSION(cl_intel_subgroups_short, true, 120)
-+OPENCL_EXTENSION(cl_intel_device_side_avc_motion_estimation, true, 120)
- 
-+// OpenCL C 3.0 features (6.2.1. Features)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_pipes, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_generic_address_space, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_acq_rel, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_atomic_order_seq_cst, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_subgroups, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_3d_image_writes, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_device_enqueue, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_read_write_images, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_program_scope_global_variables, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_fp64, false, 300, OCL_C_30)
-+OPENCL_OPTIONALCOREFEATURE(__opencl_c_images, false, 300, OCL_C_30)
- 
- #undef OPENCL_OPTIONALCOREFEATURE
- #undef OPENCL_COREFEATURE
-diff --git a/clang/include/clang/Basic/OpenCLOptions.h b/clang/include/clang/Basic/OpenCLOptions.h
-index fe27ef19d4d5..4779ad4d6507 100644
---- a/clang/include/clang/Basic/OpenCLOptions.h
-+++ b/clang/include/clang/Basic/OpenCLOptions.h
-@@ -19,6 +19,9 @@
- 
- namespace clang {
- 
-+class DiagnosticsEngine;
-+class TargetInfo;
-+
- namespace {
- // This enum maps OpenCL version(s) into value. These values are used as
- // a mask to indicate in which OpenCL version(s) extension is a core or
-@@ -64,15 +67,33 @@ static inline bool isOpenCLVersionIsContainedInMask(const LangOptions &LO,
- /// OpenCL supported extensions and optional core features
- class OpenCLOptions {
- public:
-+  // OpenCL C v1.2 s6.5 - All program scope variables must be declared in the
-+  // __constant address space.
-+  // OpenCL C v2.0 s6.5.1 - Variables defined at program scope and static
-+  // variables inside a function can also be declared in the global
-+  // address space.
-+  // OpenCL C v3.0 s6.7.1 - Variables at program scope or static or extern
-+  // variables inside functions can be declared in global address space if
-+  // the __opencl_c_program_scope_global_variables feature is supported
-+  // C++ for OpenCL inherits rule from OpenCL C v2.0.
-+  bool areProgramScopeVariablesSupported(const LangOptions &Opts) const {
-+    return Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200 ||
-+           (Opts.OpenCLVersion == 300 &&
-+            isSupported("__opencl_c_program_scope_global_variables", Opts));
-+  }
-+
-   struct OpenCLOptionInfo {
-+       // Does this option have pragma.
-+    bool WithPragma = false;
-+
-     // Option starts to be available in this OpenCL version
--    unsigned Avail;
-+       unsigned Avail = 100U;
- 
-     // Option becomes core feature in this OpenCL versions
--    unsigned Core;
-+    unsigned Core = 0U;
- 
-     // Option becomes optional core feature in this OpenCL versions
--    unsigned Opt;
-+    unsigned Opt = 0U;
- 
-     // Is this option supported
-     bool Supported = false;
-@@ -80,8 +101,10 @@ public:
-     // Is this option enabled
-     bool Enabled = false;
- 
--    OpenCLOptionInfo(unsigned A = 100, unsigned C = 0U, unsigned O = 0U)
--        : Avail(A), Core(C), Opt(O) {}
-+    OpenCLOptionInfo() = default;
-+    OpenCLOptionInfo(bool Pragma, unsigned AvailV, unsigned CoreV,
-+                     unsigned OptV)
-+        : WithPragma(Pragma), Avail(AvailV), Core(CoreV), Opt(OptV) {}
- 
-     bool isCore() const { return Core != 0U; }
- 
-@@ -107,7 +130,12 @@ public:
- 
-   bool isKnown(llvm::StringRef Ext) const;
- 
--  bool isEnabled(llvm::StringRef Ext) const;
-+  // For core or optional core feature check that it is supported
-+  // by a target, for any other option (extension) check that it is
-+  // enabled via pragma
-+  bool isAvailableOption(llvm::StringRef Ext, const LangOptions &LO) const;
-+
-+  bool isWithPragma(llvm::StringRef Ext) const;
- 
-   // Is supported as either an extension or an (optional) core feature for
-   // OpenCL version \p LO.
-@@ -131,6 +159,11 @@ public:
-   // For supported core or optional core feature, return false.
-   bool isSupportedExtension(llvm::StringRef Ext, const LangOptions &LO) const;
- 
-+  // FIXME: Whether extension should accept pragma should not
-+  // be reset dynamically. But it currently required when
-+  // registering new extensions via pragmas.
-+  void acceptsPragma(llvm::StringRef Ext, bool V = true);
-+
-   void enable(llvm::StringRef Ext, bool V = true);
- 
-   /// Enable or disable support for OpenCL extensions
-@@ -148,15 +181,35 @@ public:
-   // Disable all extensions
-   void disableAll();
- 
--  // Enable supported core and optional core features
--  void enableSupportedCore(const LangOptions &LO);
--
-   friend class ASTWriter;
-   friend class ASTReader;
- 
-   using OpenCLOptionInfoMap = llvm::StringMap<OpenCLOptionInfo>;
- 
-+  template <typename... Args>
-+  static bool isOpenCLOptionCoreIn(const LangOptions &LO, Args &&... args) {
-+    return OpenCLOptionInfo(std::forward<Args>(args)...).isCoreIn(LO);
-+  }
-+
-+  template <typename... Args>
-+  static bool isOpenCLOptionAvailableIn(const LangOptions &LO,
-+                                        Args &&... args) {
-+    return OpenCLOptionInfo(std::forward<Args>(args)...).isAvailableIn(LO);
-+  }
-+
-+  // Diagnose feature dependencies for OpenCL C 3.0. Return false if target
-+  // doesn't follow these requirements.
-+  static bool diagnoseUnsupportedFeatureDependencies(const TargetInfo &TI,
-+                                                     DiagnosticsEngine &Diags);
-+
-+  // Diagnose that features and equivalent extension are set to same values.
-+  // Return false if target doesn't follow these requirements.
-+  static bool diagnoseFeatureExtensionDifferences(const TargetInfo &TI,
-+                                                  DiagnosticsEngine &Diags);
-+
- private:
-+  // Option is enabled via pragma
-+  bool isEnabled(llvm::StringRef Ext) const;
-   OpenCLOptionInfoMap OptMap;
- };
- 
-diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h
-index b782172d93a3..ec51758a35d4 100644
---- a/clang/include/clang/Basic/TargetInfo.h
-+++ b/clang/include/clang/Basic/TargetInfo.h
-@@ -1192,6 +1192,12 @@ public:
-     return false;
-   }
- 
-+  /// Check if target has a given feature enabled
-+  virtual bool hasFeatureEnabled(const llvm::StringMap<bool> &Features,
-+                                 StringRef Name) const {
-+    return Features.lookup(Name);
-+  }
-+
-   /// Enable or disable a specific target feature;
-   /// the feature name must be valid.
-   virtual void setFeatureEnabled(llvm::StringMap<bool> &Features,
-@@ -1439,7 +1445,8 @@ public:
-   virtual void setSupportedOpenCLOpts() {}
- 
-   virtual void supportAllOpenCLOpts(bool V = true) {
--#define OPENCLEXTNAME(Ext) getTargetOpts().OpenCLFeaturesMap[#Ext] = V;
-+#define OPENCLEXTNAME(Ext)                                                     \
-+  setFeatureEnabled(getTargetOpts().OpenCLFeaturesMap, #Ext, V);
- #include "clang/Basic/OpenCLExtensions.def"
-   }
- 
-@@ -1459,10 +1466,6 @@ public:
-     }
-   }
- 
--  /// Define OpenCL macros based on target settings and language version
--  void getOpenCLFeatureDefines(const LangOptions &Opts,
--                               MacroBuilder &Builder) const;
--
-   /// Get supported OpenCL extensions and optional core features.
-   llvm::StringMap<bool> &getSupportedOpenCLOpts() {
-     return getTargetOpts().OpenCLFeaturesMap;
-@@ -1502,6 +1505,11 @@ public:
-     return true;
-   }
- 
-+  /// Check that OpenCL target has valid options setting based on OpenCL
-+  /// version.
-+  virtual bool validateOpenCLTarget(const LangOptions &Opts,
-+                                    DiagnosticsEngine &Diags) const;
-+
-   virtual void setAuxTarget(const TargetInfo *Aux) {}
- 
-   /// Whether target allows debuginfo types for decl only variables.
-diff --git a/clang/include/clang/Sema/Overload.h b/clang/include/clang/Sema/Overload.h
-index 5be6a618711c..699c3e808872 100644
---- a/clang/include/clang/Sema/Overload.h
-+++ b/clang/include/clang/Sema/Overload.h
-@@ -760,9 +760,6 @@ class Sema;
-     /// This candidate was not viable because its address could not be taken.
-     ovl_fail_addr_not_available,
- 
--    /// This candidate was not viable because its OpenCL extension is disabled.
--    ovl_fail_ext_disabled,
--
-     /// This inherited constructor is not viable because it would slice the
-     /// argument.
-     ovl_fail_inhctor_slice,
-diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
-index 2530a2776373..7e7348d6de2a 100644
---- a/clang/include/clang/Sema/Sema.h
-+++ b/clang/include/clang/Sema/Sema.h
-@@ -10106,73 +10106,6 @@ public:
-   /// potentially-throwing.
-   bool checkFinalSuspendNoThrow(const Stmt *FinalSuspend);
- 
--  //===--------------------------------------------------------------------===//
--  // OpenCL extensions.
--  //
--private:
--  std::string CurrOpenCLExtension;
--  /// Extensions required by an OpenCL type.
--  llvm::DenseMap<const Type*, std::set<std::string>> OpenCLTypeExtMap;
--  /// Extensions required by an OpenCL declaration.
--  llvm::DenseMap<const Decl*, std::set<std::string>> OpenCLDeclExtMap;
--public:
--  llvm::StringRef getCurrentOpenCLExtension() const {
--    return CurrOpenCLExtension;
--  }
--
--  /// Check if a function declaration \p FD associates with any
--  /// extensions present in OpenCLDeclExtMap and if so return the
--  /// extension(s) name(s).
--  std::string getOpenCLExtensionsFromDeclExtMap(FunctionDecl *FD);
--
--  /// Check if a function type \p FT associates with any
--  /// extensions present in OpenCLTypeExtMap and if so return the
--  /// extension(s) name(s).
--  std::string getOpenCLExtensionsFromTypeExtMap(FunctionType *FT);
--
--  /// Find an extension in an appropriate extension map and return its name
--  template<typename T, typename MapT>
--  std::string getOpenCLExtensionsFromExtMap(T* FT, MapT &Map);
--
--  void setCurrentOpenCLExtension(llvm::StringRef Ext) {
--    CurrOpenCLExtension = std::string(Ext);
--  }
--
--  /// Set OpenCL extensions for a type which can only be used when these
--  /// OpenCL extensions are enabled. If \p Exts is empty, do nothing.
--  /// \param Exts A space separated list of OpenCL extensions.
--  void setOpenCLExtensionForType(QualType T, llvm::StringRef Exts);
--
--  /// Set OpenCL extensions for a declaration which can only be
--  /// used when these OpenCL extensions are enabled. If \p Exts is empty, do
--  /// nothing.
--  /// \param Exts A space separated list of OpenCL extensions.
--  void setOpenCLExtensionForDecl(Decl *FD, llvm::StringRef Exts);
--
--  /// Set current OpenCL extensions for a type which can only be used
--  /// when these OpenCL extensions are enabled. If current OpenCL extension is
--  /// empty, do nothing.
--  void setCurrentOpenCLExtensionForType(QualType T);
--
--  /// Set current OpenCL extensions for a declaration which
--  /// can only be used when these OpenCL extensions are enabled. If current
--  /// OpenCL extension is empty, do nothing.
--  void setCurrentOpenCLExtensionForDecl(Decl *FD);
--
--  bool isOpenCLDisabledDecl(Decl *FD);
--
--  /// Check if type \p T corresponding to declaration specifier \p DS
--  /// is disabled due to required OpenCL extensions being disabled. If so,
--  /// emit diagnostics.
--  /// \return true if type is disabled.
--  bool checkOpenCLDisabledTypeDeclSpec(const DeclSpec &DS, QualType T);
--
--  /// Check if declaration \p D used by expression \p E
--  /// is disabled due to required OpenCL extensions being disabled. If so,
--  /// emit diagnostics.
--  /// \return true if type is disabled.
--  bool checkOpenCLDisabledDecl(const NamedDecl &D, const Expr &E);
--
-   //===--------------------------------------------------------------------===//
-   // OpenMP directives and clauses.
-   //
-@@ -10203,21 +10136,6 @@ private:
-   /// Pop OpenMP function region for non-capturing function.
-   void popOpenMPFunctionRegion(const sema::FunctionScopeInfo *OldFSI);
- 
--  /// Checks if a type or a declaration is disabled due to the owning extension
--  /// being disabled, and emits diagnostic messages if it is disabled.
--  /// \param D type or declaration to be checked.
--  /// \param DiagLoc source location for the diagnostic message.
--  /// \param DiagInfo information to be emitted for the diagnostic message.
--  /// \param SrcRange source range of the declaration.
--  /// \param Map maps type or declaration to the extensions.
--  /// \param Selector selects diagnostic message: 0 for type and 1 for
--  ///        declaration.
--  /// \return true if the type or declaration is disabled.
--  template <typename T, typename DiagLocT, typename DiagInfoT, typename MapT>
--  bool checkOpenCLDisabledTypeOrDecl(T D, DiagLocT DiagLoc, DiagInfoT DiagInfo,
--                                     MapT &Map, unsigned Selector = 0,
--                                     SourceRange SrcRange = SourceRange());
--
-   /// Helper to keep information about the current `omp begin/end declare
-   /// variant` nesting.
-   struct OMPDeclareVariantScope {
-diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h
-index 12073a38a77a..176badf7a0d1 100644
---- a/clang/include/clang/Serialization/ASTWriter.h
-+++ b/clang/include/clang/Serialization/ASTWriter.h
-@@ -510,8 +510,6 @@ private:
-   void WriteDeclContextVisibleUpdate(const DeclContext *DC);
-   void WriteFPPragmaOptions(const FPOptionsOverride &Opts);
-   void WriteOpenCLExtensions(Sema &SemaRef);
--  void WriteOpenCLExtensionTypes(Sema &SemaRef);
--  void WriteOpenCLExtensionDecls(Sema &SemaRef);
-   void WriteCUDAPragmas(Sema &SemaRef);
-   void WriteObjCCategories();
-   void WriteLateParsedTemplates(Sema &SemaRef);
-diff --git a/clang/lib/Basic/OpenCLOptions.cpp b/clang/lib/Basic/OpenCLOptions.cpp
-index 266acc5fe477..d7729ffb09ce 100644
---- a/clang/lib/Basic/OpenCLOptions.cpp
-+++ b/clang/lib/Basic/OpenCLOptions.cpp
-@@ -7,6 +7,8 @@
- //===----------------------------------------------------------------------===//
- 
- #include "clang/Basic/OpenCLOptions.h"
-+#include "clang/Basic/Diagnostic.h"
-+#include "clang/Basic/TargetInfo.h"
- 
- namespace clang {
- 
-@@ -14,9 +16,26 @@ bool OpenCLOptions::isKnown(llvm::StringRef Ext) const {
-   return OptMap.find(Ext) != OptMap.end();
- }
- 
-+bool OpenCLOptions::isAvailableOption(llvm::StringRef Ext,
-+                                      const LangOptions &LO) const {
-+  if (!isKnown(Ext))
-+    return false;
-+
-+  auto &OptInfo = OptMap.find(Ext)->getValue();
-+  if (OptInfo.isCoreIn(LO) || OptInfo.isOptionalCoreIn(LO))
-+    return isSupported(Ext, LO);
-+
-+  return isEnabled(Ext);
-+}
-+
- bool OpenCLOptions::isEnabled(llvm::StringRef Ext) const {
-+  auto I = OptMap.find(Ext);
-+  return I != OptMap.end() && I->getValue().Enabled;
-+}
-+
-+bool OpenCLOptions::isWithPragma(llvm::StringRef Ext) const {
-   auto E = OptMap.find(Ext);
--  return E != OptMap.end() && E->second.Enabled;
-+  return E != OptMap.end() && E->second.WithPragma;
- }
- 
- bool OpenCLOptions::isSupported(llvm::StringRef Ext,
-@@ -31,22 +50,16 @@ bool OpenCLOptions::isSupported(llvm::StringRef Ext,
- 
- bool OpenCLOptions::isSupportedCore(llvm::StringRef Ext,
-                                     const LangOptions &LO) const {
--  auto E = OptMap.find(Ext);
--  if (E == OptMap.end()) {
--    return false;
--  }
--  auto I = OptMap.find(Ext)->getValue();
--  return I.Supported && I.isCoreIn(LO);
-+  auto I = OptMap.find(Ext);
-+  return I != OptMap.end() && I->getValue().Supported &&
-+         I->getValue().isCoreIn(LO);
- }
- 
- bool OpenCLOptions::isSupportedOptionalCore(llvm::StringRef Ext,
-                                             const LangOptions &LO) const {
--  auto E = OptMap.find(Ext);
--  if (E == OptMap.end()) {
--    return false;
--  }
--  auto I = OptMap.find(Ext)->getValue();
--  return I.Supported && I.isOptionalCoreIn(LO);
-+  auto I = OptMap.find(Ext);
-+  return I != OptMap.end() && I->getValue().Supported &&
-+         I->getValue().isOptionalCoreIn(LO);
- }
- 
- bool OpenCLOptions::isSupportedCoreOrOptionalCore(llvm::StringRef Ext,
-@@ -56,12 +69,9 @@ bool OpenCLOptions::isSupportedCoreOrOptionalCore(llvm::StringRef Ext,
- 
- bool OpenCLOptions::isSupportedExtension(llvm::StringRef Ext,
-                                          const LangOptions &LO) const {
--  auto E = OptMap.find(Ext);
--  if (E == OptMap.end()) {
--    return false;
--  }
--  auto I = OptMap.find(Ext)->getValue();
--  return I.Supported && I.isAvailableIn(LO) &&
-+  auto I = OptMap.find(Ext);
-+  return I != OptMap.end() && I->getValue().Supported &&
-+         I->getValue().isAvailableIn(LO) &&
-          !isSupportedCoreOrOptionalCore(Ext, LO);
- }
- 
-@@ -69,6 +79,10 @@ void OpenCLOptions::enable(llvm::StringRef Ext, bool V) {
-   OptMap[Ext].Enabled = V;
- }
- 
-+void OpenCLOptions::acceptsPragma(llvm::StringRef Ext, bool V) {
-+  OptMap[Ext].WithPragma = V;
-+}
-+
- void OpenCLOptions::support(llvm::StringRef Ext, bool V) {
-   assert(!Ext.empty() && "Extension is empty.");
-   assert(Ext[0] != '+' && Ext[0] != '-');
-@@ -76,11 +90,9 @@ void OpenCLOptions::support(llvm::StringRef Ext, bool V) {
- }
- 
- OpenCLOptions::OpenCLOptions() {
--#define OPENCL_GENERIC_EXTENSION(Ext, AvailVer, CoreVer, OptVer)               \
--  OptMap[#Ext].Avail = AvailVer;                                               \
--  OptMap[#Ext].Core = CoreVer;                                                 \
--  OptMap[#Ext].Opt = OptVer;
--#include "clang/Basic/OpenCLExtensions.def"
-+#define OPENCL_GENERIC_EXTENSION(Ext, ...)                                     \
-+  OptMap.insert_or_assign(#Ext, OpenCLOptionInfo{__VA_ARGS__});
-+  #include "clang/Basic/OpenCLExtensions.def"
- }
- 
- void OpenCLOptions::addSupport(const llvm::StringMap<bool> &FeaturesMap,
-@@ -97,10 +109,45 @@ void OpenCLOptions::disableAll() {
-     Opt.getValue().Enabled = false;
- }
- 
--void OpenCLOptions::enableSupportedCore(const LangOptions &LO) {
--  for (auto &Opt : OptMap)
--    if (isSupportedCoreOrOptionalCore(Opt.getKey(), LO))
--      Opt.getValue().Enabled = true;
-+bool OpenCLOptions::diagnoseUnsupportedFeatureDependencies(
-+    const TargetInfo &TI, DiagnosticsEngine &Diags) {
-+  // Feature pairs. First feature in a pair requires the second one to be
-+  // supported.
-+  static const llvm::StringMap<llvm::StringRef> DependentFeaturesMap = {
-+         {"__opencl_c_read_write_images", "__opencl_c_images"},
-+      {"__opencl_c_3d_image_writes", "__opencl_c_images"}};
-+
-+  auto OpenCLFeaturesMap = TI.getSupportedOpenCLOpts();
-+
-+  bool IsValid = true;
-+  for (auto &FeaturePair : DependentFeaturesMap)
-+    if (TI.hasFeatureEnabled(OpenCLFeaturesMap, FeaturePair.getKey()) &&
-+        !TI.hasFeatureEnabled(OpenCLFeaturesMap, FeaturePair.getValue())) {
-+      IsValid = false;
-+      Diags.Report(diag::err_opencl_feature_requires)
-+          << FeaturePair.getKey() << FeaturePair.getValue();
-+    }
-+  return IsValid;
-+}
-+
-+bool OpenCLOptions::diagnoseFeatureExtensionDifferences(
-+    const TargetInfo &TI, DiagnosticsEngine &Diags) {
-+  // Extensions and equivalent feature pairs.
-+  static const llvm::StringMap<llvm::StringRef> FeatureExtensionMap = {
-+         {"cl_khr_fp64", "__opencl_c_fp64"},
-+      {"cl_khr_3d_image_writes", "__opencl_c_3d_image_writes"}};
-+
-+  auto OpenCLFeaturesMap = TI.getSupportedOpenCLOpts();
-+
-+  bool IsValid = true;
-+  for (auto &ExtAndFeat : FeatureExtensionMap)
-+    if (TI.hasFeatureEnabled(OpenCLFeaturesMap, ExtAndFeat.getKey()) !=
-+        TI.hasFeatureEnabled(OpenCLFeaturesMap, ExtAndFeat.getValue())) {
-+      IsValid = false;
-+      Diags.Report(diag::err_opencl_extension_and_feature_differs)
-+          << ExtAndFeat.getKey() << ExtAndFeat.getValue();
-+    }
-+  return IsValid;
- }
- 
- } // end namespace clang
-diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
-index 642ee753d224..61cfd59ccf28 100644
---- a/clang/lib/Basic/TargetInfo.cpp
-+++ b/clang/lib/Basic/TargetInfo.cpp
-@@ -366,6 +366,19 @@ void TargetInfo::adjust(LangOptions &Opts) {
-     HalfWidth = HalfAlign = 16;
-     FloatWidth = FloatAlign = 32;
- 
-+    // OpenCL C v3.0 s6.7.5 - The generic address space requires support for
-+    // OpenCL C 2.0 or OpenCL C 3.0 with the __opencl_c_generic_address_space
-+    // feature
-+    // FIXME: OpenCLGenericAddressSpace is also defined in setLangDefaults()
-+    // for OpenCL C 2.0 but with no access to target capabilities. Target
-+    // should be immutable once created and thus this language option needs
-+       // to be defined only once.
-+    if (Opts.OpenCLVersion >= 300) {
-+      const auto &OpenCLFeaturesMap = getSupportedOpenCLOpts();
-+      Opts.OpenCLGenericAddressSpace = hasFeatureEnabled(
-+          OpenCLFeaturesMap, "__opencl_c_generic_address_space");
-+    }
-+
-     // Embedded 32-bit targets (OpenCL EP) might have double C type
-     // defined as float. Let's not override this as it might lead
-     // to generating illegal code that uses 64bit doubles.
-@@ -388,6 +401,19 @@ void TargetInfo::adjust(LangOptions &Opts) {
-     HalfFormat = &llvm::APFloat::IEEEhalf();
-     FloatFormat = &llvm::APFloat::IEEEsingle();
-     LongDoubleFormat = &llvm::APFloat::IEEEquad();
-+
-+       // OpenCL C v3.0 s6.7.5 - The generic address space requires support for
-+    // OpenCL C 2.0 or OpenCL C 3.0 with the __opencl_c_generic_address_space
-+    // feature
-+    // FIXME: OpenCLGenericAddressSpace is also defined in setLangDefaults()
-+    // for OpenCL C 2.0 but with no access to target capabilities. Target
-+    // should be immutable once created and thus this language option needs
-+    // to be defined only once.
-+    if (Opts.OpenCLVersion >= 300) {
-+      const auto &OpenCLFeaturesMap = getSupportedOpenCLOpts();
-+      Opts.OpenCLGenericAddressSpace = hasFeatureEnabled(
-+          OpenCLFeaturesMap, "__opencl_c_generic_address_space");
-+    }
-   }
- 
-   if (Opts.DoubleSize) {
-diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
-index 90a67d03b7b2..c171d2ed7c95 100644
---- a/clang/lib/Basic/Targets.cpp
-+++ b/clang/lib/Basic/Targets.cpp
-@@ -715,29 +715,28 @@ TargetInfo::CreateTargetInfo(DiagnosticsEngine &Diags,
- 
-   return Target.release();
- }
--
--/// getOpenCLFeatureDefines - Define OpenCL macros based on target settings
--/// and language version
--void TargetInfo::getOpenCLFeatureDefines(const LangOptions &Opts,
--                                         MacroBuilder &Builder) const {
--
--  auto defineOpenCLExtMacro = [&](llvm::StringRef Name, unsigned AvailVer,
--                                  unsigned CoreVersions,
--                                  unsigned OptionalVersions) {
--    // Check if extension is supported by target and is available in this
--    // OpenCL version
--    auto It = getTargetOpts().OpenCLFeaturesMap.find(Name);
--    if ((It != getTargetOpts().OpenCLFeaturesMap.end()) && It->getValue() &&
--        OpenCLOptions::OpenCLOptionInfo(AvailVer, CoreVersions,
--                                        OptionalVersions)
--            .isAvailableIn(Opts))
--      Builder.defineMacro(Name);
-+/// validateOpenCLTarget  - Check that OpenCL target has valid
-+/// options setting based on OpenCL version.
-+bool TargetInfo::validateOpenCLTarget(const LangOptions &Opts,
-+                                      DiagnosticsEngine &Diags) const {
-+  const llvm::StringMap<bool> &OpenCLFeaturesMap = getSupportedOpenCLOpts();
-+
-+  auto diagnoseNotSupportedCore = [&](llvm::StringRef Name, auto... OptArgs) {
-+    if (OpenCLOptions::isOpenCLOptionCoreIn(Opts, OptArgs...) &&
-+        !hasFeatureEnabled(OpenCLFeaturesMap, Name))
-+      Diags.Report(diag::warn_opencl_unsupported_core_feature)
-+          << Name << Opts.OpenCLCPlusPlus
-+          << Opts.getOpenCLVersionTuple().getAsString();
-   };
--#define OPENCL_GENERIC_EXTENSION(Ext, Avail, Core, Opt)                        \
--  defineOpenCLExtMacro(#Ext, Avail, Core, Opt);
-+#define OPENCL_GENERIC_EXTENSION(Ext, ...)                                     \
-+  diagnoseNotSupportedCore(#Ext, __VA_ARGS__);
- #include "clang/Basic/OpenCLExtensions.def"
- 
--  // FIXME: OpenCL options which affect language semantics/syntax
--  // should be moved into LangOptions, thus macro definitions of
--  // such options is better to be done in clang::InitializePreprocessor
-+  // Validate that feature macros are set properly for OpenCL C 3.0.
-+  // In other cases assume that target is always valid.
-+  if (Opts.OpenCLCPlusPlus || Opts.OpenCLVersion < 300)
-+    return true;
-+
-+   return OpenCLOptions::diagnoseUnsupportedFeatureDependencies(*this, Diags) &&
-+         OpenCLOptions::diagnoseFeatureExtensionDifferences(*this, Diags);
- }
-diff --git a/clang/lib/Basic/Targets/AMDGPU.h b/clang/lib/Basic/Targets/AMDGPU.h
-index 8ee0ca30d305..b11fe212c3a2 100644
---- a/clang/lib/Basic/Targets/AMDGPU.h
-+++ b/clang/lib/Basic/Targets/AMDGPU.h
-@@ -291,6 +291,7 @@ public:
-     bool IsAMDGCN = isAMDGCN(getTriple());
- 
-     Opts["cl_khr_fp64"] = hasFP64();
-+       Opts["__opencl_c_fp64"] = hasFP64();
- 
-     if (IsAMDGCN || GPUKind >= llvm::AMDGPU::GK_CEDAR) {
-       Opts["cl_khr_byte_addressable_store"] = true;
-@@ -307,9 +308,12 @@ public:
-       Opts["cl_khr_mipmap_image"] = true;
-       Opts["cl_khr_mipmap_image_writes"] = true;
-       Opts["cl_khr_subgroups"] = true;
--      Opts["cl_khr_3d_image_writes"] = true;
-       Opts["cl_amd_media_ops"] = true;
-       Opts["cl_amd_media_ops2"] = true;
-+
-+         Opts["__opencl_c_images"] = true;
-+      Opts["__opencl_c_3d_image_writes"] = true;
-+      Opts["cl_khr_3d_image_writes"] = true;
-     }
-   }
- 
-diff --git a/clang/lib/Basic/Targets/NVPTX.h b/clang/lib/Basic/Targets/NVPTX.h
-index 038dec4a28bd..010e640804bf 100644
---- a/clang/lib/Basic/Targets/NVPTX.h
-+++ b/clang/lib/Basic/Targets/NVPTX.h
-@@ -132,6 +132,7 @@ public:
-     Opts["__cl_clang_variadic_functions"] = true;
- 
-     Opts["cl_khr_fp64"] = true;
-+       Opts["__opencl_c_fp64"] = true;
-     Opts["cl_khr_byte_addressable_store"] = true;
-     Opts["cl_khr_global_int32_base_atomics"] = true;
-     Opts["cl_khr_global_int32_extended_atomics"] = true;
-diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp
-index c5ad1c7d2c2e..701b03c868d1 100644
---- a/clang/lib/Basic/Targets/X86.cpp
-+++ b/clang/lib/Basic/Targets/X86.cpp
-@@ -1397,13 +1397,13 @@ bool X86TargetInfo::validateOperandSize(const llvm::StringMap<bool> &FeatureMap,
-       return Size <= 64;
-     case 'z':
-       // XMM0/YMM/ZMM0
--      if (FeatureMap.lookup("avx512f"))
-+         if (hasFeatureEnabled(FeatureMap, "avx512f"))
-         // ZMM0 can be used if target supports AVX512F.
-         return Size <= 512U;
--      else if (FeatureMap.lookup("avx"))
-+         else if (hasFeatureEnabled(FeatureMap, "avx"))
-         // YMM0 can be used if target supports AVX.
-         return Size <= 256U;
--      else if (FeatureMap.lookup("sse"))
-+         else if (hasFeatureEnabled(FeatureMap, "sse"))
-         return Size <= 128U;
-       return false;
-     case 'i':
-@@ -1417,10 +1417,10 @@ bool X86TargetInfo::validateOperandSize(const llvm::StringMap<bool> &FeatureMap,
-     break;
-   case 'v':
-   case 'x':
--    if (FeatureMap.lookup("avx512f"))
-+       if (hasFeatureEnabled(FeatureMap, "avx512f"))
-       // 512-bit zmm registers can be used if target supports AVX512F.
-       return Size <= 512U;
--    else if (FeatureMap.lookup("avx"))
-+       else if (hasFeatureEnabled(FeatureMap, "avx"))
-       // 256-bit ymm registers can be used if target supports AVX.
-       return Size <= 256U;
-     return Size <= 128U;
-diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
-index 956877d34680..3e5c07538662 100644
---- a/clang/lib/Frontend/CompilerInstance.cpp
-+++ b/clang/lib/Frontend/CompilerInstance.cpp
-@@ -910,6 +910,11 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
-     }
-     // FIXME: can we disable FEnvAccess?
-   }
-+  // We should do it here because target knows nothing about
-+  // language options when it's being created.
-+  if (getLangOpts().OpenCL &&
-+      !getTarget().validateOpenCLTarget(getLangOpts(), getDiagnostics()))
-+    return false;
- 
-   // Inform the target of the language options.
-   //
-diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
-index 5c5cf46150e2..e1580b60dd89 100644
---- a/clang/lib/Frontend/CompilerInvocation.cpp
-+++ b/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -2041,6 +2041,9 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
-     Opts.ZVector = 0;
-     Opts.setDefaultFPContractMode(LangOptions::FPM_On);
-     Opts.OpenCLCPlusPlus = Opts.CPlusPlus;
-+       Opts.OpenCLPipe = Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
-+    Opts.OpenCLGenericAddressSpace =
-+        Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
- 
-     // Include default header file for OpenCL.
-     if (Opts.IncludeDefaultHeader) {
-diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
-index c60972c96e5d..faa02c608540 100644
---- a/clang/lib/Frontend/InitPreprocessor.cpp
-+++ b/clang/lib/Frontend/InitPreprocessor.cpp
-@@ -598,6 +598,29 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
-     Builder.defineMacro("__cpp_coroutines", "201703L");
- }
- 
-+/// InitializeOpenCLFeatureTestMacros - Define OpenCL macros based on target
-+/// settings and language version
-+void InitializeOpenCLFeatureTestMacros(const TargetInfo &TI,
-+                                       const LangOptions &Opts,
-+                                       MacroBuilder &Builder) {
-+  const llvm::StringMap<bool> &OpenCLFeaturesMap = TI.getSupportedOpenCLOpts();
-+  // FIXME: OpenCL options which affect language semantics/syntax
-+  // should be moved into LangOptions.
-+  auto defineOpenCLExtMacro = [&](llvm::StringRef Name, auto... OptArgs) {
-+    // Check if extension is supported by target and is available in this
-+    // OpenCL version
-+    if (TI.hasFeatureEnabled(OpenCLFeaturesMap, Name) &&
-+        OpenCLOptions::isOpenCLOptionAvailableIn(Opts, OptArgs...))
-+      Builder.defineMacro(Name);
-+  };
-+#define OPENCL_GENERIC_EXTENSION(Ext, ...)                                     \
-+  defineOpenCLExtMacro(#Ext, __VA_ARGS__);
-+#include "clang/Basic/OpenCLExtensions.def"
-+
-+  // Assume compiling for FULL profile
-+  Builder.defineMacro("__opencl_c_int64");
-+}
-+
- static void InitializePredefinedMacros(const TargetInfo &TI,
-                                        const LangOptions &LangOpts,
-                                        const FrontendOptions &FEOpts,
-@@ -1120,7 +1143,7 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
- 
-   // OpenCL definitions.
-   if (LangOpts.OpenCL) {
--    TI.getOpenCLFeatureDefines(LangOpts, Builder);
-+       InitializeOpenCLFeatureTestMacros(TI, LangOpts, Builder);
-   }
- 
-   if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) {
-diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
-index b55d9601a452..e8f293a0301b 100644
---- a/clang/lib/Headers/opencl-c-base.h
-+++ b/clang/lib/Headers/opencl-c-base.h
-@@ -46,6 +46,21 @@
- #endif // defined(__SPIR__)
- #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-+// Define feature macros for OpenCL C 2.0
-+#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200)
-+#define __opencl_c_pipes 1
-+#define __opencl_c_generic_address_space 1
-+#define __opencl_c_work_group_collective_functions 1
-+#define __opencl_c_atomic_order_acq_rel 1
-+#define __opencl_c_atomic_order_seq_cst 1
-+#define __opencl_c_atomic_scope_device 1
-+#define __opencl_c_atomic_scope_all_devices 1
-+#define __opencl_c_device_enqueue 1
-+#define __opencl_c_read_write_images 1
-+#define __opencl_c_program_scope_global_variables 1
-+#define __opencl_c_images 1
-+#endif
-+
- // built-in scalar data types:
- 
- /**
-diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index 80d318b16f57..62ff0aab1d40 100644
---- a/clang/lib/Headers/opencl-c.h
-+++ b/clang/lib/Headers/opencl-c.h
-@@ -11,11 +11,11 @@
- 
- #include "opencl-c-base.h"
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_images)
- #ifndef cl_khr_depth_images
- #define cl_khr_depth_images
- #endif //cl_khr_depth_images
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_images)
- 
- #if __OPENCL_C_VERSION__ < CL_VERSION_2_0
- #ifdef cl_khr_3d_image_writes
-@@ -7354,7 +7354,7 @@ half16 __ovld __cnfn fmod(half16 x, half16 y);
-  * Returns fmin(x - floor (x), 0x1.fffffep-1f ).
-  * floor(x) is returned in iptr.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld fract(float x, float *iptr);
- float2 __ovld fract(float2 x, float2 *iptr);
- float3 __ovld fract(float3 x, float3 *iptr);
-@@ -7444,7 +7444,7 @@ half16 __ovld fract(half16 x, __private half16 *iptr);
-  * magnitude in the interval [1/2, 1) or 0. Each
-  * component of x equals mantissa returned * 2^exp.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld frexp(float x, int *exp);
- float2 __ovld frexp(float2 x, int2 *exp);
- float3 __ovld frexp(float3 x, int3 *exp);
-@@ -7651,7 +7651,7 @@ half8 __ovld __cnfn lgamma(half8 x);
- half16 __ovld __cnfn lgamma(half16 x);
- #endif //cl_khr_fp16
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld lgamma_r(float x, int *signp);
- float2 __ovld lgamma_r(float2 x, int2 *signp);
- float3 __ovld lgamma_r(float3 x, int3 *signp);
-@@ -7957,7 +7957,7 @@ half16 __ovld __cnfn minmag(half16 x, half16 y);
-  * the argument. It stores the integral part in the object
-  * pointed to by iptr.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld modf(float x, float *iptr);
- float2 __ovld modf(float2 x, float2 *iptr);
- float3 __ovld modf(float3 x, float3 *iptr);
-@@ -8217,7 +8217,7 @@ half16 __ovld __cnfn remainder(half16 x, half16 y);
-  * sign as x/y. It stores this signed value in the object
-  * pointed to by quo.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld remquo(float x, float y, int *quo);
- float2 __ovld remquo(float2 x, float2 y, int2 *quo);
- float3 __ovld remquo(float3 x, float3 y, int3 *quo);
-@@ -8441,7 +8441,7 @@ half16 __ovld __cnfn sin(half16);
-  * is the return value and computed cosine is returned
-  * in cosval.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld sincos(float x, float *cosval);
- float2 __ovld sincos(float2 x, float2 *cosval);
- float3 __ovld sincos(float3 x, float3 *cosval);
-@@ -11342,7 +11342,7 @@ half8 __ovld vload8(size_t offset, const __constant half *p);
- half16 __ovld vload16(size_t offset, const __constant half *p);
- #endif //cl_khr_fp16
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- char2 __ovld vload2(size_t offset, const char *p);
- uchar2 __ovld vload2(size_t offset, const uchar *p);
- short2 __ovld vload2(size_t offset, const short *p);
-@@ -11582,7 +11582,7 @@ half16 __ovld vload16(size_t offset, const __private half *p);
- #endif //cl_khr_fp16
- #endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- void __ovld vstore2(char2 data, size_t offset, char *p);
- void __ovld vstore2(uchar2 data, size_t offset, uchar *p);
- void __ovld vstore2(short2 data, size_t offset, short *p);
-@@ -11827,7 +11827,7 @@ void __ovld vstore16(half16 data, size_t offset, __private half *p);
-  * must be 16-bit aligned.
-  */
- float __ovld vload_half(size_t offset, const __constant half *p);
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld vload_half(size_t offset, const half *p);
- #else
- float __ovld vload_half(size_t offset, const __global half *p);
-@@ -11848,7 +11848,7 @@ float3 __ovld vload_half3(size_t offset, const __constant half *p);
- float4 __ovld vload_half4(size_t offset, const __constant half *p);
- float8 __ovld vload_half8(size_t offset, const __constant half *p);
- float16 __ovld vload_half16(size_t offset, const __constant half *p);
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float2 __ovld vload_half2(size_t offset, const half *p);
- float3 __ovld vload_half3(size_t offset, const half *p);
- float4 __ovld vload_half4(size_t offset, const half *p);
-@@ -11883,7 +11883,7 @@ float16 __ovld vload_half16(size_t offset, const __private half *p);
-  * The default current rounding mode is round to
-  * nearest even.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- void __ovld vstore_half(float data, size_t offset, half *p);
- void __ovld vstore_half_rte(float data, size_t offset, half *p);
- void __ovld vstore_half_rtz(float data, size_t offset, half *p);
-@@ -11942,7 +11942,7 @@ void __ovld vstore_half_rtn(double data, size_t offset, __private half *p);
-  * The default current rounding mode is round to
-  * nearest even.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- void __ovld vstore_half2(float2 data, size_t offset, half *p);
- void __ovld vstore_half3(float3 data, size_t offset, half *p);
- void __ovld vstore_half4(float4 data, size_t offset, half *p);
-@@ -12169,7 +12169,7 @@ float3 __ovld vloada_half3(size_t offset, const __constant half *p);
- float4 __ovld vloada_half4(size_t offset, const __constant half *p);
- float8 __ovld vloada_half8(size_t offset, const __constant half *p);
- float16 __ovld vloada_half16(size_t offset, const __constant half *p);
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- float __ovld vloada_half(size_t offset, const half *p);
- float2 __ovld vloada_half2(size_t offset, const half *p);
- float3 __ovld vloada_half3(size_t offset, const half *p);
-@@ -12213,7 +12213,7 @@ float16 __ovld vloada_half16(size_t offset, const __private half *p);
-  * mode. The default current rounding mode is
-  * round to nearest even.
-  */
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- void __ovld vstorea_half(float data, size_t offset, half *p);
- void __ovld vstorea_half2(float2 data, size_t offset, half *p);
- void __ovld vstorea_half3(float3 data, size_t offset, half *p);
-@@ -12582,7 +12582,7 @@ void __ovld write_mem_fence(cl_mem_fence_flags flags);
- 
- // OpenCL v2.0 s6.13.9 - Address Space Qualifier Functions
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_generic_address_space)
- cl_mem_fence_flags __ovld get_fence(const void *ptr);
- cl_mem_fence_flags __ovld get_fence(void *ptr);
- 
-@@ -13397,138 +13397,113 @@ void __ovld atomic_init(volatile atomic_double *object, double value);
- void __ovld atomic_work_item_fence(cl_mem_fence_flags flags, memory_order order, memory_scope scope);
- 
- // atomic_fetch()
-+// OpenCL v2.0 s6.13.11.7.5:
-+// add/sub: atomic type argument can be uintptr_t/intptr_t, value type argument can be ptrdiff_t.
- 
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- int __ovld atomic_fetch_add(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_add_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_add_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_add(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_add_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_add_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_sub(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_sub_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_sub_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_sub(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_sub_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_sub_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_or(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_or_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_or_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_or(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_or_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_or_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_xor(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_xor_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_xor_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_xor(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_xor_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_xor_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_and(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_and_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_and_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_and(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_and_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_and_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_min(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_min_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_min_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_min(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_min_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_min_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- int __ovld atomic_fetch_max(volatile atomic_int *object, int operand);
--int __ovld atomic_fetch_max_explicit(volatile atomic_int *object, int operand, memory_order order);
--int __ovld atomic_fetch_max_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
- uint __ovld atomic_fetch_max(volatile atomic_uint *object, uint operand);
--uint __ovld atomic_fetch_max_explicit(volatile atomic_uint *object, uint operand, memory_order order);
--uint __ovld atomic_fetch_max_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
- 
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
- long __ovld atomic_fetch_add(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_add_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_add_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_add(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_add_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_add_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_sub(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_sub_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_sub_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_sub(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_sub_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_sub_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_or(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_or_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_or_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_or(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_or_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_or_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_xor(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_xor_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_xor_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_xor(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_xor_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_xor_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_and(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_and_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_and_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_and(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_and_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_and_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_min(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_min_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_min_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_min(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_min_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_min_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
- long __ovld atomic_fetch_max(volatile atomic_long *object, long operand);
--long __ovld atomic_fetch_max_explicit(volatile atomic_long *object, long operand, memory_order order);
--long __ovld atomic_fetch_max_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
- ulong __ovld atomic_fetch_max(volatile atomic_ulong *object, ulong operand);
--ulong __ovld atomic_fetch_max_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
--ulong __ovld atomic_fetch_max_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+uintptr_t __ovld atomic_fetch_add(volatile atomic_uintptr_t *object, ptrdiff_t operand);
-+uintptr_t __ovld atomic_fetch_sub(volatile atomic_uintptr_t *object, ptrdiff_t operand);
- #endif //defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#endif
- 
--// OpenCL v2.0 s6.13.11.7.5:
--// add/sub: atomic type argument can be uintptr_t/intptr_t, value type argument can be ptrdiff_t.
--// or/xor/and/min/max: atomic type argument can be intptr_t/uintptr_t, value type argument can be intptr_t/uintptr_t.
--
-+#if defined(__opencl_c_atomic_scope_device)
-+int __ovld atomic_fetch_add_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_add_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_sub_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_sub_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_or_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_or_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_xor_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_xor_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_and_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_and_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_min_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_min_explicit(volatile atomic_uint *object, uint operand, memory_order order);
-+int __ovld atomic_fetch_max_explicit(volatile atomic_int *object, int operand, memory_order order);
-+uint __ovld atomic_fetch_max_explicit(volatile atomic_uint *object, uint operand, memory_order order);
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
--uintptr_t __ovld atomic_fetch_add(volatile atomic_uintptr_t *object, ptrdiff_t operand);
-+long __ovld atomic_fetch_add_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_add_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_sub_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_sub_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_or_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_or_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_xor_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_xor_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_and_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_and_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_min_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_min_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
-+long __ovld atomic_fetch_max_explicit(volatile atomic_long *object, long operand, memory_order order);
-+ulong __ovld atomic_fetch_max_explicit(volatile atomic_ulong *object, ulong operand, memory_order order);
- uintptr_t __ovld atomic_fetch_add_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order);
--uintptr_t __ovld atomic_fetch_add_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order, memory_scope scope);
--uintptr_t __ovld atomic_fetch_sub(volatile atomic_uintptr_t *object, ptrdiff_t operand);
- uintptr_t __ovld atomic_fetch_sub_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order);
--uintptr_t __ovld atomic_fetch_sub_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order, memory_scope scope);
-+#endif //defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#endif
- 
--uintptr_t __ovld atomic_fetch_or(volatile atomic_uintptr_t *object, intptr_t operand);
--uintptr_t __ovld atomic_fetch_or_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order);
--uintptr_t __ovld atomic_fetch_or_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order, memory_scope scope);
--uintptr_t __ovld atomic_fetch_xor(volatile atomic_uintptr_t *object, intptr_t operand);
--uintptr_t __ovld atomic_fetch_xor_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order);
--uintptr_t __ovld atomic_fetch_xor_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order, memory_scope scope);
--uintptr_t __ovld atomic_fetch_and(volatile atomic_uintptr_t *object, intptr_t operand);
--uintptr_t __ovld atomic_fetch_and_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order);
--uintptr_t __ovld atomic_fetch_and_explicit(volatile atomic_uintptr_t *object, intptr_t operand, memory_order order, memory_scope scope);
--uintptr_t __ovld atomic_fetch_min(volatile atomic_uintptr_t *object, intptr_t opermax);
--uintptr_t __ovld atomic_fetch_min_explicit(volatile atomic_uintptr_t *object, intptr_t opermax, memory_order minder);
--uintptr_t __ovld atomic_fetch_min_explicit(volatile atomic_uintptr_t *object, intptr_t opermax, memory_order minder, memory_scope scope);
--uintptr_t __ovld atomic_fetch_max(volatile atomic_uintptr_t *object, intptr_t opermax);
--uintptr_t __ovld atomic_fetch_max_explicit(volatile atomic_uintptr_t *object, intptr_t opermax, memory_order minder);
--uintptr_t __ovld atomic_fetch_max_explicit(volatile atomic_uintptr_t *object, intptr_t opermax, memory_order minder, memory_scope scope);
--
--intptr_t __ovld atomic_fetch_or(volatile atomic_intptr_t *object, uintptr_t operand);
--intptr_t __ovld atomic_fetch_or_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order);
--intptr_t __ovld atomic_fetch_or_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order, memory_scope scope);
--intptr_t __ovld atomic_fetch_xor(volatile atomic_intptr_t *object, uintptr_t operand);
--intptr_t __ovld atomic_fetch_xor_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order);
--intptr_t __ovld atomic_fetch_xor_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order, memory_scope scope);
--intptr_t __ovld atomic_fetch_and(volatile atomic_intptr_t *object, uintptr_t operand);
--intptr_t __ovld atomic_fetch_and_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order);
--intptr_t __ovld atomic_fetch_and_explicit(volatile atomic_intptr_t *object, uintptr_t operand, memory_order order, memory_scope scope);
--intptr_t __ovld atomic_fetch_min(volatile atomic_intptr_t *object, uintptr_t opermax);
--intptr_t __ovld atomic_fetch_min_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder);
--intptr_t __ovld atomic_fetch_min_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder, memory_scope scope);
--intptr_t __ovld atomic_fetch_max(volatile atomic_intptr_t *object, uintptr_t opermax);
--intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder);
--intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder, memory_scope scope);
-+int __ovld atomic_fetch_add_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_add_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_sub_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_sub_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_or_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_or_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_xor_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_xor_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_and_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_and_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_min_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_min_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+int __ovld atomic_fetch_max_explicit(volatile atomic_int *object, int operand, memory_order order, memory_scope scope);
-+uint __ovld atomic_fetch_max_explicit(volatile atomic_uint *object, uint operand, memory_order order, memory_scope scope);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+long __ovld atomic_fetch_add_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_add_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_sub_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_sub_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_or_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_or_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_xor_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_xor_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_and_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_and_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_min_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_min_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+long __ovld atomic_fetch_max_explicit(volatile atomic_long *object, long operand, memory_order order, memory_scope scope);
-+ulong __ovld atomic_fetch_max_explicit(volatile atomic_ulong *object, ulong operand, memory_order order, memory_scope scope);
-+#endif //defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+uintptr_t __ovld atomic_fetch_add_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order, memory_scope scope);
-+uintptr_t __ovld atomic_fetch_sub_explicit(volatile atomic_uintptr_t *object, ptrdiff_t operand, memory_order order, memory_scope scope);
- #endif
- 
- // The functionality added by cl_ext_float_atomics extension
-@@ -13911,155 +13886,213 @@ double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
- 
- // atomic_store()
- 
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- void __ovld atomic_store(volatile atomic_int *object, int desired);
--void __ovld atomic_store_explicit(volatile atomic_int *object, int desired, memory_order order);
--void __ovld atomic_store_explicit(volatile atomic_int *object, int desired, memory_order order, memory_scope scope);
- void __ovld atomic_store(volatile atomic_uint *object, uint desired);
--void __ovld atomic_store_explicit(volatile atomic_uint *object, uint desired, memory_order order);
--void __ovld atomic_store_explicit(volatile atomic_uint *object, uint desired, memory_order order, memory_scope scope);
- void __ovld atomic_store(volatile atomic_float *object, float desired);
--void __ovld atomic_store_explicit(volatile atomic_float *object, float desired, memory_order order);
--void __ovld atomic_store_explicit(volatile atomic_float *object, float desired, memory_order order, memory_scope scope);
-+
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
- #ifdef cl_khr_fp64
- void __ovld atomic_store(volatile atomic_double *object, double desired);
--void __ovld atomic_store_explicit(volatile atomic_double *object, double desired, memory_order order);
--void __ovld atomic_store_explicit(volatile atomic_double *object, double desired, memory_order order, memory_scope scope);
- #endif //cl_khr_fp64
- void __ovld atomic_store(volatile atomic_long *object, long desired);
--void __ovld atomic_store_explicit(volatile atomic_long *object, long desired, memory_order order);
--void __ovld atomic_store_explicit(volatile atomic_long *object, long desired, memory_order order, memory_scope scope);
- void __ovld atomic_store(volatile atomic_ulong *object, ulong desired);
-+#endif
-+#endif
-+
-+#if defined(__opencl_c_atomic_scope_device)
-+void __ovld atomic_store_explicit(volatile atomic_int *object, int desired, memory_order order);
-+void __ovld atomic_store_explicit(volatile atomic_uint *object, uint desired, memory_order order);
-+void __ovld atomic_store_explicit(volatile atomic_float *object, float desired, memory_order order);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+void __ovld atomic_store_explicit(volatile atomic_double *object, double desired, memory_order order);
-+#endif //cl_khr_fp64
-+void __ovld atomic_store_explicit(volatile atomic_long *object, long desired, memory_order order);
- void __ovld atomic_store_explicit(volatile atomic_ulong *object, ulong desired, memory_order order);
-+#endif
-+#endif
-+
-+void __ovld atomic_store_explicit(volatile atomic_int *object, int desired, memory_order order, memory_scope scope);
-+void __ovld atomic_store_explicit(volatile atomic_uint *object, uint desired, memory_order order, memory_scope scope);
-+void __ovld atomic_store_explicit(volatile atomic_float *object, float desired, memory_order order, memory_scope scope);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+void __ovld atomic_store_explicit(volatile atomic_double *object, double desired, memory_order order, memory_scope scope);
-+#endif //cl_khr_fp64
-+void __ovld atomic_store_explicit(volatile atomic_long *object, long desired, memory_order order, memory_scope scope);
- void __ovld atomic_store_explicit(volatile atomic_ulong *object, ulong desired, memory_order order, memory_scope scope);
- #endif
- 
- // atomic_load()
--
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- int __ovld atomic_load(volatile atomic_int *object);
--int __ovld atomic_load_explicit(volatile atomic_int *object, memory_order order);
--int __ovld atomic_load_explicit(volatile atomic_int *object, memory_order order, memory_scope scope);
- uint __ovld atomic_load(volatile atomic_uint *object);
--uint __ovld atomic_load_explicit(volatile atomic_uint *object, memory_order order);
--uint __ovld atomic_load_explicit(volatile atomic_uint *object, memory_order order, memory_scope scope);
- float __ovld atomic_load(volatile atomic_float *object);
--float __ovld atomic_load_explicit(volatile atomic_float *object, memory_order order);
--float __ovld atomic_load_explicit(volatile atomic_float *object, memory_order order, memory_scope scope);
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
- #ifdef cl_khr_fp64
- double __ovld atomic_load(volatile atomic_double *object);
--double __ovld atomic_load_explicit(volatile atomic_double *object, memory_order order);
--double __ovld atomic_load_explicit(volatile atomic_double *object, memory_order order, memory_scope scope);
- #endif //cl_khr_fp64
- long __ovld atomic_load(volatile atomic_long *object);
--long __ovld atomic_load_explicit(volatile atomic_long *object, memory_order order);
--long __ovld atomic_load_explicit(volatile atomic_long *object, memory_order order, memory_scope scope);
- ulong __ovld atomic_load(volatile atomic_ulong *object);
-+#endif
-+#endif
-+
-+#if defined(__opencl_c_atomic_scope_device)
-+int __ovld atomic_load_explicit(volatile atomic_int *object, memory_order order);
-+uint __ovld atomic_load_explicit(volatile atomic_uint *object, memory_order order);
-+float __ovld atomic_load_explicit(volatile atomic_float *object, memory_order order);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+double __ovld atomic_load_explicit(volatile atomic_double *object, memory_order order);
-+#endif //cl_khr_fp64
-+long __ovld atomic_load_explicit(volatile atomic_long *object, memory_order order);
- ulong __ovld atomic_load_explicit(volatile atomic_ulong *object, memory_order order);
-+#endif
-+#endif
-+
-+int __ovld atomic_load_explicit(volatile atomic_int *object, memory_order order, memory_scope scope);
-+uint __ovld atomic_load_explicit(volatile atomic_uint *object, memory_order order, memory_scope scope);
-+float __ovld atomic_load_explicit(volatile atomic_float *object, memory_order order, memory_scope scope);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+double __ovld atomic_load_explicit(volatile atomic_double *object, memory_order order, memory_scope scope);
-+#endif //cl_khr_fp64
-+long __ovld atomic_load_explicit(volatile atomic_long *object, memory_order order, memory_scope scope);
- ulong __ovld atomic_load_explicit(volatile atomic_ulong *object, memory_order order, memory_scope scope);
- #endif
- 
- // atomic_exchange()
- 
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- int __ovld atomic_exchange(volatile atomic_int *object, int desired);
--int __ovld atomic_exchange_explicit(volatile atomic_int *object, int desired, memory_order order);
--int __ovld atomic_exchange_explicit(volatile atomic_int *object, int desired, memory_order order, memory_scope scope);
- uint __ovld atomic_exchange(volatile atomic_uint *object, uint desired);
--uint __ovld atomic_exchange_explicit(volatile atomic_uint *object, uint desired, memory_order order);
--uint __ovld atomic_exchange_explicit(volatile atomic_uint *object, uint desired, memory_order order, memory_scope scope);
- float __ovld atomic_exchange(volatile atomic_float *object, float desired);
--float __ovld atomic_exchange_explicit(volatile atomic_float *object, float desired, memory_order order);
--float __ovld atomic_exchange_explicit(volatile atomic_float *object, float desired, memory_order order, memory_scope scope);
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
- #ifdef cl_khr_fp64
- double __ovld atomic_exchange(volatile atomic_double *object, double desired);
--double __ovld atomic_exchange_explicit(volatile atomic_double *object, double desired, memory_order order);
--double __ovld atomic_exchange_explicit(volatile atomic_double *object, double desired, memory_order order, memory_scope scope);
- #endif //cl_khr_fp64
- long __ovld atomic_exchange(volatile atomic_long *object, long desired);
--long __ovld atomic_exchange_explicit(volatile atomic_long *object, long desired, memory_order order);
--long __ovld atomic_exchange_explicit(volatile atomic_long *object, long desired, memory_order order, memory_scope scope);
- ulong __ovld atomic_exchange(volatile atomic_ulong *object, ulong desired);
-+#endif
-+#endif
-+
-+#if defined(__opencl_c_atomic_scope_device)
-+int __ovld atomic_exchange_explicit(volatile atomic_int *object, int desired, memory_order order);
-+uint __ovld atomic_exchange_explicit(volatile atomic_uint *object, uint desired, memory_order order);
-+float __ovld atomic_exchange_explicit(volatile atomic_float *object, float desired, memory_order order);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+double __ovld atomic_exchange_explicit(volatile atomic_double *object, double desired, memory_order order);
-+#endif //cl_khr_fp64
-+long __ovld atomic_exchange_explicit(volatile atomic_long *object, long desired, memory_order order);
- ulong __ovld atomic_exchange_explicit(volatile atomic_ulong *object, ulong desired, memory_order order);
-+#endif
-+#endif
-+
-+int __ovld atomic_exchange_explicit(volatile atomic_int *object, int desired, memory_order order, memory_scope scope);
-+uint __ovld atomic_exchange_explicit(volatile atomic_uint *object, uint desired, memory_order order, memory_scope scope);
-+float __ovld atomic_exchange_explicit(volatile atomic_float *object, float desired, memory_order order, memory_scope scope);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+double __ovld atomic_exchange_explicit(volatile atomic_double *object, double desired, memory_order order, memory_scope scope);
-+#endif //cl_khr_fp64
-+long __ovld atomic_exchange_explicit(volatile atomic_long *object, long desired, memory_order order, memory_scope scope);
- ulong __ovld atomic_exchange_explicit(volatile atomic_ulong *object, ulong desired, memory_order order, memory_scope scope);
- #endif
- 
- // atomic_compare_exchange_strong() and atomic_compare_exchange_weak()
--
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- bool __ovld atomic_compare_exchange_strong(volatile atomic_int *object, int *expected, int desired);
-+bool __ovld atomic_compare_exchange_strong(volatile atomic_uint *object, uint *expected, uint desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_int *object, int *expected, int desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_uint *object, uint *expected, uint desired);
-+bool __ovld atomic_compare_exchange_strong(volatile atomic_float *object, float *expected, float desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_float *object, float *expected, float desired);
-+
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+bool __ovld atomic_compare_exchange_strong(volatile atomic_double *object, double *expected, double desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_double *object, double *expected, double desired);
-+#endif //cl_khr_fp64
-+bool __ovld atomic_compare_exchange_strong(volatile atomic_long *object, long *expected, long desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_long *object, long *expected, long desired);
-+bool __ovld atomic_compare_exchange_strong(volatile atomic_ulong *object, ulong *expected, ulong desired);
-+bool __ovld atomic_compare_exchange_weak(volatile atomic_ulong *object, ulong *expected, ulong desired);
-+#endif
-+#endif
-+
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_int *object, int *expected,
-                                                                                  int desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_int *object, int *expected,
--                                                                                 int desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_strong(volatile atomic_uint *object, uint *expected, uint desired);
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_uint *object, uint *expected,
-                                                                                  uint desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_uint *object, uint *expected,
--                                                                                 uint desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_int *object, int *expected, int desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_int *object, int *expected,
-                                                                                  int desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_int *object, int *expected,
--                                                                                 int desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_uint *object, uint *expected, uint desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_uint *object, uint *expected,
-                                                                                  uint desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_uint *object, uint *expected,
--                                                                                 uint desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_strong(volatile atomic_float *object, float *expected, float desired);
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_float *object, float *expected,
-                                                                                  float desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_float *object, float *expected,
--                                                                                 float desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_float *object, float *expected, float desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_float *object, float *expected,
-                                                                                  float desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_float *object, float *expected,
--                                                                                 float desired, memory_order success, memory_order failure, memory_scope scope);
- #if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
- #ifdef cl_khr_fp64
--bool __ovld atomic_compare_exchange_strong(volatile atomic_double *object, double *expected, double desired);
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_double *object, double *expected,
-                                                                                  double desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_double *object, double *expected,
--                                                                                 double desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_double *object, double *expected, double desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_double *object, double *expected,
-                                                                                  double desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_double *object, double *expected,
--                                                                                 double desired, memory_order success, memory_order failure, memory_scope scope);
- #endif //cl_khr_fp64
--bool __ovld atomic_compare_exchange_strong(volatile atomic_long *object, long *expected, long desired);
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_long *object, long *expected,
-                                                                                  long desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_long *object, long *expected,
--                                                                                 long desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_long *object, long *expected, long desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_long *object, long *expected,
-                                                                                  long desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_long *object, long *expected,
--                                                                                 long desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_strong(volatile atomic_ulong *object, ulong *expected, ulong desired);
- bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_ulong *object, ulong *expected,
-                                                                                  ulong desired, memory_order success, memory_order failure);
--bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_ulong *object, ulong *expected,
--                                                                                 ulong desired, memory_order success, memory_order failure, memory_scope scope);
--bool __ovld atomic_compare_exchange_weak(volatile atomic_ulong *object, ulong *expected, ulong desired);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_ulong *object, ulong *expected,
-                                                                                  ulong desired, memory_order success, memory_order failure);
-+#endif
-+
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_int *object, int *expected,
-+                                                                                 int desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_uint *object, uint *expected,
-+                                                                                 uint desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_int *object, int *expected,
-+                                                                                 int desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_uint *object, uint *expected,
-+                                                                                 uint desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_float *object, float *expected,
-+                                                                                 float desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_float *object, float *expected,
-+                                                                                 float desired, memory_order success, memory_order failure, memory_scope scope);
-+#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
-+#ifdef cl_khr_fp64
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_double *object, double *expected,
-+                                                                                 double desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_double *object, double *expected,
-+                                                                                 double desired, memory_order success, memory_order failure, memory_scope scope);
-+#endif //cl_khr_fp64
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_long *object, long *expected,
-+                                                                                 long desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_long *object, long *expected,
-+                                                                                 long desired, memory_order success, memory_order failure, memory_scope scope);
-+bool __ovld atomic_compare_exchange_strong_explicit(volatile atomic_ulong *object, ulong *expected,
-+                                                                                 ulong desired, memory_order success, memory_order failure, memory_scope scope);
- bool __ovld atomic_compare_exchange_weak_explicit(volatile atomic_ulong *object, ulong *expected,
-                                                                                  ulong desired, memory_order success, memory_order failure, memory_scope scope);
- #endif
- 
- // atomic_flag_test_and_set() and atomic_flag_clear()
--
-+#if defined(__opencl_c_atomic_order_seq_cst) && defined(__opencl_c_atomic_scope_device)
- bool __ovld atomic_flag_test_and_set(volatile atomic_flag *object);
--bool __ovld atomic_flag_test_and_set_explicit(volatile atomic_flag *object, memory_order order);
--bool __ovld atomic_flag_test_and_set_explicit(volatile atomic_flag *object, memory_order order, memory_scope scope);
- void __ovld atomic_flag_clear(volatile atomic_flag *object);
-+#endif
-+
-+#if defined(__opencl_c_atomic_scope_device)
-+bool __ovld atomic_flag_test_and_set_explicit(volatile atomic_flag *object, memory_order order);
- void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, memory_order order);
--void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, memory_order order, memory_scope scope);
-+#endif
- 
-+bool __ovld atomic_flag_test_and_set_explicit(volatile atomic_flag *object, memory_order order, memory_scope scope);
-+void __ovld atomic_flag_clear_explicit(volatile atomic_flag *object, memory_order order, memory_scope scope);
- #endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
- // OpenCL v1.1 s6.11.12, v1.2 s6.12.12, v2.0 s6.13.12 - Miscellaneous Vector Functions
-@@ -14843,7 +14876,7 @@ half4 __purefn __ovld read_imageh(read_only image1d_buffer_t image, int coord);
- #endif //cl_khr_fp16
- 
- // Image read functions for read_write images
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- float4 __purefn __ovld read_imagef(read_write image1d_t image, int coord);
- int4 __purefn __ovld read_imagei(read_write image1d_t image, int coord);
- uint4 __purefn __ovld read_imageui(read_write image1d_t image, int coord);
-@@ -14886,7 +14919,6 @@ float __purefn __ovld read_imagef(read_write image2d_msaa_depth_t image, int2 co
- float __purefn __ovld read_imagef(read_write image2d_array_msaa_depth_t image, int4 coord, int sample);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- #ifdef cl_khr_mipmap_image
- float4 __purefn __ovld read_imagef(read_write image1d_t image, sampler_t sampler, float coord, float lod);
- int4 __purefn __ovld read_imagei(read_write image1d_t image, sampler_t sampler, float coord, float lod);
-@@ -14937,7 +14969,6 @@ int4 __purefn __ovld read_imagei(read_write image3d_t image, sampler_t sampler,
- uint4 __purefn __ovld read_imageui(read_write image3d_t image, sampler_t sampler, float4 coord, float4 gradientX, float4 gradientY);
- 
- #endif //cl_khr_mipmap_image
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
- // Image read functions returning half4 type
- #ifdef cl_khr_fp16
-@@ -14948,7 +14979,7 @@ half4 __purefn __ovld read_imageh(read_write image1d_array_t image, int2 coord);
- half4 __purefn __ovld read_imageh(read_write image2d_array_t image, int4 coord);
- half4 __purefn __ovld read_imageh(read_write image1d_buffer_t image, int coord);
- #endif //cl_khr_fp16
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images
- 
- /**
-  * Write color value to location specified by coordinate
-@@ -15092,7 +15123,7 @@ void __ovld write_imageh(write_only image1d_buffer_t image, int coord, half4 col
- #endif //cl_khr_fp16
- 
- // Image write functions for read_write images
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- void __ovld write_imagef(read_write image2d_t image, int2 coord, float4 color);
- void __ovld write_imagei(read_write image2d_t image, int2 coord, int4 color);
- void __ovld write_imageui(read_write image2d_t image, int2 coord, uint4 color);
-@@ -15124,7 +15155,6 @@ void __ovld write_imagef(read_write image2d_depth_t image, int2 coord, float col
- void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, float color);
- #endif //cl_khr_depth_images
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- #if defined(cl_khr_mipmap_image_writes)
- void __ovld write_imagef(read_write image1d_t image, int coord, int lod, float4 color);
- void __ovld write_imagei(read_write image1d_t image, int coord, int lod, int4 color);
-@@ -15152,7 +15182,6 @@ void __ovld write_imageui(read_write image3d_t image, int4 coord, int lod, uint4
- #endif //cl_khr_3d_image_writes
- 
- #endif //cl_khr_mipmap_image_writes
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
- // Image write functions for half4 type
- #ifdef cl_khr_fp16
-@@ -15165,7 +15194,7 @@ void __ovld write_imageh(read_write image1d_array_t image, int2 coord, half4 col
- void __ovld write_imageh(read_write image2d_array_t image, int4 coord, half4 color);
- void __ovld write_imageh(read_write image1d_buffer_t image, int coord, half4 color);
- #endif //cl_khr_fp16
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- // Note: In OpenCL v1.0/1.1/1.2, image argument of image query builtin functions does not have
- // access qualifier, which by default assume read_only access qualifier. Image query builtin
-@@ -15213,7 +15242,7 @@ int __ovld __cnfn get_image_width(write_only image2d_array_msaa_t image);
- int __ovld __cnfn get_image_width(write_only image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld __cnfn get_image_width(read_write image1d_t image);
- int __ovld __cnfn get_image_width(read_write image1d_buffer_t image);
- int __ovld __cnfn get_image_width(read_write image2d_t image);
-@@ -15230,7 +15259,7 @@ int __ovld __cnfn get_image_width(read_write image2d_msaa_depth_t image);
- int __ovld __cnfn get_image_width(read_write image2d_array_msaa_t image);
- int __ovld __cnfn get_image_width(read_write image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the image height in pixels.
-@@ -15265,7 +15294,7 @@ int __ovld __cnfn get_image_height(write_only image2d_array_msaa_t image);
- int __ovld __cnfn get_image_height(write_only image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld __cnfn get_image_height(read_write image2d_t image);
- int __ovld __cnfn get_image_height(read_write image3d_t image);
- int __ovld __cnfn get_image_height(read_write image2d_array_t image);
-@@ -15279,7 +15308,7 @@ int __ovld __cnfn get_image_height(read_write image2d_msaa_depth_t image);
- int __ovld __cnfn get_image_height(read_write image2d_array_msaa_t image);
- int __ovld __cnfn get_image_height(read_write image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the image depth in pixels.
-@@ -15290,9 +15319,9 @@ int __ovld __cnfn get_image_depth(read_only image3d_t image);
- int __ovld __cnfn get_image_depth(write_only image3d_t image);
- #endif
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld __cnfn get_image_depth(read_write image3d_t image);
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- // OpenCL Extension v2.0 s9.18 - Mipmaps
- #if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-@@ -15388,7 +15417,7 @@ int __ovld __cnfn get_image_channel_data_type(write_only image2d_array_msaa_t im
- int __ovld __cnfn get_image_channel_data_type(write_only image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld __cnfn get_image_channel_data_type(read_write image1d_t image);
- int __ovld __cnfn get_image_channel_data_type(read_write image1d_buffer_t image);
- int __ovld __cnfn get_image_channel_data_type(read_write image2d_t image);
-@@ -15405,7 +15434,7 @@ int __ovld __cnfn get_image_channel_data_type(read_write image2d_msaa_depth_t im
- int __ovld __cnfn get_image_channel_data_type(read_write image2d_array_msaa_t image);
- int __ovld __cnfn get_image_channel_data_type(read_write image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the image channel order. Valid values are:
-@@ -15460,7 +15489,7 @@ int __ovld __cnfn get_image_channel_order(write_only image2d_array_msaa_t image)
- int __ovld __cnfn get_image_channel_order(write_only image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld __cnfn get_image_channel_order(read_write image1d_t image);
- int __ovld __cnfn get_image_channel_order(read_write image1d_buffer_t image);
- int __ovld __cnfn get_image_channel_order(read_write image2d_t image);
-@@ -15477,7 +15506,7 @@ int __ovld __cnfn get_image_channel_order(read_write image2d_msaa_depth_t image)
- int __ovld __cnfn get_image_channel_order(read_write image2d_array_msaa_t image);
- int __ovld __cnfn get_image_channel_order(read_write image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the 2D image width and height as an int2
-@@ -15510,7 +15539,7 @@ int2 __ovld __cnfn get_image_dim(write_only image2d_array_msaa_t image);
- int2 __ovld __cnfn get_image_dim(write_only image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int2 __ovld __cnfn get_image_dim(read_write image2d_t image);
- int2 __ovld __cnfn get_image_dim(read_write image2d_array_t image);
- #ifdef cl_khr_depth_images
-@@ -15523,7 +15552,7 @@ int2 __ovld __cnfn get_image_dim(read_write image2d_msaa_depth_t image);
- int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_t image);
- int2 __ovld __cnfn get_image_dim(read_write image2d_array_msaa_depth_t image);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the 3D image width, height, and depth as an
-@@ -15535,9 +15564,9 @@ int4 __ovld __cnfn get_image_dim(read_only image3d_t image);
- #ifdef cl_khr_3d_image_writes
- int4 __ovld __cnfn get_image_dim(write_only image3d_t image);
- #endif
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int4 __ovld __cnfn get_image_dim(read_write image3d_t image);
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
-  * Return the image array size.
-@@ -15563,7 +15592,7 @@ size_t __ovld __cnfn get_image_array_size(write_only image2d_array_msaa_t image_
- size_t __ovld __cnfn get_image_array_size(write_only image2d_array_msaa_depth_t image_array);
- #endif //cl_khr_gl_msaa_sharing
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- size_t __ovld __cnfn get_image_array_size(read_write image1d_array_t image_array);
- size_t __ovld __cnfn get_image_array_size(read_write image2d_array_t image_array);
- #ifdef cl_khr_depth_images
-@@ -15573,7 +15602,7 @@ size_t __ovld __cnfn get_image_array_size(read_write image2d_array_depth_t image
- size_t __ovld __cnfn get_image_array_size(read_write image2d_array_msaa_t image_array);
- size_t __ovld __cnfn get_image_array_size(read_write image2d_array_msaa_depth_t image_array);
- #endif //cl_khr_gl_msaa_sharing
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- 
- /**
- * Return the number of samples associated with image
-@@ -15589,12 +15618,12 @@ int __ovld get_image_num_samples(write_only image2d_msaa_depth_t image);
- int __ovld get_image_num_samples(write_only image2d_array_msaa_t image);
- int __ovld get_image_num_samples(write_only image2d_array_msaa_depth_t image);
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- int __ovld get_image_num_samples(read_write image2d_msaa_t image);
- int __ovld get_image_num_samples(read_write image2d_msaa_depth_t image);
- int __ovld get_image_num_samples(read_write image2d_array_msaa_t image);
- int __ovld get_image_num_samples(read_write image2d_array_msaa_depth_t image);
--#endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif //defined(__opencl_c_read_write_images)
- #endif
- 
- // OpenCL v2.0 s6.13.15 - Work-group Functions
-@@ -16630,34 +16659,38 @@ uint16  __ovld __conv intel_sub_group_shuffle_xor( uint16 x, uint c );
- long    __ovld __conv intel_sub_group_shuffle_xor( long x, uint c );
- ulong   __ovld __conv intel_sub_group_shuffle_xor( ulong x, uint c );
- 
-+#if defined(__opencl_c_images)
- uint    __ovld __conv intel_sub_group_block_read( read_only image2d_t image, int2 coord );
- uint2   __ovld __conv intel_sub_group_block_read2( read_only image2d_t image, int2 coord );
- uint4   __ovld __conv intel_sub_group_block_read4( read_only image2d_t image, int2 coord );
- uint8   __ovld __conv intel_sub_group_block_read8( read_only image2d_t image, int2 coord );
-+#endif
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- uint    __ovld __conv intel_sub_group_block_read(read_write image2d_t image, int2 coord);
- uint2   __ovld __conv intel_sub_group_block_read2(read_write image2d_t image, int2 coord);
- uint4   __ovld __conv intel_sub_group_block_read4(read_write image2d_t image, int2 coord);
- uint8   __ovld __conv intel_sub_group_block_read8(read_write image2d_t image, int2 coord);
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- uint    __ovld __conv intel_sub_group_block_read( const __global uint* p );
- uint2   __ovld __conv intel_sub_group_block_read2( const __global uint* p );
- uint4   __ovld __conv intel_sub_group_block_read4( const __global uint* p );
- uint8   __ovld __conv intel_sub_group_block_read8( const __global uint* p );
- 
-+#if defined(__opencl_c_images)
- void    __ovld __conv intel_sub_group_block_write(write_only image2d_t image, int2 coord, uint data);
- void    __ovld __conv intel_sub_group_block_write2(write_only image2d_t image, int2 coord, uint2 data);
- void    __ovld __conv intel_sub_group_block_write4(write_only image2d_t image, int2 coord, uint4 data);
- void    __ovld __conv intel_sub_group_block_write8(write_only image2d_t image, int2 coord, uint8 data);
-+#endif // defined(__opencl_c_images)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- void    __ovld __conv intel_sub_group_block_write(read_write image2d_t image, int2 coord, uint data);
- void    __ovld __conv intel_sub_group_block_write2(read_write image2d_t image, int2 coord, uint2 data);
- void    __ovld __conv intel_sub_group_block_write4(read_write image2d_t image, int2 coord, uint4 data);
- void    __ovld __conv intel_sub_group_block_write8(read_write image2d_t image, int2 coord, uint8 data);
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- void    __ovld __conv intel_sub_group_block_write( __global uint* p, uint data );
- void    __ovld __conv intel_sub_group_block_write2( __global uint* p, uint2 data );
-@@ -16770,68 +16803,76 @@ ushort      __ovld __conv intel_sub_group_scan_inclusive_min( ushort  x );
- short       __ovld __conv intel_sub_group_scan_inclusive_max( short   x );
- ushort      __ovld __conv intel_sub_group_scan_inclusive_max( ushort  x );
- 
-+#if defined(__opencl_c_images)
- uint       __ovld __conv intel_sub_group_block_read_ui( read_only image2d_t image, int2 byte_coord );
- uint2      __ovld __conv intel_sub_group_block_read_ui2( read_only image2d_t image, int2 byte_coord );
- uint4      __ovld __conv intel_sub_group_block_read_ui4( read_only image2d_t image, int2 byte_coord );
- uint8      __ovld __conv intel_sub_group_block_read_ui8( read_only image2d_t image, int2 byte_coord );
-+#endif // defined(__opencl_c_images)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- uint       __ovld __conv intel_sub_group_block_read_ui( read_write image2d_t image, int2 byte_coord );
- uint2      __ovld __conv intel_sub_group_block_read_ui2( read_write image2d_t image, int2 byte_coord );
- uint4      __ovld __conv intel_sub_group_block_read_ui4( read_write image2d_t image, int2 byte_coord );
- uint8      __ovld __conv intel_sub_group_block_read_ui8( read_write image2d_t image, int2 byte_coord );
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- uint       __ovld __conv intel_sub_group_block_read_ui( const __global uint* p );
- uint2      __ovld __conv intel_sub_group_block_read_ui2( const __global uint* p );
- uint4      __ovld __conv intel_sub_group_block_read_ui4( const __global uint* p );
- uint8      __ovld __conv intel_sub_group_block_read_ui8( const __global uint* p );
- 
-+#if defined(__opencl_c_images)
- void       __ovld __conv intel_sub_group_block_write_ui( read_only image2d_t image, int2 byte_coord, uint data );
- void       __ovld __conv intel_sub_group_block_write_ui2( read_only image2d_t image, int2 byte_coord, uint2 data );
- void       __ovld __conv intel_sub_group_block_write_ui4( read_only image2d_t image, int2 byte_coord, uint4 data );
- void       __ovld __conv intel_sub_group_block_write_ui8( read_only image2d_t image, int2 byte_coord, uint8 data );
-+#endif //defined(__opencl_c_images)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- void       __ovld __conv intel_sub_group_block_write_ui( read_write image2d_t image, int2 byte_coord, uint data );
- void       __ovld __conv intel_sub_group_block_write_ui2( read_write image2d_t image, int2 byte_coord, uint2 data );
- void       __ovld __conv intel_sub_group_block_write_ui4( read_write image2d_t image, int2 byte_coord, uint4 data );
- void       __ovld __conv intel_sub_group_block_write_ui8( read_write image2d_t image, int2 byte_coord, uint8 data );
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- void       __ovld __conv intel_sub_group_block_write_ui( __global uint* p, uint data );
- void       __ovld __conv intel_sub_group_block_write_ui2( __global uint* p, uint2 data );
- void       __ovld __conv intel_sub_group_block_write_ui4( __global uint* p, uint4 data );
- void       __ovld __conv intel_sub_group_block_write_ui8( __global uint* p, uint8 data );
- 
-+#if defined(__opencl_c_images)
- ushort      __ovld __conv intel_sub_group_block_read_us( read_only image2d_t image, int2 coord );
- ushort2     __ovld __conv intel_sub_group_block_read_us2( read_only image2d_t image, int2 coord );
- ushort4     __ovld __conv intel_sub_group_block_read_us4( read_only image2d_t image, int2 coord );
- ushort8     __ovld __conv intel_sub_group_block_read_us8( read_only image2d_t image, int2 coord );
-+#endif // defined(__opencl_c_images)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- ushort      __ovld __conv intel_sub_group_block_read_us(read_write image2d_t image, int2 coord);
- ushort2     __ovld __conv intel_sub_group_block_read_us2(read_write image2d_t image, int2 coord);
- ushort4     __ovld __conv intel_sub_group_block_read_us4(read_write image2d_t image, int2 coord);
- ushort8     __ovld __conv intel_sub_group_block_read_us8(read_write image2d_t image, int2 coord);
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- ushort      __ovld __conv intel_sub_group_block_read_us(  const __global ushort* p );
- ushort2     __ovld __conv intel_sub_group_block_read_us2( const __global ushort* p );
- ushort4     __ovld __conv intel_sub_group_block_read_us4( const __global ushort* p );
- ushort8     __ovld __conv intel_sub_group_block_read_us8( const __global ushort* p );
- 
-+#if defined(__opencl_c_images)
- void        __ovld __conv intel_sub_group_block_write_us(write_only image2d_t image, int2 coord, ushort  data);
- void        __ovld __conv intel_sub_group_block_write_us2(write_only image2d_t image, int2 coord, ushort2 data);
- void        __ovld __conv intel_sub_group_block_write_us4(write_only image2d_t image, int2 coord, ushort4 data);
- void        __ovld __conv intel_sub_group_block_write_us8(write_only image2d_t image, int2 coord, ushort8 data);
-+#endif // defined(__opencl_c_images)
- 
--#if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#if defined(__opencl_c_read_write_images)
- void        __ovld __conv intel_sub_group_block_write_us(read_write image2d_t image, int2 coord, ushort  data);
- void        __ovld __conv intel_sub_group_block_write_us2(read_write image2d_t image, int2 coord, ushort2 data);
- void        __ovld __conv intel_sub_group_block_write_us4(read_write image2d_t image, int2 coord, ushort4 data);
- void        __ovld __conv intel_sub_group_block_write_us8(read_write image2d_t image, int2 coord, ushort8 data);
--#endif // defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
-+#endif // defined(__opencl_c_read_write_images)
- 
- void        __ovld __conv intel_sub_group_block_write_us(  __global ushort* p, ushort  data );
- void        __ovld __conv intel_sub_group_block_write_us2( __global ushort* p, ushort2 data );
-@@ -16949,6 +16990,7 @@ short2 __ovld intel_sub_group_avc_ime_adjust_ref_offset(
-     short2 ref_offset, ushort2 src_coord, ushort2 ref_window_size,
-     ushort2 image_size);
- 
-+#if defined(__opencl_c_images)
- intel_sub_group_avc_ime_result_t __ovld
- intel_sub_group_avc_ime_evaluate_with_single_reference(
-     read_only image2d_t src_image, read_only image2d_t ref_image,
-@@ -16989,6 +17031,7 @@ intel_sub_group_avc_ime_evaluate_with_dual_reference_streaminout(
-     read_only image2d_t bwd_ref_image, sampler_t vme_media_sampler,
-     intel_sub_group_avc_ime_payload_t payload,
-     intel_sub_group_avc_ime_dual_reference_streamin_t streamin_components);
-+#endif
- 
- intel_sub_group_avc_ime_single_reference_streamin_t __ovld
- intel_sub_group_avc_ime_get_single_reference_streamin(
-@@ -17053,6 +17096,7 @@ intel_sub_group_avc_ref_payload_t __ovld
- intel_sub_group_avc_ref_set_bilinear_filter_enable(
-     intel_sub_group_avc_ref_payload_t payload);
- 
-+#if defined(__opencl_c_images)
- intel_sub_group_avc_ref_result_t __ovld
- intel_sub_group_avc_ref_evaluate_with_single_reference(
-     read_only image2d_t src_image, read_only image2d_t ref_image,
-@@ -17071,6 +17115,7 @@ intel_sub_group_avc_ref_evaluate_with_multi_reference(
-     read_only image2d_t src_image, uint packed_reference_ids,
-     uchar packed_reference_field_polarities, sampler_t vme_media_sampler,
-     intel_sub_group_avc_ref_payload_t payload);
-+#endif //defined(__opencl_c_images)
- 
- // SIC built-in functions
- intel_sub_group_avc_sic_payload_t __ovld
-@@ -17121,6 +17166,7 @@ intel_sub_group_avc_sic_set_block_based_raw_skip_sad(
-     uchar block_based_skip_type,
-     intel_sub_group_avc_sic_payload_t payload);
- 
-+#if defined(__opencl_c_images)
- intel_sub_group_avc_sic_result_t __ovld
- intel_sub_group_avc_sic_evaluate_ipe(
-     read_only image2d_t src_image, sampler_t vme_media_sampler,
-@@ -17143,6 +17189,7 @@ intel_sub_group_avc_sic_evaluate_with_multi_reference(
-     read_only image2d_t src_image, uint packed_reference_ids,
-     uchar packed_reference_field_polarities, sampler_t vme_media_sampler,
-     intel_sub_group_avc_sic_payload_t payload);
-+#endif //defined(__opencl_c_images)
- 
- uchar __ovld intel_sub_group_avc_sic_get_ipe_luma_shape(
-     intel_sub_group_avc_sic_result_t result);
-@@ -17529,31 +17576,23 @@ uint16 __ovld amd_sadw(uint16 src0, uint16 src1, uint16 src2);
- #endif // cl_amd_media_ops2
- 
- #if defined(cl_arm_integer_dot_product_int8)
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_int8 : begin
- uint __ovld arm_dot(uchar4 a, uchar4 b);
- int __ovld arm_dot(char4 a, char4 b);
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_int8 : end
- #endif // defined(cl_arm_integer_dot_product_int8)
- 
- #if defined(cl_arm_integer_dot_product_accumulate_int8)
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int8 : begin
- uint __ovld arm_dot_acc(uchar4 a, uchar4 b, uint c);
- int __ovld arm_dot_acc(char4 a, char4 b, int c);
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int8 : end
- #endif // defined(cl_arm_integer_dot_product_accumulate_int8)
- 
- #if defined(cl_arm_integer_dot_product_accumulate_int16)
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int16 : begin
- uint __ovld arm_dot_acc(ushort2 a, ushort2 b, uint c);
- int __ovld arm_dot_acc(short2 a, short2 b, int c);
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int16 : end
- #endif // defined(cl_arm_integer_dot_product_accumulate_int16)
- 
- #if defined(cl_arm_integer_dot_product_accumulate_saturate_int8)
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_saturate_int8 : begin
- uint __ovld arm_dot_acc_sat(uchar4 a, uchar4 b, uint c);
- int __ovld arm_dot_acc_sat(char4 a, char4 b, int c);
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_saturate_int8 : end
- #endif // defined(cl_arm_integer_dot_product_accumulate_saturate_int8)
- 
- // Disable any extensions we may have enabled previously.
-diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
-index 347d992b1643..c489c8c75623 100644
---- a/clang/lib/Parse/ParseDecl.cpp
-+++ b/clang/lib/Parse/ParseDecl.cpp
-@@ -3631,8 +3631,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
-       // C++ for OpenCL does not allow virtual function qualifier, to avoid
-       // function pointers restricted in OpenCL v2.0 s6.9.a.
-       if (getLangOpts().OpenCLCPlusPlus &&
--          !getActions().getOpenCLOptions().isEnabled(
--              "__cl_clang_function_pointers")) {
-+                 !getActions().getOpenCLOptions().isAvailableOption(
-+              "__cl_clang_function_pointers", getLangOpts())) {
-         DiagID = diag::err_openclcxx_virtual_function;
-         PrevSpec = Tok.getIdentifierInfo()->getNameStart();
-         isInvalid = true;
-@@ -4002,8 +4002,9 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
-     case tok::kw___generic:
-       // generic address space is introduced only in OpenCL v2.0
-       // see OpenCL C Spec v2.0 s6.5.5
--      if (Actions.getLangOpts().OpenCLVersion < 200 &&
--          !Actions.getLangOpts().OpenCLCPlusPlus) {
-+         // OpenCL v3.0 introduces __opencl_c_generic_address_space
-+      // feature macro to indicate if generic address space is supported
-+         if (!Actions.getLangOpts().OpenCLGenericAddressSpace) {
-         DiagID = diag::err_opencl_unknown_type_specifier;
-         PrevSpec = Tok.getIdentifierInfo()->getNameStart();
-         isInvalid = true;
-@@ -5059,8 +5060,7 @@ bool Parser::isDeclarationSpecifier(bool DisambiguatingWithExpression) {
-   default: return false;
- 
-   case tok::kw_pipe:
--    return (getLangOpts().OpenCL && getLangOpts().OpenCLVersion >= 200) ||
--           getLangOpts().OpenCLCPlusPlus;
-+    return getLangOpts().OpenCLPipe;
- 
-   case tok::identifier:   // foo::bar
-     // Unfortunate hack to support "Class.factoryMethod" notation.
-@@ -5587,9 +5587,7 @@ static bool isPtrOperatorToken(tok::TokenKind Kind, const LangOptions &Lang,
-                                DeclaratorContext TheContext) {
-   if (Kind == tok::star || Kind == tok::caret)
-     return true;
--
--  if (Kind == tok::kw_pipe &&
--      ((Lang.OpenCL && Lang.OpenCLVersion >= 200) || Lang.OpenCLCPlusPlus))
-+  if (Kind == tok::kw_pipe && Lang.OpenCLPipe)
-     return true;
- 
-   if (!Lang.CPlusPlus)
-diff --git a/clang/lib/Parse/ParsePragma.cpp b/clang/lib/Parse/ParsePragma.cpp
-index f9b852826775..948e04eafa41 100644
---- a/clang/lib/Parse/ParsePragma.cpp
-+++ b/clang/lib/Parse/ParsePragma.cpp
-@@ -771,22 +771,21 @@ void Parser::HandlePragmaOpenCLExtension() {
-   // overriding all previously issued extension directives, but only if the
-   // behavior is set to disable."
-   if (Name == "all") {
--    if (State == Disable) {
-+    if (State == Disable)
-       Opt.disableAll();
--      Opt.enableSupportedCore(getLangOpts());
--    } else {
-+    else
-       PP.Diag(NameLoc, diag::warn_pragma_expected_predicate) << 1;
--    }
-   } else if (State == Begin) {
-     if (!Opt.isKnown(Name) || !Opt.isSupported(Name, getLangOpts())) {
-       Opt.support(Name);
-+         // FIXME: Default behavior of the extension pragma is not defined.
-+      // Therefore, it should never be added by default.
-+      Opt.acceptsPragma(Name);
-     }
--    Actions.setCurrentOpenCLExtension(Name);
-   } else if (State == End) {
--    if (Name != Actions.getCurrentOpenCLExtension())
--      PP.Diag(NameLoc, diag::warn_pragma_begin_end_mismatch);
--    Actions.setCurrentOpenCLExtension("");
--  } else if (!Opt.isKnown(Name))
-+       // There is no behavior for this directive. We only accept this for
-+    // backward compatibility.
-+  } else if (!Opt.isKnown(Name) || !Opt.isWithPragma(Name))
-     PP.Diag(NameLoc, diag::warn_pragma_unknown_extension) << Ident;
-   else if (Opt.isSupportedExtension(Name, getLangOpts()))
-     Opt.enable(Name, State == Enable);
-diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
-index 9b0f921b4269..b3b02f8d266a 100644
---- a/clang/lib/Parse/Parser.cpp
-+++ b/clang/lib/Parse/Parser.cpp
-@@ -1079,8 +1079,6 @@ Parser::ParseDeclOrFunctionDefInternal(ParsedAttributesWithRange &attrs,
-     Decl *TheDecl = Actions.ParsedFreeStandingDeclSpec(getCurScope(), AS_none,
-                                                        DS, AnonRecord);
-     DS.complete(TheDecl);
--    if (getLangOpts().OpenCL)
--      Actions.setCurrentOpenCLExtensionForDecl(TheDecl);
-     if (AnonRecord) {
-       Decl* decls[] = {AnonRecord, TheDecl};
-       return Actions.BuildDeclaratorGroup(decls);
-diff --git a/clang/lib/Sema/DeclSpec.cpp b/clang/lib/Sema/DeclSpec.cpp
-index da42db3e8f7b..f60708d7dc01 100644
---- a/clang/lib/Sema/DeclSpec.cpp
-+++ b/clang/lib/Sema/DeclSpec.cpp
-@@ -625,7 +625,8 @@ bool DeclSpec::SetStorageClassSpec(Sema &S, SCS SC, SourceLocation Loc,
-   // OpenCL v1.2 s6.8 changes this to "The auto and register storage-class
-   // specifiers are not supported."
-   if (S.getLangOpts().OpenCL &&
--      !S.getOpenCLOptions().isEnabled("cl_clang_storage_class_specifiers")) {
-+         !S.getOpenCLOptions().isAvailableOption(
-+          "cl_clang_storage_class_specifiers", S.getLangOpts())) {
-     switch (SC) {
-     case SCS_extern:
-     case SCS_private_extern:
-diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
-index a91291c7af38..95ba22ddf2a7 100644
---- a/clang/lib/Sema/Sema.cpp
-+++ b/clang/lib/Sema/Sema.cpp
-@@ -299,7 +299,6 @@ void Sema::Initialize() {
-   if (getLangOpts().OpenCL) {
-     getOpenCLOptions().addSupport(
-         Context.getTargetInfo().getSupportedOpenCLOpts(), getLangOpts());
--    getOpenCLOptions().enableSupportedCore(getLangOpts());
-     addImplicitTypedef("sampler_t", Context.OCLSamplerTy);
-     addImplicitTypedef("event_t", Context.OCLEventTy);
-     if (getLangOpts().OpenCLCPlusPlus || getLangOpts().OpenCLVersion >= 200) {
-@@ -309,28 +308,13 @@ void Sema::Initialize() {
-       addImplicitTypedef("atomic_int", Context.getAtomicType(Context.IntTy));
-       addImplicitTypedef("atomic_uint",
-                          Context.getAtomicType(Context.UnsignedIntTy));
--      auto AtomicLongT = Context.getAtomicType(Context.LongTy);
--      addImplicitTypedef("atomic_long", AtomicLongT);
--      auto AtomicULongT = Context.getAtomicType(Context.UnsignedLongTy);
--      addImplicitTypedef("atomic_ulong", AtomicULongT);
-       auto AtomicHalfT = Context.getAtomicType(Context.HalfTy);
-       addImplicitTypedef("atomic_half", AtomicHalfT);
--      setOpenCLExtensionForType(AtomicHalfT, "cl_khr_fp16");
-       addImplicitTypedef("atomic_float",
-                          Context.getAtomicType(Context.FloatTy));
--      auto AtomicDoubleT = Context.getAtomicType(Context.DoubleTy);
--      addImplicitTypedef("atomic_double", AtomicDoubleT);
-       // OpenCLC v2.0, s6.13.11.6 requires that atomic_flag is implemented as
-       // 32-bit integer and OpenCLC v2.0, s6.1.1 int is always 32-bit wide.
-       addImplicitTypedef("atomic_flag", Context.getAtomicType(Context.IntTy));
--      auto AtomicIntPtrT = Context.getAtomicType(Context.getIntPtrType());
--      addImplicitTypedef("atomic_intptr_t", AtomicIntPtrT);
--      auto AtomicUIntPtrT = Context.getAtomicType(Context.getUIntPtrType());
--      addImplicitTypedef("atomic_uintptr_t", AtomicUIntPtrT);
--      auto AtomicSizeT = Context.getAtomicType(Context.getSizeType());
--      addImplicitTypedef("atomic_size_t", AtomicSizeT);
--      auto AtomicPtrDiffT = Context.getAtomicType(Context.getPointerDiffType());
--      addImplicitTypedef("atomic_ptrdiff_t", AtomicPtrDiffT);
- 
-       // OpenCL v2.0 s6.13.11.6:
-       // - The atomic_long and atomic_ulong types are supported if the
-@@ -343,31 +327,47 @@ void Sema::Initialize() {
-       //   atomic_intptr_t, atomic_uintptr_t, atomic_size_t and
-       //   atomic_ptrdiff_t are supported if the cl_khr_int64_base_atomics and
-       //   cl_khr_int64_extended_atomics extensions are supported.
--      std::vector<QualType> Atomic64BitTypes;
--      Atomic64BitTypes.push_back(AtomicLongT);
--      Atomic64BitTypes.push_back(AtomicULongT);
--      Atomic64BitTypes.push_back(AtomicDoubleT);
--      if (Context.getTypeSize(AtomicSizeT) == 64) {
--        Atomic64BitTypes.push_back(AtomicSizeT);
--        Atomic64BitTypes.push_back(AtomicIntPtrT);
--        Atomic64BitTypes.push_back(AtomicUIntPtrT);
--        Atomic64BitTypes.push_back(AtomicPtrDiffT);
-+      auto AddPointerSizeDependentTypes = [&]() {
-+        auto AtomicSizeT = Context.getAtomicType(Context.getSizeType());
-+        auto AtomicIntPtrT = Context.getAtomicType(Context.getIntPtrType());
-+        auto AtomicUIntPtrT = Context.getAtomicType(Context.getUIntPtrType());
-+        auto AtomicPtrDiffT =
-+            Context.getAtomicType(Context.getPointerDiffType());
-+        addImplicitTypedef("atomic_size_t", AtomicSizeT);
-+        addImplicitTypedef("atomic_intptr_t", AtomicIntPtrT);
-+        addImplicitTypedef("atomic_uintptr_t", AtomicUIntPtrT);
-+        addImplicitTypedef("atomic_ptrdiff_t", AtomicPtrDiffT);
-+      };
-+
-+      if (Context.getTypeSize(Context.getSizeType()) == 32) {
-+        AddPointerSizeDependentTypes();
-       }
--      for (auto &I : Atomic64BitTypes)
--        setOpenCLExtensionForType(I,
--            "cl_khr_int64_base_atomics cl_khr_int64_extended_atomics");
- 
--      setOpenCLExtensionForType(AtomicDoubleT, "cl_khr_fp64");
-+      std::vector<QualType> Atomic64BitTypes;
-+         if (getOpenCLOptions().isSupported("cl_khr_int64_base_atomics",
-+                                         getLangOpts()) &&
-+          getOpenCLOptions().isSupported("cl_khr_int64_extended_atomics",
-+                                         getLangOpts())) {
-+        if (getOpenCLOptions().isSupported("cl_khr_fp64", getLangOpts())) {
-+          auto AtomicDoubleT = Context.getAtomicType(Context.DoubleTy);
-+          addImplicitTypedef("atomic_double", AtomicDoubleT);
-+          Atomic64BitTypes.push_back(AtomicDoubleT);
-+        }
-+        auto AtomicLongT = Context.getAtomicType(Context.LongTy);
-+        auto AtomicULongT = Context.getAtomicType(Context.UnsignedLongTy);
-+
-+        addImplicitTypedef("atomic_long", AtomicLongT);
-+        addImplicitTypedef("atomic_ulong", AtomicULongT);
-+               if (Context.getTypeSize(Context.getSizeType()) == 64) {
-+          AddPointerSizeDependentTypes();
-+           }
-+         }
-     }
- 
--    setOpenCLExtensionForType(Context.DoubleTy, "cl_khr_fp64");
--
--#define GENERIC_IMAGE_TYPE_EXT(Type, Id, Ext) \
--    setOpenCLExtensionForType(Context.Id, Ext);
--#include "clang/Basic/OpenCLImageTypes.def"
--#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
--    addImplicitTypedef(#ExtType, Context.Id##Ty); \
--    setOpenCLExtensionForType(Context.Id##Ty, #Ext);
-+#define EXT_OPAQUE_TYPE(ExtType, Id, Ext)                                      \
-+  if (getOpenCLOptions().isSupported(#Ext, getLangOpts())) {                   \
-+    addImplicitTypedef(#ExtType, Context.Id##Ty);                              \
-+  }
- #include "clang/Basic/OpenCLExtensionTypes.def"
-   }
- 
-@@ -2451,114 +2451,3 @@ const llvm::MapVector<FieldDecl *, Sema::DeleteLocs> &
- Sema::getMismatchingDeleteExpressions() const {
-   return DeleteExprs;
- }
--
--void Sema::setOpenCLExtensionForType(QualType T, llvm::StringRef ExtStr) {
--  if (ExtStr.empty())
--    return;
--  llvm::SmallVector<StringRef, 1> Exts;
--  ExtStr.split(Exts, " ", /* limit */ -1, /* keep empty */ false);
--  auto CanT = T.getCanonicalType().getTypePtr();
--  for (auto &I : Exts)
--    OpenCLTypeExtMap[CanT].insert(I.str());
--}
--
--void Sema::setOpenCLExtensionForDecl(Decl *FD, StringRef ExtStr) {
--  llvm::SmallVector<StringRef, 1> Exts;
--  ExtStr.split(Exts, " ", /* limit */ -1, /* keep empty */ false);
--  if (Exts.empty())
--    return;
--  for (auto &I : Exts)
--    OpenCLDeclExtMap[FD].insert(I.str());
--}
--
--void Sema::setCurrentOpenCLExtensionForType(QualType T) {
--  if (CurrOpenCLExtension.empty())
--    return;
--  setOpenCLExtensionForType(T, CurrOpenCLExtension);
--}
--
--void Sema::setCurrentOpenCLExtensionForDecl(Decl *D) {
--  if (CurrOpenCLExtension.empty())
--    return;
--  setOpenCLExtensionForDecl(D, CurrOpenCLExtension);
--}
--
--std::string Sema::getOpenCLExtensionsFromDeclExtMap(FunctionDecl *FD) {
--  if (!OpenCLDeclExtMap.empty())
--    return getOpenCLExtensionsFromExtMap(FD, OpenCLDeclExtMap);
--
--  return "";
--}
--
--std::string Sema::getOpenCLExtensionsFromTypeExtMap(FunctionType *FT) {
--  if (!OpenCLTypeExtMap.empty())
--    return getOpenCLExtensionsFromExtMap(FT, OpenCLTypeExtMap);
--
--  return "";
--}
--
--template <typename T, typename MapT>
--std::string Sema::getOpenCLExtensionsFromExtMap(T *FDT, MapT &Map) {
--  auto Loc = Map.find(FDT);
--  return llvm::join(Loc->second, " ");
--}
--
--bool Sema::isOpenCLDisabledDecl(Decl *FD) {
--  auto Loc = OpenCLDeclExtMap.find(FD);
--  if (Loc == OpenCLDeclExtMap.end())
--    return false;
--  for (auto &I : Loc->second) {
--    if (!getOpenCLOptions().isEnabled(I))
--      return true;
--  }
--  return false;
--}
--
--template <typename T, typename DiagLocT, typename DiagInfoT, typename MapT>
--bool Sema::checkOpenCLDisabledTypeOrDecl(T D, DiagLocT DiagLoc,
--                                         DiagInfoT DiagInfo, MapT &Map,
--                                         unsigned Selector,
--                                         SourceRange SrcRange) {
--  auto Loc = Map.find(D);
--  if (Loc == Map.end())
--    return false;
--  bool Disabled = false;
--  for (auto &I : Loc->second) {
--    if (I != CurrOpenCLExtension && !getOpenCLOptions().isEnabled(I)) {
--      Diag(DiagLoc, diag::err_opencl_requires_extension) << Selector << DiagInfo
--                                                         << I << SrcRange;
--      Disabled = true;
--    }
--  }
--  return Disabled;
--}
--
--bool Sema::checkOpenCLDisabledTypeDeclSpec(const DeclSpec &DS, QualType QT) {
--  // Check extensions for declared types.
--  Decl *Decl = nullptr;
--  if (auto TypedefT = dyn_cast<TypedefType>(QT.getTypePtr()))
--    Decl = TypedefT->getDecl();
--  if (auto TagT = dyn_cast<TagType>(QT.getCanonicalType().getTypePtr()))
--    Decl = TagT->getDecl();
--  auto Loc = DS.getTypeSpecTypeLoc();
--
--  // Check extensions for vector types.
--  // e.g. double4 is not allowed when cl_khr_fp64 is absent.
--  if (QT->isExtVectorType()) {
--    auto TypePtr = QT->castAs<ExtVectorType>()->getElementType().getTypePtr();
--    return checkOpenCLDisabledTypeOrDecl(TypePtr, Loc, QT, OpenCLTypeExtMap);
--  }
--
--  if (checkOpenCLDisabledTypeOrDecl(Decl, Loc, QT, OpenCLDeclExtMap))
--    return true;
--
--  // Check extensions for builtin types.
--  return checkOpenCLDisabledTypeOrDecl(QT.getCanonicalType().getTypePtr(), Loc,
--                                       QT, OpenCLTypeExtMap);
--}
--
--bool Sema::checkOpenCLDisabledDecl(const NamedDecl &D, const Expr &E) {
--  IdentifierInfo *FnName = D.getIdentifier();
--  return checkOpenCLDisabledTypeOrDecl(&D, E.getBeginLoc(), FnName,
--                                       OpenCLDeclExtMap, 1, D.getSourceRange());
--}
-diff --git a/clang/lib/Sema/SemaCast.cpp b/clang/lib/Sema/SemaCast.cpp
-index 671820afd485..22ec2c7ed8bb 100644
---- a/clang/lib/Sema/SemaCast.cpp
-+++ b/clang/lib/Sema/SemaCast.cpp
-@@ -2916,8 +2916,8 @@ void CastOperation::CheckCStyleCast() {
-     }
-   }
- 
--  if (Self.getLangOpts().OpenCL &&
--      !Self.getOpenCLOptions().isEnabled("cl_khr_fp16")) {
-+  if (Self.getLangOpts().OpenCL && !Self.getOpenCLOptions().isAvailableOption(
-+                                       "cl_khr_fp16", Self.getLangOpts())) {
-     if (DestType->isHalfType()) {
-       Self.Diag(SrcExpr.get()->getBeginLoc(), diag::err_opencl_cast_to_half)
-           << DestType << SrcExpr.get()->getSourceRange();
-diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
-index 2b55712d44c2..b35ac5af9d75 100644
---- a/clang/lib/Sema/SemaChecking.cpp
-+++ b/clang/lib/Sema/SemaChecking.cpp
-@@ -837,7 +837,8 @@ static bool checkOpenCLBlockArgs(Sema &S, Expr *BlockArg) {
- }
- 
- static bool checkOpenCLSubgroupExt(Sema &S, CallExpr *Call) {
--  if (!S.getOpenCLOptions().isEnabled("cl_khr_subgroups")) {
-+  if (!S.getOpenCLOptions().isAvailableOption("cl_khr_subgroups",
-+                                              S.getLangOpts())) {
-     S.Diag(Call->getBeginLoc(), diag::err_opencl_requires_extension)
-         << 1 << Call->getDirectCallee() << "cl_khr_subgroups";
-     return true;
-diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
-index 1f7ab49ccdd7..420ba7a5498f 100644
---- a/clang/lib/Sema/SemaDecl.cpp
-+++ b/clang/lib/Sema/SemaDecl.cpp
-@@ -5559,9 +5559,6 @@ Decl *Sema::ActOnDeclarator(Scope *S, Declarator &D) {
-       Dcl && Dcl->getDeclContext()->isFileContext())
-     Dcl->setTopLevelDeclInObjCContainer();
- 
--  if (getLangOpts().OpenCL)
--    setCurrentOpenCLExtensionForDecl(Dcl);
--
-   return Dcl;
- }
- 
-@@ -6341,7 +6338,11 @@ void Sema::deduceOpenCLAddressSpace(ValueDecl *Decl) {
-     if (Type->isSamplerT() || Type->isVoidType())
-       return;
-     LangAS ImplAS = LangAS::opencl_private;
--    if ((getLangOpts().OpenCLCPlusPlus || getLangOpts().OpenCLVersion >= 200) &&
-+       // OpenCL C v3.0 s6.7.8 - For OpenCL C 2.0 or with the
-+    // __opencl_c_program_scope_global_variables feature, the address space
-+    // for a variable at program scope or a static or extern variable inside
-+    // a function are inferred to be __global.
-+    if (getOpenCLOptions().areProgramScopeVariablesSupported(getLangOpts()) &&
-         Var->hasGlobalStorage())
-       ImplAS = LangAS::opencl_global;
-     // If the original type from a decayed type is an array type and that array
-@@ -6757,7 +6758,8 @@ static bool diagnoseOpenCLTypes(Scope *S, Sema &Se, Declarator &D,
-   }
- 
-   // OpenCL v1.0 s6.8.a.3: Pointers to functions are not allowed.
--  if (!Se.getOpenCLOptions().isEnabled("__cl_clang_function_pointers")) {
-+  if (!Se.getOpenCLOptions().isAvailableOption("__cl_clang_function_pointers",
-+                                               Se.getLangOpts())) {
-     QualType NR = R;
-     while (NR->isPointerType() || NR->isMemberFunctionPointerType()) {
-       if (NR->isFunctionPointerType() || NR->isMemberFunctionPointerType()) {
-@@ -6769,7 +6771,8 @@ static bool diagnoseOpenCLTypes(Scope *S, Sema &Se, Declarator &D,
-     }
-   }
- 
--  if (!Se.getOpenCLOptions().isEnabled("cl_khr_fp16")) {
-+  if (!Se.getOpenCLOptions().isAvailableOption("cl_khr_fp16",
-+                                               Se.getLangOpts())) {
-     // OpenCL v1.2 s6.1.1.1: reject declaring variables of the half and
-     // half array type (unless the cl_khr_fp16 extension is enabled).
-     if (Se.Context.getBaseElementType(R)->isHalfType()) {
-@@ -7878,7 +7881,8 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
-   // OpenCL v1.2 s6.8 - The static qualifier is valid only in program
-   // scope.
-   if (getLangOpts().OpenCLVersion == 120 &&
--      !getOpenCLOptions().isEnabled("cl_clang_storage_class_specifiers") &&
-+         !getOpenCLOptions().isAvailableOption("cl_clang_storage_class_specifiers",
-+                                            getLangOpts()) &&
-       NewVD->isStaticLocal()) {
-     Diag(NewVD->getLocation(), diag::err_static_function_scope);
-     NewVD->setInvalidDecl();
-@@ -7907,23 +7911,16 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
-         return;
-       }
-     }
--    // OpenCL C v1.2 s6.5 - All program scope variables must be declared in the
--    // __constant address space.
--    // OpenCL C v2.0 s6.5.1 - Variables defined at program scope and static
--    // variables inside a function can also be declared in the global
--    // address space.
--    // C++ for OpenCL inherits rule from OpenCL C v2.0.
-     // FIXME: Adding local AS in C++ for OpenCL might make sense.
-     if (NewVD->isFileVarDecl() || NewVD->isStaticLocal() ||
-         NewVD->hasExternalStorage()) {
--      if (!T->isSamplerT() &&
--          !T->isDependentType() &&
-+               if (!T->isSamplerT() && !T->isDependentType() &&
-           !(T.getAddressSpace() == LangAS::opencl_constant ||
-             (T.getAddressSpace() == LangAS::opencl_global &&
--             (getLangOpts().OpenCLVersion == 200 ||
--              getLangOpts().OpenCLCPlusPlus)))) {
-+             getOpenCLOptions().areProgramScopeVariablesSupported(
-+                 getLangOpts())))) {
-         int Scope = NewVD->isStaticLocal() | NewVD->hasExternalStorage() << 1;
--        if (getLangOpts().OpenCLVersion == 200 || getLangOpts().OpenCLCPlusPlus)
-+        if (getOpenCLOptions().areProgramScopeVariablesSupported(getLangOpts()))
-           Diag(NewVD->getLocation(), diag::err_opencl_global_invalid_addr_space)
-               << Scope << "global or constant";
-         else
-@@ -8650,7 +8647,8 @@ static OpenCLParamType getOpenCLKernelParameterType(Sema &S, QualType PT) {
-   // OpenCL extension spec v1.2 s9.5:
-   // This extension adds support for half scalar and vector types as built-in
-   // types that can be used for arithmetic operations, conversions etc.
--  if (!S.getOpenCLOptions().isEnabled("cl_khr_fp16") && PT->isHalfType())
-+  if (!S.getOpenCLOptions().isAvailableOption("cl_khr_fp16", S.getLangOpts()) &&
-+      PT->isHalfType())
-     return InvalidKernelParam;
- 
-   if (PT->isRecordType())
-diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
-index 30d08b3d4ac0..a06fcfb8cc22 100644
---- a/clang/lib/Sema/SemaDeclAttr.cpp
-+++ b/clang/lib/Sema/SemaDeclAttr.cpp
-@@ -7308,16 +7308,21 @@ static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
-     }
-   }
- 
--  // OpenCL v2.0 s6.6 - read_write can be used for image types to specify that an
--  // image object can be read and written.
--  // OpenCL v2.0 s6.13.6 - A kernel cannot read from and write to the same pipe
--  // object. Using the read_write (or __read_write) qualifier with the pipe
--  // qualifier is a compilation error.
-+  // OpenCL v2.0 s6.6 - read_write can be used for image types to specify that
-+  // an image object can be read and written. OpenCL v2.0 s6.13.6 - A kernel
-+  // cannot read from and write to the same pipe object. Using the read_write
-+  // (or __read_write) qualifier with the pipe qualifier is a compilation error.
-+  // OpenCL v3.0 s6.8 - For OpenCL C 2.0, or with the
-+  // __opencl_c_read_write_images feature, image objects specified as arguments
-+  // to a kernel can additionally be declared to be read-write.
-   if (const auto *PDecl = dyn_cast<ParmVarDecl>(D)) {
-     const Type *DeclTy = PDecl->getType().getCanonicalType().getTypePtr();
-     if (AL.getAttrName()->getName().find("read_write") != StringRef::npos) {
-       if ((!S.getLangOpts().OpenCLCPlusPlus &&
--           S.getLangOpts().OpenCLVersion < 200) ||
-+                      (S.getLangOpts().OpenCLVersion < 200) ||
-+           (S.getLangOpts().OpenCLVersion == 300 &&
-+            !S.getOpenCLOptions().isSupported("__opencl_c_read_write_images",
-+                                              S.getLangOpts()))) ||
-           DeclTy->isPipeType()) {
-         S.Diag(AL.getLoc(), diag::err_opencl_invalid_read_write)
-             << AL << PDecl->getType() << DeclTy->isImageType();
-diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
-index ae8508d6c601..cc29938c5ea5 100644
---- a/clang/lib/Sema/SemaExpr.cpp
-+++ b/clang/lib/Sema/SemaExpr.cpp
-@@ -657,7 +657,8 @@ ExprResult Sema::DefaultLvalueConversion(Expr *E) {
-     return E;
- 
-   // OpenCL usually rejects direct accesses to values of 'half' type.
--  if (getLangOpts().OpenCL && !getOpenCLOptions().isEnabled("cl_khr_fp16") &&
-+  if (getLangOpts().OpenCL &&
-+      !getOpenCLOptions().isAvailableOption("cl_khr_fp16", getLangOpts()) &&
-       T->isHalfType()) {
-     Diag(E->getExprLoc(), diag::err_opencl_half_load_store)
-       << 0 << T;
-@@ -829,10 +830,10 @@ ExprResult Sema::DefaultArgumentPromotion(Expr *E) {
-   if (BTy && (BTy->getKind() == BuiltinType::Half ||
-               BTy->getKind() == BuiltinType::Float)) {
-     if (getLangOpts().OpenCL &&
--        !getOpenCLOptions().isEnabled("cl_khr_fp64")) {
--        if (BTy->getKind() == BuiltinType::Half) {
--            E = ImpCastExprToType(E, Context.FloatTy, CK_FloatingCast).get();
--        }
-+               !getOpenCLOptions().isAvailableOption("cl_khr_fp64", getLangOpts())) {
-+         if (BTy->getKind() == BuiltinType::Half) {
-+        E = ImpCastExprToType(E, Context.FloatTy, CK_FloatingCast).get();
-+      }
-     } else {
-       E = ImpCastExprToType(E, Context.DoubleTy, CK_FloatingCast).get();
-     }
-@@ -3819,7 +3820,7 @@ ExprResult Sema::ActOnNumericConstant(const Token &Tok, Scope *UDLScope) {
-   } else if (Literal.isFloatingLiteral()) {
-     QualType Ty;
-     if (Literal.isHalf){
--      if (getOpenCLOptions().isEnabled("cl_khr_fp16"))
-+      if (getOpenCLOptions().isAvailableOption("cl_khr_fp16", getLangOpts()))
-         Ty = Context.HalfTy;
-       else {
-         Diag(Tok.getLocation(), diag::err_half_const_requires_fp16);
-@@ -3843,10 +3844,11 @@ ExprResult Sema::ActOnNumericConstant(const Token &Tok, Scope *UDLScope) {
-         if (Ty->castAs<BuiltinType>()->getKind() != BuiltinType::Float) {
-           Res = ImpCastExprToType(Res, Context.FloatTy, CK_FloatingCast).get();
-         }
--      } else if (getLangOpts().OpenCL &&
--                 !getOpenCLOptions().isEnabled("cl_khr_fp64")) {
-+         } else if (getLangOpts().OpenCL && !getOpenCLOptions().isAvailableOption(
-+                                             "cl_khr_fp64", getLangOpts())) {
-         // Impose single-precision float type when cl_khr_fp64 is not enabled.
--        Diag(Tok.getLocation(), diag::warn_double_const_requires_fp64);
-+               Diag(Tok.getLocation(), diag::warn_double_const_requires_fp64)
-+            << (getLangOpts().OpenCLVersion >= 300);
-         Res = ImpCastExprToType(Res, Context.FloatTy, CK_FloatingCast).get();
-       }
-     }
-@@ -6468,9 +6470,6 @@ ExprResult Sema::BuildCallExpr(Scope *Scope, Expr *Fn, SourceLocation LParenLoc,
-                                       FD, /*Complain=*/true, Fn->getBeginLoc()))
-       return ExprError();
- 
--    if (getLangOpts().OpenCL && checkOpenCLDisabledDecl(*FD, *Fn))
--      return ExprError();
--
-     checkDirectCallValidity(*this, Fn, FD, ArgExprs);
-   }
- 
-@@ -12900,7 +12899,8 @@ QualType Sema::CheckAssignmentOperands(Expr *LHSExpr, ExprResult &RHS,
-   // OpenCL v1.2 s6.1.1.1 p2:
-   // The half data type can only be used to declare a pointer to a buffer that
-   // contains half values
--  if (getLangOpts().OpenCL && !getOpenCLOptions().isEnabled("cl_khr_fp16") &&
-+  if (getLangOpts().OpenCL &&
-+      !getOpenCLOptions().isAvailableOption("cl_khr_fp16", getLangOpts()) &&
-     LHSType->isHalfType()) {
-     Diag(Loc, diag::err_opencl_half_load_store) << 1
-         << LHSType.getUnqualifiedType();
-diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
-index f4493d84238d..0e4259bfce09 100644
---- a/clang/lib/Sema/SemaInit.cpp
-+++ b/clang/lib/Sema/SemaInit.cpp
-@@ -5572,8 +5572,8 @@ static bool TryOCLZeroOpaqueTypeInitialization(Sema &S,
-   // We should allow zero initialization for all types defined in the
-   // cl_intel_device_side_avc_motion_estimation extension, except
-   // intel_sub_group_avc_mce_payload_t and intel_sub_group_avc_mce_result_t.
--  if (S.getOpenCLOptions().isEnabled(
--          "cl_intel_device_side_avc_motion_estimation") &&
-+  if (S.getOpenCLOptions().isAvailableOption(
-+          "cl_intel_device_side_avc_motion_estimation", S.getLangOpts()) &&
-       DestType->isOCLIntelSubgroupAVCType()) {
-     if (DestType->isOCLIntelSubgroupAVCMcePayloadType() ||
-         DestType->isOCLIntelSubgroupAVCMceResultType())
-@@ -8758,8 +8758,8 @@ ExprResult InitializationSequence::Perform(Sema &S,
-         unsigned AddressingMode  = (0x0E & SamplerValue) >> 1;
-         unsigned FilterMode      = (0x30 & SamplerValue) >> 4;
-         if (FilterMode != 1 && FilterMode != 2 &&
--            !S.getOpenCLOptions().isEnabled(
--                "cl_intel_device_side_avc_motion_estimation"))
-+                 !S.getOpenCLOptions().isAvailableOption(
-+                "cl_intel_device_side_avc_motion_estimation", S.getLangOpts()))
-           S.Diag(Kind.getLocation(),
-                  diag::warn_sampler_initializer_invalid_bits)
-                  << "Filter Mode";
-diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
-index 29038ab9fe1c..12f58556c9dd 100644
---- a/clang/lib/Sema/SemaLookup.cpp
-+++ b/clang/lib/Sema/SemaLookup.cpp
-@@ -743,18 +743,6 @@ static void GetOpenCLBuiltinFctOverloads(
-   }
- }
- 
--/// Add extensions to the function declaration.
--/// \param S (in/out) The Sema instance.
--/// \param BIDecl (in) Description of the builtin.
--/// \param FDecl (in/out) FunctionDecl instance.
--static void AddOpenCLExtensions(Sema &S, const OpenCLBuiltinStruct &BIDecl,
--                                FunctionDecl *FDecl) {
--  // Fetch extension associated with a function prototype.
--  StringRef E = FunctionExtensionTable[BIDecl.Extension];
--  if (E != "")
--    S.setOpenCLExtensionForDecl(FDecl, E);
--}
--
- /// When trying to resolve a function name, if isOpenCLBuiltin() returns a
- /// non-null <Index, Len> pair, then the name is referencing an OpenCL
- /// builtin function.  Add all candidate signatures to the LookUpResult.
-@@ -789,7 +777,13 @@ static void InsertOCLBuiltinDeclarationsFromTable(Sema &S, LookupResult &LR,
-     if ((OpenCLBuiltin.MaxVersion != 0) &&
-         (OpenCLVersion >= OpenCLBuiltin.MaxVersion))
-       continue;
--
-+    
-+    // Ignore this builtin function if it carries an extension macro that is
-+    // not defined. This indicates that the extension is not supported by the
-+    // target, so the builtin function should not be available.
-+    StringRef Ext = FunctionExtensionTable[OpenCLBuiltin.Extension];
-+    if (!Ext.empty() && !S.getPreprocessor().isMacroDefined(Ext))
-+      continue;
-     SmallVector<QualType, 1> RetTypes;
-     SmallVector<SmallVector<QualType, 1>, 5> ArgTypes;
- 
-@@ -843,8 +837,6 @@ static void InsertOCLBuiltinDeclarationsFromTable(Sema &S, LookupResult &LR,
-       if (!S.getLangOpts().OpenCLCPlusPlus)
-         NewOpenCLBuiltin->addAttr(OverloadableAttr::CreateImplicit(Context));
- 
--      AddOpenCLExtensions(S, OpenCLBuiltin, NewOpenCLBuiltin);
--
-       LR.addDecl(NewOpenCLBuiltin);
-     }
-   }
-diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
-index 7fe7466725fa..05815bb6e38d 100644
---- a/clang/lib/Sema/SemaOverload.cpp
-+++ b/clang/lib/Sema/SemaOverload.cpp
-@@ -6479,12 +6479,6 @@ void Sema::AddOverloadCandidate(
-     Candidate.DeductionFailure.Data = FailedAttr;
-     return;
-   }
--
--  if (LangOpts.OpenCL && isOpenCLDisabledDecl(Function)) {
--    Candidate.Viable = false;
--    Candidate.FailureKind = ovl_fail_ext_disabled;
--    return;
--  }
- }
- 
- ObjCMethodDecl *
-@@ -11092,14 +11086,6 @@ static void DiagnoseFailedExplicitSpec(Sema &S, OverloadCandidate *Cand) {
-       << (ES.getExpr() ? ES.getExpr()->getSourceRange() : SourceRange());
- }
- 
--static void DiagnoseOpenCLExtensionDisabled(Sema &S, OverloadCandidate *Cand) {
--  FunctionDecl *Callee = Cand->Function;
--
--  S.Diag(Callee->getLocation(),
--         diag::note_ovl_candidate_disabled_by_extension)
--    << S.getOpenCLExtensionsFromDeclExtMap(Callee);
--}
--
- /// Generates a 'note' diagnostic for an overload candidate.  We've
- /// already generated a primary error at the call site.
- ///
-@@ -11195,9 +11181,6 @@ static void NoteFunctionCandidate(Sema &S, OverloadCandidate *Cand,
-   case ovl_fail_explicit:
-     return DiagnoseFailedExplicitSpec(S, Cand);
- 
--  case ovl_fail_ext_disabled:
--    return DiagnoseOpenCLExtensionDisabled(S, Cand);
--
-   case ovl_fail_inhctor_slice:
-     // It's generally not interesting to note copy/move constructors here.
-     if (cast<CXXConstructorDecl>(Fn)->isCopyOrMoveConstructor())
-diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp
-index 4178024d1264..e44a25c6aead 100644
---- a/clang/lib/Sema/SemaType.cpp
-+++ b/clang/lib/Sema/SemaType.cpp
-@@ -1548,6 +1548,16 @@ static QualType ConvertDeclSpecToType(TypeProcessingState &state) {
-       Result = Context.LongDoubleTy;
-     else
-       Result = Context.DoubleTy;
-+       if (S.getLangOpts().OpenCL) {
-+      if (!S.getOpenCLOptions().isSupported("cl_khr_fp64", S.getLangOpts()))
-+        S.Diag(DS.getTypeSpecTypeLoc(), diag::err_opencl_requires_extension)
-+            << 0 << Result
-+            << (S.getLangOpts().OpenCLVersion == 300
-+                    ? "cl_khr_fp64 and __opencl_c_fp64"
-+                    : "cl_khr_fp64");
-+      else if (!S.getOpenCLOptions().isAvailableOption("cl_khr_fp64", S.getLangOpts()))
-+        S.Diag(DS.getTypeSpecTypeLoc(), diag::ext_opencl_double_without_pragma);
-+    }
-     break;
-   case DeclSpec::TST_float128:
-     if (!S.Context.getTargetInfo().hasFloat128Type() &&
-@@ -1723,10 +1733,33 @@ static QualType ConvertDeclSpecToType(TypeProcessingState &state) {
-   if (Result->containsErrors())
-     declarator.setInvalidType();
- 
--  if (S.getLangOpts().OpenCL &&
--      S.checkOpenCLDisabledTypeDeclSpec(DS, Result))
--    declarator.setInvalidType(true);
--
-+  if (S.getLangOpts().OpenCL) {
-+    const auto &OpenCLOptions = S.getOpenCLOptions();
-+    bool IsOpenCLC30 = (S.getLangOpts().OpenCLVersion == 300);
-+    // OpenCL C v3.0 s6.3.3 - OpenCL image types require __opencl_c_images
-+    // support.
-+    // OpenCL C v3.0 s6.2.1 - OpenCL 3d image write types requires support
-+    // for OpenCL C 2.0, or OpenCL C 3.0 or newer and the
-+    // __opencl_c_3d_image_writes feature. OpenCL C v3.0 API s4.2 - For devices
-+    // that support OpenCL 3.0, cl_khr_3d_image_writes must be returned when and
-+    // only when the optional feature is supported
-+    if ((Result->isImageType() || Result->isSamplerT()) &&
-+        (IsOpenCLC30 &&
-+         !OpenCLOptions.isSupported("__opencl_c_images", S.getLangOpts()))) {
-+      S.Diag(DS.getTypeSpecTypeLoc(), diag::err_opencl_requires_extension)
-+          << 0 << Result << "__opencl_c_images";
-+      declarator.setInvalidType();
-+    } else if (Result->isOCLImage3dWOType() &&
-+               !OpenCLOptions.isSupported("cl_khr_3d_image_writes",
-+                                          S.getLangOpts())) {
-+      S.Diag(DS.getTypeSpecTypeLoc(), diag::err_opencl_requires_extension)
-+          << 0 << Result
-+          << (IsOpenCLC30
-+                  ? "cl_khr_3d_image_writes and __opencl_c_3d_image_writes"
-+                  : "cl_khr_3d_image_writes");
-+      declarator.setInvalidType();
-+    }
-+  }
-   bool IsFixedPointType = DS.getTypeSpecType() == DeclSpec::TST_accum ||
-                           DS.getTypeSpecType() == DeclSpec::TST_fract;
- 
-@@ -2060,8 +2093,7 @@ static QualType deduceOpenCLPointeeAddrSpace(Sema &S, QualType PointeeType) {
-       !PointeeType->isSamplerT() &&
-       !PointeeType.hasAddressSpace())
-     PointeeType = S.getASTContext().getAddrSpaceQualType(
--        PointeeType,
--        S.getLangOpts().OpenCLCPlusPlus || S.getLangOpts().OpenCLVersion == 200
-+           PointeeType, S.getLangOpts().OpenCLGenericAddressSpace
-             ? LangAS::opencl_generic
-             : LangAS::opencl_private);
-   return PointeeType;
-@@ -2090,7 +2122,8 @@ QualType Sema::BuildPointerType(QualType T,
-   }
- 
-   if (T->isFunctionType() && getLangOpts().OpenCL &&
--      !getOpenCLOptions().isEnabled("__cl_clang_function_pointers")) {
-+         !getOpenCLOptions().isAvailableOption("__cl_clang_function_pointers",
-+                                            getLangOpts())) {
-     Diag(Loc, diag::err_opencl_function_pointer);
-     return QualType();
-   }
-@@ -4994,7 +5027,8 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
-       // FIXME: This really should be in BuildFunctionType.
-       if (T->isHalfType()) {
-         if (S.getLangOpts().OpenCL) {
--          if (!S.getOpenCLOptions().isEnabled("cl_khr_fp16")) {
-+                 if (!S.getOpenCLOptions().isAvailableOption("cl_khr_fp16",
-+                                                      S.getLangOpts())) {
-             S.Diag(D.getIdentifierLoc(), diag::err_opencl_invalid_return)
-                 << T << 0 /*pointer hint*/;
-             D.setInvalidType(true);
-@@ -5019,7 +5053,8 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
-         // (s6.9.e and s6.12.5 OpenCL v2.0) except for printf.
-         // We also allow here any toolchain reserved identifiers.
-         if (FTI.isVariadic &&
--            !S.getOpenCLOptions().isEnabled("__cl_clang_variadic_functions") &&
-+                       !S.getOpenCLOptions().isAvailableOption(
-+                "__cl_clang_variadic_functions", S.getLangOpts()) &&
-             !(D.getIdentifier() &&
-               ((D.getIdentifier()->getName() == "printf" &&
-                 (LangOpts.OpenCLCPlusPlus || LangOpts.OpenCLVersion >= 120)) ||
-@@ -5214,7 +5249,8 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
-             // Disallow half FP parameters.
-             // FIXME: This really should be in BuildFunctionType.
-             if (S.getLangOpts().OpenCL) {
--              if (!S.getOpenCLOptions().isEnabled("cl_khr_fp16")) {
-+                         if (!S.getOpenCLOptions().isAvailableOption("cl_khr_fp16",
-+                                                          S.getLangOpts())) {
-                 S.Diag(Param->getLocation(), diag::err_opencl_invalid_param)
-                     << ParamTy << 0;
-                 D.setInvalidType();
-diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
-index 1f68f6bc3e38..aa5eaf7fe2dc 100644
---- a/clang/lib/Serialization/ASTReader.cpp
-+++ b/clang/lib/Serialization/ASTReader.cpp
-@@ -3611,36 +3611,13 @@ ASTReader::ReadASTBlock(ModuleFile &F, unsigned ClientLoadCapabilities) {
-         auto &OptInfo = OpenCLExtensions.OptMap[Name];
-         OptInfo.Supported = Record[I++] != 0;
-         OptInfo.Enabled = Record[I++] != 0;
-+               OptInfo.WithPragma = Record[I++] != 0;
-         OptInfo.Avail = Record[I++];
-         OptInfo.Core = Record[I++];
-         OptInfo.Opt = Record[I++];
-       }
-       break;
- 
--    case OPENCL_EXTENSION_TYPES:
--      for (unsigned I = 0, E = Record.size(); I != E;) {
--        auto TypeID = static_cast<::TypeID>(Record[I++]);
--        auto *Type = GetType(TypeID).getTypePtr();
--        auto NumExt = static_cast<unsigned>(Record[I++]);
--        for (unsigned II = 0; II != NumExt; ++II) {
--          auto Ext = ReadString(Record, I);
--          OpenCLTypeExtMap[Type].insert(Ext);
--        }
--      }
--      break;
--
--    case OPENCL_EXTENSION_DECLS:
--      for (unsigned I = 0, E = Record.size(); I != E;) {
--        auto DeclID = static_cast<::DeclID>(Record[I++]);
--        auto *Decl = GetDecl(DeclID);
--        auto NumExt = static_cast<unsigned>(Record[I++]);
--        for (unsigned II = 0; II != NumExt; ++II) {
--          auto Ext = ReadString(Record, I);
--          OpenCLDeclExtMap[Decl].insert(Ext);
--        }
--      }
--      break;
--
-     case TENTATIVE_DEFINITIONS:
-       for (unsigned I = 0, N = Record.size(); I != N; ++I)
-         TentativeDefinitions.push_back(getGlobalDeclID(F, Record[I]));
-@@ -7869,8 +7846,6 @@ void ASTReader::InitializeSema(Sema &S) {
-   }
- 
-   SemaObj->OpenCLFeatures = OpenCLExtensions;
--  SemaObj->OpenCLTypeExtMap = OpenCLTypeExtMap;
--  SemaObj->OpenCLDeclExtMap = OpenCLDeclExtMap;
- 
-   UpdateSema();
- }
-diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
-index 40900af6f9e0..d6e5269d24fd 100644
---- a/clang/lib/Serialization/ASTWriter.cpp
-+++ b/clang/lib/Serialization/ASTWriter.cpp
-@@ -3976,6 +3976,7 @@ void ASTWriter::WriteOpenCLExtensions(Sema &SemaRef) {
-     auto V = I.getValue();
-     Record.push_back(V.Supported ? 1 : 0);
-     Record.push_back(V.Enabled ? 1 : 0);
-+       Record.push_back(V.WithPragma ? 1 : 0);
-     Record.push_back(V.Avail);
-     Record.push_back(V.Core);
-     Record.push_back(V.Opt);
-@@ -3983,71 +3984,6 @@ void ASTWriter::WriteOpenCLExtensions(Sema &SemaRef) {
-   Stream.EmitRecord(OPENCL_EXTENSIONS, Record);
- }
- 
--void ASTWriter::WriteOpenCLExtensionTypes(Sema &SemaRef) {
--  if (!SemaRef.Context.getLangOpts().OpenCL)
--    return;
--
--  // Sort the elements of the map OpenCLTypeExtMap by TypeIDs,
--  // without copying them.
--  const llvm::DenseMap<const Type *, std::set<std::string>> &OpenCLTypeExtMap =
--      SemaRef.OpenCLTypeExtMap;
--  using ElementTy = std::pair<TypeID, const std::set<std::string> *>;
--  llvm::SmallVector<ElementTy, 8> StableOpenCLTypeExtMap;
--  StableOpenCLTypeExtMap.reserve(OpenCLTypeExtMap.size());
--
--  for (const auto &I : OpenCLTypeExtMap)
--    StableOpenCLTypeExtMap.emplace_back(
--        getTypeID(I.first->getCanonicalTypeInternal()), &I.second);
--
--  auto CompareByTypeID = [](const ElementTy &E1, const ElementTy &E2) -> bool {
--    return E1.first < E2.first;
--  };
--  llvm::sort(StableOpenCLTypeExtMap, CompareByTypeID);
--
--  RecordData Record;
--  for (const ElementTy &E : StableOpenCLTypeExtMap) {
--    Record.push_back(E.first); // TypeID
--    const std::set<std::string> *ExtSet = E.second;
--    Record.push_back(static_cast<unsigned>(ExtSet->size()));
--    for (const std::string &Ext : *ExtSet)
--      AddString(Ext, Record);
--  }
--
--  Stream.EmitRecord(OPENCL_EXTENSION_TYPES, Record);
--}
--
--void ASTWriter::WriteOpenCLExtensionDecls(Sema &SemaRef) {
--  if (!SemaRef.Context.getLangOpts().OpenCL)
--    return;
--
--  // Sort the elements of the map OpenCLDeclExtMap by DeclIDs,
--  // without copying them.
--  const llvm::DenseMap<const Decl *, std::set<std::string>> &OpenCLDeclExtMap =
--      SemaRef.OpenCLDeclExtMap;
--  using ElementTy = std::pair<DeclID, const std::set<std::string> *>;
--  llvm::SmallVector<ElementTy, 8> StableOpenCLDeclExtMap;
--  StableOpenCLDeclExtMap.reserve(OpenCLDeclExtMap.size());
--
--  for (const auto &I : OpenCLDeclExtMap)
--    StableOpenCLDeclExtMap.emplace_back(getDeclID(I.first), &I.second);
--
--  auto CompareByDeclID = [](const ElementTy &E1, const ElementTy &E2) -> bool {
--    return E1.first < E2.first;
--  };
--  llvm::sort(StableOpenCLDeclExtMap, CompareByDeclID);
--
--  RecordData Record;
--  for (const ElementTy &E : StableOpenCLDeclExtMap) {
--    Record.push_back(E.first); // DeclID
--    const std::set<std::string> *ExtSet = E.second;
--    Record.push_back(static_cast<unsigned>(ExtSet->size()));
--    for (const std::string &Ext : *ExtSet)
--      AddString(Ext, Record);
--  }
--
--  Stream.EmitRecord(OPENCL_EXTENSION_DECLS, Record);
--}
--
- void ASTWriter::WriteCUDAPragmas(Sema &SemaRef) {
-   if (SemaRef.ForceCUDAHostDeviceDepth > 0) {
-     RecordData::value_type Record[] = {SemaRef.ForceCUDAHostDeviceDepth};
-@@ -4792,17 +4728,12 @@ ASTFileSignature ASTWriter::WriteASTCore(Sema &SemaRef, StringRef isysroot,
-   WriteIdentifierTable(PP, SemaRef.IdResolver, isModule);
-   WriteFPPragmaOptions(SemaRef.CurFPFeatureOverrides());
-   WriteOpenCLExtensions(SemaRef);
--  WriteOpenCLExtensionTypes(SemaRef);
-   WriteCUDAPragmas(SemaRef);
- 
-   // If we're emitting a module, write out the submodule information.
-   if (WritingModule)
-     WriteSubmodules(WritingModule);
- 
--  // We need to have information about submodules to correctly deserialize
--  // decls from OpenCLExtensionDecls block
--  WriteOpenCLExtensionDecls(SemaRef);
--
-   Stream.EmitRecord(SPECIAL_TYPES, SpecialTypes);
- 
-   // Write the record containing external, unnamed definitions.
-diff --git a/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl b/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl
-index 21e0f2b05747..d24c9c5f85a4 100644
---- a/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl
-+++ b/clang/test/CodeGenOpenCL/addr-space-struct-arg.cl
-@@ -2,6 +2,8 @@
- // RUN: %clang_cc1 %s -emit-llvm -o - -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN %s
- // RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL2.0 -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN,AMDGCN20 %s
- // RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL1.2 -O0 -triple spir-unknown-unknown-unknown | FileCheck -enable-var-scope -check-prefixes=SPIR %s
-+// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL3.0 -O0 -triple amdgcn -cl-ext=+__opencl_c_program_scope_global_variables | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN,AMDGCN20 %s
-+// RUN: %clang_cc1 %s -emit-llvm -o - -cl-std=CL3.0 -O0 -triple amdgcn | FileCheck -enable-var-scope -check-prefixes=ALL,AMDGCN %s
- 
- typedef int int2 __attribute__((ext_vector_type(2)));
- 
-@@ -39,7 +41,7 @@ struct LargeStructTwoMember {
-   int2 y[20];
- };
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ >= 300 && defined(__opencl_c_program_scope_global_variables))
- struct LargeStructOneMember g_s;
- #endif
- 
-@@ -98,7 +100,7 @@ void FuncOneLargeMember(struct LargeStructOneMember u) {
- // AMDGCN20:  %[[r0:.*]] = bitcast %struct.LargeStructOneMember addrspace(5)* %[[byval_temp]] to i8 addrspace(5)*
- // AMDGCN20:  call void @llvm.memcpy.p5i8.p1i8.i64(i8 addrspace(5)* align 8 %[[r0]], i8 addrspace(1)* align 8 bitcast (%struct.LargeStructOneMember addrspace(1)* @g_s to i8 addrspace(1)*), i64 800, i1 false)
- // AMDGCN20:  call void @FuncOneLargeMember(%struct.LargeStructOneMember addrspace(5)* byval(%struct.LargeStructOneMember) align 8 %[[byval_temp]])
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ >= 300 && defined(__opencl_c_program_scope_global_variables))
- void test_indirect_arg_globl(void) {
-   FuncOneLargeMember(g_s);
- }
-diff --git a/clang/test/CodeGenOpenCL/address-spaces-conversions.cl b/clang/test/CodeGenOpenCL/address-spaces-conversions.cl
-index cd3099e0a1a4..8fdb46184bed 100644
---- a/clang/test/CodeGenOpenCL/address-spaces-conversions.cl
-+++ b/clang/test/CodeGenOpenCL/address-spaces-conversions.cl
-@@ -1,5 +1,7 @@
- // RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -ffake-address-space-map -cl-std=CL2.0 -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -ffake-address-space-map -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -emit-llvm -o - | FileCheck %s
- // RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -cl-std=CL2.0 -emit-llvm -o - | FileCheck --check-prefix=CHECK-NOFAKE %s
-+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -emit-llvm -o - | FileCheck --check-prefix=CHECK-NOFAKE %s
- // When -ffake-address-space-map is not used, all addr space mapped to 0 for x86_64.
- 
- // test that we generate address space casts everywhere we need conversions of
-diff --git a/clang/test/CodeGenOpenCL/address-spaces-mangling.cl b/clang/test/CodeGenOpenCL/address-spaces-mangling.cl
-index 50622f099143..b46834c2a678 100644
---- a/clang/test/CodeGenOpenCL/address-spaces-mangling.cl
-+++ b/clang/test/CodeGenOpenCL/address-spaces-mangling.cl
-@@ -2,10 +2,14 @@
- // RUN: %clang_cc1 %s -cl-std=CL2.0 -ffake-address-space-map -faddress-space-map-mangling=yes -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefixes="ASMANG,ASMANG20" %s
- // RUN: %clang_cc1 %s -ffake-address-space-map -faddress-space-map-mangling=no -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefixes="NOASMANG,NOASMANG10" %s
- // RUN: %clang_cc1 %s -cl-std=CL2.0 -ffake-address-space-map -faddress-space-map-mangling=no -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefixes="NOASMANG,NOASMANG20" %s
-+// RUN: %clang_cc1 %s -cl-std=CL3.0 -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -ffake-address-space-map -faddress-space-map-mangling=no -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefixes="NOASMANG,NOASMANG20" %s
-+// RUN: %clang_cc1 %s -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -ffake-address-space-map -faddress-space-map-mangling=yes -triple %itanium_abi_triple -emit-llvm -o - | FileCheck -check-prefixes="ASMANG,ASMANG20" %s
- 
- // We check that the address spaces are mangled the same in both version of OpenCL
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL2.0 -emit-llvm -o - | FileCheck -check-prefix=OCL-20 %s
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL1.2 -emit-llvm -o - | FileCheck -check-prefix=OCL-12 %s
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -emit-llvm -o - | FileCheck -check-prefix=OCL-20 %s
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL3.0 -cl-ext=-__opencl_c_generic_address_space -emit-llvm -o - | FileCheck -check-prefix=OCL-12 %s
- 
- // We can't name this f as private is equivalent to default
- // no specifier given address space so we get multiple definition
-@@ -47,7 +51,7 @@ void f(constant int *arg) { }
- // OCL-20-DAG: @_Z1fPU3AS2i
- // OCL-12-DAG: @_Z1fPU3AS2i
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || defined(__opencl_c_generic_address_space)
- __attribute__((overloadable))
- void f(generic int *arg) { }
- // ASMANG20: @_Z1fPU3AS4i
-diff --git a/clang/test/CodeGenOpenCL/address-spaces.cl b/clang/test/CodeGenOpenCL/address-spaces.cl
-index ebd227a6a9c7..be131c7820f9 100644
---- a/clang/test/CodeGenOpenCL/address-spaces.cl
-+++ b/clang/test/CodeGenOpenCL/address-spaces.cl
-@@ -1,9 +1,13 @@
- // RUN: %clang_cc1 %s -O0 -ffake-address-space-map -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,SPIR
-+// RUN: %clang_cc1 %s -O0 -cl-std=CL3.0 -cl-ext=-__opencl_c_generic_address_space -ffake-address-space-map -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,SPIR
- // RUN: %clang_cc1 %s -O0 -DCL20 -cl-std=CL2.0 -ffake-address-space-map -emit-llvm -o - | FileCheck %s --check-prefixes=CL20,CL20SPIR
- // RUN: %clang_cc1 %s -O0 -triple amdgcn-amd-amdhsa -emit-llvm -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
-+// RUN: %clang_cc1 %s -O0 -triple amdgcn-amd-amdhsa -cl-std=CL3.0 -emit-llvm -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
- // RUN: %clang_cc1 %s -O0 -triple amdgcn-amd-amdhsa -DCL20 -cl-std=CL2.0 -emit-llvm -o - | FileCheck %s --check-prefixes=CL20,CL20AMDGCN
- // RUN: %clang_cc1 %s -O0 -triple amdgcn-mesa-mesa3d -emit-llvm -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
-+// RUN: %clang_cc1 %s -O0 -triple amdgcn-mesa-mesa3d -cl-std=CL3.0 -emit-llvm -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
- // RUN: %clang_cc1 %s -O0 -triple r600-- -emit-llvm -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
-+// RUN: %clang_cc1 %s -O0 -triple r600-- -emit-llvm -cl-std=CL3.0 -o - | FileCheck --check-prefixes=CHECK,AMDGCN %s
- 
- // SPIR: %struct.S = type { i32, i32, i32* }
- // CL20SPIR: %struct.S = type { i32, i32, i32 addrspace(4)* }
-diff --git a/clang/test/CodeGenOpenCL/amdgpu-sizeof-alignof.cl b/clang/test/CodeGenOpenCL/amdgpu-sizeof-alignof.cl
-index a5d438933fa4..3bd395da6d45 100644
---- a/clang/test/CodeGenOpenCL/amdgpu-sizeof-alignof.cl
-+++ b/clang/test/CodeGenOpenCL/amdgpu-sizeof-alignof.cl
-@@ -5,6 +5,18 @@
- // RUN: %clang_cc1 -triple amdgcn---amdgizcl -cl-std=CL1.2 %s -emit-llvm -o - | FileCheck %s
- // RUN: %clang_cc1 -triple amdgcn---amdgizcl -cl-std=CL2.0 %s -emit-llvm -o - | FileCheck %s
- 
-+// RUN: %clang_cc1 -triple r600 -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn-mesa-mesa3d -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---opencl -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---amdgizcl -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn-mesa-mesa3d -cl-ext=+__opencl_c_generic_address_space -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---opencl -cl-ext=+__opencl_c_generic_address_space -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---amdgizcl -cl-ext=+__opencl_c_generic_address_space -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple r600 -cl-ext=+cl_khr_fp64,+__opencl_c_fp64 -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn-mesa-mesa3d -cl-ext=+cl_khr_fp64,+__opencl_c_fp64 -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---opencl -cl-ext=+cl_khr_fp64,+__opencl_c_fp64 -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang_cc1 -triple amdgcn---amdgizcl -cl-ext=+cl_khr_fp64,+__opencl_c_fp64 -cl-std=CL3.0 %s -emit-llvm -o - | FileCheck %s
-+
- #ifdef __AMDGCN__
- #define PTSIZE 8
- #else
-@@ -58,9 +70,12 @@ void test() {
-   check(sizeof(double) == 8);
-   check(__alignof__(double) == 8);
- #endif
--
--  check(sizeof(void*) == (__OPENCL_C_VERSION__ >= 200 ? 8 : 4));
--  check(__alignof__(void*) == (__OPENCL_C_VERSION__ >= 200 ? 8 : 4));
-+  check(sizeof(private void*) == 4);
-+  check(__alignof__(private void*) == 4);
-+#if (__OPENCL_C_VERSION__ == 200) || defined(__opencl_c_generic_address_space)
-+  check(sizeof(generic void*) == 8);
-+  check(__alignof__(generic void*) == 8);
-+#endif
-   check(sizeof(global_ptr_t) == PTSIZE);
-   check(__alignof__(global_ptr_t) == PTSIZE);
-   check(sizeof(constant_ptr_t) == PTSIZE);
-diff --git a/clang/test/CodeGenOpenCL/arm-integer-dot-product.cl b/clang/test/CodeGenOpenCL/arm-integer-dot-product.cl
-index d1ab6aceac5c..cc62d1df4275 100644
---- a/clang/test/CodeGenOpenCL/arm-integer-dot-product.cl
-+++ b/clang/test/CodeGenOpenCL/arm-integer-dot-product.cl
-@@ -1,38 +1,39 @@
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -finclude-default-header -cl-std=CL1.2 -emit-llvm -o - -O0 | FileCheck %s
- 
-+// Pragmas are only accepted for backward compatibility.
-+
- #pragma OPENCL EXTENSION cl_arm_integer_dot_product_int8 : enable
-+#pragma OPENCL EXTENSION cl_arm_integer_dot_product_int8 : disable
- void test_int8(uchar4 ua, uchar4 ub, char4 sa, char4 sb) {
-     uint ur = arm_dot(ua, ub);
-     // CHECK: call spir_func i32 @_Z7arm_dotDv4_hS_
-     int sr = arm_dot(sa, sb);
-     // CHECK: call spir_func i32 @_Z7arm_dotDv4_cS_
- }
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_int8 : disable
- 
- #pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int8 : enable
-+#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int8 : disable
- void test_accumulate_int8(uchar4 ua, uchar4 ub, uint uc, char4 sa, char4 sb, int c) {
-     uint ur = arm_dot_acc(ua, ub, uc);
-     // CHECK: call spir_func i32 @_Z11arm_dot_accDv4_hS_j
-     int sr = arm_dot_acc(sa, sb, c);
-     // CHECK: call spir_func i32 @_Z11arm_dot_accDv4_cS_i
- }
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int8 : disable
- 
- #pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int16 : enable
-+#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int16 : disable
- void test_accumulate_int16(ushort2 ua, ushort2 ub, uint uc, short2 sa, short2 sb, int c) {
-     uint ur = arm_dot_acc(ua, ub, uc);
-     // CHECK: call spir_func i32 @_Z11arm_dot_accDv2_tS_j
-     int sr = arm_dot_acc(sa, sb, c);
-     // CHECK: call spir_func i32 @_Z11arm_dot_accDv2_sS_i
- }
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_int16 : disable
- 
- #pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_saturate_int8 : enable
-+#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_saturate_int8 : disable
- void test_accumulate_saturate_int8(uchar4 ua, uchar4 ub, uint uc, char4 sa, char4 sb, int c) {
-     uint ur = arm_dot_acc_sat(ua, ub, uc);
-     // CHECK: call spir_func i32 @_Z15arm_dot_acc_satDv4_hS_j
-     int sr = arm_dot_acc_sat(sa, sb, c);
-     // CHECK: call spir_func i32 @_Z15arm_dot_acc_satDv4_cS_i
- }
--#pragma OPENCL EXTENSION cl_arm_integer_dot_product_accumulate_saturate_int8 : disable
--
-diff --git a/clang/test/CodeGenOpenCL/extension-begin.cl b/clang/test/CodeGenOpenCL/extension-begin.cl
-deleted file mode 100644
-index 89b4256b2b11..000000000000
---- a/clang/test/CodeGenOpenCL/extension-begin.cl
-+++ /dev/null
-@@ -1,25 +0,0 @@
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -emit-llvm -o - | FileCheck %s
--
--__attribute__((overloadable)) void f(int x);
--
--#pragma OPENCL EXTENSION my_ext : begin
--
--__attribute__((overloadable)) void f(long x);
--
--#pragma OPENCL EXTENSION my_ext : end
--
--#pragma OPENCL EXTENSION my_ext : enable
--
--//CHECK: define{{.*}} spir_func void @test_f1(i64 %x)
--//CHECK: call spir_func void @_Z1fl(i64 %{{.*}})
--void test_f1(long x) {
--  f(x);
--}
--
--#pragma OPENCL EXTENSION my_ext : disable
--
--//CHECK: define{{.*}} spir_func void @test_f2(i64 %x)
--//CHECK: call spir_func void @_Z1fi(i32 %{{.*}})
--void test_f2(long x) {
--  f(x);
--}
-diff --git a/clang/test/CodeGenOpenCL/overload.cl b/clang/test/CodeGenOpenCL/overload.cl
-index f182cb5fd2af..bc844595a59a 100644
---- a/clang/test/CodeGenOpenCL/overload.cl
-+++ b/clang/test/CodeGenOpenCL/overload.cl
-@@ -1,4 +1,5 @@
- // RUN: %clang_cc1 -cl-std=CL2.0 -emit-llvm -o - -triple spir-unknown-unknown %s | FileCheck %s
-+// RUN: %clang_cc1 -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -emit-llvm -o - -triple spir-unknown-unknown %s | FileCheck %s
- 
- typedef short short4 __attribute__((ext_vector_type(4)));
- 
-diff --git a/clang/test/CodeGenOpenCL/printf.cl b/clang/test/CodeGenOpenCL/printf.cl
-index fc139d776db6..c68c43bcc286 100644
---- a/clang/test/CodeGenOpenCL/printf.cl
-+++ b/clang/test/CodeGenOpenCL/printf.cl
-@@ -1,10 +1,12 @@
- // RUN: %clang_cc1 -cl-std=CL1.2 -cl-ext=-+cl_khr_fp64 -triple spir-unknown-unknown -disable-llvm-passes -emit-llvm -o - %s | FileCheck -check-prefixes=FP64,ALL %s
- // RUN: %clang_cc1 -cl-std=CL1.2 -cl-ext=-cl_khr_fp64 -triple spir-unknown-unknown -disable-llvm-passes -emit-llvm -o - %s | FileCheck -check-prefixes=NOFP64,ALL %s
-+// RUN: %clang_cc1 -cl-std=CL3.0 -cl-ext=+__opencl_c_fp64,+cl_khr_fp64 -triple spir-unknown-unknown -disable-llvm-passes -emit-llvm -o - %s | FileCheck -check-prefixes=FP64,ALL %s
-+// RUN: %clang_cc1 -cl-std=CL3.0 -cl-ext=-__opencl_c_fp64,-cl_khr_fp64 -triple spir-unknown-unknown -disable-llvm-passes -emit-llvm -o - %s | FileCheck -check-prefixes=NOFP64,ALL %s
- 
- typedef __attribute__((ext_vector_type(2))) float float2;
- typedef __attribute__((ext_vector_type(2))) half half2;
- 
--#ifdef cl_khr_fp64
-+#if defined(cl_khr_fp64) || defined(__opencl_c_fp64)
- typedef __attribute__((ext_vector_type(2))) double double2;
- #endif
- 
-@@ -28,7 +30,7 @@ kernel void test_printf_half2(half2 arg) {
-   printf("%v2hf", arg);
- }
- 
--#ifdef cl_khr_fp64
-+#if defined(cl_khr_fp64) || defined(__opencl_c_fp64)
- // FP64-LABEL: @test_printf_double2(
- // FP64: call spir_func i32 (i8 addrspace(2)*, ...) @printf(i8 addrspace(2)* getelementptr inbounds ([6 x i8], [6 x i8] addrspace(2)* @.str.2, i32 0, i32 0), <2 x double> %0)
- kernel void test_printf_double2(double2 arg) {
-diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
-index 184eefd9f9c3..1c671acb174e 100644
---- a/clang/test/Headers/opencl-c-header.cl
-+++ b/clang/test/Headers/opencl-c-header.cl
-@@ -253,4 +253,88 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
- 
- #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- 
-+// OpenCL C features.
-+#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200)
-+
-+#ifndef  __opencl_c_pipes
-+#error "Feature macro __opencl_c_pipes should be defined"
-+#endif
-+#ifndef __opencl_c_generic_address_space
-+#error "Feature macro __opencl_c_generic_address_space should be defined"
-+#endif
-+#ifndef __opencl_c_work_group_collective_functions
-+#error "Feature macro __opencl_c_work_group_collective_functions should be defined"
-+#endif
-+#ifndef __opencl_c_atomic_order_acq_rel
-+#error "Feature macro __opencl_c_atomic_order_acq_rel should be defined"
-+#endif
-+#ifndef __opencl_c_atomic_order_seq_cst
-+#error "Feature macro __opencl_c_atomic_order_seq_cst should be defined"
-+#endif
-+#ifndef __opencl_c_atomic_scope_device
-+#error "Feature macro __opencl_c_atomic_scope_device should be defined"
-+#endif
-+#ifndef __opencl_c_atomic_scope_all_devices
-+#error "Feature macro __opencl_c_atomic_scope_all_devices should be defined"
-+#endif
-+#ifndef __opencl_c_device_enqueue
-+#error "Feature macro __opencl_c_device_enqueue should be defined"
-+#endif
-+#ifndef __opencl_c_read_write_images
-+#error "Feature macro __opencl_c_read_write_images should be defined"
-+#endif
-+#ifndef __opencl_c_program_scope_global_variables
-+#error "Feature macro __opencl_c_program_scope_global_variables should be defined"
-+#endif
-+#ifndef __opencl_c_images
-+#error "Feature macro __opencl_c_images should be defined"
-+#endif
-+
-+#elif (__OPENCL_C_VERSION__ < 200)
-+
-+#ifdef  __opencl_c_pipes
-+#error "Incorret feature macro __opencl_c_pipes define"
-+#endif
-+#ifdef __opencl_c_generic_address_space
-+#error "Incorret feature macro __opencl_c_generic_address_space define"
-+#endif
-+#ifdef __opencl_c_work_group_collective_functions
-+#error "Incorret feature macro __opencl_c_work_group_collective_functions define"
-+#endif
-+#ifdef __opencl_c_atomic_order_acq_rel
-+#error "Incorret feature macro __opencl_c_atomic_order_acq_rel define"
-+#endif
-+#ifdef __opencl_c_atomic_order_seq_cst
-+#error "Incorret feature macro __opencl_c_atomic_order_seq_cst define"
-+#endif
-+#ifdef __opencl_c_atomic_scope_device
-+#error "Incorret feature macro __opencl_c_atomic_scope_device define"
-+#endif
-+#ifdef __opencl_c_atomic_scope_all_devices
-+#error "Incorret feature macro __opencl_c_atomic_scope_all_devices define"
-+#endif
-+#ifdef __opencl_c_device_enqueue
-+#error "Incorret feature macro __opencl_c_device_enqueue define"
-+#endif
-+#ifdef __opencl_c_read_write_images
-+#error "Incorret feature macro __opencl_c_read_write_images define"
-+#endif
-+#ifdef __opencl_c_program_scope_global_variables
-+#error "Incorret feature macro __opencl_c_program_scope_global_variables define"
-+#endif
-+#ifdef __opencl_c_images
-+#error "Incorret feature macro __opencl_c_images define"
-+#endif
-+#ifdef __opencl_c_3d_image_writes
-+#error "Incorret feature macro __opencl_c_3d_image_writes define"
-+#endif
-+#ifdef __opencl_c_fp64
-+#error "Incorret feature macro __opencl_c_fp64 define"
-+#endif
-+#ifdef __opencl_c_subgroups
-+#error "Incorret feature macro __opencl_c_subgroups define"
-+#endif
-+
-+#endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200)
-+
- #endif // defined(__SPIR__)
-diff --git a/clang/test/Misc/nvptx.unsupported_core.cl b/clang/test/Misc/nvptx.unsupported_core.cl
-new file mode 100644
-index 000000000000..b56a4828914e
---- /dev/null
-+++ b/clang/test/Misc/nvptx.unsupported_core.cl
-@@ -0,0 +1,7 @@
-+// RUN: %clang_cc1 -cl-std=CL2.0 -triple nvptx-unknown-unknown -Wpedantic-core-features %s 2> %t
-+// RUN: FileCheck --check-prefixes=CHECK-C < %t %s
-+// RUN: %clang_cc1 -cl-std=CLC++ -triple nvptx-unknown-unknown -Wpedantic-core-features %s 2> %t
-+// RUN: FileCheck --check-prefixes=CHECK-CPP < %t %s
-+
-+// CHECK-C: cl_khr_3d_image_writes is a core feature in OpenCL C version 2.0 but not supported on this target
-+// CHECK-CPP: cl_khr_3d_image_writes is a core feature in C++ for OpenCL version 1.0 but not supported on this target
-diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
-index 54e36e1e0884..e4f9069b88c8 100644
---- a/clang/test/Misc/warning-flags.c
-+++ b/clang/test/Misc/warning-flags.c
-@@ -91,4 +91,4 @@ CHECK-NEXT:   warn_weak_import
- 
- The list of warnings in -Wpedantic should NEVER grow.
- 
--CHECK: Number in -Wpedantic (not covered by other -W flags): 26
-+CHECK: Number in -Wpedantic (not covered by other -W flags): 27
-diff --git a/clang/test/Parser/opencl-atomics-cl20.cl b/clang/test/Parser/opencl-atomics-cl20.cl
-index 844902e847f7..c3f86b6a44c4 100644
---- a/clang/test/Parser/opencl-atomics-cl20.cl
-+++ b/clang/test/Parser/opencl-atomics-cl20.cl
-@@ -1,66 +1,78 @@
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0 -DCL20
--// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0 -DCL20
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0 -DCL20 -DEXT -Wpedantic-core-features
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0 -cl-ext=-cl_khr_int64_base_atomics
-+// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0
-+// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -verify -fsyntax-only -cl-std=CLC++
-+// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -verify -fsyntax-only -cl-std=CL2.0 -cl-ext=-cl_khr_int64_base_atomics
- 
--#ifdef EXT
--#pragma OPENCL EXTENSION cl_khr_int64_base_atomics:enable
--#pragma OPENCL EXTENSION cl_khr_int64_extended_atomics:enable
--#pragma OPENCL EXTENSION cl_khr_fp64:enable
--#if __OPENCL_C_VERSION__ >= CL_VERSION_1_2
--// expected-warning@-2{{OpenCL extension 'cl_khr_fp64' is core feature or supported optional core feature - ignoring}}
--#endif
-+#if defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= CL_VERSION_1_2
-+#define LANG_VER_OK
- #endif
- 
- void atomic_types_test() {
- // OpenCL v2.0 s6.13.11.6 defines supported atomic types.
-+
-+// Non-optional types
-   atomic_int i;
-   atomic_uint ui;
-+  atomic_float f;
-+  atomic_flag fl;
-+#if !defined(LANG_VER_OK)
-+// expected-error@-5 {{use of undeclared identifier 'atomic_int'}}
-+// expected-error@-5 {{use of undeclared identifier 'atomic_uint'}}
-+// expected-error@-5 {{use of undeclared identifier 'atomic_float'}}
-+// expected-error@-5 {{use of undeclared identifier 'atomic_flag'}}
-+#endif
-+
-+// Optional types
-   atomic_long l;
-   atomic_ulong ul;
--  atomic_float f;
-   atomic_double d;
--  atomic_flag fl;
-+  atomic_size_t s;
-   atomic_intptr_t ip;
-   atomic_uintptr_t uip;
--  atomic_size_t s;
-   atomic_ptrdiff_t pd;
--// OpenCL v2.0 s6.13.11.8, _Atomic type specifier and _Atomic type qualifier
--// are not supported by OpenCL.
--  _Atomic int i; // expected-error {{use of undeclared identifier '_Atomic'}}
--}
--#ifndef CL20
--// expected-error@-16 {{use of undeclared identifier 'atomic_int'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_uint'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_long'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_ulong'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_float'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_double'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_flag'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_intptr_t'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_uintptr_t'}}
--// expected-error@-16 {{use of undeclared identifier 'atomic_size_t'}}
-+// Optional type identifiers are not added in earlier version or if at least
-+// one of the extensions is not supported. Here we check with
-+// `cl_khr_int64_base_atomics` only.
-+#if !defined(LANG_VER_OK) || !defined(cl_khr_int64_base_atomics)
-+// expected-error@-11 {{use of undeclared identifier 'atomic_long'}}
-+// expected-error@-11 {{use of undeclared identifier 'atomic_ulong'}}
-+// expected-error@-11 {{use of undeclared identifier 'atomic_double'}}
-+#if defined(LANG_VER_OK)
-+// expected-error@-15 {{expected ';' after expression}}
-+// expected-error@-16 {{use of undeclared identifier 'l'}}
-+// expected-error@-16 {{expected ';' after expression}}
-+// expected-error@-17 {{use of undeclared identifier 'ul'}}
-+#endif
-+#if !defined(LANG_VER_OK) || defined(__SPIR64__)
-+// expected-error@-18 {{use of undeclared identifier 'atomic_size_t'}}
- // expected-error@-16 {{use of undeclared identifier 'atomic_ptrdiff_t'}}
--#elif !EXT
--// expected-error@-26 {{use of type 'atomic_long' (aka '_Atomic(long)') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error@-27 {{use of type 'atomic_long' (aka '_Atomic(long)') requires cl_khr_int64_extended_atomics extension to be enabled}}
--// expected-error@-27 {{use of type 'atomic_ulong' (aka '_Atomic(unsigned long)') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error@-28 {{use of type 'atomic_ulong' (aka '_Atomic(unsigned long)') requires cl_khr_int64_extended_atomics extension to be enabled}}
--// expected-error@-27 {{use of type 'atomic_double' (aka '_Atomic(double)') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error@-28 {{use of type 'atomic_double' (aka '_Atomic(double)') requires cl_khr_int64_extended_atomics extension to be enabled}}
--#if __LP64__
--// expected-error-re@-28 {{use of type 'atomic_intptr_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error-re@-29 {{use of type 'atomic_intptr_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_extended_atomics extension to be enabled}}
--// expected-error-re@-29 {{use of type 'atomic_uintptr_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error-re@-30 {{use of type 'atomic_uintptr_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_extended_atomics extension to be enabled}}
--// expected-error-re@-30 {{use of type 'atomic_size_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error-re@-31 {{use of type 'atomic_size_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_extended_atomics extension to be enabled}}
--// expected-error-re@-31 {{use of type 'atomic_ptrdiff_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_base_atomics extension to be enabled}}
--// expected-error-re@-32 {{use of type 'atomic_ptrdiff_t' (aka '_Atomic({{.+}})') requires cl_khr_int64_extended_atomics extension to be enabled}}
-+#if !defined(LANG_VER_OK)
-+// expected-error@-20 {{use of undeclared identifier 'atomic_intptr_t'}}
-+// expected-error@-20 {{use of undeclared identifier 'atomic_uintptr_t'}}
-+#else
-+// expected-error@-24 {{expected ';' after expression}}
-+// expected-error@-25 {{use of undeclared identifier 's'}}
-+// expected-error@-25 {{unknown type name 'atomic_intptr_t'; did you mean 'atomic_int'?}}
-+// expected-note@* {{'atomic_int' declared here}}
-+// expected-error@-26 {{unknown type name 'atomic_uintptr_t'; did you mean 'atomic_uint'?}}
-+// expected-note@* {{'atomic_uint' declared here}}
-+#endif
- #endif
- #endif
- 
--#ifdef CL20
-+// OpenCL v2.0 s6.13.11.8, _Atomic type specifier and _Atomic type qualifier
-+// are not supported by OpenCL.
-+  _Atomic int i;
-+#ifdef __OPENCL_C_VERSION__
-+// expected-error@-2 {{use of undeclared identifier '_Atomic'}}
-+#else
-+ // expected-error@-4 {{unknown type name '_Atomic'}}
-+#endif
-+}
-+
-+#if defined(LANG_VER_OK)
-+int atomic_uint; //expected-error{{redefinition of 'atomic_uint' as different kind of symbol}}
- void foo(atomic_int * ptr) {}
- void atomic_ops_test() {
-   atomic_int i;
-@@ -71,4 +83,6 @@ void atomic_ops_test() {
-   i += 1; // expected-error {{invalid operands to binary expression ('__private atomic_int' (aka '__private _Atomic(int)') and 'int')}}
-   i = i + i; // expected-error {{invalid operands to binary expression ('__private atomic_int' (aka '__private _Atomic(int)') and '__private atomic_int')}}
- }
-+#else
-+__constant int atomic_uint = 1;
- #endif
-diff --git a/clang/test/SemaOpenCL/access-qualifier.cl b/clang/test/SemaOpenCL/access-qualifier.cl
-index a5e1b65daf70..c538e73253ce 100644
---- a/clang/test/SemaOpenCL/access-qualifier.cl
-+++ b/clang/test/SemaOpenCL/access-qualifier.cl
-@@ -1,12 +1,14 @@
--// RUN: %clang_cc1 -verify -pedantic -fsyntax-only -cl-std=CL1.2 %s
--// RUN: %clang_cc1 -verify -pedantic -fsyntax-only -cl-std=CL2.0 %s
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL1.2 %s -cl-ext=-cl_khr_3d_image_writes
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL2.0 %s
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL3.0 %s
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL3.0 %s -cl-ext=-__opencl_c_read_write_images
- 
- typedef image1d_t img1d_ro_default; // expected-note {{previously declared 'read_only' here}}
- 
- typedef write_only image1d_t img1d_wo; // expected-note {{previously declared 'write_only' here}}
- typedef read_only image1d_t img1d_ro;
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ == 300 && defined(__opencl_c_read_write_images))
- typedef read_write image1d_t img1d_rw;
- #endif
- 
-@@ -17,10 +19,10 @@ typedef read_only int IntRO; // expected-error {{access qualifier can only be us
- void myWrite(write_only image1d_t); // expected-note {{passing argument to parameter here}} expected-note {{passing argument to parameter here}}
- void myRead(read_only image1d_t); // expected-note {{passing argument to parameter here}}
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ == 300 && defined(__opencl_c_read_write_images))
- void myReadWrite(read_write image1d_t);
- #else
--void myReadWrite(read_write image1d_t); // expected-error {{access qualifier 'read_write' can not be used for '__read_write image1d_t' prior to OpenCL version 2.0}}
-+void myReadWrite(read_write image1d_t); // expected-error {{access qualifier 'read_write' can not be used for '__read_write image1d_t' prior to OpenCL C version 2.0 or in version 3.0 and without __opencl_c_read_write_images feature}}
- #endif
- 
- 
-@@ -36,7 +38,7 @@ kernel void k3(img1d_wo img) {
-   myWrite(img);
- }
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ == 300 && defined(__opencl_c_read_write_images))
- kernel void k4(img1d_rw img) {
-   myReadWrite(img);
- }
-@@ -62,26 +64,26 @@ kernel void k11(read_only write_only image1d_t i){} // expected-error{{multiple
- 
- kernel void k12(read_only read_only image1d_t i){} // expected-warning {{duplicate 'read_only' declaration specifier}}
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ == 300 && defined(__opencl_c_read_write_images))
- kernel void k13(read_write pipe int i){} // expected-error{{access qualifier 'read_write' can not be used for 'read_only pipe int'}}
- #else
--kernel void k13(__read_write image1d_t i){} // expected-error{{access qualifier '__read_write' can not be used for '__read_write image1d_t' prior to OpenCL version 2.0}}
--#endif
--
--#if __OPENCL_C_VERSION__ >= 200
--void myPipeWrite(write_only pipe int); // expected-note {{passing argument to parameter here}}
--kernel void k14(read_only pipe int p) {
--  myPipeWrite(p); // expected-error {{passing '__private read_only pipe int' to parameter of incompatible type 'write_only pipe int'}}
--}
-+kernel void k13(__read_write image1d_t i){} // expected-error{{access qualifier '__read_write' can not be used for '__read_write image1d_t' prior to OpenCL C version 2.0 or in version 3.0 and without __opencl_c_read_write_images feature}}
- #endif
- 
- #if __OPENCL_C_VERSION__ < 200
--kernel void test_image3d_wo(write_only image3d_t img) {} // expected-error {{use of type '__write_only image3d_t' requires cl_khr_3d_image_writes extension to be enabled}}
-+kernel void test_image3d_wo(write_only image3d_t img) {} // expected-error {{use of type '__write_only image3d_t' requires cl_khr_3d_image_writes support}}
- #endif
- 
--#if __OPENCL_C_VERSION__ >= 200
-+#if (__OPENCL_C_VERSION__ == 200) || (__OPENCL_C_VERSION__ == 300 && defined(__opencl_c_read_write_images))
- kernel void read_write_twice_typedef(read_write img1d_rw i){} // expected-warning {{duplicate 'read_write' declaration specifier}}
--// expected-note@-74 {{previously declared 'read_write' here}}
-+// expected-note@-67 {{previously declared 'read_write' here}}
-+#endif
-+
-+#if OPENCL_C_VERSION__ >= 200
-+void myPipeWrite(write_only pipe int); // expected-note {{passing argument to parameter here}}
-+kernel void k14(read_only pipe int p) {
-+  myPipeWrite(p); // expected-error {{passing '__private read_only pipe int' to parameter of incompatible type 'write_only pipe int'}}
-+}
- 
- kernel void pipe_ro_twice(read_only read_only pipe int i){} // expected-warning{{duplicate 'read_only' declaration specifier}}
- // Conflicting access qualifiers
-@@ -94,7 +96,7 @@ kernel void pipe_ro_twice_typedef(read_only ROPipeInt i){} // expected-warning{{
- 
- kernel void pass_ro_typedef_to_wo(ROPipeInt p) {
-   myPipeWrite(p); // expected-error {{passing '__private ROPipeInt' (aka '__private read_only pipe int') to parameter of incompatible type 'write_only pipe int'}}
--  // expected-note@-25 {{passing argument to parameter here}}
-+  // expected-note@-16 {{passing argument to parameter here}}
- }
- #endif
- 
-diff --git a/clang/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl b/clang/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl
-index a5a838241347..daedce8459aa 100644
---- a/clang/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl
-+++ b/clang/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl
-@@ -4,6 +4,9 @@
- // RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++
- // RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++
- // RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++
-+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space
-+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space
-+// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space
- 
- /* OpenCLC v2.0 adds a set of restrictions for conversions between pointers to
- *  different address spaces, mainly described in Sections 6.5.5 and 6.5.6.
-diff --git a/clang/test/SemaOpenCL/address-spaces.cl b/clang/test/SemaOpenCL/address-spaces.cl
-index 2c4f0fdec524..98b9a39e78ea 100644
---- a/clang/test/SemaOpenCL/address-spaces.cl
-+++ b/clang/test/SemaOpenCL/address-spaces.cl
-@@ -1,5 +1,6 @@
- // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
- // RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only
-+// RUN: %clang_cc1 %s -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -verify -pedantic -fsyntax-only
- // RUN: %clang_cc1 %s -cl-std=clc++ -verify -pedantic -fsyntax-only
- 
- __constant int ci = 1;
-diff --git a/clang/test/SemaOpenCL/arm-integer-dot-product.cl b/clang/test/SemaOpenCL/arm-integer-dot-product.cl
-index d7219d7402a9..5552f7777954 100644
---- a/clang/test/SemaOpenCL/arm-integer-dot-product.cl
-+++ b/clang/test/SemaOpenCL/arm-integer-dot-product.cl
-@@ -1,4 +1,4 @@
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -finclude-default-header -verify -cl-std=CL1.2 -emit-llvm -o - -O0
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -finclude-default-header  -fdeclare-opencl-builtins -verify -cl-std=CL1.2 -emit-llvm -o - -cl-ext=-all
- 
- void test_negative() {
-     uchar4 ua8, ub8;
-@@ -7,37 +7,13 @@ void test_negative() {
-     short2 sa16, sb16;
-     uint ur;
-     int sr;
--    ur = arm_dot(ua8, ub8); // expected-error{{no matching function for call to 'arm_dot'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_int8' to be enabled}}
--    sr = arm_dot(sa8, sb8); // expected-error{{no matching function for call to 'arm_dot'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_int8' to be enabled}}
--    ur = arm_dot_acc(ua8, ub8, ur); // expected-error{{no matching function for call to 'arm_dot_acc'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_int8' to be enabled}}
--    sr = arm_dot_acc(sa8, sb8, sr); // expected-error{{no matching function for call to 'arm_dot_acc'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_int8' to be enabled}}
--    ur = arm_dot_acc(ua16, ub16, ur); // expected-error{{no matching function for call to 'arm_dot_acc'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_int16' to be enabled}}
--    sr = arm_dot_acc(sa16, sb16, sr); // expected-error{{no matching function for call to 'arm_dot_acc'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_int16' to be enabled}}
--    ur = arm_dot_acc_sat(ua8, ub8, ur); // expected-error{{no matching function for call to 'arm_dot_acc_sat'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_saturate_int8' to be enabled}}
--    sr = arm_dot_acc_sat(sa8, sb8, sr); // expected-error{{no matching function for call to 'arm_dot_acc_sat'}}
--    // expected-note@opencl-c.h:* {{candidate function not viable}}
--    // expected-note@opencl-c.h:* {{candidate unavailable as it requires OpenCL extension 'cl_arm_integer_dot_product_accumulate_saturate_int8' to be enabled}}
-+    ur = arm_dot(ua8, ub8); // expected-error{{implicit declaration of function 'arm_dot' is invalid in OpenCL}}
-+    sr = arm_dot(sa8, sb8);
-+    ur = arm_dot_acc(ua8, ub8, ur); // expected-error{{implicit declaration of function 'arm_dot_acc' is invalid in OpenCL}} //expected-note{{'arm_dot_acc' declared here}}
-+    sr = arm_dot_acc(sa8, sb8, sr);
-+    ur = arm_dot_acc(ua16, ub16, ur);
-+    sr = arm_dot_acc(sa16, sb16, sr);
-+    ur = arm_dot_acc_sat(ua8, ub8, ur); // expected-error{{implicit declaration of function 'arm_dot_acc_sat' is invalid in OpenCL}} //expected-note{{did you mean 'arm_dot_acc'?}}
-+    sr = arm_dot_acc_sat(sa8, sb8, sr);
- }
- 
-diff --git a/clang/test/SemaOpenCL/cl20-device-side-enqueue.cl b/clang/test/SemaOpenCL/cl20-device-side-enqueue.cl
-index f63e2913c749..d25a03504c03 100644
---- a/clang/test/SemaOpenCL/cl20-device-side-enqueue.cl
-+++ b/clang/test/SemaOpenCL/cl20-device-side-enqueue.cl
-@@ -235,11 +235,11 @@ kernel void bar(global unsigned int *buf)
- kernel void foo1(global unsigned int *buf)
- {
-   ndrange_t n;
--  buf[0] = get_kernel_max_sub_group_size_for_ndrange(n, ^(){}); // expected-error {{use of declaration 'get_kernel_max_sub_group_size_for_ndrange' requires cl_khr_subgroups extension to be enabled}}
-+  buf[0] = get_kernel_max_sub_group_size_for_ndrange(n, ^(){}); // expected-error {{use of declaration 'get_kernel_max_sub_group_size_for_ndrange' requires cl_khr_subgroups support}}
- }
- 
- kernel void bar1(global unsigned int *buf)
- {
-   ndrange_t n;
--  buf[0] = get_kernel_sub_group_count_for_ndrange(n, ^(){}); // expected-error {{use of declaration 'get_kernel_sub_group_count_for_ndrange' requires cl_khr_subgroups extension to be enabled}}
-+  buf[0] = get_kernel_sub_group_count_for_ndrange(n, ^(){}); // expected-error {{use of declaration 'get_kernel_sub_group_count_for_ndrange' requires cl_khr_subgroups support}}
- }
-diff --git a/clang/test/SemaOpenCL/extension-begin.cl b/clang/test/SemaOpenCL/extension-begin.cl
-index fdb481f8e092..9124ceba4e2a 100644
---- a/clang/test/SemaOpenCL/extension-begin.cl
-+++ b/clang/test/SemaOpenCL/extension-begin.cl
-@@ -29,25 +29,23 @@
- #ifndef USE_PCH
- // expected-warning@extension-begin.h:4 {{expected 'disable' - ignoring}}
- // expected-warning@extension-begin.h:5 {{expected 'disable' - ignoring}}
--// expected-warning@extension-begin.h:21 {{OpenCL extension end directive mismatches begin directive - ignoring}}
- #endif // USE_PCH
- 
-+#if defined(IMPLICIT_INCLUDE) && defined(USE_PCH)
-+//expected-no-diagnostics
-+#endif
-+
-+// Tests that the pragmas are accepted for backward compatibility.
- #pragma OPENCL EXTENSION my_ext : enable
--void test_f1(void) {
-+#pragma OPENCL EXTENSION my_ext : disable 
-+
-+#ifndef my_ext
-+#error "Missing my_ext macro"
-+#endif
-+ 
-+// When extension is supported its functionality can be used freely.
-+void test(void) {
-   struct A test_A1;
-   f();
-   g(0);
- }
--
--#pragma OPENCL EXTENSION my_ext : disable 
--void test_f2(void) {
--  struct A test_A2; // expected-error {{use of type 'struct A' requires my_ext extension to be enabled}}
--  const struct A test_A_local; // expected-error {{use of type 'struct A' requires my_ext extension to be enabled}}
--  TypedefOfA test_typedef_A; // expected-error {{use of type 'TypedefOfA' (aka 'struct A') requires my_ext extension to be enabled}}
--  PointerOfA test_A_pointer; // expected-error {{use of type 'PointerOfA' (aka 'const __private struct A *') requires my_ext extension to be enabled}}
--  f(); // expected-error {{use of declaration 'f' requires my_ext extension to be enabled}}
--  g(0); // expected-error {{no matching function for call to 'g'}}
--        // expected-note@extension-begin.h:18 {{candidate unavailable as it requires OpenCL extension 'my_ext' to be enabled}}
--        // expected-note@extension-begin.h:23 {{candidate function not viable: requires 0 arguments, but 1 was provided}}
--}
--
-diff --git a/clang/test/SemaOpenCL/extension-begin.h b/clang/test/SemaOpenCL/extension-begin.h
-index d9865ba0b33a..0e262e4adb93 100644
---- a/clang/test/SemaOpenCL/extension-begin.h
-+++ b/clang/test/SemaOpenCL/extension-begin.h
-@@ -5,10 +5,13 @@
- #pragma OPENCL EXTENSION all : end
- 
- #pragma OPENCL EXTENSION my_ext : begin
--
- struct A {
-   int a;
- };
-+#pragma OPENCL EXTENSION my_ext : end
-+#pragma OPENCL EXTENSION my_ext : end
-+
-+#define my_ext
- 
- typedef struct A TypedefOfA;
- typedef const __private TypedefOfA* PointerOfA;
-@@ -17,10 +20,8 @@ void f(void);
- 
- __attribute__((overloadable)) void g(long x);
- 
--#pragma OPENCL EXTENSION my_ext : end
--#pragma OPENCL EXTENSION my_ext : end
-+
- 
- __attribute__((overloadable)) void g(void);
- 
- #endif // INCLUDED
--
-diff --git a/clang/test/SemaOpenCL/extension-version.cl b/clang/test/SemaOpenCL/extension-version.cl
-index b997a00145ef..6f26a23c4192 100644
---- a/clang/test/SemaOpenCL/extension-version.cl
-+++ b/clang/test/SemaOpenCL/extension-version.cl
-@@ -3,15 +3,13 @@
- // RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown
- // RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown
- // RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown
-+// RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple spir-unknown-unknown
- // RUN: %clang_cc1 -x cl -cl-std=CL %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
- // RUN: %clang_cc1 -x cl -cl-std=CL1.1 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
- // RUN: %clang_cc1 -x cl -cl-std=CL1.2 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
- // RUN: %clang_cc1 -x cl -cl-std=CL2.0 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
- // RUN: %clang_cc1 -x cl -cl-std=clc++ %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
--
--#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) && !defined(TEST_CORE_FEATURES)
--// expected-no-diagnostics
--#endif
-+// RUN: %clang_cc1 -x cl -cl-std=CL3.0 %s -verify -triple spir-unknown-unknown -Wpedantic-core-features -DTEST_CORE_FEATURES
- 
- // Extensions in all versions
- #ifndef cl_clang_storage_class_specifiers
-@@ -95,12 +93,12 @@
- // expected-warning@-2{{OpenCL extension 'cl_khr_fp64' is core feature or supported optional core feature - ignoring}}
- #endif
- 
--//Core feature in CL 2.0
-+//Core feature in CL 2.0, optional core feature in CL 3.0
- #ifndef cl_khr_3d_image_writes
- #error "Missing cl_khr_3d_image_writes define"
- #endif
- #pragma OPENCL EXTENSION cl_khr_3d_image_writes : enable
--#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) && defined TEST_CORE_FEATURES
-+#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200) && defined TEST_CORE_FEATURES
- // expected-warning@-2{{OpenCL extension 'cl_khr_3d_image_writes' is core feature or supported optional core feature - ignoring}}
- #endif
- 
-@@ -215,3 +213,55 @@
- // expected-warning@+2{{unsupported OpenCL extension 'cl_intel_device_side_avc_motion_estimation' - ignoring}}
- #endif
- #pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : enable
-+
-+// Check that pragmas for the OpenCL 3.0 features are rejected.
-+
-+#pragma OPENCL EXTENSION __opencl_c_int64 : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_int64' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_3d_image_writes : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_3d_image_writes' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_atomic_order_acq_rel : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_atomic_order_acq_rel' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_atomic_order_seq_cst : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_atomic_order_seq_cst' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_device_enqueue : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_device_enqueue' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_fp64 : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_fp64' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_generic_address_space : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_generic_address_space' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_images : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_images' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_pipes : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_pipes' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_program_scope_global_variables : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_program_scope_global_variables' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_read_write_images : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_read_write_images' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_subgroups : disable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_subgroups' - ignoring}}
-+
-+#pragma OPENCL EXTENSION __opencl_c_int64 : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_int64' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_3d_image_writes : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_3d_image_writes' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_atomic_order_acq_rel : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_atomic_order_acq_rel' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_atomic_order_seq_cst : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_atomic_order_seq_cst' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_device_enqueue : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_device_enqueue' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_fp64 : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_fp64' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_generic_address_space : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_generic_address_space' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_images : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_images' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_pipes : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_pipes' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_program_scope_global_variables : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_program_scope_global_variables' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_read_write_images : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_read_write_images' - ignoring}}
-+#pragma OPENCL EXTENSION __opencl_c_subgroups : enable
-+//expected-warning@-1{{unknown OpenCL extension '__opencl_c_subgroups' - ignoring}}
-diff --git a/clang/test/SemaOpenCL/extensions.cl b/clang/test/SemaOpenCL/extensions.cl
-index 55dbd1d5eede..d43cdcece2e4 100644
---- a/clang/test/SemaOpenCL/extensions.cl
-+++ b/clang/test/SemaOpenCL/extensions.cl
-@@ -1,26 +1,34 @@
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL1.0
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL1.1
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -fsyntax-only -cl-std=CL1.1 -DNOPEDANTIC
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-std=CL1.2 -DFP64
- 
- // Test with a target not supporting fp64.
--// RUN: %clang_cc1 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -DNOFP64 -DNOFP16
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -DNOFP64 -DNOFP16
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -DNOFP64 -DNOFP16
- 
- // Test with some extensions enabled or disabled by cmd-line args
- //
- // Target does not support fp64 and fp16 - override it
--// RUN: %clang_cc1 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+cl_khr_fp64,+cl_khr_fp16
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+cl_khr_fp64,+cl_khr_fp16
- //
- // Disable or enable all extensions
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -DNOFP64 -DNOFP16
--// RUN: %clang_cc1 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all
--// RUN: %clang_cc1 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all,-cl_khr_fp64 -DNOFP64
--// RUN: %clang_cc1 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=-all,+cl_khr_fp64 -DNOFP16
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -DNOFP64 -DNOFP16
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all,-cl_khr_fp64 -DNOFP64
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=-all,+cl_khr_fp64 -DNOFP16
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -DNOFP64 -DNOFP16
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all -DFP64
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple r600-unknown-unknown -target-cpu r600 -verify -pedantic -fsyntax-only -cl-ext=+all,-__opencl_c_fp64,-cl_khr_fp64 -DNOFP64
- //
- // Concatenating
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-cl_khr_fp64 -cl-ext=+cl_khr_fp64
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-cl_khr_fp64,+cl_khr_fp64
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -cl-ext=+cl_khr_fp64 -cl-ext=+cl_khr_fp16 -cl-ext=-cl_khr_fp64 -DNOFP64
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-cl_khr_fp64 -cl-ext=+cl_khr_fp64
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-cl_khr_fp64,+cl_khr_fp64
-+// RUN: %clang_cc1 %s -cl-std=CL1.0 -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -cl-ext=+cl_khr_fp64 -cl-ext=+cl_khr_fp16 -cl-ext=-cl_khr_fp64 -DNOFP64
- // RUN: %clang_cc1 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-all -cl-ext=+cl_khr_fp64,-cl_khr_fp64,+cl_khr_fp16 -DNOFP64
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-__opencl_c_fp64,-cl_khr_fp64 -cl-ext=+__opencl_c_fp64,+cl_khr_fp64 -DFP64
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-__opencl_c_fp64,+__opencl_c_fp64,+cl_khr_fp64 -DFP64
-+// RUN: %clang_cc1 -cl-std=CL3.0 %s -triple spir-unknown-unknown -verify -pedantic -fsyntax-only -cl-ext=-__opencl_c_fp64,-cl_khr_fp64 -DNOFP64
- 
- // Test with -finclude-default-header, which includes opencl-c.h. opencl-c.h
- // disables all extensions by default, but supported core extensions for a
-@@ -43,8 +51,20 @@
- #endif
- 
- #if (defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ < 120)
--void f1(double da) { // expected-error {{type 'double' requires cl_khr_fp64 extension}}
--  double d; // expected-error {{type 'double' requires cl_khr_fp64 extension}}
-+void f1(double da) {
-+#ifdef NOFP64
-+// expected-error@-2 {{type 'double' requires cl_khr_fp64 support}}
-+#elif !defined(NOPEDANTIC)
-+// expected-warning@-4{{Clang permits use of type 'double' regardless pragma if 'cl_khr_fp64' is supported}}
-+#endif
-+  double d;
-+#ifdef NOFP64
-+// expected-error@-2 {{type 'double' requires cl_khr_fp64 support}}
-+#elif !defined(NOPEDANTIC)
-+// expected-warning@-4{{Clang permits use of type 'double' regardless pragma if 'cl_khr_fp64' is supported}}
-+#endif
-+  // FIXME: this diagnostic depends on the extension pragma in the earlier versions.
-+  // There is no indication that this behavior is expected.
-   (void) 1.0; // expected-warning {{double precision constant requires cl_khr_fp64}}
- }
- #endif
-@@ -72,20 +92,30 @@ int isfinite(float x) {
- void f2(void) {
-   double d;
- #ifdef NOFP64
--// expected-error@-2{{use of type 'double' requires cl_khr_fp64 extension to be enabled}}
-+#if (defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ >= 300)
-+// expected-error@-3{{use of type 'double' requires cl_khr_fp64 and __opencl_c_fp64 support}}
-+#else
-+// expected-error@-5{{use of type 'double' requires cl_khr_fp64 support}}
-+#endif
- #endif
- 
-   typedef double double4 __attribute__((ext_vector_type(4)));
-   double4 d4 = {0.0f, 2.0f, 3.0f, 1.0f};
- #ifdef NOFP64
--// expected-error@-3 {{use of type 'double' requires cl_khr_fp64 extension to be enabled}}
--// expected-error@-3 {{use of type 'double4' (vector of 4 'double' values) requires cl_khr_fp64 extension to be enabled}}
-+#if (defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ >= 300)
-+// expected-error@-4 {{use of type 'double' requires cl_khr_fp64 and __opencl_c_fp64 support}}
-+#else
-+// expected-error@-6 {{use of type 'double' requires cl_khr_fp64 support}}
-+#endif
- #endif
- 
-   (void) 1.0;
--
- #ifdef NOFP64
--// expected-warning@-3{{double precision constant requires cl_khr_fp64, casting to single precision}}
-+#if (defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ >= 300)
-+// expected-warning@-3{{double precision constant requires cl_khr_fp64 and __opencl_c_fp64, casting to single precision}}
-+#else
-+// expected-warning@-5{{double precision constant requires cl_khr_fp64, casting to single precision}}
-+#endif
- #endif
- }
- 
-@@ -96,6 +126,11 @@ void f2(void) {
- 
- #if (defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ < 120)
- void f3(void) {
--  double d; // expected-error {{type 'double' requires cl_khr_fp64 extension}}
-+  double d;
-+#ifdef NOFP64
-+// expected-error@-2 {{type 'double' requires cl_khr_fp64 support}}
-+#elif !defined(NOPEDANTIC)
-+// expected-warning@-4 {{Clang permits use of type 'double' regardless pragma if 'cl_khr_fp64' is supported}}
-+#endif
- }
- #endif
-diff --git a/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl b/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl
-index d1dcdfe8cb35..2db651836cb1 100644
---- a/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl
-+++ b/clang/test/SemaOpenCL/fdeclare-opencl-builtins.cl
-@@ -39,26 +39,7 @@ kernel void test_pointers(volatile global void *global_p, global const int4 *a)
-   prefetch(a, 2);
- 
-   atom_add((volatile __global int *)global_p, i);
--#if !defined(__OPENCL_CPP_VERSION__) && __OPENCL_C_VERSION__ < CL_VERSION_1_1
--// expected-error@-2{{no matching function for call to 'atom_add'}}
--
--// There are two potential definitions of the function "atom_add", both are
--// currently disabled because the associated extension is disabled.
--// expected-note@-6{{candidate function not viable: cannot pass pointer to address space '__global' as a pointer to address space '__local' in 1st argument}}
--// expected-note@-7{{candidate function not viable: no known conversion}}
--// expected-note@-8{{candidate function not viable: no known conversion}}
--// expected-note@-9{{candidate function not viable: no known conversion}}
--// expected-note@-10{{candidate unavailable as it requires OpenCL extension 'cl_khr_global_int32_base_atomics' to be enabled}}
--// expected-note@-11{{candidate unavailable as it requires OpenCL extension 'cl_khr_global_int32_base_atomics' to be enabled}}
--// expected-note@-12{{candidate unavailable as it requires OpenCL extension 'cl_khr_int64_base_atomics' to be enabled}}
--// expected-note@-13{{candidate unavailable as it requires OpenCL extension 'cl_khr_int64_base_atomics' to be enabled}}
--#endif
--
--#if __OPENCL_C_VERSION__ < CL_VERSION_1_1
--#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
--#endif
- 
--  atom_add((volatile __global int *)global_p, i);
-   atom_cmpxchg((volatile __global unsigned int *)global_p, ui, ui);
- }
- 
-@@ -140,11 +121,9 @@ kernel void basic_image_writeonly(write_only image1d_buffer_t image_write_only_i
- 
- kernel void basic_subgroup(global uint *out) {
-   out[0] = get_sub_group_size();
--#if defined(__OPENCL_CPP_VERSION__)
--  // expected-error@-2{{no matching function for call to 'get_sub_group_size'}}
--  // expected-note@-3{{candidate unavailable as it requires OpenCL extension 'cl_khr_subgroups' to be enabled}}
--#else
--  // expected-error@-5{{use of declaration 'get_sub_group_size' requires cl_khr_subgroups extension to be enabled}}
-+#if __OPENCL_C_VERSION__ <= CL_VERSION_1_2 && !defined(__OPENCL_CPP_VERSION__)
-+  // expected-error@-2{{implicit declaration of function 'get_sub_group_size' is invalid in OpenCL}}
-+  // expected-error@-3{{implicit conversion changes signedness}}
- #endif
- }
- 
-diff --git a/clang/test/SemaOpenCL/features.cl b/clang/test/SemaOpenCL/features.cl
-new file mode 100644
-index 000000000000..57c52694b685
---- /dev/null
-+++ b/clang/test/SemaOpenCL/features.cl
-@@ -0,0 +1,48 @@
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=-all \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=FEATURES
-+// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=FEATURES
-+
-+// For OpenCL C 2.0 feature macros are defined only in header, so test that earlier OpenCL
-+// versions don't define feature macros accidentally and CL2.0 don't define them without header
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.1 \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.2 \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL2.0 \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CLC++ \
-+// RUN:   | FileCheck -match-full-lines %s  --check-prefix=NO-FEATURES
-+
-+// Note that __opencl_c_int64 is always defined assuming
-+// always compiling for FULL OpenCL profile
-+
-+// FEATURES: #define __opencl_c_3d_image_writes 1
-+// FEATURES: #define __opencl_c_atomic_order_acq_rel 1
-+// FEATURES: #define __opencl_c_atomic_order_seq_cst 1
-+// FEATURES: #define __opencl_c_device_enqueue 1
-+// FEATURES: #define __opencl_c_fp64 1
-+// FEATURES: #define __opencl_c_generic_address_space 1
-+// FEATURES: #define __opencl_c_images 1
-+// FEATURES: #define __opencl_c_int64 1
-+// FEATURES: #define __opencl_c_pipes 1
-+// FEATURES: #define __opencl_c_program_scope_global_variables 1
-+// FEATURES: #define __opencl_c_read_write_images 1
-+// FEATURES: #define __opencl_c_subgroups 1
-+
-+// NO-FEATURES: #define __opencl_c_int64 1
-+// NO-FEATURES-NOT: __opencl_c_3d_image_writes
-+// NO-FEATURES-NOT: __opencl_c_atomic_order_acq_rel
-+// NO-FEATURES-NOT: __opencl_c_atomic_order_seq_cst
-+// NO-FEATURES-NOT: __opencl_c_device_enqueue
-+// NO-FEATURES-NOT: __opencl_c_fp64
-+// NO-FEATURES-NOT: __opencl_c_generic_address_space
-+// NO-FEATURES-NOT: __opencl_c_images
-+// NO-FEATURES-NOT: __opencl_c_pipes
-+// NO-FEATURES-NOT: __opencl_c_program_scope_global_variables
-+// NO-FEATURES-NOT: __opencl_c_read_write_images
-+// NO-FEATURES-NOT: __opencl_c_subgroups
-diff --git a/clang/test/SemaOpenCL/intel-subgroup-avc-ext-types.cl b/clang/test/SemaOpenCL/intel-subgroup-avc-ext-types.cl
-index e76d54763016..48ed4c0594d6 100644
---- a/clang/test/SemaOpenCL/intel-subgroup-avc-ext-types.cl
-+++ b/clang/test/SemaOpenCL/intel-subgroup-avc-ext-types.cl
-@@ -1,6 +1,9 @@
--// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL1.2 -cl-ext=+cl_intel_device_side_avc_motion_estimation -fsyntax-only -verify %s
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL1.2 -cl-ext=+cl_intel_device_side_avc_motion_estimation -fsyntax-only -verify -DEXT %s
-+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=CL1.2 -cl-ext=-cl_intel_device_side_avc_motion_estimation -fsyntax-only -verify  %s
- 
-+#ifdef cl_intel_device_side_avc_motion_estimation
- #pragma OPENCL EXTENSION cl_intel_device_side_avc_motion_estimation : enable
-+#endif
- 
- // All intel_sub_group_avc_* types can only be used as argument or return value
- // of built-in functions defined in the extension.
-@@ -16,55 +19,77 @@ struct st{};
- // negative test cases for initializers
- void foo(char c, float f, void* v, struct st ss) {
-   intel_sub_group_avc_mce_payload_t payload_mce = 0; // No zero initializer for mce types
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_mce_payload_t' with an expression of incompatible type 'int'}}
-   intel_sub_group_avc_ime_payload_t payload_ime = 1; // No literal initializer for *payload_t types
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ime_payload_t' with an expression of incompatible type 'int'}}
-   intel_sub_group_avc_ref_payload_t payload_ref = f;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ref_payload_t' with an expression of incompatible type '__private float'}}
-   intel_sub_group_avc_sic_payload_t payload_sic = ss;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_sic_payload_t' with an expression of incompatible type '__private struct st'}}
--
-   intel_sub_group_avc_mce_result_t result_mce = 0; // No zero initializer for mce types
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_mce_result_t' with an expression of incompatible type 'int'}}
-   intel_sub_group_avc_ime_result_t result_ime = 1; // No literal initializer for *result_t types
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ime_result_t' with an expression of incompatible type 'int'}}
-   intel_sub_group_avc_ref_result_t result_ref = f;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ref_result_t' with an expression of incompatible type '__private float'}}
-   intel_sub_group_avc_sic_result_t result_sic = ss;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_sic_result_t' with an expression of incompatible type '__private struct st'}}
--
-   intel_sub_group_avc_ime_result_single_reference_streamout_t sstreamout = v;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ime_result_single_reference_streamout_t' with an expression of incompatible type '__private void *__private'}}
--
-   intel_sub_group_avc_ime_result_dual_reference_streamout_t dstreamin_list = {0x0, 0x1};
--  // expected-warning@-1 {{excess elements in struct initializer}}
-   intel_sub_group_avc_ime_dual_reference_streamin_t dstreamin_list2 = {};
--  // expected-error@-1 {{scalar initializer cannot be empty}}
-   intel_sub_group_avc_ime_single_reference_streamin_t dstreamin_list3 = {c};
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ime_single_reference_streamin_t' with an expression of incompatible type '__private char'}}
-   intel_sub_group_avc_ime_dual_reference_streamin_t dstreamin_list4 = {1};
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ime_dual_reference_streamin_t' with an expression of incompatible type 'int'}}
-+#ifdef EXT
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_mce_payload_t' with an expression of incompatible type 'int'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ime_payload_t' with an expression of incompatible type 'int'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ref_payload_t' with an expression of incompatible type '__private float'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_sic_payload_t' with an expression of incompatible type '__private struct st'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_mce_result_t' with an expression of incompatible type 'int'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ime_result_t' with an expression of incompatible type 'int'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ref_result_t' with an expression of incompatible type '__private float'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_sic_result_t' with an expression of incompatible type '__private struct st'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ime_result_single_reference_streamout_t' with an expression of incompatible type '__private void *__private'}}
-+// expected-warning@-14 {{excess elements in struct initializer}}
-+// expected-error@-14 {{scalar initializer cannot be empty}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ime_single_reference_streamin_t' with an expression of incompatible type '__private char'}}
-+// expected-error@-14 {{initializing '__private intel_sub_group_avc_ime_dual_reference_streamin_t' with an expression of incompatible type 'int'}}
-+#else
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_mce_payload_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_payload_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ref_payload_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_sic_payload_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_mce_result_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_result_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ref_result_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_sic_result_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_result_single_reference_streamout_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_result_dual_reference_streamout_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_dual_reference_streamin_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_single_reference_streamin_t'}}
-+// expected-error@-28 {{use of undeclared identifier 'intel_sub_group_avc_ime_dual_reference_streamin_t'}}
-+#endif
- }
- 
- // negative tests for initializers and assignment
- void far() {
-   intel_sub_group_avc_mce_payload_t payload_mce;
-   intel_sub_group_avc_mce_payload_t payload_mce2 = payload_mce;
--
-   intel_sub_group_avc_ime_payload_t payload_ime;
-   intel_sub_group_avc_ref_payload_t payload_ref = payload_ime;
--  // expected-error@-1 {{initializing '__private intel_sub_group_avc_ref_payload_t' with an expression of incompatible type '__private intel_sub_group_avc_ime_payload_t'}}
--
-   intel_sub_group_avc_sic_result_t result_sic;
-   intel_sub_group_avc_ime_result_t result_ime;
-   result_sic = result_ime;
--  // expected-error@-1 {{assigning to '__private intel_sub_group_avc_sic_result_t' from incompatible type '__private intel_sub_group_avc_ime_result_t'}}
-+#ifdef EXT
-+// expected-error@-5 {{initializing '__private intel_sub_group_avc_ref_payload_t' with an expression of incompatible type '__private intel_sub_group_avc_ime_payload_t'}}
-+// expected-error@-3 {{assigning to '__private intel_sub_group_avc_sic_result_t' from incompatible type '__private intel_sub_group_avc_ime_result_t'}}
-+#else
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_mce_payload_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_mce_payload_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_ime_payload_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_ref_payload_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_sic_result_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'intel_sub_group_avc_ime_result_t'}}
-+// expected-error@-11 {{use of undeclared identifier 'result_sic'}} expected-error@-11 {{use of undeclared identifier 'result_ime'}}
-+#endif
- }
- 
- // Using 0x0 directly allows us not to include opencl-c.h header and not to
- // redefine all of these CLK_AVC_*_INTITIALIZE_INTEL macro. '0x0' value must
- // be in sync with ones defined in opencl-c.h
- 
-+#ifdef EXT
- // positive test cases
- void bar() {
-   const sampler_t vme_sampler = 0x0;
-@@ -102,4 +127,4 @@ void bar() {
-   intel_sub_group_avc_ime_single_reference_streamin_t sstreamin_list = {0};
-   intel_sub_group_avc_ime_dual_reference_streamin_t dstreamin_list = {0};
- }
--
-+#endif //EXT
-diff --git a/clang/test/SemaOpenCL/storageclass.cl b/clang/test/SemaOpenCL/storageclass.cl
-index f35ab9c2e08c..060aff2354d1 100644
---- a/clang/test/SemaOpenCL/storageclass.cl
-+++ b/clang/test/SemaOpenCL/storageclass.cl
-@@ -1,28 +1,118 @@
- // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.2
--
-+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0 -cl-ext=-__opencl_c_program_scope_global_variables,-__opencl_c_generic_address_space
-+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0 -cl-ext=+__opencl_c_program_scope_global_variables,-__opencl_c_generic_address_space
-+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0 -cl-ext=-__opencl_c_program_scope_global_variables,+__opencl_c_generic_address_space
-+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0 -cl-ext=+__opencl_c_program_scope_global_variables,+__opencl_c_generic_address_space
- static constant int G1 = 0;
- constant int G2 = 0;
--int G3 = 0;        // expected-error{{program scope variable must reside in constant address space}}
--global int G4 = 0; // expected-error{{program scope variable must reside in constant address space}}
- 
--static float g_implicit_static_var = 0; // expected-error {{program scope variable must reside in constant address space}}
-+int G3 = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#endif
-+
-+global int G4 = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#endif
-+
-+static float g_implicit_static_var = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#endif
-+
- static constant float g_constant_static_var = 0;
--static global float g_global_static_var = 0;   // expected-error {{program scope variable must reside in constant address space}}
--static local float g_local_static_var = 0;     // expected-error {{program scope variable must reside in constant address space}}
--static private float g_private_static_var = 0; // expected-error {{program scope variable must reside in constant address space}}
--static generic float g_generic_static_var = 0; // expected-error{{OpenCL C version 1.2 does not support the 'generic' type qualifier}} // expected-error {{program scope variable must reside in constant address space}}
- 
--extern float g_implicit_extern_var; // expected-error {{extern variable must reside in constant address space}}
-+static global float g_global_static_var = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#endif
-+
-+static local float g_local_static_var = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#else
-+// expected-error@-4 {{program scope variable must reside in global or constant address space}}
-+#endif
-+
-+static private float g_private_static_var = 0;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{program scope variable must reside in constant address space}}
-+#else
-+// expected-error@-4 {{program scope variable must reside in global or constant address space}}
-+#endif
-+
-+static generic float g_generic_static_var = 0;
-+#if (__OPENCL_C_VERSION__ < 300)
-+// expected-error@-2 {{OpenCL C version 1.2 does not support the 'generic' type qualifier}}
-+// expected-error@-3 {{program scope variable must reside in constant address space}}
-+#elif (__OPENCL_C_VERSION__ == 300)
-+ #if !defined(__opencl_c_generic_address_space)
-+// expected-error@-6 {{OpenCL C version 3.0 does not support the 'generic' type qualifier}}
-+ #endif
-+ #if !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-9 {{program scope variable must reside in constant address space}}
-+ #endif
-+ #if defined(__opencl_c_generic_address_space) && defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-12 {{program scope variable must reside in global or constant address space}}
-+ #endif
-+#endif
-+
-+extern float g_implicit_extern_var;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#endif
-+
- extern constant float g_constant_extern_var;
--extern global float g_global_extern_var;   // expected-error {{extern variable must reside in constant address space}}
--extern local float g_local_extern_var;     // expected-error {{extern variable must reside in constant address space}}
--extern private float g_private_extern_var; // expected-error {{extern variable must reside in constant address space}}
--extern generic float g_generic_extern_var; // expected-error{{OpenCL C version 1.2 does not support the 'generic' type qualifier}} // expected-error {{extern variable must reside in constant address space}}
-+
-+extern global float g_global_extern_var;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#endif
-+
-+extern local float g_local_extern_var;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#else
-+// expected-error@-4 {{extern variable must reside in global or constant address space}}
-+#endif
-+
-+extern private float g_private_extern_var;
-+#ifndef __opencl_c_program_scope_global_variables
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#else
-+// expected-error@-4 {{extern variable must reside in global or constant address space}}
-+#endif
-+
-+extern generic float g_generic_extern_var;
-+#if (__OPENCL_C_VERSION__ < 300)
-+// expected-error@-2 {{OpenCL C version 1.2 does not support the 'generic' type qualifier}}
-+// expected-error@-3 {{extern variable must reside in constant address space}}
-+#elif (__OPENCL_C_VERSION__ == 300)
-+ #if !defined(__opencl_c_generic_address_space)
-+// expected-error@-6 {{OpenCL C version 3.0 does not support the 'generic' type qualifier}}
-+ #endif
-+ #if !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-9 {{extern variable must reside in constant address space}}
-+ #endif
-+ #if defined(__opencl_c_generic_address_space) && defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-12 {{extern variable must reside in global or constant address space}}
-+ #endif
-+#endif
- 
- void kernel foo(int x) {
-   // static is not allowed at local scope before CL2.0
--  static int S1 = 5;          // expected-error{{variables in function scope cannot be declared static}}
--  static constant int S2 = 5; // expected-error{{variables in function scope cannot be declared static}}
-+  static int S1 = 5;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{static local variable must reside in constant address space}}
-+#endif
-+
-+  static constant int S2 = 5;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#endif
- 
-   constant int L1 = 0;
-   local int L2;
-@@ -32,12 +122,13 @@ void kernel foo(int x) {
-     constant int L1 = 42; // expected-error {{variables in the constant address space can only be declared in the outermost scope of a kernel function}}
-   }
- 
--  auto int L3 = 7;                            // expected-error{{OpenCL C version 1.2 does not support the 'auto' storage class specifier}}
-+  auto int L3 = 7;                            // expected-error-re{{OpenCL C version {{1.2|3.0}} does not support the 'auto' storage class specifier}}
-   global int L4;                              // expected-error{{function scope variable cannot be declared in global address space}}
-   __attribute__((address_space(100))) int L5; // expected-error{{automatic variable qualified with an invalid address space}}
- 
-   constant int L6 = x;                        // expected-error {{initializer element is not a compile-time constant}}
-   global int *constant L7 = &G4;
-+
-   private int *constant L8 = &x;              // expected-error {{initializer element is not a compile-time constant}}
-   constant int *constant L9 = &L1;
-   local int *constant L10 = &L2;              // expected-error {{initializer element is not a compile-time constant}}
-@@ -59,17 +150,106 @@ void f() {
-     __attribute__((address_space(100))) int L4; // expected-error{{automatic variable qualified with an invalid address space}}
-   }
- 
--  static float l_implicit_static_var = 0;          // expected-error {{variables in function scope cannot be declared static}}
--  static constant float l_constant_static_var = 0; // expected-error {{variables in function scope cannot be declared static}}
--  static global float l_global_static_var = 0;     // expected-error {{variables in function scope cannot be declared static}}
--  static local float l_local_static_var = 0;       // expected-error {{variables in function scope cannot be declared static}}
--  static private float l_private_static_var = 0;   // expected-error {{variables in function scope cannot be declared static}}
--  static generic float l_generic_static_var = 0;   // expected-error{{OpenCL C version 1.2 does not support the 'generic' type qualifier}} // expected-error {{variables in function scope cannot be declared static}}
-+  static float l_implicit_static_var = 0;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{static local variable must reside in constant address space}}
-+#endif
-+
-+  static constant float l_constant_static_var = 0;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#endif
-+
-+  static global float l_global_static_var = 0;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{static local variable must reside in constant address space}}
-+#endif
-+
-+  static local float l_local_static_var = 0;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{static local variable must reside in constant address space}}
-+#elif defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-6 {{static local variable must reside in global or constant address space}}
-+#endif
-+
-+  static private float l_private_static_var = 0;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{variables in function scope cannot be declared static}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{static local variable must reside in constant address space}}
-+#elif defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-6 {{static local variable must reside in global or constant address space}}
-+#endif
-+
-+  static generic float l_generic_static_var = 0;
-+#if (__OPENCL_C_VERSION__ < 300)
-+// expected-error@-2 {{OpenCL C version 1.2 does not support the 'generic' type qualifier}}
-+// expected-error@-3 {{variables in function scope cannot be declared static}}
-+#elif (__OPENCL_C_VERSION__ == 300)
-+ #if !defined(__opencl_c_generic_address_space)
-+// expected-error@-6 {{OpenCL C version 3.0 does not support the 'generic' type qualifier}}
-+ #endif
-+ #if !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-9 {{static local variable must reside in constant address space}}
-+ #endif
-+ #if defined(__opencl_c_generic_address_space) && defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-12 {{static local variable must reside in global or constant address space}}
-+ #endif
-+#endif
-+
-+  extern float l_implicit_extern_var;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{extern variable must reside in constant address space}}
-+#endif
- 
--  extern float l_implicit_extern_var; // expected-error {{extern variable must reside in constant address space}}
-   extern constant float l_constant_extern_var;
--  extern global float l_global_extern_var;   // expected-error {{extern variable must reside in constant address space}}
--  extern local float l_local_extern_var;     // expected-error {{extern variable must reside in constant address space}}
--  extern private float l_private_extern_var; // expected-error {{extern variable must reside in constant address space}}
--  extern generic float l_generic_extern_var; // expected-error{{OpenCL C version 1.2 does not support the 'generic' type qualifier}} // expected-error {{extern variable must reside in constant address space}}
-+
-+  extern global float l_global_extern_var;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{extern variable must reside in constant address space}}
-+#endif
-+
-+  extern local float l_local_extern_var;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{extern variable must reside in constant address space}}
-+#elif defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-6 {{extern variable must reside in global or constant address space}}
-+#endif
-+
-+  extern private float l_private_extern_var;
-+#if __OPENCL_C_VERSION__ < 300
-+// expected-error@-2 {{extern variable must reside in constant address space}}
-+#elif !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-4 {{extern variable must reside in constant address space}}
-+#elif defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-6 {{extern variable must reside in global or constant address space}}
-+#endif
-+
-+  extern generic float l_generic_extern_var;
-+#if (__OPENCL_C_VERSION__ < 300)
-+// expected-error@-2 {{OpenCL C version 1.2 does not support the 'generic' type qualifier}}
-+// expected-error@-3 {{extern variable must reside in constant address space}}
-+#elif (__OPENCL_C_VERSION__ == 300)
-+ #if !defined(__opencl_c_generic_address_space)
-+// expected-error@-6 {{OpenCL C version 3.0 does not support the 'generic' type qualifier}}
-+ #endif
-+ #if !defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-9 {{extern variable must reside in constant address space}}
-+ #endif
-+ #if defined(__opencl_c_generic_address_space) && defined(__opencl_c_program_scope_global_variables)
-+// expected-error@-12 {{extern variable must reside in global or constant address space}}
-+ #endif
-+#endif
- }
-diff --git a/clang/test/SemaOpenCL/unsupported-image.cl b/clang/test/SemaOpenCL/unsupported-image.cl
-new file mode 100644
-index 000000000000..40772460e54d
---- /dev/null
-+++ b/clang/test/SemaOpenCL/unsupported-image.cl
-@@ -0,0 +1,69 @@
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -cl-std=CL3.0 -cl-ext=-__opencl_c_images,-__opencl_c_read_write_images,-cl_khr_3d_image_writes,-__opencl_c_3d_image_writes %s
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -cl-std=CL3.0 -cl-ext=+__opencl_c_images,+__opencl_c_read_write_images,+cl_khr_3d_image_writes,+__opencl_c_3d_image_writes %s
-+// RUN: %clang_cc1 -triple spir-unknown-unknown -verify -cl-std=CL3.0 -cl-ext=+__opencl_c_images,+__opencl_c_read_write_images,-cl_khr_3d_image_writes,-__opencl_c_3d_image_writes %s
-+
-+#if defined(__opencl_c_images) && defined(__opencl_c_3d_image_writes)
-+//expected-no-diagnostics
-+#endif
-+
-+void test1(image1d_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image1d_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test2(image2d_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test3(image1d_array_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image1d_array_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test4(image2d_array_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_array_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test5(image2d_depth_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_depth_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test6(image1d_buffer_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image1d_buffer_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test7(image2d_msaa_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_msaa_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test8(image2d_array_msaa_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_array_msaa_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test9(image2d_msaa_depth_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_msaa_depth_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test10(image2d_array_msaa_depth_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__read_only image2d_array_msaa_depth_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test11(sampler_t s) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type 'sampler_t' requires __opencl_c_images support}}
-+#endif
-+
-+void test12(write_only image3d_t i) {}
-+#if !defined(__opencl_c_images)
-+// expected-error@-2{{use of type '__write_only image3d_t' requires __opencl_c_images support}}
-+#elif !defined(__opencl_c_3d_image_writes)
-+// expected-error@-4{{use of type '__write_only image3d_t' requires cl_khr_3d_image_writes and __opencl_c_3d_image_writes support}}
-+#endif
--- 
-2.18.1
-
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
deleted file mode 100644
index e3fd054b..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:"
-
-SRC_URI_LLVM12_PATCHES = " \
-                   file://llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch \
-                   file://llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch \
-                   file://llvm12-0003-Support-cl_ext_float_atomics.patch \
-                   file://llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch \
-                   file://llvm12-0005-ispc-12_0_fix_for_2111.patch \
-                   file://llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch \
-                   file://llvm12-0007-OpenCL-3.0-support.patch \
-                   "
-
-SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
index 4646856d..265fcfa2 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
@@ -1,4 +1,4 @@
-From 40e9344d37d62158e6c9f72919f0595ef5fde61a Mon Sep 17 00:00:00 2001
+From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001
 From: Dongwon Kim <dongwon.kim@intel.com>
 Date: Sat, 21 Aug 2021 16:09:39 -0700
 Subject: [PATCH] Build not able to locate cpp_generation_tool.
@@ -7,28 +7,27 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
-
 ---
- shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
-index 769e2a100..eef25747e 100644
+index ed85a37c52..f7c9e79137 100644
 --- a/shared/source/built_ins/kernels/CMakeLists.txt
 +++ b/shared/source/built_ins/kernels/CMakeLists.txt
-@@ -94,9 +94,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo
+@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode
        )
        add_custom_command(
                           OUTPUT ${OUTPUT_FILE_CPP}
--                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
-+                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
+-                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
++                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 -                         DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool>
 +                         DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool
        )
        list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}")
      else()
-@@ -147,9 +147,9 @@ function(generate_cpp_spirv builtin)
+@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin)
      )
      add_custom_command(
                         OUTPUT ${OUTPUT_FILE_CPP}
@@ -40,3 +39,13 @@ index 769e2a100..eef25747e 100644
      )
      set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE)
    else()
+@@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "")
+   )
+ endif()
+ 
+-apply_macro_for_each_core_type("SUPPORTED")
+\ No newline at end of file
++apply_macro_for_each_core_type("SUPPORTED")
+-- 
+2.43.2
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
new file mode 100644
index 00000000..20d9b847
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d52e089778..bc0cf35014 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -727,7 +727,7 @@ if(NOT MSVC)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
+     endif()
+   endif()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla")
+ 
+   if(USE_SANITIZE_UB)
+     check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER)
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
index 9ee8c96a..5f93b7b6 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
@@ -1,4 +1,4 @@
-From 1189028d9f77265edf6258a66f8ecadf3aad556a Mon Sep 17 00:00:00 2001
+From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001
 From: Dongwon Kim <dongwon.kim@intel.com>
 Date: Wed, 2 Mar 2022 15:52:45 -0800
 Subject: [PATCH] external ocloc
@@ -11,7 +11,7 @@ Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake
-index 9b6bd3cd3..0aba48709 100644
+index 2b44330831..03067c9df0 100644
 --- a/cmake/ocloc_cmd_prefix.cmake
 +++ b/cmake/ocloc_cmd_prefix.cmake
 @@ -4,12 +4,14 @@
@@ -22,19 +22,19 @@ index 9b6bd3cd3..0aba48709 100644
 -  set(ocloc_cmd_prefix ocloc)
 -else()
 -  if(DEFINED NEO__IGC_LIBRARY_PATH)
--    set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +if(NOT DEFINED ocloc_cmd_prefix)
 +  if(WIN32)
 +    set(ocloc_cmd_prefix ocloc)
    else()
--    set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +    if(DEFINED NEO__IGC_LIBRARY_PATH)
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
++      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
 +    else()
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
++      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
 +    endif()
    endif()
  endif()
 -- 
-2.20.1
+2.37.3
 
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch
new file mode 100644
index 00000000..b7fcb3d1
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch
@@ -0,0 +1,54 @@
+From f10439aea214984a060566831f63d3aa198ef1b8 Mon Sep 17 00:00:00 2001
+From: Pawel Cieslak <pawel.cieslak@intel.com>
+Date: Tue, 14 May 2024 14:20:24 +0000
+Subject: [PATCH] fix: include <algorithm> where std::find is used
+
+Related-To: NEO-11375
+Signed-off-by: Pawel Cieslak <pawel.cieslak@intel.com>
+
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/f10439aea214984a060566831f63d3aa198ef1b8]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ .../sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp    | 3 ++-
+ shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp  | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+index 6ab1b751d866..8a224752c8fc 100644
+--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
++++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
++ * Copyright (C) 2021-2024 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -13,6 +13,7 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#include <algorithm>
+ #include <limits>
+ #include <netlink/handlers.h>
+ 
+diff --git a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+index 206c272c5bb2..e961248e73a3 100644
+--- a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
++++ b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
++ * Copyright (C) 2021-2024 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -17,6 +17,8 @@
+ 
+ #include "gtest/gtest.h"
+ 
++#include <algorithm>
++
+ using namespace NEO;
+ 
+ struct MockGmmHandleAllocator : NEO::GmmHandleAllocator {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
index ebf69af2..7280ed03 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
@@ -4,27 +4,26 @@ is an open source project to converge Intel's development efforts \
 on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
 architecture."
 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \
-                    file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
+                    file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \
-          "
+SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \
+           file://disable-werror.patch \
+           file://allow-to-find-cpp-generation-tool.patch \
+           file://external-ocloc.patch \
+           file://f10439aea214984a060566831f63d3aa198ef1b8.patch \
+           "
 
-SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
-                               file://external-ocloc.patch \
-                              "
-
-SRCREV = "c046824c183da8f365f8f742537b21eb70b5628d"
+SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += " intel-graphics-compiler gmmlib"
-DEPENDS:append:class-target = " intel-compute-runtime-native libva"
+DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native"
 
 RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
 
-inherit cmake pkgconfig
+inherit cmake pkgconfig qemu
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@@ -40,14 +39,20 @@ EXTRA_OECMAKE = " \
 
 EXTRA_OECMAKE:append:class-target = " \
                                      -Docloc_cmd_prefix=ocloc \
-                                    "
+                                     -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                                     "
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"
 
-do_install:append:class-native() {
-    install -d ${D}${bindir}
-    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
+do_configure:prepend:class-target () {
+    # Write out a qemu wrapper that will be used by cmake.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
 }
 
 FILES:${PN} += " \
@@ -57,6 +62,4 @@ FILES:${PN} += " \
 
 FILES:${PN}-dev = "${includedir}"
 
-BBCLASSEXTEND = "native nativesdk"
-
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
index 0dd75537..377081fd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
@@ -1,4 +1,4 @@
-From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001
+From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 12 Oct 2021 23:46:42 +0800
 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@@ -14,22 +14,22 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index be8e5557e..07ab40382 100644
---- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
-   add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
-     COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-     COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
--    DEPENDS opt ${BIF_CMCL_BC_PATH})
-+    DEPENDS ${BIF_CMCL_BC_PATH})
+diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+index d20d7f887..882e09fea 100644
+--- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
++++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+@@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
+     COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}"
+     COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL}
+     COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
+-    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL}
++    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}
+     BYPRODUCTS ${BIF_OPT_BC_PATH}
+     SOURCES ${CMCL_SRC_PATH})
    set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
- endfunction()
- 
 -- 
-2.35.3
+2.43.2
 
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
new file mode 100644
index 00000000..dca75e22
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
@@ -0,0 +1,31 @@
+From e69a3181482e5f442756a61c7b683914072884f1 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Mon, 9 Jan 2023 11:43:05 +0800
+Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers
+
+We clone the SPIRV headers and tools in a different directory to ensure
+file path substitutions take place.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+---
+ external/SPIRV-Tools/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index 9afa5746c..7ca24d5dc 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
++++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -43,8 +43,8 @@ else() #By default use build from sources
+  message(STATUS "[SPIRV-Tools] : Building from source")
+  message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+- set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
+- set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Tools")
++ set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Headers") # used in subdirectory
++ set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Tools")
+ 
+  set(SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR}/external/SPIRV-Tools/build")
+  set(IGC_BUILD__SPIRV-Headers_DIR "${SPIRV-Headers_SOURCE_DIR}")
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
index 24367f19..39443931 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -1,17 +1,19 @@
-From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001
+From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Thu, 19 May 2022 22:50:09 +0800
 Subject: [PATCH] fix tblgen
 
+Upstream-Status: Inappropriate [OE specific]
+
 ---
  IGC/cmake/igc_llvm.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 89c03fc49..85be9ae08 100644
+index 10322533c..9020cb3c8 100644
 --- a/IGC/cmake/igc_llvm.cmake
 +++ b/IGC/cmake/igc_llvm.cmake
-@@ -48,7 +48,7 @@ else()
+@@ -52,7 +52,7 @@ else()
    set(LLVM_OPT_EXE "opt" CACHE STRING "")
  
    set(LLVM_TABLEGEN_EXE "llvm-tblgen")
@@ -20,6 +22,3 @@ index 89c03fc49..85be9ae08 100644
      if(DEFINED LLVM_TABLEGEN)
        set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
      else()
--- 
-2.35.3
-
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
index 7dd36aec..650130a8 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
@@ -1,7 +1,7 @@
-From c2b7f30dd56568482b1b7c2f22bafdf68736fc88 Mon Sep 17 00:00:00 2001
+From 0559332abd04b6c8bc70171d201f43d2e4735336 Mon Sep 17 00:00:00 2001
 From: Lee Chee Yang <chee.yang.lee@intel.com>
 Date: Wed, 2 Sep 2020 08:28:35 +0800
-Subject: [PATCH 3/5] Improve Reproducibility for src package
+Subject: [PATCH] Improve Reproducibility for src package
 
 Improve reproducibility for intel-graphics-compiler-src package.
 needs to pass build path as environment variable to the build.
@@ -9,12 +9,13 @@ this only works on bison 3.7 onward, hence check for bison version
 before adding the flags.
 Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream]
 Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
+
 ---
  visa/CMakeLists.txt | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index 65dbb4934..8cd607a69 100644
+index 6be467587..930c386a6 100644
 --- a/visa/CMakeLists.txt
 +++ b/visa/CMakeLists.txt
 @@ -123,8 +123,11 @@ endif()
@@ -31,6 +32,3 @@ index 65dbb4934..8cd607a69 100644
  ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser)
  set(CISAScanner_dependencies)
  
--- 
-2.20.1
-
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
index 0442bec9..24eb97bd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
@@ -6,22 +6,23 @@ hardware architecture."
 LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
                     file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
-                    file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
+                    file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
 
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \
-           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \
-           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
-           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \
+           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
+           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \
            file://0003-Improve-Reproducibility-for-src-package.patch \
            file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
+           file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
            "
 
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
 
-SRCREV_igc = "bf3552db35cabf0ca416f7d216d4697b9bfb03cb"
-SRCREV_vc = "984bb27baacce6ee5c716c2e64845f2a1928025b"
-SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
-SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
+SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775"
+SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd"
+SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
+SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 
 SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
 
@@ -30,43 +31,45 @@ export B
 
 S = "${WORKDIR}/git"
 
-inherit cmake pkgconfig
+inherit cmake pkgconfig qemu python3native
 
 CXXFLAGS:append = " -Wno-error=nonnull"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-DEPENDS += " flex-native bison-native clang opencl-clang"
-DEPENDS:append:class-target = " clang-cross-x86_64 intel-graphics-compiler-native"
+DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native"
 
 RDEPENDS:${PN} += "opencl-clang"
 
 PACKAGECONFIG ??= "vc"
-PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_VC=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF,"
+PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF,"
 
 EXTRA_OECMAKE = " \
                   -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \
-                  -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
                   -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
                   -DIGC_OPTION__LLVM_MODE=Prebuilds \
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \
+                  -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
                   "
 
-do_install:append:class-native () {
-    install -d ${D}${bindir}
-    install ${B}/IGC/Release/elf_packager ${D}${bindir}/
-    if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
-        install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
-        install ${B}/IGC/Release/vcb ${D}${bindir}/
-    fi
+do_configure:prepend:class-target () {
+    # Write out a qemu wrapper that will be used by cmake.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
 }
 
-BBCLASSEXTEND = "native nativesdk"
-
 UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
 
 FILES:${PN} += " \
                  ${libdir}/igc/NOTICES.txt \
                  "
+
+# libigc.so contains buildpaths
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
new file mode 100644
index 00000000..031a77c7
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
@@ -0,0 +1,49 @@
+From 5aea653e611b59c70e529a1bd71885a509831557 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Tue, 1 Aug 2023 11:15:31 +0800
+Subject: [PATCH] cl_headers/CMakeLists.txt: use clang from native sysroot
+
+Allow clang to be found in target sysroot for target builds and dont try
+to compile cross binaries, we do that ourselves.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 8 ++++----
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5864009..60ba39e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,10 +35,10 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+-  include(CrossCompile)
+-  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+-endif()
++#if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
++#  include(CrossCompile)
++#  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
++#endif()
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+     set(USE_PREBUILT_LLVM ON)
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 16cabb7..4423536 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set(CL_HEADERS_LIB cl_headers)
+ if(USE_PREBUILT_LLVM)
+-    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
++    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR})
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
deleted file mode 100644
index 8df7e3ab..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 2 Apr 2020 08:59:20 +0800
-Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE
-
-Use the value that has been passed by the user.
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6893e97..941b0ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM)
- set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
- set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
- 
--set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(NOT DEFINED LLVM_TABLEGEN_EXE)
-+  set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+endif()
-+
- set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
- if(USE_PREBUILT_LLVM)
-   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
--- 
-2.25.1
-
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
new file mode 100644
index 00000000..2f1814f8
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
@@ -0,0 +1,60 @@
+From 43c806ef321b1f677a49d28c89fb7ffecf539c2d Mon Sep 17 00:00:00 2001
+From: Tim Creech <timothy.m.creech@intel.com>
+Date: Wed, 28 Jun 2023 03:45:51 -0400
+Subject: [PATCH 2/2] Request native clang only when cross-compiling (#464)
+
+* Request native clang only when cross-compiling
+
+LLVM_USE_HOST_TOOLS may be set if LLVM is configured with
+LLVM_OPTIMIZED_TABLEGEN, which does not necessarily indicate
+cross-compilation or that clang will only execute on the target.
+
+By checking that CMAKE_CROSSCOMPILING is set, we ensure that we only
+build/use clang again if necessary for host execution.
+
+* fixup: CMAKE_CROSSCOMPILING implies LLVM_USE_HOST_TOOLS
+
+Co-authored-by: Wenju He <wenju.he@intel.com>
+
+* fixup: also use CMAKE_CROSSCOMPILING in top-level CMakeLists.txt
+
+---------
+
+Co-authored-by: Wenju He <wenju.he@intel.com>
+
+Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/53843eee13cfb2357919ee02714a43bef1af0f86]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 2 +-
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e772de9..5864009 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(LLVM_USE_HOST_TOOLS AND OPENCL_CLANG_BUILD_EXTERNAL)
++if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+   include(CrossCompile)
+   llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+ endif()
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 18296c2..16cabb7 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -4,7 +4,7 @@ if(USE_PREBUILT_LLVM)
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
++if(CMAKE_CROSSCOMPILING AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+   build_native_tool(clang CLANG_COMMAND)
+ endif()
+ 
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
index 1d9b4d51..31a3fb21 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@@ -6,6 +6,8 @@ LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c"
 
 SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \
+           file://0002-Request-native-clang-only-when-cross-compiling-464.patch \
+           file://0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch \
            "
 S = "${WORKDIR}/git"
 
@@ -16,9 +18,17 @@ DEPENDS:append:class-target = " opencl-clang-native"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
+DEPENDS += " spirv-llvm-translator"
+
+EXTRA_OECMAKE += "\
+                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DCMAKE_SKIP_RPATH=TRUE \
+                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
+                  "
+
 do_install:append:class-native() {
         install -d ${D}${bindir}
-        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
+        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
 }
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb
deleted file mode 100644
index d0b2acfb..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require opencl-clang.inc
-
-SRCREV = "8fc6b059248dc6c9c40c7cbe5fedcc6ebb951983"
-
-DEPENDS += " spirv-llvm-translator"
-
-BRANCH = "ocl-open-120"
-
-EXTRA_OECMAKE += "\
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION="12.0.0" \
-                  "
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
deleted file mode 100644
index 367ca7e9..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require opencl-clang.inc
-
-SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \
-           "
-SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f"
-
-BRANCH = "ocl-open-140"
-
-DEPENDS += " spirv-llvm-translator"
-
-EXTRA_OECMAKE += "\
-                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
-                  "
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
new file mode 100644
index 00000000..e946c31c
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
@@ -0,0 +1,5 @@
+require opencl-clang.inc
+
+SRCREV = "60fd799cc58755c16d951f9ebfde6d0f9b8554dd"
+
+BRANCH = "ocl-open-150"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb
deleted file mode 100644
index dfdb4450..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "VC Intrinsics"
-DESCRIPTION = "VC Intrinsics project contains a set of new intrinsics on \
-top of core LLVM IR instructions that represent SIMD semantics of a program \
-targeting GPU"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc"
-
-SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;branch=master \
-          "
-SRCREV = "99ac111c2604a47d865bd4d7996be8cfaf2af146"
-
-S = "${WORKDIR}/git"
-
-PE = "1"
-PV .= "+git${SRCPV}"
-
-inherit cmake
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-DEPENDS += "  clang"
-
-EXTRA_OECMAKE = "-DLLVM_DIR=${STAGING_LIBDIR}"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.1.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
index c2e91eda..de765d6c 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.1.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \
 learning models for optimal execution on end-point target devices."
 HOMEPAGE = "https://01.org/openvinotoolkit"
 
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/1;lfs=0 \
            "
-SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e"
+SRCREV = "f4afc983258bcb2592d999ed6700043fdb58ad78"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
@@ -20,13 +20,14 @@ inherit setuptools3
 SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo"
 
 RDEPENDS:${PN} += " \
-                    python3-numpy \
-                    python3-protobuf \
                     python3-defusedxml \
+                    python3-fastjsonschema \
                     python3-networkx \
+                    python3-numpy \
+                    python3-protobuf \
                     python3-requests \
                     python3-urllib3 \
                     bash \
                     "
 
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
index e0d6b91e..bdf32576 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -10,11 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 COMPATIBLE_HOST:libc-musl = "null"
 
-inherit cmake systemd features_check
+inherit cmake systemd features_check python3native
 
-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native"
-
-EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3"
+DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native"
 
 # Enable either connman or networkmanager or none but not both.
 PACKAGECONFIG ??= "connman"
@@ -31,9 +29,10 @@ SYSTEMD_SERVICE:${PN} = "lms.service"
 
 SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
            "
-SRCREV = "7f4e295da5df69ae5424df18805af761c6601545"
+SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"
 
 do_install:append() {
+    install -d ${D}${sysconfdir}/lms
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir}
     install -d ${D}${sysconfdir}/udev/rules.d
@@ -42,5 +41,4 @@ do_install:append() {
 
 RDEPENDS:${PN} += "ace"
 
-# This CVE is for Lan Management System software and not this lms.
-CVE_CHECK_IGNORE += "CVE-2018-1000535"
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
new file mode 100644
index 00000000..ea86bc31
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -0,0 +1,35 @@
+From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 11 Mar 2024 13:13:32 +0800
+Subject: [PATCH] Makefile: Fix build Issue
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In case build directory is different from source, make sure make is able to find the correct input files.
+
+Fixes:
+| dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml
+| glib-compile-resources --generate-source thermald-resource.gresource.xml
+| Failed to open file “thermald-resource.gresource.xml”: No such file or directory
+
+Upstream-Status: Submitted
+https://github.com/intel/thermal_daemon/pull/436
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dd2ef10..cb19e17 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
+        $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $<
+ 
+ thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml
+-       $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml
++       $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $<
+ 
+ CLEANFILES = $(BUILT_SOURCES)
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
index 8738c56b..66765e56 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
@@ -7,13 +7,16 @@ compensation using available cooling methods."
 HOMEPAGE = "https://github.com/01org/thermal_daemon"
 
 DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
+DEPENDS += "autoconf-archive-native"
+
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
 
 SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
+           file://0001-Makefile-Fix-build-Issue.patch \
            "
 
-SRCREV = "43ddb029ce599e2805eed446d414a2b4882e0a1b"
+SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools systemd gtk-doc
@@ -28,7 +31,7 @@ EXTRA_OECONF = " \
                  --with-systemdsystemunitdir=${systemd_system_unitdir} \
                  "
 
-FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
+FILES:${PN} += "${datadir}/dbus-1"
 
 SYSTEMD_SERVICE:${PN} = "thermald.service"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
new file mode 100644
index 00000000..4d583657
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
@@ -0,0 +1,53 @@
+From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Sun, 11 Dec 2022 22:34:15 +0800
+Subject: [PATCH] Add print function to print test run status in ptest format
+
+Upstream-Status: Inappropriate [OE ptest specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ run_tests.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/run_tests.py b/run_tests.py
+index 1cd796dd..e3ffd1ab 100755
+--- a/run_tests.py
++++ b/run_tests.py
+@@ -327,6 +327,9 @@ def run_test(testname, host, target):
+     else:
+         ispc_exe_rel = add_prefix(host.ispc_cmd, host, target)
+ 
++    # to reslove the error '.rodata' can not be used when making a PIE object
++    ispc_exe_rel = ispc_exe_rel + " --pic"
++
+     # is this a test to make sure an error is issued?
+     want_error = (filename.find("tests_errors") != -1)
+     if want_error == True:
+@@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe):
+             return
+     error("missing the required compiler: %s \n" % compiler_exe, 1)
+ 
++def print_test_run_status(results):
++    for fstatus in results:
++       if (fstatus[1]  ==  Status.Success):
++          print( "%s: %s" % ("PASS", fstatus[0]))
++       elif (fstatus[1] ==  Status.Compfail):
++          print( "%s: %s" % ("FAIL", fstatus[0]))
++       elif (fstatus[1] ==  Status.Runfail):
++          print( "%s: %s" % ("FAIL", fstatus[0]))
++       elif (fstatus[1] ==  Status.Skip):
++          print( "%s: %s" % ("SKIP", fstatus[0]))
++
+ def print_result(status, results, s, run_tests_log, csv):
+     title = StatusStr[status]
+     file_list = [fname for fname, fstatus in results if status == fstatus]
+@@ -938,6 +952,8 @@ def run_tests(options1, args, print_version):
+         pass_rate = -1
+     print_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log)
+ 
++    print_test_run_status(results)
++
+     for status in Status:
+         print_result(status, results, s, run_tests_log, options.csv)
+     fails = [status != Status.Compfail and status != Status.Runfail for _, status in results]
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
index e7bb599e..b0a76ff9 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
@@ -1,4 +1,4 @@
-From 139b94a7fb72114c31a2a6ab3f7e6024b4a738ec Mon Sep 17 00:00:00 2001
+From 7beff95c11071170eb27b6fa7d0cc77588caee8e Mon Sep 17 00:00:00 2001
 From: Yogesh Tyagi <yogesh.tyagi@intel.com>
 Date: Tue, 26 Jul 2022 15:25:10 +0800
 Subject: [PATCH] Fix QA Issues
@@ -8,16 +8,15 @@ Stop ispc from inserting host file path in generated headers which leads to repr
 Upstream-Status: Inappropriate [OE build specific]
 
 Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
-
 ---
  src/module.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/module.cpp b/src/module.cpp
-index 58a2ae83..82673052 100644
+index e2084d2e..e2626865 100644
 --- a/src/module.cpp
 +++ b/src/module.cpp
-@@ -2105,7 +2105,7 @@ bool Module::writeHeader(const char *fn) {
+@@ -2555,7 +2555,7 @@ bool Module::writeHeader(const char *fn) {
          perror("fopen");
          return false;
      }
@@ -26,7 +25,7 @@ index 58a2ae83..82673052 100644
      fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n");
  
      // Create a nice guard string from the filename, turning any
-@@ -2219,7 +2219,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) {
+@@ -2677,7 +2677,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) {
      FILE *f = DHI->file;
  
      if (DHI->EmitFrontMatter) {
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
index a13ade9f..f452dc50 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
@@ -1,4 +1,4 @@
-From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001
+From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Thu, 24 Feb 2022 20:01:11 +0530
 Subject: [PATCH] cmake: don't build for 32-bit targets
@@ -16,14 +16,14 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- cmake/GenerateBuiltins.cmake | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ cmake/GenerateBuiltins.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
-index fa228247..7adc7e52 100644
+index f84494ed..d90cb1ec 100644
 --- a/cmake/GenerateBuiltins.cmake
 +++ b/cmake/GenerateBuiltins.cmake
-@@ -272,7 +272,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
+@@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
              #   In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up
              #   by clang by default. So the following line adds such path explicitly. If this path doesn't exist and
              #   the headers can be found in other locations, this should not be a problem.
@@ -32,7 +32,7 @@ index fa228247..7adc7e52 100644
          endif()
      endif()
  
-@@ -354,7 +354,7 @@ function (generate_target_builtins resultList)
+@@ -339,7 +339,7 @@ function (generate_target_builtins resultList)
      set(regular_targets ${ARGN})
      list(FILTER regular_targets EXCLUDE REGEX wasm)
      foreach (ispc_target ${regular_targets})
@@ -41,24 +41,12 @@ index fa228247..7adc7e52 100644
              foreach (os_name ${TARGET_OS_LIST_FOR_LL})
                  target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
                  list(APPEND tmpList ${output${os_name}${bit}})
-@@ -415,7 +415,7 @@ function (generate_common_builtins resultList)
+@@ -405,7 +405,7 @@ function (generate_common_builtins resultList)
      endif()
  
      message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
 -    foreach (bit 32 64)
 +    foreach (bit 64)
          foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
-             foreach (arch "x86" "arm" "wasm32")
+             foreach (arch "x86" "arm" "wasm")
                  builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
-@@ -428,7 +428,7 @@ function (generate_common_builtins resultList)
-         endforeach()
-     endforeach()
-     if (XE_ENABLED)
--        foreach (bit 32 64)
-+        foreach (bit 64)
-             builtin_xe_to_cpp(${bit} res_xe_${bit})
-             list(APPEND tmpList ${res_xe_${bit}} )
-             if(MSVC)
--- 
-2.17.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
new file mode 100644
index 00000000..77d13bb4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+python3 run_tests.py
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
index db674178..ed8df859 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
@@ -5,23 +5,29 @@ HOMEPAGE = "https://github.com/ispc/ispc"
 
 LICENSE  = "BSD-3-Clause & Apache-2.0-with-LLVM-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \
-                    file://third-party-programs.txt;md5=3cd6f8a7c3bd9d2bb898fcb27c75221a"
+                    file://third-party-programs.txt;md5=2061218c7be521556719c8b504bf9ddd"
 
-inherit cmake python3native
+inherit cmake python3native ptest
 
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
-           file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
            file://0002-cmake-don-t-build-for-32-bit-targets.patch \
            file://0001-Fix-QA-Issues.patch \
+           file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \
+           file://run-ptest \
            "
-SRCREV = "f7ec3aa173c816377c215d83196b5c7c3a88db1c"
+
+SRCREV = "bcb2cf896c00f9a802a11cbf291ef6e44b205416"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
 DEPENDS += " clang-native bison-native flex-native"
-RDEPENDS:${PN} += " clang-libllvm clang"
+DEPENDS:append:class-target = " clang"
+RDEPENDS:${PN}-ptest += " python3-multiprocessing"
+
+PACKAGECONFIG ??= "tbb"
+PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, -DISPCRT_BUILD_TASK_MODEL=OpenMP, tbb"
 
 YFLAGS='-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}'
 
@@ -30,18 +36,29 @@ do_configure:prepend() {
         sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt
 }
 
+do_install_ptest() {
+        cp -rf ${S}/run_tests.py ${D}${PTEST_PATH}
+        cp -rf ${S}/common.py ${D}${PTEST_PATH}
+        cp -rf ${S}/tests ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.isph ${D}${PTEST_PATH}
+        cp -rf ${S}/fail_db.txt ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.cpp ${D}${PTEST_PATH}
+}
+
 EXTRA_OECMAKE += " \
                   -DISPC_INCLUDE_TESTS=OFF  \
                   -DISPC_INCLUDE_EXAMPLES=OFF  \
-                  -DISPC_NO_DUMPS=ON  \
                   -DARM_ENABLED=OFF  \
                   -DISPC_CROSS=ON  \
                   -DISPC_ANDROID_TARGET=OFF  \
                   -DISPC_FREEBSD_TARGET=OFF  \
                   -DISPC_WINDOWS_TARGET=OFF  \
                   -DISPC_IOS_TARGET=OFF  \
-                  -DISPC_PS4_TARGET=OFF  \
-                  -DSYSROOT_DIR=${STAGING_DIR_NATIVE}  \
+                  -DISPC_PS_TARGET=OFF  \
+                  -DSYSROOT_DIR=${STAGING_DIR} \
+                  -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
+                  -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
                   "
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
index 42431416..8bade9f4 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc"
 
 SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master"
-SRCREV = "bb7fff05b801e26c3d7858e03e509d1089914d59"
+SRCREV = "1685d01497428ca4d8b99200972b64685424d5c9"
 S = "${WORKDIR}/git"
 
 inherit cmake
@@ -30,3 +30,4 @@ FILES:${PN}-loader = "${libdir}"
 INSANE_SKIP:${PN}-loader = "dev-so"
 INSANE_SKIP:${PN}-samples = "dev-so"
 ALLOW_EMPTY:${PN} = "1"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
new file mode 100644
index 00000000..2748d7ab
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
@@ -0,0 +1,99 @@
+From b57297c14d94dac9bdef7570b7b33d70b10171f3 Mon Sep 17 00:00:00 2001
+From: Jozef Wludzik <jozef.wludzik@intel.com>
+Date: Tue, 26 Mar 2024 14:43:29 +0100
+Subject: [PATCH 1/2] Fix the compilation warning when using gcc-13 (#25)
+
+Added missing headers. Fixed compilation error about casting from
+unsigned to signed int.
+
+Upstream-Status: Backport [https://github.com/intel/linux-npu-driver/commit/4bcbf2abe94eb4d9c083bd616b58e309a82d008a]
+
+Signed-off-by: Jozef Wludzik <jozef.wludzik@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp | 7 ++++---
+ umd/vpu_driver/include/umd_common.hpp                  | 1 +
+ validation/umd-test/umd_prime_buffers.h                | 9 +++++++--
+ validation/umd-test/utilities/data_handle.h            | 1 +
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+index f206ebe..682e5b4 100644
+--- a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
++++ b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+@@ -5,12 +5,13 @@
+  *
+  */
+ 
+-#include <dlfcn.h>
+-#include <memory>
+-
+ #include "vpux_driver_compiler.h"
+ #include "vpu_driver/source/utilities/log.hpp"
+ 
++#include <array>
++#include <dlfcn.h>
++#include <memory>
++
+ class Vcl {
+   public:
+     static Vcl &sym() {
+diff --git a/umd/vpu_driver/include/umd_common.hpp b/umd/vpu_driver/include/umd_common.hpp
+index 0c874a3..5ad9be2 100644
+--- a/umd/vpu_driver/include/umd_common.hpp
++++ b/umd/vpu_driver/include/umd_common.hpp
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <limits>
+ #include <linux/kernel.h>
+ #include <stdexcept>
+diff --git a/validation/umd-test/umd_prime_buffers.h b/validation/umd-test/umd_prime_buffers.h
+index 6f7c7de..ab4814c 100644
+--- a/validation/umd-test/umd_prime_buffers.h
++++ b/validation/umd-test/umd_prime_buffers.h
+@@ -6,12 +6,17 @@
+  */
+ 
+ #pragma once
++
++#include "umd_test.h"
++
+ #include <fcntl.h>
+-#include <linux/kernel.h>
+ #include <linux/dma-buf.h>
+ #include <linux/dma-heap.h>
++#include <linux/kernel.h>
++#include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <unistd.h>
+ 
+ #define ALLIGN_TO_PAGE(x) __ALIGN_KERNEL((x), (UmdTest::PAGE_SIZE))
+ 
+@@ -60,7 +65,7 @@ class PrimeBufferHelper {
+             return false;
+ 
+         bufferFd = heapAlloc.fd;
+-        buffers.insert({heapAlloc.fd, {size, nullptr}});
++        buffers.insert({static_cast<int>(heapAlloc.fd), {size, nullptr}});
+         return true;
+     }
+ 
+diff --git a/validation/umd-test/utilities/data_handle.h b/validation/umd-test/utilities/data_handle.h
+index d6e0ec0..5d937b2 100644
+--- a/validation/umd-test/utilities/data_handle.h
++++ b/validation/umd-test/utilities/data_handle.h
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <stdint.h>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.43.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
new file mode 100644
index 00000000..9fb97354
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
@@ -0,0 +1,110 @@
+From a9f51fd88effb7d324609e692ca7da576d6dad2e Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Tue, 28 May 2024 10:23:42 +0800
+Subject: [PATCH 2/2] Fix compilation failure with GCC-14
+
+umd/level_zero_driver/core/source/event/event.cpp:65:31: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|    65 |     associatedJobs.erase(std::remove_if(associatedJobs.begin(),
+|       |                               ^~~~~~~~~
+|       |                               remove_cv
+
+| umd/vpu_driver/source/command/vpu_command.cpp: In member function 'void VPU::VPUCommand::appendAssociateBufferObject(VPU::VPUBufferObject*)':
+| umd/vpu_driver/source/command/vpu_command.cpp:126:20: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   126 |     auto it = std::find(bufferObjects.begin(), bufferObjects.end(), bo);
+|       |                    ^~~~
+|       |                    bind
+
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp: In member function 'bool VPU::VPUCommandBuffer::addCommand(VPU::VPUCommand*, uint64_t&, uint64_t&)':
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp:185:24: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   185 |         auto it = std::find(bufferHandles.begin(), bufferHandles.end(), bo->getHandle());
+|       |                        ^~~~
+|       |                        bind
+
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:301:32: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   301 |                           std::max_element(stride_begin + TENSOR_5D_STRIDE_C, stride_end));
+|       |                                ^~~~~~~~~~~
+|       |                                tuple_element
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:315:37: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   315 |         auto max_stride_val = *std::max_element(stride_begin + TENSOR_4D_STRIDE_C, stride_end);
+|       |                                     ^~~~~~~~~~~
+
+| umd/level_zero_driver/tools/source/metrics/metric.cpp: In member function 'void L0::MetricContext::deactivateMetricGroups(int)':
+| umd/level_zero_driver/tools/source/metrics/metric.cpp:275:38: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|   275 |     activatedMetricGroups.erase(std::remove_if(activatedMetricGroups.begin(),
+|       |                                      ^~~~~~~~~
+|       |                                      remove_cv
+
+Upstream-Status: Submitted [https://github.com/intel/linux-npu-driver/pull/30]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/core/source/event/event.cpp     | 1 +
+ umd/level_zero_driver/ext/source/graph/elf_parser.cpp | 1 +
+ umd/level_zero_driver/tools/source/metrics/metric.cpp | 1 +
+ umd/vpu_driver/source/command/vpu_command.cpp         | 1 +
+ umd/vpu_driver/source/command/vpu_command_buffer.cpp  | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/umd/level_zero_driver/core/source/event/event.cpp b/umd/level_zero_driver/core/source/event/event.cpp
+index a92248f..196d176 100644
+--- a/umd/level_zero_driver/core/source/event/event.cpp
++++ b/umd/level_zero_driver/core/source/event/event.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include <level_zero/ze_api.h>
+ #include <thread>
++#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+index a1c8e14..dfbd61d 100644
+--- a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
++++ b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+@@ -21,6 +21,7 @@
+ #include <vpux_headers/metadata.hpp>
+ #include <vpux_elf/types/vpu_extensions.hpp>
+ #include <vpux_elf/utils/error.hpp>
++#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/tools/source/metrics/metric.cpp b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+index b67750f..9497311 100644
+--- a/umd/level_zero_driver/tools/source/metrics/metric.cpp
++++ b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include "level_zero_driver/tools/source/metrics/metric.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
++#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command.cpp b/umd/vpu_driver/source/command/vpu_command.cpp
+index f4ca23f..75331d9 100644
+--- a/umd/vpu_driver/source/command/vpu_command.cpp
++++ b/umd/vpu_driver/source/command/vpu_command.cpp
+@@ -14,6 +14,7 @@
+ #include <cstdint>
+ #include <vector>
+ #include <map>
++#include <algorithm>
+ 
+ namespace VPU {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command_buffer.cpp b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+index c4ad052..bbb80ec 100644
+--- a/umd/vpu_driver/source/command/vpu_command_buffer.cpp
++++ b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+@@ -11,6 +11,7 @@
+ #include "vpu_driver/source/command/vpu_command_buffer.hpp"
+ #include "vpu_driver/source/command/vpu_copy_command.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
++#include <algorithm>
+ 
+ namespace VPU {
+ 
+-- 
+2.43.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb
new file mode 100644
index 00000000..03e409af
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "User Mode Driver for Intel® NPU device"
+HOMEPAGE = "https://github.com/intel/linux-npu-driver"
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=37acda99f3f9c108e62d970fe0e08027 \
+                    file://third-party-programs.txt;md5=dbf0d7a91947cccc5410e9760d9acae5 \
+                    file://third_party/vpux_elf/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux-npu-driver;branch=main;lfs=1 \
+            git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=git/third_party/vpux_elf;name=vpux-elf;nobranch=1 \
+            git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=git/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
+            git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=git/third_party/level-zero-vpu-extensions;name=lzvext;nobranch=1 \
+            git://github.com/google/googletest.git;protocol=https;destsuffix=git/third_party/googletest;name=googletest;nobranch=1 \
+            file://0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch \
+            file://0002-Fix-compilation-failure-with-GCC-14.patch \
+        "
+
+SRCREV_linux-npu-driver = "9d1dd3daa01ebd97a4ac2e8279ddd6e2cb109244"
+SRCREV_vpux-elf = "03878c115d13aa1ce6af5329c5759fc1cc94a3fb"
+SRCREV_yaml-cpp = "0579ae3d976091d7d664aa9d2527e0d0cff25763"
+SRCREV_lzvext = "0e1c471356a724ef6d176ba027a68e210d90939e"
+SRCREV_googletest = "b796f7d44681514f58a683a3a71ff17c94edb0c1"
+SRCREV_FORMAT = "linux-npu-driver_vpux-elf_yaml-cpp_lzvext_googletest"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+DEPENDS = "level-zero"
+
+PACKAGES =+ "${PN}-firmware ${PN}-tests"
+
+FILES:${PN}-firmware = "${libdir}/firmware/updates/intel/vpu/*"
+FILES:${PN}-tests = "${bindir}"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
deleted file mode 100644
index b9d4fdf6..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler & Intel® C++ Compiler Classic runtime common files"
-DESCRIPTION = "Intel® C++ Compiler Classic generates applications\
- that can run on Intel® 64 architecture and the IA-32 architecture.\
- Intel® oneAPI Data Parallel C++ (DPC++) is an open alternative \
- to single-architecture proprietary languages. It allows developers to reuse \
- code across hardware targets (CPUs and accelerators such as GPUs and FPGAs) \
- and also perform custom tuning for a specific accelerator."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html"
-
-LICENSE="EULA"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/openmp/third-party-programs.txt;md5=da72b17a4a1efef54faf14df4a703282 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/c/third-party-programs.txt;md5=3414f5649b09160ade46d4981f3452fe \
-                     file://opt/intel/oneapi/lib/licensing/opencl/EULA.txt;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/TBB_TPP.txt;md5=0a69156543e3e115c673c6041b6aee92 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/redist.txt;md5=32fb3b7d1c0a92ea577fe2e4b0dfa663 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/third-party-programs.txt;md5=c660b8b0891e780a62da6a198e80e9ac \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-${PV}_amd64.deb;subdir=${BPN};name=runtime-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-common-${PV}_all.deb;subdir=${BPN};name=common-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${PV}_amd64.deb;subdir=${BPN};name=runtime-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${PV}_all.deb;subdir=${BPN};name=common-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-${PV}_amd64.deb;subdir=${BPN};name=runtime-opencl \
-            "
-
-SRC_URI[runtime-compilers.sha256sum] = "8951fd8a0946095609f0ef7bb2b51c698fc0315455a76d268a54851936c07db9"
-SRC_URI[common-compilers.sha256sum] = "c592482f68b131fff0623fdc978c592950f02d7f35f6795587e93a28fe1d3c31"
-SRC_URI[runtime-dpcpp-cpp.sha256sum] = "9e26b9c5321281d829d62542c22552182d00255ebc2f8a6e179b95515c63c24d"
-SRC_URI[common-dpcpp-cpp.sha256sum] = "9cd0957a75f5ad45b208f2c1c8ee2aa032e335ada9193ca69f8ac5a7cb548d02"
-SRC_URI[runtime-openmp.sha256sum] = "86fb0d6e3a34217cc30594e9f21e89070425c6c56773edae4d5a86730239c171"
-SRC_URI[common-openmp.sha256sum] = "5bd2fc7a1605545fc8536ec0e8d80c982f1feb7dc6eed5b45adf3cd0370e0a98"
-SRC_URI[runtime-opencl.sha256sum] = "65d73c23f07c2419b8a1d22043b73346f25b387d3ec07b48f08177de1835a360"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit bin_package update-alternatives
-
-ALTERNATIVE:${PN} = "Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_LINK_NAME[Intel_FPGA_SSG_Emulator.icd] = "/etc/OpenCL/vendors/intel64-fpgaemu.icd"
-ALTERNATIVE_TARGET[Intel_FPGA_SSG_Emulator.icd] = "/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "perl elfutils ocl-icd level-zero-loader zlib tbb libelf setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "textrel dev-so"
-
-# The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6
-do_install:append () {
-    rm -f ${D}/opt/intel/oneapi/lib/libomptarget.rtl.x86_64.so
-    echo "/opt/intel/oneapi/lib/emu/libintelocl_emu.so" > ${D}/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd
-}
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
new file mode 100644
index 00000000..cedbae1e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
@@ -0,0 +1,54 @@
+SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files"
+DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
+that help your applications run faster on Intel® 64 architectures with support \
+for the latest C, C++, and SYCL language standards. This compiler produces \
+optimized code that can run significantly faster by taking advantage of the \
+ever-increasing core count and vector register width in Intel® Xeon® processors \
+and compatible processors."
+
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
+
+LICENSE="EULA"
+
+COMPILERMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \
+                     "
+COMPILERDOTVER = "2024.0.0-49406"
+DEVUTILITVERSION = "2024.0-2024.0.0-49320"
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \
+            "
+
+SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33"
+SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa"
+SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394"
+SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750"
+SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe"
+SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d"
+SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6"
+SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50"
+
+S = "${WORKDIR}/${BPN}"
+
+inherit bin_package
+
+RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh"
+SKIP_FILEDEPS:${PN} = '1'
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+# doesn't have GNU_HASH (didn't pass LDFLAGS?)
+INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps"
+
+FILES_SOLIBSDEV = ""
+BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
new file mode 100644
index 00000000..90ada087
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
@@ -0,0 +1,45 @@
+SUMMARY = "Intel® oneAPI DPC++/C++ Compiler"
+DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
+that help your applications run faster on Intel® 64 architectures with support \
+for the latest C, C++, and SYCL language standards. This compiler produces \
+optimized code that can run significantly faster by taking advantage of the \
+ever-increasing core count and vector register width in Intel® Xeon® processors \
+and compatible processors."
+
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
+
+LICENSE="EULA"
+
+COMPILERMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \
+                     "
+
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \
+            "
+
+SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82"
+SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236"
+SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558"
+
+S = "${WORKDIR}/${BPN}"
+
+inherit bin_package
+
+RDEPENDS:${PN} += "intel-oneapi-dpcpp-cpp-runtime"
+SKIP_FILEDEPS:${PN} = '1'
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+# doesn't have GNU_HASH (didn't pass LDFLAGS?)
+INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped file-rdeps staticdev rpaths arch useless-rpaths"
+
+FILES_SOLIBSDEV = ""
+
+EXCLUDE_FROM_SHLIBS = "1"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.4.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
index 98652e07..1eeaf339 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.4.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
@@ -4,18 +4,17 @@ intended to graphics application engineers that want to improve the \
 performance of their application."
 HOMEPAGE = "https://github.com/embree/embree"
 
-LICENSE  = "Apache-2.0 & syrah"
+LICENSE  = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://third-party-programs.txt;md5=86f6028ba2138fe41ac5c121d0a3518e \
+                    file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \
                     file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8"
 
 inherit pkgconfig cmake
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master \
-            "
-SRCREV = "489b746c0d5010e0da10345e9dc96768bec9a037"
+SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master"
+SRCREV = "daa8de0e714e18ad5e5c9841b67c1950d9c91c51"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@@ -23,9 +22,11 @@ COMPATIBLE_HOST:libc-musl = "null"
 DEPENDS = "tbb jpeg libpng glfw ispc-native"
 
 EXTRA_OECMAKE += " \
-                  -DEMBREE_ISPC_SUPPORT=OFF  \
                   -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF  \
                   -DEMBREE_MAX_ISA=DEFAULT  \
                   -DEMBREE_TUTORIALS=OFF  \
                   -DEMBREE_ISPC_SUPPORT=ON  \
+                  -DEMBREE_ZIP_MODE=OFF  \
                   "
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
new file mode 100644
index 00000000..1841253e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
+ building blocks for cross-platform performance. Develop high-performance vision, \
+ signal, security, and storage applications with this multithreaded software library."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
+
+LICENSE = "ISSL"
+
+MAXVER = "2021.10"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \
+                     "
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \
+            "
+
+SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07"
+SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005"
+SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6"
+
+S = "${WORKDIR}/${BPN}"
+
+COMPATIBLE_HOST:libc-musl = "null"
+
+inherit bin_package
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+INHIBIT_DEFAULT_DEPS = ""
+
+RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
+INSANE_SKIP:${PN} += "ldflags dev-so"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
deleted file mode 100644
index ae764253..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
- building blocks for cross-platform performance. Develop high-performance vision, \
- signal, security, and storage applications with this multithreaded software library."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
-
-LICENSE = "ISSL"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/ipp/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/ipp/third-party-programs.txt;md5=6cd9ad51f3b5cdfd4a355fa5599a6c03 \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-common-${PV}_all.deb;subdir=${BPN};name=common \
-            "
-
-SRC_URI[runtime.sha256sum] = "98cd14bf635969d57bf9ea7bb27b90f27f72404f1927aa486a2bcf3c20a0f303"
-SRC_URI[common.sha256sum] = "1aac41633179e824567b90afd39b8405db30df79a027421568df019b2b51bdd1"
-
-S = "${WORKDIR}/${BPN}"
-
-COMPATIBLE_HOST:libc-musl = "null"
-
-inherit bin_package
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "ldflags dev-so"
-
-# Some libraries are linking against the unversioned lib and there's no soname entry.
-# Workaround errors like:
-# Problem: conflicting requests
-#  - nothing provides libippcore_tl_omp.so()(64bit) needed by intel-oneapi-ipp-2021.3.0+333-r0.skylake_64
-do_install:append () {
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so
-}
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
deleted file mode 100644
index fc89206a..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
-DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
- math library of highly optimized and extensively parallelized routines \
- for applications that require maximum performance. oneMKL contains \
- the high-performance optimizations from the full Intel® Math Kernel Library \
- for CPU architectures (with C/Fortran programming language interfaces)\
- and adds to them a set of DPC++ programming language interfaces for \
- achieving performance on various CPU architectures \
- and Intel Graphics Technology for certain key functionalities."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
-
-LICENSE = "ISSL"
-
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/mkl/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs.txt;md5=980965cf1f086d40998ca4981968b6a4 \
-                     "
-
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-common-${PV}_all.deb;subdir=${BPN};name=common \
-            "
-
-SRC_URI[runtime.sha256sum] = "b20e0f7400fbbc55d8489f9f3ef35a8c8df7f5af7d87903bf305703e3a2ebc3b"
-SRC_URI[common.sha256sum] = "bff8b2bfedbd09c9e6d0366cca3d4de80af521302bd5938fe6fa0128c6839041"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit bin_package
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-
-RDEPENDS:${PN} += "tbb intel-oneapi-compiler setup-intel-oneapi-env"
-INSANE_SKIP:${PN} = "ldflags textrel dev-so"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
new file mode 100644
index 00000000..e3e93028
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
@@ -0,0 +1,74 @@
+SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
+DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
+ math library of highly optimized and extensively parallelized routines \
+ for applications that require maximum performance. oneMKL contains \
+ the high-performance optimizations from the full Intel® Math Kernel Library \
+ for CPU architectures (with C/Fortran programming language interfaces)\
+ and adds to them a set of DPC++ programming language interfaces for \
+ achieving performance on various CPU architectures \
+ and Intel Graphics Technology for certain key functionalities."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
+
+LICENSE = "ISSL"
+
+MKLMAINVER = "2024.0"
+
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd  \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \
+                     "
+
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \
+            "
+
+SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959"
+SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192"
+SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84"
+SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef"
+
+S = "${WORKDIR}/${BPN}"
+
+inherit bin_package
+
+do_install:append () {
+        install -d ${D}${bindir}
+        (cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .)
+        install -d ${D}${libdir}
+        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .)
+        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .)
+        install -d ${D}${libdir}/pkgconfig
+        (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .)
+        install -d ${D}${libdir}/cmake
+        (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .)
+
+        install -d ${D}${includedir}
+        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do
+            install -d ${D}${includedir}/$srcdir
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/)
+        done
+
+        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .)
+        done
+}
+
+AUTO_LIBNAME_PKGS = ""
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+
+RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd"
+INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped"
+
+FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*"
+
+SKIP_FILEDEPS:${PN} = '1'
+
+SYSROOT_DIRS += "/opt"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
deleted file mode 100644
index 0f39a581..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 46b7de8c4ae0cc34805c2a11356c5a730fb8760a Mon Sep 17 00:00:00 2001
-From: Ezhilarasan <ezhilarasanx.s@intel.com>
-Date: Fri, 4 Mar 2022 21:04:47 +0530
-Subject: [PATCH] remove-redundant-RPATH
-
-Error Log:
-ERROR: oidn-1.4.3-r0 do_package_qa: QA Issue: oidn: /usr/lib/libOpenImageDenoise.so.1.4.3 contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnTest contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnDenoise contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnBenchmark contains probably-redundant RPATH /usr/lib [useless-rpaths]
-ERROR: oidn-1.4.3-r0 do_package_qa: Fatal QA errors were found, failing task.
-
-Remove the redundant RPATH
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com>
----
- cmake/oidn_package.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/oidn_package.cmake b/cmake/oidn_package.cmake
-index 1f76af8..46c0854 100644
---- a/cmake/oidn_package.cmake
-+++ b/cmake/oidn_package.cmake
-@@ -29,7 +29,7 @@ if(OIDN_ZIP_MODE)
-     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   endif()
- else()
--  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-+#  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- endif()
- 
- ## -----------------------------------------------------------------------------
--- 
-2.17.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
index 8e055a57..4ea6ffbe 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
@@ -7,15 +7,14 @@ HOMEPAGE = "https://www.openimagedenoise.org/"
 
 LICENSE = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://mkl-dnn/LICENSE;md5=8e17c0f9656ebaf0c380d9b22707c846 \
-                    file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
-                    file://mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
+                    file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
+                    file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
                     file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\
-           file://0001-remove-redundant-RPATH.patch \
            "
-SRC_URI[sha256sum] = "3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a"
+SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6"
 
 inherit cmake
 
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
index 04255a3c..a2d709a1 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
@@ -20,16 +20,22 @@ S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \
            "
-SRCREV = "ec551ea08cbceab187326e2358fdc1ceeffaf1d6"
+SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-DEPENDS = "ispc-native rkcommon embree"
+DEPENDS = "ispc ispc-native rkcommon embree"
 
 EXTRA_OECMAKE += " \
                   -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc  \
                   "
+EXTRA_OECMAKE:intel-corei7-64 += " \
+                  -DOPENVKL_ISA_AVX=OFF  \
+                  -DOPENVKL_ISA_AVX2=OFF  \
+                  -DOPENVKL_ISA_AVX512SKX=OFF  \
+                  "
+
 PACKAGES =+ "${PN}-examples"
 FILES:${PN}-examples = "\
                      ${bindir} \
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
index bd0d41d8..3e03dcc2 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://www.ospray.org/"
 
 LICENSE  = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
-                    file://third-party-programs.txt;md5=7cccb4c920e5b7de8eddf8a5d408d900 \
+                    file://third-party-programs.txt;md5=e37b77e3bd997abccc359c710fb1f1db \
                     "
 
 inherit pkgconfig cmake
@@ -15,17 +15,18 @@ S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \
             "
-SRCREV = "fdda0889f9143a8b20f26389c22d1691f1a6a527"
+SRCREV = "f2a61c2eb58ccd666e34abfdb0fd7049ea073194"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-DEPENDS = "rkcommon ispc-native openvkl embree"
+DEPENDS = "rkcommon ispc ispc-native openvkl embree"
 
 EXTRA_OECMAKE += " \
                   -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \
                   -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \
                   -DOSPRAY_ENABLE_APPS_TESTING=OFF \
+                  -DOSPRAY_ENABLE_APPS_EXAMPLES=OFF \
                   "
 
 PACKAGES =+ "${PN}-apps"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
index 8bf6d28b..fe6b23ea 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \
             "
-SRCREV = "0b8856cd9278474b56dc5bcff516a4b9482cf147"
+SRCREV = "7ebfa0765ea590767202b328e7da38102c2f5a15"
 
 DEPENDS = "tbb"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 7fede93c..11305e83 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,48 +1,50 @@
-
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
 Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
  MdePkg/Include/Base.h | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
-index 2da08b0c78..072eefdb94 100644
+index d209e6de28..6e61b8f3d3 100644
 --- a/MdePkg/Include/Base.h
 +++ b/MdePkg/Include/Base.h
-@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
- ///
- /// NULL pointer (VOID *)
- ///
+@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
+ #define NULL  __null
+   #endif
+ #else
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
  #define NULL  ((VOID *) 0)
+ #endif
 +#endif
 +#endif
- 
+
  //
  // Null character
-@@ -810,6 +814,8 @@ typedef UINTN  *BASE_LIST;
+@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
  // Section 2.3.1 of the UEFI 2.3 Specification.
  //
- 
+
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
  STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
  STATIC_ASSERT (sizeof (INT8)    == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
  STATIC_ASSERT (sizeof (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
-@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
+@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
  STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
  STATIC_ASSERT (sizeof (L'A')    == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
  STATIC_ASSERT (sizeof (L"A")    == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
+
  //
  // The following three enum types are used to verify that the compiler
-@@ -843,9 +851,13 @@ typedef enum {
+@@ -812,9 +820,13 @@ typedef enum {
    __VerifyUint32EnumValue = 0xffffffff
  } __VERIFY_UINT32_ENUM_SIZE;
- 
+
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
  STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
@@ -50,8 +52,8 @@ index 2da08b0c78..072eefdb94 100644
  STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
+
  /**
    Macro that returns a pointer to the data structure that contains a specified field of
--- 
-2.31.0.windows.1
+--
+2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch
deleted file mode 100644
index a6e83617..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 227d9cb35658fe104ff6fde62e4a00e6d595df0d Mon Sep 17 00:00:00 2001
-From: Adam Borowski <kilobyte@angband.pl>
-Date: Sat, 25 Jun 2022 20:35:35 +0200
-Subject: [PATCH] Drop unused queries for block size, fixing build with new
- kernels
-
-Quoting Linux commit f8669f1d6a86a6b17104ceca9340ded280307ac1:
-
-> Block Aperture Window support was an attempt to layer an error model
-> over PMEM for platforms that did not support machine-check-recovery.
-> However, it was abandoned before it ever shipped, and only ever existed
-> in the ACPI specification. Meanwhile Linux has carried a large pile of
-> dead code for non-shipping infrastructure. [...]
-
-We fetched block sizes but never used that info for anything.  Now that
-the required defines have been dropped in kernel 5.18, let's purge that
-code.
-
-Signed-off-by: Adam Borowski <adam.borowski@intel.com>
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/os/linux/lnx_system.c | 56 ---------------------------------------
- src/os/os.h               |  2 --
- src/os/win/win_system.c   |  2 --
- 3 files changed, 60 deletions(-)
-
-diff --git a/src/os/linux/lnx_system.c b/src/os/linux/lnx_system.c
-index a2903d8b..d2ad3c1f 100644
---- a/src/os/linux/lnx_system.c
-+++ b/src/os/linux/lnx_system.c
-@@ -315,61 +315,6 @@ int os_get_os_type()
-        return OS_TYPE_LINUX;
- }
- 
--int get_supported_block_sizes(struct nvm_driver_capabilities *p_capabilities)
--{
--       int rc = NVM_SUCCESS;
--       int found = 0;
--       struct ndctl_ctx *ctx;
--
--       p_capabilities->num_block_sizes = 0;
--
--       if ((rc = ndctl_new(&ctx)) >= 0)
--       {
--               struct ndctl_bus *bus;
--               ndctl_bus_foreach(ctx, bus)
--               {
--                       struct ndctl_region *region;
--                       ndctl_region_foreach(bus, region)
--                       {
--                               int nstype = ndctl_region_get_nstype(region);
--                               if (ndctl_region_is_enabled(region) &&
--                                       (nstype == ND_DEVICE_NAMESPACE_BLK))
--                               {
--                                       struct ndctl_namespace *namespace;
--                                       ndctl_namespace_foreach(region, namespace)
--                                       {
--                                               p_capabilities->num_block_sizes =
--                                                       ndctl_namespace_get_num_sector_sizes(namespace);
--
--                                               for (int i = 0; i < p_capabilities->num_block_sizes; i++)
--                                               {
--                                                       p_capabilities->block_sizes[i] =
--                                                               ndctl_namespace_get_supported_sector_size(namespace, i);
--                                               }
--                                               found = 1;
--                                               break;
--                                       }
--                               }
--                               if (found)
--                               {
--                                       break;
--                               }
--                       }
--                       if (found)
--                       {
--                               break;
--                       }
--               }
--               ndctl_unref(ctx);
--       }
--       else
--       {
--               rc = linux_err_to_nvm_lib_err(rc);
--       }
--
--       return rc;
--}
--
- int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
- {
-        p_capabilities->features.get_platform_capabilities = 1;
-@@ -399,7 +344,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
-        p_capabilities->features.app_direct_mode = 1;
- 
-        p_capabilities->min_namespace_size = ndctl_min_namespace_size();
--       get_supported_block_sizes(p_capabilities);
-        p_capabilities->namespace_memory_page_allocation_capable = 1;
-        return 0;
- }
-diff --git a/src/os/os.h b/src/os/os.h
-index 736904de..e5a08bcd 100644
---- a/src/os/os.h
-+++ b/src/os/os.h
-@@ -66,8 +66,6 @@ struct driver_feature_flags
- 
- struct nvm_driver_capabilities
- {
--       unsigned int block_sizes[MAX_NUMBER_OF_BLOCK_SIZES]; // in bytes
--       unsigned int num_block_sizes;
-        unsigned long long min_namespace_size; // in bytes
-        unsigned int namespace_memory_page_allocation_capable;
-        struct driver_feature_flags features;
-diff --git a/src/os/win/win_system.c b/src/os/win/win_system.c
-index 0c18cf0e..4d840333 100644
---- a/src/os/win/win_system.c
-+++ b/src/os/win/win_system.c
-@@ -830,8 +830,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
-        memset(p_capabilities, 0, sizeof(struct nvm_driver_capabilities));
- 
-        p_capabilities->min_namespace_size = BYTES_PER_GIB;
--       p_capabilities->num_block_sizes = 1;
--       p_capabilities->block_sizes[0] = 1;
- 
-        p_capabilities->namespace_memory_page_allocation_capable = 0;
-        p_capabilities->features.get_platform_capabilities = 1;
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0439.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
index 7bf0cb70..c4743d1c 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0439.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
@@ -15,16 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71  \
                     file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
 
-SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \
+SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \
         git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
         file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
         file://0001-CMakeLists-disable-Werror.patch \
-        file://227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch \
 "
 
-SRCREV_ipmctl = "8a73a975e2501c9baa6e4b1fb9101b40a227d084"
-#tag edk2-stable202205
-SRCREV_edk2 = "16779ede2d366bfc6b702e817356ccf43425bcc8"
+SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51"
+#tag edk2-stable202302
+SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3"
+SRCREV_FORMAT = "ipmctl_edk2"
 
 S = "${WORKDIR}/git"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
new file mode 100644
index 00000000..7f5b46c6
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -0,0 +1,86 @@
+From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:42:57 +0530
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
+
+* Dont try to detect glibc version as that doesn't work when cross compiling.
+* Dont try to detect CXX11_ABI
+* Install sample binaries as well.
+* Dont try to write triggers for CPack. We package ourselves.
+* Fix the installation path for Python modules when baselib = lib64.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
+ cmake/developer_package/target_flags.cmake      | 4 ++--
+ samples/cpp/CMakeLists.txt                      | 6 +++---
+ src/bindings/python/CMakeLists.txt              | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
+index 99f11730983..1a1f61fcd3d 100644
+--- a/cmake/developer_package/packaging/rpm/rpm.cmake
++++ b/cmake/developer_package/packaging/rpm/rpm.cmake
+@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
+ # needed to add triggers for packages with libraries
+ set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
+ set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
+-file(WRITE "${def_triggers}" "${triggers_content}")
++#file(WRITE "${def_triggers}" "${triggers_content}")
+ 
+ #
+ # Functions helpful for packaging your modules with RPM cpack
+diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
+index d047a1aebd9..4e8ca68c60f 100644
+--- a/cmake/developer_package/target_flags.cmake
++++ b/cmake/developer_package/target_flags.cmake
+@@ -149,7 +149,7 @@ function(ov_glibc_version)
+     endif()
+ endfunction()
+ 
+-ov_glibc_version()
++#ov_glibc_version()
+ 
+ #
+ # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
+@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
+     endif()
+ endmacro()
+ 
+-ov_get_glibcxx_use_cxx11_abi()
++#ov_get_glibcxx_use_cxx11_abi()
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index 4d33bff944e..3e7f1458578 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -206,9 +206,9 @@ macro(ov_add_sample)
+     target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES})
+ 
+     install(TARGETS ${SAMPLE_NAME}
+-            RUNTIME DESTINATION samples_bin/
+-            COMPONENT samples_bin
+-            EXCLUDE_FROM_ALL)
++            DESTINATION ${CMAKE_INSTALL_BINDIR}
++            COMPONENT samples_bin)
++
+ 
+     # create global target with all samples / demo apps
+     if(NOT TARGET ov_samples)
+diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
+index 6cf43ec3fed..d539b9d003f 100644
+--- a/src/bindings/python/CMakeLists.txt
++++ b/src/bindings/python/CMakeLists.txt
+@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
+     # install OpenVINO Python API
+ 
+     set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
+-    set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
++    set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
+     set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+     set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
+ 
+-- 
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
deleted file mode 100644
index 315385d8..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 7 Apr 2022 21:39:26 +0800
-Subject: [PATCH] Use system installed dependencies
-
-Use the system versions of libva, tbb, OpenCV, ade and zlib.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
----
- cmake/dependencies.cmake                | 75 -------------------------
- cmake/extra_modules.cmake               |  4 +-
- cmake/templates/OpenVINOConfig.cmake.in |  9 ---
- src/cmake/ie_parallel.cmake             |  2 +-
- src/plugins/intel_gpu/include/va/va.h   |  6 --
- tests/fuzz/src/CMakeLists.txt           |  3 +-
- thirdparty/CMakeLists.txt               | 26 ++++-----
- thirdparty/cnpy/CMakeLists.txt          |  2 +-
- 8 files changed, 15 insertions(+), 112 deletions(-)
- delete mode 100644 src/plugins/intel_gpu/include/va/va.h
-
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index e2f941fcd..1fcc358ef 100644
---- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -29,26 +29,6 @@ endif()
- 
- if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-     set(protoc_version "3.18.2")
--
--    RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
--        ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
--        TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
--        SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
--    )
--    debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
--
--    reset_deps_cache(SYSTEM_PROTOC)
--
--    find_host_program(
--        SYSTEM_PROTOC
--        NAMES protoc
--        PATHS "${SYSTEM_PROTOC_ROOT}/bin"
--        NO_DEFAULT_PATH)
--    if(NOT SYSTEM_PROTOC)
--        message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
--    endif()
--
--    update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
- endif()
- 
- if(ENABLE_INTEL_MYRIAD)
-@@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-         set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
-     endif()
- 
--    if(WIN32 AND X86_64)
--        # TODO: add target_path to be platform specific as well, to avoid following if
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_WIN "tbb2020_20200415_win.zip"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
--        if(ENABLE_TBBBIND_2_5)
--            RESOLVE_DEPENDENCY(TBBBIND_2_5
--                    ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
--                    TARGET_PATH "${TEMP}/tbbbind_2_5"
--                    ENVIRONMENT "TBBBIND_2_5_ROOT"
--                    SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
--        else()
--            message(WARNING "prebuilt TBBBIND_2_5 is not available.
--    Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
--        endif()
--    elseif(ANDROID)  # Should be before LINUX due LINUX is detected as well
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
--    elseif(LINUX AND X86_64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
--        if(ENABLE_TBBBIND_2_5)
--            RESOLVE_DEPENDENCY(TBBBIND_2_5
--                    ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
--                    TARGET_PATH "${TEMP}/tbbbind_2_5"
--                    ENVIRONMENT "TBBBIND_2_5_ROOT"
--                    SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
--        else()
--            message(WARNING "prebuilt TBBBIND_2_5 is not available.
--    Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
--        endif()
--    elseif(LINUX AND AARCH64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
--                TARGET_PATH "${TEMP}/tbb_yocto"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
--    elseif(APPLE AND X86_64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
--    else()
--        message(FATAL_ERROR "TBB is not available on current platform")
--    endif()
--
-     update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
-     if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake")
-         # oneTBB case
-diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
-index e33e4378f..f0cacdf6f 100644
---- a/cmake/extra_modules.cmake
-+++ b/cmake/extra_modules.cmake
-@@ -18,7 +18,7 @@ function(ie_generate_dev_package_config)
-     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
-                                   "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
-                                   INSTALL_DESTINATION share # not used
--                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
-+                                  PATH_VARS "OpenVINO_SOURCE_DIR"
-                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-@@ -45,7 +45,7 @@ function(ov_generate_dev_package_config)
-     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
-                                   "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
-                                   INSTALL_DESTINATION share # not used
--                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
-+                                  PATH_VARS "OpenVINO_SOURCE_DIR"
-                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
-diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in
-index 00e892f2b..7c686fa07 100644
---- a/cmake/templates/OpenVINOConfig.cmake.in
-+++ b/cmake/templates/OpenVINOConfig.cmake.in
-@@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
- 
- set(THREADING "@THREADING@")
- if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
--    set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
--    _ov_find_dependency(TBB
--                        COMPONENTS tbb tbbmalloc
--                        CONFIG
--                        PATHS ${TBBROOT}/cmake
--                              ${_tbb_dir}
--                        NO_CMAKE_FIND_ROOT_PATH
--                        NO_DEFAULT_PATH)
--
-     set(install_tbbbind "@install_tbbbind@")
-     if(install_tbbbind)
-         set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@")
-diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake
-index a036b019c..031f1ea48 100644
---- a/src/cmake/ie_parallel.cmake
-+++ b/src/cmake/ie_parallel.cmake
-@@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
-             endforeach()
-         endif()
-         set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
--        set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
-+        set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc"  PARENT_SCOPE)
-         set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
-         if (NOT TBB_FOUND)
-             set(THREADING "SEQ" PARENT_SCOPE)
-diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
-deleted file mode 100644
-index 5c8a5c6f6..000000000
---- a/src/plugins/intel_gpu/include/va/va.h
-+++ /dev/null
-@@ -1,6 +0,0 @@
--// Copyright (C) 2018-2022 Intel Corporation
--// SPDX-License-Identifier: Apache-2.0
--//
--
--typedef cl_uint VASurfaceID;
--typedef void* VADisplay;
-diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
-index 5e6b7b168..a81c51bb7 100644
---- a/tests/fuzz/src/CMakeLists.txt
-+++ b/tests/fuzz/src/CMakeLists.txt
-@@ -10,14 +10,13 @@ add_custom_target(fuzz)
- FILE(GLOB tests "*-fuzzer.cc")
- 
- add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
--add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
- 
- foreach(test_source ${tests})
-     get_filename_component(test_name ${test_source} NAME_WE)
-     add_fuzzer(${test_name} ${test_source})
- 
-     target_link_libraries(${test_name} PRIVATE
--        openvino::runtime cnpy zlib)
-+        openvino::runtime cnpy z)
- 
-     add_dependencies(fuzz ${test_name})
- 
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 2d61c5fd7..97b372998 100644
---- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -12,10 +12,9 @@ endif()
- 
- add_subdirectory(ittapi)
- add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
--add_subdirectory(zlib EXCLUDE_FROM_ALL)
- add_subdirectory(cnpy EXCLUDE_FROM_ALL)
- if(ENABLE_INTEL_GPU)
--    add_subdirectory(ocl)
-+       #add_subdirectory(ocl)
- endif()
- 
- add_subdirectory(xbyak EXCLUDE_FROM_ALL)
-@@ -52,21 +51,16 @@ endif()
- add_library(ocv_hal INTERFACE)
- target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
- 
--add_subdirectory(ade EXCLUDE_FROM_ALL)
- add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
--set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
--openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
-+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
- 
--ov_install_static_lib(ade openvino_common)
- ov_install_static_lib(fluid openvino_common)
- 
- #
- # Gflags
- #
- 
--add_subdirectory(gflags EXCLUDE_FROM_ALL)
--openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
--
- #
- # Google Tests framework
- #
-@@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-             set(Protobuf_DEBUG ON)
-         endif()
-         find_package(Protobuf 3.18.2 REQUIRED)
--        set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
--        set(Protobuf_LIBRARIES protobuf::libprotobuf)
--        set(SYSTEM_PROTOC protobuf::protoc)
-+       set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
-+       set(Protobuf_LIBRARIES protobuf::libprotobuf)
-+       #set(SYSTEM_PROTOC protobuf::protoc)
-         set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC})
- 
-         foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES})
--            set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
-+               #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
-         endforeach()
-     else()
-         add_subdirectory(protobuf EXCLUDE_FROM_ALL)
-@@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-     # forward variables used in the other places
-     set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE)
-     set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE)
--    set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE)
--    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE)
-+    set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE)
-+    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE)
-     set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE)
-     set(Protobuf_IN_FRONTEND ON PARENT_SCOPE)
- 
-@@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-             set(link_type INTERFACE)
-         endif()
-         if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
--            target_compile_options(${target} ${link_type} -Wno-undef)
-+               #target_compile_options(${target} ${link_type} -Wno-undef)
-         endif()
-     endforeach()
- endif()
-diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
-index 041031e92..793de9845 100644
---- a/thirdparty/cnpy/CMakeLists.txt
-+++ b/thirdparty/cnpy/CMakeLists.txt
-@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
-                                           PRIVATE -Wno-all)
- endif()
- 
--target_link_libraries(${TARGET_NAME} PUBLIC zlib)
-+target_link_libraries(${TARGET_NAME} PUBLIC z)
- target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
- 
- set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
--- 
-2.35.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
new file mode 100644
index 00000000..8a1464d5
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -0,0 +1,33 @@
+From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:49:35 +0530
+Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
+
+* Remove -Werror for:
+|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
+|  129 |     virtual JitDefinitions GetDefinitions() const = 0;
+|      |
+
+Upstream-Status: Pending
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/plugins/intel_gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
+index 2f3d9127dde..2fd4f5c1b3c 100644
+--- a/src/plugins/intel_gpu/CMakeLists.txt
++++ b/src/plugins/intel_gpu/CMakeLists.txt
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
+ include(thirdparty/cmake/rapidjson.cmake)
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    ov_add_compiler_flags(-Werror)
++       #ov_add_compiler_flags(-Werror)
+ endif()
+ 
+ add_subdirectory(src/runtime)
+-- 
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch
deleted file mode 100644
index 9e2b46fd..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Mon, 11 Apr 2022 11:11:23 +0800
-Subject: [PATCH] Fix installation of binaries and libraries
-
-Make sure binaries are installed correctly.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- CMakeLists.txt                                       |  2 +-
- cmake/developer_package/frontends/frontends.cmake    |  2 +-
- cmake/developer_package/packaging.cmake              |  4 ++--
- cmake/developer_package/plugins/plugins.cmake        |  2 +-
- docs/CMakeLists.txt                                  |  3 ++-
- samples/CMakeLists.txt                               |  2 +-
- samples/c/common/opencv_c_wrapper/CMakeLists.txt     |  2 ++
- samples/cpp/CMakeLists.txt                           |  2 ++
- scripts/CMakeLists.txt                               | 10 +++++-----
- src/bindings/c/src/CMakeLists.txt                    |  4 ++--
- src/cmake/openvino.cmake                             | 12 ++++++------
- src/common/preprocessing/CMakeLists.txt              |  2 +-
- src/core/CMakeLists.txt                              |  4 ++--
- src/inference/CMakeLists.txt                         |  2 +-
- .../intel_gpu/src/kernel_selector/CMakeLists.txt     |  2 +-
- src/plugins/intel_myriad/myriad_dependencies.cmake   |  2 +-
- .../intel_myriad/myriad_plugin/CMakeLists.txt        |  2 +-
- tools/CMakeLists.txt                                 |  2 +-
- tools/compile_tool/CMakeLists.txt                    |  8 ++++----
- 19 files changed, 37 insertions(+), 32 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe62c6318..344d9398f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake)
- add_subdirectory(docs)
- add_subdirectory(tools)
- add_subdirectory(scripts)
--add_subdirectory(licensing)
-+#add_subdirectory(licensing)
- 
- #
- # CPack
-diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
-index 39b23fe65..aa638c077 100644
---- a/cmake/developer_package/frontends/frontends.cmake
-+++ b/cmake/developer_package/frontends/frontends.cmake
-@@ -2,7 +2,7 @@
- # SPDX-License-Identifier: Apache-2.0
- #
- 
--set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
-+set(FRONTEND_INSTALL_INCLUDE "include/")
- set(FRONTEND_NAME_PREFIX "openvino_")
- set(FRONTEND_NAME_SUFFIX "_frontend")
- 
-diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
-index cc287ff1f..2daee6611 100644
---- a/cmake/developer_package/packaging.cmake
-+++ b/cmake/developer_package/packaging.cmake
-@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
-     else()
--        set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
--        set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
-+        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-+        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
-     endif()
- endfunction()
-diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
-index a630d6c35..779c43631 100644
---- a/cmake/developer_package/plugins/plugins.cmake
-+++ b/cmake/developer_package/plugins/plugins.cmake
-@@ -138,7 +138,7 @@ function(ie_add_plugin)
- 
-             if(BUILD_SHARED_LIBS)
-                 install(TARGETS ${IE_PLUGIN_NAME}
--                        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+                        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
-                         COMPONENT ${install_component})
-             else()
-                 ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 86b0e8652..4f31d3cc4 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER)
-     foreach(target openvino_template_plugin template_extension openvino_template_extension)
-         if(TARGET ${target})
-             install(TARGETS ${target}
--                    LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+                   LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-                     COMPONENT tests
-                     EXCLUDE_FROM_ALL)
-+            install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-         endif()
-     endforeach()
- endif()
-diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
-index 8101b5e32..6abe8c20c 100644
---- a/samples/CMakeLists.txt
-+++ b/samples/CMakeLists.txt
-@@ -9,7 +9,7 @@ add_subdirectory(c)
- if(TARGET format_reader)
-     install(TARGETS format_reader
-             RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
--            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests)
- endif()
- 
- openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
-diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-index a8e6e5172..aa3d2fe0e 100644
---- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-@@ -34,3 +34,5 @@ install(
-     RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
-     LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index 3433dee0e..0c0fa0723 100644
---- a/samples/cpp/CMakeLists.txt
-+++ b/samples/cpp/CMakeLists.txt
-@@ -222,6 +222,8 @@ macro(ie_add_sample)
-         EXCLUDE_FROM_ALL
-     )
- 
-+    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
-+
-     # create global target with all samples / demo apps
-     if(NOT TARGET ie_samples)
-         add_custom_target(ie_samples ALL)
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 9ad26ba95..0853e2370 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
- 
- # install setupvars
- 
--ie_cpack_add_component(setupvars REQUIRED)
-+#ie_cpack_add_component(setupvars REQUIRED)
- 
- if(UNIX)
-     set(_setupvars_file setupvars/setupvars.sh)
-@@ -43,13 +43,13 @@ elseif(WIN32)
-         file(WRITE "${_setupvars_file}" "${_setupvars_content}")
-     endif()
- endif()
--install(PROGRAMS "${_setupvars_file}"
--        DESTINATION .
--        COMPONENT setupvars)
-+#install(PROGRAMS "${_setupvars_file}"
-+#        DESTINATION .
-+#        COMPONENT setupvars)
- 
- # install install_dependencies
- 
--if(LINUX)
-+if (FALSE)
-     ie_cpack_add_component(install_dependencies REQUIRED)
-     install(DIRECTORY install_dependencies/
-             DESTINATION install_dependencies
-diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt
-index 9200d0bda..b3636e071 100644
---- a/src/bindings/c/src/CMakeLists.txt
-+++ b/src/bindings/c/src/CMakeLists.txt
-@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c
-         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c
--        INCLUDES DESTINATION runtime/include/ie)
-+        INCLUDES DESTINATION include/ie)
- 
- install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
--        DESTINATION runtime/include/ie
-+        DESTINATION include/ie
-         COMPONENT core_c_dev)
-diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
-index c46548468..3d65a20a5 100644
---- a/src/cmake/openvino.cmake
-+++ b/src/cmake/openvino.cmake
-@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
--        INCLUDES DESTINATION runtime/include
--                             runtime/include/ie)
-+        INCLUDES DESTINATION include
-+                             include/ie)
- 
- # --------------- OpenVINO runtime library dev ------------------------------
- add_library(${TARGET_NAME}_dev INTERFACE)
-@@ -96,7 +96,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
- 
- if(BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
--            DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+            DESTINATION ${IE_CPACK_LIBRARY_PATH}
-             COMPONENT core)
- 
-     # for InferenceEngineUnitTest
-@@ -115,7 +115,7 @@ endif()
- install(EXPORT OpenVINOTargets
-         FILE OpenVINOTargets.cmake
-         NAMESPACE openvino::
--        DESTINATION runtime/cmake
-+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
-         COMPONENT core_dev)
- 
- set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core")
-@@ -161,10 +161,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
- install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
-               "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake"
--        DESTINATION runtime/cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
- 
- install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
-               "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
--        DESTINATION runtime/cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
-         COMPONENT core_dev)
-diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
-index e41e286c9..11aaffca6 100644
---- a/src/common/preprocessing/CMakeLists.txt
-+++ b/src/common/preprocessing/CMakeLists.txt
-@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
- 
- if(BUILD_SHARED_LIBS)
-     install(TARGETS ${TARGET_NAME}
--            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
- else()
-     ov_install_static_lib(${TARGET_NAME} core)
- endif()
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index cc64b94ca..5f0dcf20c 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
- #-----------------------------------------------------------------------------------------------
- 
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
--        DESTINATION "runtime/include"
-+        DESTINATION "include"
-         COMPONENT core_dev
-         FILES_MATCHING
-             PATTERN "*.hpp"
-@@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
- 
- install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
-               ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
--        DESTINATION "runtime/cmake"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT core_dev)
-diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
-index ddd2fdcbc..f4ad1e623 100644
---- a/src/inference/CMakeLists.txt
-+++ b/src/inference/CMakeLists.txt
-@@ -204,7 +204,7 @@ set_target_properties(${TARGET_NAME}_obj
- 
- openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
- 
--install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
-+install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include
-         COMPONENT core_dev)
- 
- # Install static libraries for case BUILD_SHARED_LIBS=OFF
-diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-index 3993bd973..99287bad5 100644
---- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-+++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-@@ -94,7 +94,7 @@ add_custom_command(
-     COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)
- 
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
--        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+        DESTINATION ${IE_CPACK_LIBRARY_PATH}
-         COMPONENT gpu)
- 
- ov_install_static_lib(${TARGET_NAME} gpu)
-diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake
-index 5bba4235f..69c1470a7 100644
---- a/src/plugins/intel_myriad/myriad_dependencies.cmake
-+++ b/src/plugins/intel_myriad/myriad_dependencies.cmake
-@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
-         VERBATIM)
- 
-     install(FILES ${${var_name}}
--            DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+            DESTINATION ${IE_CPACK_LIBRARY_PATH}
-             COMPONENT myriad)
- 
-     if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS)
-diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-index 12a2f15e4..893146294 100644
---- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-+++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
- # install
- if (LINUX)
-     install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules
--        DESTINATION runtime/3rdparty
-+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
-         COMPONENT myriad)
- endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index c8638f7fd..ba30641c5 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -20,7 +20,7 @@ endif()
- ie_cpack_add_component(deployment_manager REQUIRED)
- 
- install(DIRECTORY deployment_manager
--        DESTINATION tools
-+        DESTINATION share/openvino/tools
-         COMPONENT deployment_manager
-         USE_SOURCE_PERMISSIONS)
- 
-diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt
-index d19eb5cc1..9fc929cbb 100644
---- a/tools/compile_tool/CMakeLists.txt
-+++ b/tools/compile_tool/CMakeLists.txt
-@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- ie_cpack_add_component(core_tools DEPENDS core)
- 
- install(TARGETS compile_tool
--        RUNTIME DESTINATION tools/compile_tool
-+        RUNTIME DESTINATION bin
-         COMPONENT core_tools)
- 
--install(FILES README.md
--        DESTINATION tools/compile_tool
--        COMPONENT core_tools)
-+#install(FILES README.md
-+#        DESTINATION tools/compile_tool
-+#        COMPONENT core_tools)
--- 
-2.35.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
new file mode 100644
index 00000000..bbdeaa2a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -0,0 +1,45 @@
+From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:55:19 +0530
+Subject: [PATCH 3/3] protobuf: allow target protoc to be built
+
+We can run target binaries using a qemu wrapper so allow these to be
+built and run.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/frontends/frontends.cmake | 2 +-
+ thirdparty/protobuf/CMakeLists.txt                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
+index f3b5520d6d2..7579f638c5a 100644
+--- a/cmake/developer_package/frontends/frontends.cmake
++++ b/cmake/developer_package/frontends/frontends.cmake
+@@ -163,7 +163,7 @@ macro(ov_add_frontend)
+         set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
+         add_custom_command(
+                 OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
+-                COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
++                COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+                 DEPENDS ${PROTOC_DEPENDENCY} ${proto_file}
+                 COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
+                 VERBATIM
+diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
+index 15f32601f23..36853caf7dc 100644
+--- a/thirdparty/protobuf/CMakeLists.txt
++++ b/thirdparty/protobuf/CMakeLists.txt
+@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
+ if(CMAKE_CROSSCOMPILING OR
+     (APPLE AND (HOST_X86_64 AND AARCH64)) OR
+     (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
+-    set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
++    set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ else()
+     set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ endif()
+-- 
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
deleted file mode 100644
index 45ed0d27..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Change the working directory to source to workaround cython
-embedding absolute path to the pyx file in output.
-
-Upstream-Status: Inappropriate [OE build specific]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
-diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-index f14662ad50..8d199fe328 100644
---- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-+++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-@@ -259,7 +259,7 @@ function( compile_pyx _name generated_file )
-   add_custom_command( OUTPUT ${_generated_file}
-     COMMAND ${CYTHON_EXECUTABLE}
-     ARGS ${cxx_arg} ${include_directory_arg} ${version_arg}
--    ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS}
-+    ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR}
-     --output-file  ${_generated_file} ${pyx_locations}
-     DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies}
-     IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies}
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
index 3db0a31e..816a98a3 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
@@ -1,6 +1,6 @@
-From e071d6a6323f04dc7e6e40047199e509536d7f6e Mon Sep 17 00:00:00 2001
+From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Mon, 30 Aug 2021 17:54:17 +0800
+Date: Fri, 21 Oct 2022 11:38:23 +0800
 Subject: [PATCH] demos: use gflags from meta-oe
 
 Upstream-Status: Inappropriate
@@ -13,15 +13,15 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index 98de0db6c..077d43fb4 100644
+index 51767051c..fb7e3d22f 100644
 --- a/demos/CMakeLists.txt
 +++ b/demos/CMakeLists.txt
-@@ -140,7 +140,7 @@ endmacro()
- find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs gapi)
+@@ -141,7 +141,7 @@ endmacro()
+ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
  find_package(OpenVINO REQUIRED COMPONENTS Runtime)
  
 -add_subdirectory(thirdparty/gflags)
 +#add_subdirectory(thirdparty/gflags)
  add_subdirectory(common/cpp)
- add_subdirectory(common/cpp_gapi)
- add_subdirectory(multi_channel_common/cpp)
+ 
+ find_package(OpenCV QUIET COMPONENTS gapi)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
index d21b2968..a9422e70 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "This repository includes optimized deep learning \
 models and a set of demos to expedite development of high-performance \
 deep learning inference applications."
 
-SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/1 \
+SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \
            file://0001-use-oe-gflags.patch \
            "
 
-SRCREV = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
+SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -44,11 +44,11 @@ do_install(){
         install -d ${D}${bindir}
         install -d ${D}${datadir}/openvino/open-model-zoo/tools
         install -d ${D}${datadir}/openvino/open-model-zoo/demos
-        cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir}
-        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
-        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+        cp -rf ${B}/intel64/Release/*.a ${D}${libdir}
+        cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir}
+        cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
 }
 
 FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb
deleted file mode 100644
index 4595835f..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb
+++ /dev/null
@@ -1,145 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
-HOMEPAGE = "https://github.com/opencv/dldt"
-DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
-deep learning models through a high-level C++ Inference Engine API \
-integrated with application logic."
-
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
-           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
-           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \
-           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
-           git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \
-           git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \
-           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \
-           git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \
-           git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \
-           file://0001-inference-engine-use-system-installed-packages.patch \
-           file://0002-inference-engine-installation-fixes.patch \
-           file://cython-cmake.patch \
-           "
-
-SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e"
-SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8"
-SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6"
-SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
-SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b"
-SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea"
-SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
-SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
-SRCREV_omz = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
-
-SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
-SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
-
-LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
-                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
-                    file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
-                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \
-                    file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \
-                    file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \
-"
-
-inherit cmake python3native
-
-S = "${WORKDIR}/git"
-EXTRA_OECMAKE += " \
-                  -DENABLE_OPENCV=OFF \
-                  -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \
-                  -DENABLE_PLUGIN_RPATH=0 \
-                  -DENABLE_INTEL_GNA=OFF \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
-                  -DENABLE_SAMPLES=ON \
-                  -DTREAT_WARNING_AS_ERROR=FALSE \
-                  -DENABLE_DATA=FALSE \
-                  -DENABLE_SYSTEM_PUGIXML=TRUE \
-                  -DENABLE_SYSTEM_PROTOBUF=TRUE \
-                  -DProtobuf_LIBRARIES=protobuf \
-                  -DProtobuf_LITE_LIBRARIES=protobuf-lite \
-                  -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \
-                  -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \
-                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
-                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
-                  "
-
-DEPENDS += "libusb1 \
-            ade \
-            opencv \
-            pugixml \
-            protobuf \
-            protobuf-native \
-            tbb \
-            zlib \
-            "
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-PACKAGECONFIG ?= "vpu opencl"
-PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva,"
-PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
-PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
-PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
-
-do_configure:prepend() {
-    # Dont set PROJECT_ROOT_DIR
-    sed -i -e 's:\${CMAKE_CURRENT_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
-}
-
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-        install -d ${D}${datadir}/openvino
-        mv ${D}/usr/samples/python ${D}${datadir}/openvino/
-
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
-        mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/
-
-        rm -rf ${D}${prefix}/python
-    fi
-
-    rm -rf ${D}${prefix}/deployment_tools
-
-    # Remove the samples source directory. We install the built samples.
-    rm -rf ${D}/usr/samples
-
-    sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp
-}
-
-# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
-# instead of RSS
-SSTATE_SCAN_FILES:append = " *.cmake"
-
-FILES:${PN}-dev = "${includedir} \
-                   ${libdir}/cmake \
-                   "
-
-FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
-                ${datadir}/openvino \
-                ${libdir}/custom_kernels \
-                ${libdir}/plugins.xml \
-                ${libdir}/cache.json \
-                "
-
-# Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
-
-FILES:${PN}-samples = "${datadir}/openvino \
-                       ${bindir} \
-                       "
-FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
-
-# Package for inference engine python API
-PACKAGES =+ "${PN}-${PYTHON_PN}"
-
-FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
new file mode 100644
index 00000000..675d9920
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -0,0 +1,146 @@
+SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
+HOMEPAGE = "https://github.com/opencv/dldt"
+DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
+deep learning models through a high-level C++ Inference Engine API \
+integrated with application logic."
+
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \
+           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
+           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
+           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
+           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \
+           git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \
+           git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \
+           git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \
+           git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \
+           git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
+           git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
+           git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
+           git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \
+           file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
+           file://0002-cmake-Fix-overloaded-virtual-error.patch \
+           file://0003-protobuf-allow-target-protoc-to-be-built.patch \
+           "
+
+SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
+SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
+SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
+SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
+SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
+SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e"
+SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
+SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
+SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
+SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
+SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
+SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b"
+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry"
+
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
+                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
+                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
+                    file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \
+                    file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \
+                    file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
+                    file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
+                    file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+"
+
+inherit cmake python3native pkgconfig qemu
+
+S = "${WORKDIR}/git"
+EXTRA_OECMAKE += " \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                  -DENABLE_OPENCV=OFF \
+                  -DENABLE_INTEL_GNA=OFF \
+                  -DENABLE_SYSTEM_TBB=ON \
+                  -DPYTHON_EXECUTABLE=${PYTHON} \
+                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
+                  -DTREAT_WARNING_AS_ERROR=FALSE \
+                  -DENABLE_DATA=FALSE \
+                  -DENABLE_SYSTEM_PUGIXML=TRUE \
+                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
+                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
+                  -DENABLE_FUZZING=OFF \
+                  -DENABLE_TBBBIND_2_5=OFF \
+                  -DCPACK_GENERATOR=RPM \
+                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
+                  -DENABLE_SYSTEM_SNAPPY=ON \
+                  -DFETCHCONTENT_BASE_DIR="${S}" \
+                  -DENABLE_INTEL_NPU=OFF \
+                  "
+
+DEPENDS += "\
+            flatbuffers-native \
+            pugixml \
+            python3-pybind11 \
+            python3-pybind11-native \
+            qemu-native \
+            snappy \
+            tbb \
+            "
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+PACKAGECONFIG ?= "opencl samples"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
+PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress"
+PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
+PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
+
+do_configure:prepend() {
+    # Dont set PROJECT_ROOT_DIR
+    sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
+
+    # qemu wrapper that can be used by cmake to run target binaries.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
+}
+
+do_install:append() {
+    rm -rf ${D}${prefix}/install_dependencies
+    rm -rf ${D}${prefix}/setupvars.sh
+
+    find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} +
+}
+
+# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
+# instead of RSS
+SSTATE_SCAN_FILES:append = " *.cmake"
+
+FILES:${PN} += "\
+                ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \
+                ${libdir}/openvino-${PV}/plugins.xml \
+                ${libdir}/openvino-${PV}/cache.json \
+                "
+
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples"
+
+FILES:${PN}-samples = "${datadir}/openvino \
+                       ${bindir} \
+                       ${libdir}/libformat_reader.a \
+                       ${libdir}/libopencv_c_wrapper.a \
+                       "
+
+RDEPENDS:${PN}-samples += "python3-core"
+
+# Package for inference engine python API
+PACKAGES =+ "${PN}-python3"
+
+FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"