github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Supervector test fixes

Browse Source
This commit is contained in:
apostolos
2021-07-19 10:23:11 +03:00
committed by Konstantinos Margaritis
parent ae6bc52076
commit 6f88ecac44
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nfa/shufti_simd.hpp
View File

@@ -70,7 +70,7 @@ static really_inline
const u8 *fwdBlock(SuperVector<S> mask_lo, SuperVector<S> mask_hi, SuperVector<S> chars,
const SuperVector<S> low4bits, const u8 *buf) {
typename SuperVector<S>::movemask_type z = block(mask_lo, mask_hi, chars, low4bits);
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return firstMatch<S>(buf, z);
}
@@ -90,9 +90,9 @@ const u8 *shortShufti(SuperVector<S> mask_lo, SuperVector<S> mask_hi, const u8 *
typename SuperVector<S>::movemask_type maske = SINGLE_LOAD_MASK(len - alignment);
typename SuperVector<S>::movemask_type z = block(mask_lo, mask_hi, chars, low4bits);
// reuse the load mask to indicate valid bytes
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
z &= maskb | maske;
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return firstMatch<S>(buf, z);
}
@@ -102,8 +102,7 @@ static really_inline
const u8 *revBlock(SuperVector<S> mask_lo, SuperVector<S> mask_hi, SuperVector<S> chars,
const SuperVector<S> low4bits, const u8 *buf) {
typename SuperVector<S>::movemask_type z = block(mask_lo, mask_hi, chars, low4bits);
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return lastMatch<S>(buf, z);
}
@@ -234,7 +233,7 @@ const u8 *fwdBlockDouble(SuperVector<S> mask1_lo, SuperVector<S> mask1_hi, Super
SuperVector<S> t = t1 | (t2 >> 1);
typename SuperVector<S>::movemask_type z = t.eqmask(SuperVector<S>::Ones());
DEBUG_PRINTF(" z: 0x%08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return firstMatch<S>(buf, z);
}

6
src/nfa/truffle_simd.hpp
View File

@@ -68,7 +68,7 @@ typename SuperVector<S>::movemask_type block(SuperVector<S> shuf_mask_lo_highcle
t2.print8("t2");
shuf3.print8("shuf3");
tmp.print8("tmp");
DEBUG_PRINTF("z %08x \n", tmp.eqmask(SuperVector<S>::Zeroes()));
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)tmp.eqmask(SuperVector<S>::Zeroes()));
return tmp.eqmask(SuperVector<S>::Zeroes());
}
@@ -98,7 +98,7 @@ static really_inline
const u8 *fwdBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> v,
const u8 *buf) {
typename SuperVector<S>::movemask_type z = block(shuf_mask_lo_highclear, shuf_mask_lo_highset, v);
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return firstMatch<S>(buf, z);
}
@@ -185,7 +185,7 @@ static really_inline
const u8 *revBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> v,
const u8 *buf) {
typename SuperVector<S>::movemask_type z = block(shuf_mask_lo_highclear, shuf_mask_lo_highset, v);
DEBUG_PRINTF("z %08x\n", z);
DEBUG_PRINTF(" z: 0x%016llx\n", (u64a)z);
return lastMatch<S>(buf, z);
}