From d50fe36d406ad6f8d5b2455f3edcfe4ac1beb1d2 Mon Sep 17 00:00:00 2001 From: SakiTakamachi Date: Mon, 6 May 2024 23:28:10 +0900 Subject: [PATCH 1/4] Cast the parameter type of arm's BLOCKCONV_LOAD --- Zend/zend_operators.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 8853d24549fb2..7e3b48e75035f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -122,7 +122,7 @@ static _locale_t current_locale = NULL; #define BLOCKCONV_LOAD(input) \ int8x16_t blconv_operand = vld1q_s8((const int8_t*)(input)); \ - uint8x16_t blconv_mask = vcltq_s8(vaddq_s8(blconv_operand, blconv_offset), blconv_threshold); + uint8x16_t blconv_mask = vcltq_u8(vaddq_u8((uint8x16_t) blconv_operand, (uint8x16_t) blconv_offset), (uint8x16_t) blconv_threshold); #define BLOCKCONV_FOUND() vmaxvq_u8(blconv_mask) From 42e2aa8caf01287f471a4c89137de912c6a53fa1 Mon Sep 17 00:00:00 2001 From: SakiTakamachi Date: Mon, 6 May 2024 23:54:51 +0900 Subject: [PATCH 2/4] fix --- Zend/zend_operators.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 7e3b48e75035f..f368f9e2816ce 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -122,7 +122,7 @@ static _locale_t current_locale = NULL; #define BLOCKCONV_LOAD(input) \ int8x16_t blconv_operand = vld1q_s8((const int8_t*)(input)); \ - uint8x16_t blconv_mask = vcltq_u8(vaddq_u8((uint8x16_t) blconv_operand, (uint8x16_t) blconv_offset), (uint8x16_t) blconv_threshold); + uint8x16_t blconv_mask = vcltq_s8((int8x16_t) vaddq_u8((uint8x16_t) blconv_operand, (uint8x16_t) blconv_offset), blconv_threshold); #define BLOCKCONV_FOUND() vmaxvq_u8(blconv_mask) From dab5ee0577b41719e128f6369aa3e6c275f8e384 Mon Sep 17 00:00:00 2001 From: Saki Takamachi <34942839+SakiTakamachi@users.noreply.github.com> Date: Tue, 7 May 2024 08:17:14 +0900 Subject: [PATCH 3/4] commit suggestion Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> --- Zend/zend_operators.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index f368f9e2816ce..cda9baa2c2b9e 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -122,7 +122,7 @@ static _locale_t current_locale = NULL; #define BLOCKCONV_LOAD(input) \ int8x16_t blconv_operand = vld1q_s8((const int8_t*)(input)); \ - uint8x16_t blconv_mask = vcltq_s8((int8x16_t) vaddq_u8((uint8x16_t) blconv_operand, (uint8x16_t) blconv_offset), blconv_threshold); + uint8x16_t blconv_mask = vcltq_s8(vreinterpretq_u8_s8(vaddq_u8(vreinterpretq_s8_u8(blconv_operand), vreinterpretq_s8_u8(blconv_offset))), blconv_threshold); #define BLOCKCONV_FOUND() vmaxvq_u8(blconv_mask) From f4dfe4ee255f99e39b6e5d48d510879cb758877e Mon Sep 17 00:00:00 2001 From: SakiTakamachi Date: Tue, 7 May 2024 08:52:21 +0900 Subject: [PATCH 4/4] fix --- Zend/zend_operators.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index cda9baa2c2b9e..890c19c0ab223 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -122,7 +122,7 @@ static _locale_t current_locale = NULL; #define BLOCKCONV_LOAD(input) \ int8x16_t blconv_operand = vld1q_s8((const int8_t*)(input)); \ - uint8x16_t blconv_mask = vcltq_s8(vreinterpretq_u8_s8(vaddq_u8(vreinterpretq_s8_u8(blconv_operand), vreinterpretq_s8_u8(blconv_offset))), blconv_threshold); + uint8x16_t blconv_mask = vcltq_s8(vreinterpretq_s8_u8(vaddq_u8(vreinterpretq_u8_s8(blconv_operand), vreinterpretq_u8_s8(blconv_offset))), blconv_threshold); #define BLOCKCONV_FOUND() vmaxvq_u8(blconv_mask)