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

resolving conficts after merging

Browse Source
This commit is contained in:
apostolos
2021-11-13 18:58:22 +02:00
parent 4114b8a480 7e7c50bdd7
commit e09d8674b4
31 changed files with 1283 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unit/internal/rvermicelli.cpp
View File

@@ -30,7 +30,7 @@
#include "config.h"
#include "gtest/gtest.h"
#include "nfa/vermicelli.h"
#include "nfa/vermicelli.hpp"
#define BOUND (~(VERM_BOUNDARY - 1))
@@ -563,4 +563,4 @@ TEST(RNVermicelli16, Exec5) {
}
}
#endif // HAVE_SVE2
#endif // HAVE_SVE2

1
unit/internal/simd_utils.cpp
View File

@@ -671,6 +671,7 @@ TEST(SimdUtilsTest, movq) {
#elif defined(ARCH_PPC64EL)
int64x2_t a = {0x123456789abcdefLL, ~0LL };
simd = (m128) a;
simd = vreinterpretq_s32_s64(a);
#endif
#endif
r = movq(simd);

4
unit/internal/vermicelli.cpp
View File

@@ -30,7 +30,7 @@
#include "config.h"
#include "gtest/gtest.h"
#include "nfa/vermicelli.h"
#include "nfa/vermicelli.hpp"
TEST(Vermicelli, ExecNoMatch1) {
char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
@@ -1150,4 +1150,4 @@ TEST(DoubleVermicelliMasked16, Exec5) {
}
}
#endif // HAVE_SVE2
#endif // HAVE_SVE2