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

mmbBuildInitRangePlan: correct offset if initial block is not block 0

Browse Source
This commit is contained in:
Alex Coyte 2017-03-22 12:43:42 +11:00 committed by Matthew Barr
parent 1200f33116
commit 0cbec2c1c3
2 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/multibit_build.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, Intel Corporation * Copyright (c) 2015-2017, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -272,7 +272,7 @@ void mmbBuildInitRangePlan(u32 total_bits, u32 begin, u32 end,
} }
// Partial block to deal with beginning. // Partial block to deal with beginning.
block_offset += k1 / MMB_KEY_BITS; block_offset += (k1 / MMB_KEY_BITS) * sizeof(MMB_TYPE);
if (k1 % MMB_KEY_BITS) { if (k1 % MMB_KEY_BITS) {
u32 idx = k1 / MMB_KEY_BITS; u32 idx = k1 / MMB_KEY_BITS;
u32 block_end = (idx + 1) * MMB_KEY_BITS; u32 block_end = (idx + 1) * MMB_KEY_BITS;

61
unit/internal/multi_bit.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, Intel Corporation * Copyright (c) 2015-2017, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -30,6 +30,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "ue2common.h" #include "ue2common.h"
#include "rose/rose_build_scatter.h"
#include "util/compile_error.h" #include "util/compile_error.h"
#include "util/make_unique.h" #include "util/make_unique.h"
#include "util/multibit.h" #include "util/multibit.h"
@ -698,7 +699,9 @@ TEST_P(MultiBitTest, InitRangeChunked) {
for (u32 n = 2; n <= 10; n++) { for (u32 n = 2; n <= 10; n++) {
u32 chunk_size = test_size / n; u32 chunk_size = test_size / n;
if (chunk_size == 0) break; if (chunk_size == 0) {
break;
}
for (u32 k = 0; k < n; k++) { for (u32 k = 0; k < n; k++) {
u32 chunk_begin = k * chunk_size; u32 chunk_begin = k * chunk_size;
@ -723,6 +726,60 @@ TEST_P(MultiBitTest, InitRangeChunked) {
} }
} }
static
void apply(const scatter_plan_raw &sp, u8 *out) {
for (const auto &e : sp.p_u64a) {
memcpy(out + e.offset, &e.val, sizeof(e.val));
}
for (const auto &e : sp.p_u32) {
memcpy(out + e.offset, &e.val, sizeof(e.val));
}
for (const auto &e : sp.p_u16) {
memcpy(out + e.offset, &e.val, sizeof(e.val));
}
for (const auto &e : sp.p_u8) {
memcpy(out + e.offset, &e.val, sizeof(e.val));
}
}
TEST_P(MultiBitTest, InitRangePlanChunked) {
SCOPED_TRACE(test_size);
ASSERT_TRUE(ba != nullptr);
// Init ranges chunk by chunk.
for (u32 n = 2; n <= 10; n++) {
u32 chunk_size = test_size / n;
if (chunk_size == 0) {
break;
}
for (u32 k = 0; k < n; k++) {
u32 chunk_begin = k * chunk_size;
u32 chunk_end = min(test_size, (k + 1) * chunk_size);
scatter_plan_raw sp;
mmbBuildInitRangePlan(test_size, chunk_begin, chunk_end, &sp);
memset(ba, 0xaa, mmbit_size(test_size));
apply(sp, ba);
// First bit set should be chunk_begin.
ASSERT_EQ(chunk_begin, mmbit_iterate(ba, test_size, MMB_INVALID));
// All bits in the chunk should be on.
for (u64a i = chunk_begin; i < chunk_end; i += stride) {
SCOPED_TRACE(i);
ASSERT_TRUE(mmbit_isset(ba, test_size, i));
}
// Last bit on is chunk_end - 1.
if (chunk_end) {
ASSERT_EQ(MMB_INVALID, mmbit_iterate(ba, test_size, chunk_end - 1));
}
}
}
}
TEST(MultiBit, SparseIteratorBegin1) { TEST(MultiBit, SparseIteratorBegin1) {
const u32 test_size = 100; const u32 test_size = 100;
vector<mmbit_sparse_iter> it; vector<mmbit_sparse_iter> it;