mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
ipsc: upgrade 1.16.1 -> 1.17.0
Release notes: https://github.com/ispc/ispc/releases/tag/v1.17.0 Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
parent
b4680fd416
commit
f25cc6b707
|
@ -0,0 +1,52 @@
|
||||||
|
From 9b722217a2818bc4335bf2c7d3293d30aa5977b1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dmitry Babokin <dmitry.y.babokin@intel.com>
|
||||||
|
Date: Fri, 4 Feb 2022 16:45:34 -0800
|
||||||
|
Subject: [PATCH 01/24] Enable LLVM 15.0 support
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://github.com/ispc/ispc/commit/9b722217a2818bc4335bf2c7d3293d30aa5977b1]
|
||||||
|
|
||||||
|
Signed-off-by: Dmitry Babokin <dmitry.y.babokin@intel.com>
|
||||||
|
---
|
||||||
|
src/ispc.h | 4 ++--
|
||||||
|
src/ispc_version.h | 3 ++-
|
||||||
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/ispc.h b/src/ispc.h
|
||||||
|
index 362c2b93..581d5de6 100644
|
||||||
|
--- a/src/ispc.h
|
||||||
|
+++ b/src/ispc.h
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- Copyright (c) 2010-2021, Intel Corporation
|
||||||
|
+ Copyright (c) 2010-2022, Intel Corporation
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
#include "target_registry.h"
|
||||||
|
|
||||||
|
#if ISPC_LLVM_VERSION < OLDEST_SUPPORTED_LLVM || ISPC_LLVM_VERSION > LATEST_SUPPORTED_LLVM
|
||||||
|
-#error "Only LLVM 11.0 - 13.0 and 14.0 development branch are supported"
|
||||||
|
+#error "Only LLVM 11.0 - 14.0 and 15.0 development branch are supported"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
diff --git a/src/ispc_version.h b/src/ispc_version.h
|
||||||
|
index e8487e5b..04a3cf64 100644
|
||||||
|
--- a/src/ispc_version.h
|
||||||
|
+++ b/src/ispc_version.h
|
||||||
|
@@ -50,9 +50,10 @@
|
||||||
|
#define ISPC_LLVM_12_0 120000
|
||||||
|
#define ISPC_LLVM_13_0 130000
|
||||||
|
#define ISPC_LLVM_14_0 140000
|
||||||
|
+#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
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 3f3f81bde7d9d80921515ed0bf7fe36e69319bc4 Mon Sep 17 00:00:00 2001
|
From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001
|
||||||
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||||
Date: Wed, 30 Jun 2021 13:47:41 +0800
|
Date: Thu, 24 Feb 2022 20:01:11 +0530
|
||||||
Subject: [PATCH] cmake: don't build for 32-bit targets
|
Subject: [PATCH] cmake: don't build for 32-bit targets
|
||||||
|
|
||||||
Error log:
|
Error log:
|
||||||
|
@ -20,10 +20,10 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
|
diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
|
||||||
index 15a74788..db30f809 100644
|
index fa228247..7adc7e52 100644
|
||||||
--- a/cmake/GenerateBuiltins.cmake
|
--- a/cmake/GenerateBuiltins.cmake
|
||||||
+++ b/cmake/GenerateBuiltins.cmake
|
+++ b/cmake/GenerateBuiltins.cmake
|
||||||
@@ -249,7 +249,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
|
@@ -272,7 +272,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
|
# 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
|
# 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.
|
# the headers can be found in other locations, this should not be a problem.
|
||||||
|
@ -32,7 +32,7 @@ index 15a74788..db30f809 100644
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -331,7 +331,7 @@ function (generate_target_builtins resultList)
|
@@ -354,7 +354,7 @@ function (generate_target_builtins resultList)
|
||||||
set(regular_targets ${ARGN})
|
set(regular_targets ${ARGN})
|
||||||
list(FILTER regular_targets EXCLUDE REGEX wasm)
|
list(FILTER regular_targets EXCLUDE REGEX wasm)
|
||||||
foreach (ispc_target ${regular_targets})
|
foreach (ispc_target ${regular_targets})
|
||||||
|
@ -41,7 +41,7 @@ index 15a74788..db30f809 100644
|
||||||
foreach (os_name ${TARGET_OS_LIST_FOR_LL})
|
foreach (os_name ${TARGET_OS_LIST_FOR_LL})
|
||||||
target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
|
target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
|
||||||
list(APPEND tmpList ${output${os_name}${bit}})
|
list(APPEND tmpList ${output${os_name}${bit}})
|
||||||
@@ -392,7 +392,7 @@ function (generate_common_builtins resultList)
|
@@ -415,7 +415,7 @@ function (generate_common_builtins resultList)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
|
message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
|
||||||
|
@ -50,14 +50,14 @@ index 15a74788..db30f809 100644
|
||||||
foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
|
foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
|
||||||
foreach (arch "x86" "arm" "wasm32")
|
foreach (arch "x86" "arm" "wasm32")
|
||||||
builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
|
builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
|
||||||
@@ -405,7 +405,7 @@ function (generate_common_builtins resultList)
|
@@ -428,7 +428,7 @@ function (generate_common_builtins resultList)
|
||||||
endforeach()
|
endforeach()
|
||||||
endforeach()
|
endforeach()
|
||||||
if (GENX_ENABLED)
|
if (XE_ENABLED)
|
||||||
- foreach (bit 32 64)
|
- foreach (bit 32 64)
|
||||||
+ foreach (bit 64)
|
+ foreach (bit 64)
|
||||||
builtin_genx_to_cpp(${bit} res_genx_${bit})
|
builtin_xe_to_cpp(${bit} res_xe_${bit})
|
||||||
list(APPEND tmpList ${res_genx_${bit}} )
|
list(APPEND tmpList ${res_xe_${bit}} )
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
--
|
--
|
||||||
2.17.1
|
2.17.1
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
From 8b5d0f26916e776bc3664e6a4dc68eff3a198d7a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dmitry Babokin <dmitry.y.babokin@intel.com>
|
|
||||||
Date: Wed, 16 Jun 2021 20:38:44 -0700
|
|
||||||
Subject: [PATCH] Do not use depricated file open flags
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/ispc/ispc/commit/8b5d0f26916e776bc3664e6a4dc68eff3a198d7a]
|
|
||||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
||||||
---
|
|
||||||
src/module.cpp | 2 +-
|
|
||||||
src/opt.cpp | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/module.cpp b/src/module.cpp
|
|
||||||
index 1e68d30c4..352bcd09e 100644
|
|
||||||
--- a/src/module.cpp
|
|
||||||
+++ b/src/module.cpp
|
|
||||||
@@ -1314,7 +1314,7 @@ bool Module::writeObjectFileOrAssembly(llvm::TargetMachine *targetMachine, llvm:
|
|
||||||
llvm::CodeGenFileType fileType = (outputType == Object) ? llvm::CGFT_ObjectFile : llvm::CGFT_AssemblyFile;
|
|
||||||
bool binary = (fileType == llvm::CGFT_ObjectFile);
|
|
||||||
|
|
||||||
- llvm::sys::fs::OpenFlags flags = binary ? llvm::sys::fs::F_None : llvm::sys::fs::F_Text;
|
|
||||||
+ llvm::sys::fs::OpenFlags flags = binary ? llvm::sys::fs::OF_None : llvm::sys::fs::OF_Text;
|
|
||||||
|
|
||||||
std::error_code error;
|
|
||||||
|
|
||||||
diff --git a/src/opt.cpp b/src/opt.cpp
|
|
||||||
index ae1a11d3d..de1b27e1e 100644
|
|
||||||
--- a/src/opt.cpp
|
|
||||||
+++ b/src/opt.cpp
|
|
||||||
@@ -4687,7 +4687,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
|
|
||||||
std::error_code EC;
|
|
||||||
char fname[100];
|
|
||||||
snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
|
|
||||||
- llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
|
|
||||||
+ llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::OF_None);
|
|
||||||
Assert(!EC && "IR dump file creation failed!");
|
|
||||||
module.print(OS, 0);
|
|
||||||
}
|
|
|
@ -11,12 +11,12 @@ inherit cmake python3native
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=releases/v1.16.x \
|
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://8b5d0f26916e776bc3664e6a4dc68eff3a198d7a.patch \
|
file://0001-Enable-LLVM-15.0-support.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "ae404c1da54422bc70696fbdaa4055bca0d1711e"
|
SRCREV = "7ad8429369a4d5ced6b524fdfffe623939d8fe9a"
|
||||||
|
|
||||||
COMPATIBLE_HOST = '(x86_64).*-linux'
|
COMPATIBLE_HOST = '(x86_64).*-linux'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user