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

fdr: further tidy up layout

Browse Source
This commit is contained in:
Justin Viiret 2017-05-24 10:13:06 +10:00 committed by Matthew Barr
parent 549062ec2b
commit c878d5ec66
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fdr/fdr_compile.cpp
View File

@ -151,14 +151,15 @@ void FDRCompiler::createInitialState(FDR *fdr) {
* cacheline-aligned. * cacheline-aligned.
*/ */
bytecode_ptr<FDR> FDRCompiler::setupFDR() { bytecode_ptr<FDR> FDRCompiler::setupFDR() {
size_t tabSize = ROUNDUP_CL(eng.getTabSizeBytes());
auto floodTable = setupFDRFloodControl(lits, eng, grey); auto floodTable = setupFDRFloodControl(lits, eng, grey);
auto confirmTable = setupFullConfs(lits, eng, bucketToLits, make_small); auto confirmTable = setupFullConfs(lits, eng, bucketToLits, make_small);
size_t headerSize = ROUNDUP_CL(sizeof(FDR)); size_t headerSize = sizeof(FDR);
size_t size = headerSize + tabSize + ROUNDUP_CL(confirmTable.size()) + size_t tabSize = eng.getTabSizeBytes();
floodTable.size();
// Note: we place each major structure here on a cacheline boundary.
size_t size = ROUNDUP_CL(headerSize) + ROUNDUP_CL(tabSize) +
ROUNDUP_CL(confirmTable.size()) + floodTable.size();
DEBUG_PRINTF("sizes base=%zu tabSize=%zu confirm=%zu floodControl=%zu " DEBUG_PRINTF("sizes base=%zu tabSize=%zu confirm=%zu floodControl=%zu "
"total=%zu\n", "total=%zu\n",
@ -177,7 +178,7 @@ bytecode_ptr<FDR> FDRCompiler::setupFDR() {
assert(eng.bits > 8 && eng.bits < 16); // we allow domains 9 to 15 only assert(eng.bits > 8 && eng.bits < 16); // we allow domains 9 to 15 only
fdr->domain = eng.bits; fdr->domain = eng.bits;
fdr->domainMask = (1 << eng.bits) - 1; fdr->domainMask = (1 << eng.bits) - 1;
fdr->tabSize = (1 << eng.bits) * (eng.schemeWidth / 8); fdr->tabSize = tabSize;
fdr->stride = eng.stride; fdr->stride = eng.stride;
createInitialState(fdr.get()); createInitialState(fdr.get());
@ -185,7 +186,7 @@ bytecode_ptr<FDR> FDRCompiler::setupFDR() {
u8 *ptr = fdr_base + ROUNDUP_CL(sizeof(FDR)); u8 *ptr = fdr_base + ROUNDUP_CL(sizeof(FDR));
assert(ISALIGNED_CL(ptr)); assert(ISALIGNED_CL(ptr));
copy(tab.begin(), tab.end(), ptr); copy(tab.begin(), tab.end(), ptr);
ptr += tabSize; ptr += ROUNDUP_CL(tabSize);
// Write confirm structures. // Write confirm structures.
assert(ISALIGNED_CL(ptr)); assert(ISALIGNED_CL(ptr));