Skip to content

Commit 84fcbb0

Browse files
committed
Test example MSA 14
1 parent cb516e2 commit 84fcbb0

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

scripts/generate_trimmed_msas.sh

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ mkdir test_msas/automated1
66
mkdir test_msas/nogaps
77
mkdir test_msas/noallgaps
88

9+
10+
./bin/trimal -in dataset/example.014.AA.EggNOG.COG0591.fasta -strict -out test_msas/strict/example.014.AA.EggNOG.COG0591.fasta
11+
12+
'
913
./bin/trimal -in dataset/example.004.AA.fasta -gappyout -out test_msas/gappyout/example.004.AA.fasta
1014
./bin/trimal -in dataset/example.004.AA.fasta -strict -out test_msas/strict/example.004.AA.fasta
1115
./bin/trimal -in dataset/example.004.AA.fasta -strictplus -out test_msas/strictplus/example.004.AA.fasta
@@ -510,3 +514,4 @@ mkdir test_msas/noallgaps
510514
./bin/trimal -in dataset/example.091.AA.strNOG.ENOG411BWBU.fasta -automated1 -out test_msas/automated1/example.091.AA.strNOG.ENOG411BWBU.fasta
511515
./bin/trimal -in dataset/example.091.AA.strNOG.ENOG411BWBU.fasta -nogaps -out test_msas/nogaps/example.091.AA.strNOG.ENOG411BWBU.fasta
512516
./bin/trimal -in dataset/example.091.AA.strNOG.ENOG411BWBU.fasta -noallgaps -out test_msas/noallgaps/example.091.AA.strNOG.ENOG411BWBU.fasta
517+
'

source/Platform/x86/AVX2.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,22 @@ class AVX2Vector {
109109
inline uint16_t sum() const {
110110
__m256i sum256 = _mm256_sad_epu8(vector, _mm256_setzero_si256());
111111
__m128i sum128 = _mm_add_epi64(_mm256_extractf128_si256(sum256, 1), _mm256_castsi256_si128(sum256));
112+
uint16_t res32 = _mm_extract_epi32(sum128, 0) + _mm_extract_epi32(sum128, 2);
113+
uint16_t res64 = _mm_extract_epi64(sum128, 0) + _mm_extract_epi64(sum128, 1);
114+
if (res32 != res64) {
115+
std::cout << "uint16_t res32 = " << res32 << "\n";
116+
std::cout << "uint16_t res64 = " << res64 << "\n";
117+
exit (1);
118+
}
119+
120+
112121
return _mm_extract_epi64(sum128, 0) + _mm_extract_epi64(sum128, 1);
113122
}
114123
#else
115124
inline uint16_t sum() const {
116125
__m256i sum256 = _mm256_sad_epu8(vector, _mm256_setzero_si256());
117126
__m128i sum128 = _mm_add_epi64(_mm256_extractf128_si256(sum256, 1), _mm256_castsi256_si128(sum256));
127+
std::cout << "NOT CPU_FEATURES_ARCH_X86_64 \n";
118128

119129
return _mm_extract_epi32(sum128, 0) + _mm_extract_epi32(sum128, 2);
120130
}

0 commit comments

Comments
 (0)