mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
ispc: upgrade 1.18.0 -> 1.19.0
Dropped patches which are already available. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
parent
3289c1c659
commit
5f2a109a15
|
@ -1,6 +1,6 @@
|
||||||
From b9bc0df996d1e65fd70d5eb2d40866693f23bb67 Mon Sep 17 00:00:00 2001
|
From 0445d97c8ad66c9cbb2c6f88c52aadc0b01a1f15 Mon Sep 17 00:00:00 2001
|
||||||
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||||
Date: Thu, 24 Jun 2021 17:53:27 +0800
|
Date: Tue, 11 Oct 2022 16:43:22 +0800
|
||||||
Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead
|
Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
Upstream-Status: Inappropriate
|
||||||
|
@ -11,18 +11,18 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index ef88317e..7507d6a5 100644
|
index f6199704..f979f1c1 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -281,7 +281,7 @@ if (WASM_ENABLED)
|
@@ -288,7 +288,7 @@ if (WASM_ENABLED)
|
||||||
list(APPEND ISPC_TARGETS wasm-i32x4)
|
list(APPEND ISPC_TARGETS wasm-i32x4)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
|
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
|
||||||
+set(CLANG_LIBRARY_LIST clang-cpp)
|
+set(CLANG_LIBRARY_LIST clang-cpp)
|
||||||
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
|
if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
|
||||||
|
list(APPEND CLANG_LIBRARY_LIST clangSupport)
|
||||||
if (X86_ENABLED)
|
endif()
|
||||||
--
|
--
|
||||||
2.17.1
|
2.37.3
|
||||||
|
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
From 6a1b2ffae0cc12467838bc671e3b089924de90a6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dmitry Babokin <dmitry.y.babokin@intel.com>
|
|
||||||
Date: Thu, 5 May 2022 16:34:34 -0700
|
|
||||||
Subject: [PATCH] Bump ISPC version v1.19.0dev
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
Include only the LLVM specific bits and not the ispc version bump.
|
|
||||||
|
|
||||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
||||||
---
|
|
||||||
diff --git a/src/ispc_version.h b/src/ispc_version.h
|
|
||||||
index 0e28dfcfa..2b9d9b0cc 100644
|
|
||||||
--- a/src/ispc_version.h
|
|
||||||
+++ b/src/ispc_version.h
|
|
||||||
@@ -51,7 +51,7 @@
|
|
||||||
#define ISPC_LLVM_15_0 150000
|
|
||||||
|
|
||||||
#define OLDEST_SUPPORTED_LLVM ISPC_LLVM_10_0
|
|
||||||
-#define LATEST_SUPPORTED_LLVM ISPC_LLVM_14_0
|
|
||||||
+#define LATEST_SUPPORTED_LLVM ISPC_LLVM_15_0
|
|
||||||
|
|
||||||
#ifdef __ispc__xstr
|
|
||||||
#undef __ispc__xstr
|
|
||||||
@@ -63,7 +63,7 @@
|
|
||||||
__ispc__xstr(LLVM_VERSION_MAJOR) "." __ispc__xstr(LLVM_VERSION_MINOR) "." __ispc__xstr(LLVM_VERSION_PATCH)
|
|
||||||
|
|
||||||
#if ISPC_LLVM_VERSION < OLDEST_SUPPORTED_LLVM || ISPC_LLVM_VERSION > LATEST_SUPPORTED_LLVM
|
|
||||||
-#error "Only LLVM 11.0 - 14.0 are supported"
|
|
||||||
+#error "Only LLVM 11.0 - 14.0 and 15.0 development branch are supported"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ISPC_VERSION_STRING \
|
|
|
@ -1,63 +0,0 @@
|
||||||
From ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
|
|
||||||
Date: Tue, 23 Aug 2022 15:21:50 -0700
|
|
||||||
Subject: [PATCH] Adjust opt passes for LLVM 15
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
||||||
---
|
|
||||||
src/opt.cpp | 17 +++++++++++++++++
|
|
||||||
1 file changed, 17 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/opt.cpp b/src/opt.cpp
|
|
||||||
index 910821e26..86219f384 100644
|
|
||||||
--- a/src/opt.cpp
|
|
||||||
+++ b/src/opt.cpp
|
|
||||||
@@ -84,6 +84,9 @@
|
|
||||||
#include <llvm/Transforms/Scalar.h>
|
|
||||||
#include <llvm/Transforms/Scalar/GVN.h>
|
|
||||||
#include <llvm/Transforms/Scalar/InstSimplifyPass.h>
|
|
||||||
+#if ISPC_LLVM_VERSION >= ISPC_LLVM_15_0
|
|
||||||
+#include <llvm/Transforms/Scalar/SimpleLoopUnswitch.h>
|
|
||||||
+#endif
|
|
||||||
#include <llvm/Transforms/Utils.h>
|
|
||||||
#include <llvm/Transforms/Utils/BasicBlockUtils.h>
|
|
||||||
|
|
||||||
@@ -647,7 +650,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
|
|
||||||
optPM.add(llvm::createCFGSimplificationPass());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
|
|
||||||
+ // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857)
|
|
||||||
+ // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359
|
|
||||||
optPM.add(llvm::createArgumentPromotionPass());
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
optPM.add(llvm::createAggressiveDCEPass());
|
|
||||||
optPM.add(llvm::createInstructionCombiningPass(), 241);
|
|
||||||
@@ -722,7 +729,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
|
|
||||||
optPM.add(CreateInstructionSimplifyPass());
|
|
||||||
|
|
||||||
optPM.add(llvm::createFunctionInliningPass());
|
|
||||||
+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
|
|
||||||
+ // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857)
|
|
||||||
+ // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359
|
|
||||||
optPM.add(llvm::createArgumentPromotionPass());
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
optPM.add(llvm::createSROAPass());
|
|
||||||
|
|
||||||
@@ -736,7 +747,13 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
|
|
||||||
optPM.add(llvm::createReassociatePass());
|
|
||||||
optPM.add(llvm::createLoopRotatePass());
|
|
||||||
optPM.add(llvm::createLICMPass());
|
|
||||||
+ // Loop unswitch pass was removed in LLVM 15.0 (fb4113).
|
|
||||||
+ // Recommended replacement: createSimpleLoopUnswitchLegacyPass
|
|
||||||
+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
|
|
||||||
optPM.add(llvm::createLoopUnswitchPass(false));
|
|
||||||
+#else
|
|
||||||
+ optPM.add(llvm::createSimpleLoopUnswitchLegacyPass(false));
|
|
||||||
+#endif
|
|
||||||
optPM.add(llvm::createInstructionCombiningPass());
|
|
||||||
optPM.add(CreateInstructionSimplifyPass());
|
|
||||||
optPM.add(llvm::createIndVarSimplifyPass());
|
|
|
@ -15,13 +15,11 @@ SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
|
||||||
file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
|
file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
|
||||||
file://0002-cmake-don-t-build-for-32-bit-targets.patch \
|
file://0002-cmake-don-t-build-for-32-bit-targets.patch \
|
||||||
file://0001-Fix-QA-Issues.patch \
|
file://0001-Fix-QA-Issues.patch \
|
||||||
file://6a1b2ffae0cc12467838bc671e3b089924de90a6.patch \
|
|
||||||
file://ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch \
|
|
||||||
file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \
|
file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "f7ec3aa173c816377c215d83196b5c7c3a88db1c"
|
SRCREV = "ee43967286215a0511c2bc090e604848b4a32bed"
|
||||||
|
|
||||||
COMPATIBLE_HOST = '(x86_64).*-linux'
|
COMPATIBLE_HOST = '(x86_64).*-linux'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user