mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 07:16:14 +08:00
Bring LZ4 support for hardnested tables
Testing perfs on an old 8-core laptop: BZ2 : 2 Mb, average decompression time: 5514 ms LZ4 -9: 9 Mb, average decompression time: 837 ms RAW : 704 Mb, average decompression time: 368 ms Other LZ4 options don't help: -1 is slower and bigger, --favor-decSpeed does not do anything To enable: apt install liblz4-dev cd client/resources/hardnested_tables for i in *bz2; do bunzip2 $i; lz4 -9 --rm ${i%.bz2}; done
This commit is contained in:
parent
3190cc5a3d
commit
83e083100b
|
@ -183,6 +183,13 @@ else(EMBED_BZIP2)
|
|||
find_package (BZip2 REQUIRED)
|
||||
endif(EMBED_BZIP2)
|
||||
|
||||
find_path(LZ4_INCLUDE_DIRS lz4frame.h)
|
||||
find_library(LZ4_LIBRARIES lz4)
|
||||
|
||||
if (LZ4_INCLUDE_DIRS AND LZ4_LIBRARIES)
|
||||
set(LZ4_FOUND ON)
|
||||
endif (LZ4_INCLUDE_DIRS AND LZ4_LIBRARIES)
|
||||
|
||||
if (NOT SKIPWHEREAMISYSTEM EQUAL 1)
|
||||
find_path(WHEREAMI_INCLUDE_DIRS whereami.h)
|
||||
find_library(WHEREAMI_LIBRARIES whereami)
|
||||
|
@ -457,6 +464,11 @@ if (BZIP2_FOUND)
|
|||
set(ADDITIONAL_LNK ${BZIP2_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
endif (BZIP2_FOUND)
|
||||
|
||||
if (LZ4_FOUND)
|
||||
set(ADDITIONAL_DIRS ${LZ4_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
|
||||
set(ADDITIONAL_LNK ${LZ4_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
endif (LZ4_FOUND)
|
||||
|
||||
if (WHEREAMI_FOUND)
|
||||
set(ADDITIONAL_DIRS ${WHEREAMI_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
|
||||
set(ADDITIONAL_LNK ${WHEREAMI_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
|
@ -495,6 +507,12 @@ else (EMBED_BZIP2)
|
|||
message(STATUS "Bzip2 library: system library found")
|
||||
endif (EMBED_BZIP2)
|
||||
|
||||
if (LZ4_FOUND)
|
||||
message(STATUS "LZ4 library: system library found")
|
||||
else (LZ4_FOUND)
|
||||
message(SEND_ERROR "LZ4 library: system library not found and no local library implemented")
|
||||
endif (LZ4_FOUND)
|
||||
|
||||
if (SKIPJANSSONSYSTEM EQUAL 1)
|
||||
message(STATUS "Jansson library: local library forced")
|
||||
else (SKIPJANSSONSYSTEM EQUAL 1)
|
||||
|
|
|
@ -242,6 +242,9 @@ endif
|
|||
## BZIP2
|
||||
LDLIBS += -lbz2
|
||||
|
||||
## LZ4
|
||||
LDLIBS += -llz4
|
||||
|
||||
## Bluez (optional)
|
||||
ifneq ($(SKIPBT),1)
|
||||
BTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags bluez 2>/dev/null)
|
||||
|
|
|
@ -183,6 +183,13 @@ else(EMBED_BZIP2)
|
|||
find_package (BZip2 REQUIRED)
|
||||
endif(EMBED_BZIP2)
|
||||
|
||||
find_path(LZ4_INCLUDE_DIRS lz4frame.h)
|
||||
find_library(LZ4_LIBRARIES lz4)
|
||||
|
||||
if (LZ4_INCLUDE_DIRS AND LZ4_LIBRARIES)
|
||||
set(LZ4_FOUND ON)
|
||||
endif (LZ4_INCLUDE_DIRS AND LZ4_LIBRARIES)
|
||||
|
||||
if (NOT SKIPWHEREAMISYSTEM EQUAL 1)
|
||||
find_path(WHEREAMI_INCLUDE_DIRS whereami.h)
|
||||
find_library(WHEREAMI_LIBRARIES whereami)
|
||||
|
@ -457,6 +464,11 @@ if (BZIP2_FOUND)
|
|||
set(ADDITIONAL_LNK ${BZIP2_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
endif (BZIP2_FOUND)
|
||||
|
||||
if (LZ4_FOUND)
|
||||
set(ADDITIONAL_DIRS ${LZ4_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
|
||||
set(ADDITIONAL_LNK ${LZ4_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
endif (LZ4_FOUND)
|
||||
|
||||
if (WHEREAMI_FOUND)
|
||||
set(ADDITIONAL_DIRS ${WHEREAMI_INCLUDE_DIRS} ${ADDITIONAL_DIRS})
|
||||
set(ADDITIONAL_LNK ${WHEREAMI_LIBRARIES} ${ADDITIONAL_LNK})
|
||||
|
@ -495,6 +507,12 @@ else (EMBED_BZIP2)
|
|||
message(STATUS "Bzip2 library: system library found")
|
||||
endif (EMBED_BZIP2)
|
||||
|
||||
if (LZ4_FOUND)
|
||||
message(STATUS "LZ4 library: system library found")
|
||||
else (LZ4_FOUND)
|
||||
message(SEND_ERROR "LZ4 library: system library not found and no local library implemented")
|
||||
endif (LZ4_FOUND)
|
||||
|
||||
if (SKIPJANSSONSYSTEM EQUAL 1)
|
||||
message(STATUS "Jansson library: local library forced")
|
||||
else (SKIPJANSSONSYSTEM EQUAL 1)
|
||||
|
|
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_001_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_001_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_003_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_003_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_005_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_005_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_007_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_007_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_009_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_009_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_00b_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_00b_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_00d_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_00d_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_00f_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_00f_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_010_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_010_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_014_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_014_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_01c_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_01c_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_021_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_021_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_023_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_023_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_025_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_025_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_027_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_027_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_029_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_029_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_02b_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_02b_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_02d_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_02d_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_02f_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_02f_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_030_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_030_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_034_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_034_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_03c_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_03c_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_040_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_040_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_044_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_044_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_04c_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_04c_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_051_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_051_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_053_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_053_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_055_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_055_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_057_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_057_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_059_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_059_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_05b_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_05b_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_05d_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_05d_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_05f_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_05f_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_064_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_064_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_06c_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_06c_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_071_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_071_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_073_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_073_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_075_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_075_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_077_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_077_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_079_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_079_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_07b_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_07b_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_07f_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_07f_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_081_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_081_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_083_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_083_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_085_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_085_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_087_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_087_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_089_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_089_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
BIN
client/resources/hardnested_tables/bitflip_0_08b_states.bin.lz4
Normal file
BIN
client/resources/hardnested_tables/bitflip_0_08b_states.bin.lz4
Normal file
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue