github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix last failing Shufti/Truffle tests

Browse Source
This commit is contained in:
Konstantinos Margaritis 2021-07-06 09:22:31 +03:00
parent ec3f108d71
commit d453a612dc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nfa/shufti_simd.hpp
View File

@ -212,7 +212,7 @@ const u8 *rshuftiExecReal(m128 mask_lo, m128 mask_hi, const u8 *buf, const u8 *b
rv = shuftiRevSlow((const u8 *)&mask_lo, (const u8 *)&mask_hi, buf, d); rv = shuftiRevSlow((const u8 *)&mask_lo, (const u8 *)&mask_hi, buf, d);
// rv = shortShufti(wide_mask_lo, wide_mask_hi, buf_end - S, buf_end, low4bits); // rv = shortShufti(wide_mask_lo, wide_mask_hi, buf_end - S, buf_end, low4bits);
DEBUG_PRINTF("rv %p \n", rv); DEBUG_PRINTF("rv %p \n", rv);
if (rv != d - 1) return rv; if (rv) return rv;
} }
return buf - 1; return buf - 1;

8
src/nfa/truffle_simd.hpp
View File

@ -48,10 +48,7 @@ typename SuperVector<S>::movemask_type block(SuperVector<S> shuf_mask_lo_highcle
SuperVector<S> v){ SuperVector<S> v){
SuperVector<S> highconst = SuperVector<S>::dup_u8(0x80); SuperVector<S> highconst = SuperVector<S>::dup_u8(0x80);
printv_u8("highconst", highconst);
SuperVector<S> shuf_mask_hi = SuperVector<S>::dup_u64(0x8040201008040201); SuperVector<S> shuf_mask_hi = SuperVector<S>::dup_u64(0x8040201008040201);
printv_u64("shuf_mask_hi", shuf_mask_hi);
SuperVector<S> shuf1 = shuf_mask_lo_highclear.pshufb(v); SuperVector<S> shuf1 = shuf_mask_lo_highclear.pshufb(v);
SuperVector<S> t1 = v ^ highconst; SuperVector<S> t1 = v ^ highconst;
@ -68,7 +65,9 @@ static really_inline const u8 *truffleMini(SuperVector<S> shuf_mask_lo_highclear
const u8 *buf, const u8 *buf_end){ const u8 *buf, const u8 *buf_end){
uintptr_t len = buf_end - buf; uintptr_t len = buf_end - buf;
assert(len < 16); assert(len < 16);
SuperVector<S> chars = SuperVector<S>::loadu(buf);
SuperVector<S> chars = SuperVector<S>::Zeroes();
memcpy(&chars.u.u8[0], buf, len);
u32 mask = (0xffff >> (16 - len)) ^ 0xffff; u32 mask = (0xffff >> (16 - len)) ^ 0xffff;
typename SuperVector<S>::movemask_type z = block(shuf_mask_lo_highclear, shuf_mask_lo_highset, chars); typename SuperVector<S>::movemask_type z = block(shuf_mask_lo_highclear, shuf_mask_lo_highset, chars);
@ -81,7 +80,6 @@ static really_inline const u8 *truffleMini(SuperVector<S> shuf_mask_lo_highclear
} }
} }
template <uint16_t S> template <uint16_t S>
static really_inline static really_inline
const u8 *fwdBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> v, const u8 *fwdBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> v,