ispc: upgrade 1.22.0 -> 1.23.0

Release notes:
https://github.com/ispc/ispc/releases/tag/v1.23.0

llvm-dis is no longer a build dependency.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2024-02-28 11:53:10 +08:00
parent 0935c639d4
commit 9ed54a1380
5 changed files with 14 additions and 74 deletions

View File

@ -1,4 +1,4 @@
From 6ba81efe971fb6038af6e950e853d35ee6dd9cc3 Mon Sep 17 00:00:00 2001 From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com> From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Sun, 11 Dec 2022 22:34:15 +0800 Date: Sun, 11 Dec 2022 22:34:15 +0800
Subject: [PATCH] Add print function to print test run status in ptest format Subject: [PATCH] Add print function to print test run status in ptest format
@ -11,10 +11,10 @@ Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
1 file changed, 16 insertions(+) 1 file changed, 16 insertions(+)
diff --git a/run_tests.py b/run_tests.py diff --git a/run_tests.py b/run_tests.py
index 87305a06..4f2f0f59 100755 index 1cd796dd..e3ffd1ab 100755
--- a/run_tests.py --- a/run_tests.py
+++ b/run_tests.py +++ b/run_tests.py
@@ -385,6 +385,9 @@ def run_test(testname, host, target): @@ -327,6 +327,9 @@ def run_test(testname, host, target):
else: else:
ispc_exe_rel = add_prefix(host.ispc_cmd, host, target) ispc_exe_rel = add_prefix(host.ispc_cmd, host, target)
@ -24,7 +24,7 @@ index 87305a06..4f2f0f59 100755
# is this a test to make sure an error is issued? # is this a test to make sure an error is issued?
want_error = (filename.find("tests_errors") != -1) want_error = (filename.find("tests_errors") != -1)
if want_error == True: if want_error == True:
@@ -844,6 +847,17 @@ def check_compiler_exists(compiler_exe): @@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe):
return return
error("missing the required compiler: %s \n" % compiler_exe, 1) error("missing the required compiler: %s \n" % compiler_exe, 1)
@ -42,7 +42,7 @@ index 87305a06..4f2f0f59 100755
def print_result(status, results, s, run_tests_log, csv): def print_result(status, results, s, run_tests_log, csv):
title = StatusStr[status] title = StatusStr[status]
file_list = [fname for fname, fstatus in results if status == fstatus] file_list = [fname for fname, fstatus in results if status == fstatus]
@@ -987,6 +1001,8 @@ def run_tests(options1, args, print_version): @@ -938,6 +952,8 @@ def run_tests(options1, args, print_version):
pass_rate = -1 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_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log)
@ -51,6 +51,3 @@ index 87305a06..4f2f0f59 100755
for status in Status: for status in Status:
print_result(status, results, s, run_tests_log, options.csv) print_result(status, results, s, run_tests_log, options.csv)
fails = [status != Status.Compfail and status != Status.Runfail for _, status in results] fails = [status != Status.Compfail and status != Status.Runfail for _, status in results]
--
2.37.3

View File

@ -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> From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Tue, 26 Jul 2022 15:25:10 +0800 Date: Tue, 26 Jul 2022 15:25:10 +0800
Subject: [PATCH] Fix QA Issues 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] Upstream-Status: Inappropriate [OE build specific]
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
--- ---
src/module.cpp | 4 ++-- src/module.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/module.cpp b/src/module.cpp diff --git a/src/module.cpp b/src/module.cpp
index 58a2ae83..82673052 100644 index e2084d2e..e2626865 100644
--- a/src/module.cpp --- a/src/module.cpp
+++ b/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"); perror("fopen");
return false; return false;
} }
@ -26,7 +25,7 @@ index 58a2ae83..82673052 100644
fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n"); fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n");
// Create a nice guard string from the filename, turning any // 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; FILE *f = DHI->file;
if (DHI->EmitFrontMatter) { if (DHI->EmitFrontMatter) {

View File

@ -1,51 +0,0 @@
From 1d1b0f4eacb7d3875d7dd53e2df8dfca2031fa3a Mon Sep 17 00:00:00 2001
From: Aleksei Nurmukhametov <aleksei.nurmukhametov@intel.com>
Date: Tue, 28 Nov 2023 04:11:44 -0800
Subject: [PATCH] Fix return type of lParseOperator
When bison is used in -y mode that emulates POSIX Yacc, tokens are
defined as enums (under YYTOKENTYPE ifdef) or as int via macro
definitions. Defining return type as yytokentype causes compile error:
invalid conversion from 'int' to 'yytokentype'. To avoid it, return int
as we do with lParseInteger and lParseFP.
Upstream-Status: Submitted [https://github.com/ispc/ispc/pull/2709]
Signed-off-by: Aleksei Nurmukhametov <aleksei.nurmukhametov@intel.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
src/lex.ll | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lex.ll b/src/lex.ll
index f9e47578..0279831d 100644
--- a/src/lex.ll
+++ b/src/lex.ll
@@ -20,6 +20,7 @@ using namespace ispc;
static uint64_t lParseBinary(const char *ptr, SourcePos pos, char **endPtr);
static int lParseInteger(bool dotdotdot);
static int lParseFP();
+static int lParseOperator(const char *ptr);
static void lCComment(SourcePos *);
static void lCppComment(SourcePos *);
static void lNextValidChar(SourcePos *, char const*&);
@@ -29,7 +30,6 @@ static bool lConsumePragma(YYSTYPE *, SourcePos *);
static void lHandleCppHash(SourcePos *);
static void lStringConst(YYSTYPE *, SourcePos *);
static double lParseHexFloat(const char *ptr);
-static yytokentype lParseOperator(const char *ptr);
extern const char *RegisterDependency(const std::string &fileName);
#define YY_USER_ACTION \
@@ -1162,7 +1162,7 @@ lParseHexFloat(const char *ptr) {
/** Parse an operator.
*/
-static yytokentype
+static int
lParseOperator(const char *ptr) {
yylval.stringVal = new std::string(ptr);
if (m->symbolTable->LookupFunctionTemplate(yytext))
--
2.37.3

View File

@ -1,4 +1,4 @@
From cad70deae39566fa11814e27f06d5fe8ddcb1cbc Mon Sep 17 00:00:00 2001 From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 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 Feb 2022 20:01:11 +0530 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
@ -20,7 +20,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
index 936590a7..b8f731de 100644 index f84494ed..d90cb1ec 100644
--- a/cmake/GenerateBuiltins.cmake --- a/cmake/GenerateBuiltins.cmake
+++ b/cmake/GenerateBuiltins.cmake +++ b/cmake/GenerateBuiltins.cmake
@@ -253,7 +253,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
@ -32,7 +32,7 @@ index 936590a7..b8f731de 100644
endif() endif()
endif() endif()
@@ -340,7 +340,7 @@ function (generate_target_builtins resultList) @@ -339,7 +339,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 936590a7..b8f731de 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}})
@@ -406,7 +406,7 @@ function (generate_common_builtins resultList) @@ -405,7 +405,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,6 +50,3 @@ index 936590a7..b8f731de 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" "wasm") foreach (arch "x86" "arm" "wasm")
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})
--
2.41.0

View File

@ -15,11 +15,10 @@ SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
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://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://0001-Fix-return-type-of-lParseOperator.patch \
file://run-ptest \ file://run-ptest \
" "
SRCREV = "bd2c42d42e0cc3da1baf92160b82d4dc820a02ee" SRCREV = "bcb2cf896c00f9a802a11cbf291ef6e44b205416"
COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST = '(x86_64).*-linux'
@ -59,7 +58,6 @@ EXTRA_OECMAKE += " \
-DSYSROOT_DIR=${STAGING_DIR} \ -DSYSROOT_DIR=${STAGING_DIR} \
-DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \ -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
-DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \ -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
-DLLVM_DIS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-dis \
-DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \ -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
" "