Skip to content

Commit 665afd5

Browse files
SDA USRsdausr
authored and
GitHub Enterprise
committed
Squashed 'data_compression' changes from 6a828e0..c383658 (#589)
c383658 updating release notes 9cb6688 added 2022.1 release notes 1801212 pthread issue fix 69982f3 disabling latest u50 Co-authored-by: sdausr <[email protected]>
1 parent 49e5d3b commit 665afd5

File tree

14 files changed

+37
-26
lines changed

14 files changed

+37
-26
lines changed

data_compression/L2/demos/lz4/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u200_gen3x16_xdma_2_202110_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += u200 u250 u50 vck190 aws-vu9p-f1
68+
PLATFORM_ALLOWLIST += u200 u250 vck190 aws-vu9p-f1
6969
PLATFORM_BLOCKLIST += zc xilinx_vck190_base_202210_1
7070

7171
include ./utils.mk
@@ -224,9 +224,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
224224
@echo "Generating sd_card folder...."
225225
mkdir -p $(SD_CARD)
226226
chmod a+rx $(BUILD_DIR)/run_script.sh
227-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
227+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
228228
ifeq ($(TARGET),hw)
229-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
229+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
230230
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
231231
@echo "### ***** sd_card generation done! ***** ###"
232232
vck190_dfx_hw := true

data_compression/L2/demos/lz4/description.json

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"platform_allowlist": [
3939
"u200",
4040
"u250",
41-
"u50",
4241
"vck190",
4342
"aws-vu9p-f1"
4443
],

data_compression/L2/tests/gzipd_quadcores/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u250_gen3x16_xdma_3_1_202020_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += xilinx_u250_gen3x16_xdma_3_1_202020_1 u200 u50
68+
PLATFORM_ALLOWLIST += xilinx_u250_gen3x16_xdma_3_1_202020_1 u200
6969
PLATFORM_BLOCKLIST += zc vck
7070

7171
include ./utils.mk
@@ -218,9 +218,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
218218
@echo "Generating sd_card folder...."
219219
mkdir -p $(SD_CARD)
220220
chmod a+rx $(BUILD_DIR)/run_script.sh
221-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
221+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
222222
ifeq ($(TARGET),hw)
223-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
223+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
224224
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
225225
@echo "### ***** sd_card generation done! ***** ###"
226226
vck190_dfx_hw := true

data_compression/L2/tests/gzipd_quadcores/description.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
],
1919
"platform_allowlist": [
2020
"xilinx_u250_gen3x16_xdma_3_1_202020_1",
21-
"u200",
22-
"u50"
21+
"u200"
2322
],
2423
"host": {
2524
"host_exe": "xil_zlib",

data_compression/L2/tests/zlib_decompress_8KB_checksum/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u200_gen3x16_xdma_2_202110_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += u200 u250 u50 vck190 aws-vu9p-f1
68+
PLATFORM_ALLOWLIST += u200 u250 vck190 aws-vu9p-f1
6969
PLATFORM_BLOCKLIST += zc xilinx_vck190_base_202210_1
7070

7171
include ./utils.mk
@@ -231,9 +231,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
231231
@echo "Generating sd_card folder...."
232232
mkdir -p $(SD_CARD)
233233
chmod a+rx $(BUILD_DIR)/run_script.sh
234-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
234+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
235235
ifeq ($(TARGET),hw)
236-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
236+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
237237
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
238238
@echo "### ***** sd_card generation done! ***** ###"
239239
vck190_dfx_hw := true

data_compression/L2/tests/zlib_decompress_8KB_checksum/description.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"platform_allowlist": [
2727
"u200",
2828
"u250",
29-
"u50",
3029
"vck190",
3130
"aws-vu9p-f1"
3231
],

data_compression/L2/tests/zlibc_static_8KB/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u250_gen3x16_xdma_4_1_202210_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += xilinx_u250_gen3x16_xdma_3_1_202020_1 u200 u50 vck190 aws-vu9p-f1
68+
PLATFORM_ALLOWLIST += xilinx_u250_gen3x16_xdma_3_1_202020_1 u200 vck190 aws-vu9p-f1
6969
PLATFORM_BLOCKLIST += zc xilinx_vck190_base_202210_1
7070

7171
include ./utils.mk
@@ -227,9 +227,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
227227
@echo "Generating sd_card folder...."
228228
mkdir -p $(SD_CARD)
229229
chmod a+rx $(BUILD_DIR)/run_script.sh
230-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
230+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
231231
ifeq ($(TARGET),hw)
232-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
232+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
233233
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
234234
@echo "### ***** sd_card generation done! ***** ###"
235235
vck190_dfx_hw := true

data_compression/L2/tests/zlibc_static_8KB/description.json

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"platform_allowlist": [
4545
"xilinx_u250_gen3x16_xdma_3_1_202020_1",
4646
"u200",
47-
"u50",
4847
"vck190",
4948
"aws-vu9p-f1"
5049
],

data_compression/L2/tests/zstd_hexacore_compress/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u200_gen3x16_xdma_2_202110_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += u200 u250 u50 u280 vck190 aws-vu9p-f1
68+
PLATFORM_ALLOWLIST += u200 u250 u280 vck190 aws-vu9p-f1
6969
PLATFORM_BLOCKLIST += xilinx_vck190_base_202210_1
7070

7171
include ./utils.mk
@@ -226,9 +226,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
226226
@echo "Generating sd_card folder...."
227227
mkdir -p $(SD_CARD)
228228
chmod a+rx $(BUILD_DIR)/run_script.sh
229-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
229+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
230230
ifeq ($(TARGET),hw)
231-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
231+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
232232
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
233233
@echo "### ***** sd_card generation done! ***** ###"
234234
vck190_dfx_hw := true

data_compression/L2/tests/zstd_hexacore_compress/description.json

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"platform_allowlist": [
1212
"u200",
1313
"u250",
14-
"u50",
1514
"u280",
1615
"vck190",
1716
"aws-vu9p-f1"

data_compression/L2/tests/zstdd_32KB_fastHuff/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PLATFORM := xilinx_u200_gen3x16_xdma_2_202110_1
6565
endif
6666

6767
# #################### Checking if PLATFORM in whitelist ############################
68-
PLATFORM_ALLOWLIST += u200 u250 u50 u280 vck190 aws-vu9p-f1
68+
PLATFORM_ALLOWLIST += u200 u250 u280 vck190 aws-vu9p-f1
6969
PLATFORM_BLOCKLIST += xilinx_vck190_base_202210_1
7070

7171
include ./utils.mk
@@ -231,9 +231,9 @@ $(SD_CARD): $(EXE_FILE) $(BINARY_CONTAINERS) $(RUN_SCRIPT) $(EMCONFIG)
231231
@echo "Generating sd_card folder...."
232232
mkdir -p $(SD_CARD)
233233
chmod a+rx $(BUILD_DIR)/run_script.sh
234-
ifneq (,$(findstring vck190_base_dfx, $(PLATFORM_NAME)))
234+
ifeq ($(findstring vck190_base_dfx, $(PLATFORM_NAME)),vck190_base_dfx)
235235
ifeq ($(TARGET),hw)
236-
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) -o $(BINARY_CONTAINERS_PKG)
236+
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p $(PACKAGE_FILES) $(VPP_PACKAGE) -o $(BINARY_CONTAINERS_PKG)
237237
$(VPP) -t $(TARGET) --platform $(XPLATFORM) -p --package.out_dir $(SD_CARD) --package.rootfs $(SYSROOT)/../../rootfs.ext4 --package.kernel_image $(K_IMAGE) $(SD_FILES_WITH_PREFIX) $(SD_DIRS_WITH_PREFIX) --package.sd_file $(BINARY_CONTAINERS_PKG)
238238
@echo "### ***** sd_card generation done! ***** ###"
239239
vck190_dfx_hw := true

data_compression/L2/tests/zstdd_32KB_fastHuff/description.json

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"platform_allowlist": [
1212
"u200",
1313
"u250",
14-
"u50",
1514
"u280",
1615
"vck190",
1716
"aws-vu9p-f1"

data_compression/L3/demos/libzso/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ $(HOST_OBJ_FILES): $(OBJ_DIR)/host.o $(SRC_DIR)/host.cpp
375375
$(EXE_FILE): $(HOST_OBJ_FILES)
376376
@echo -e "----\nCompiling host executable..."
377377
mkdir -p $(BUILD_DIR)
378-
$(CXX) -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -o $@ $^ -L. $(LIBZLIB_NAME) $(LDXRM) -lboost_system -lboost_filesystem -lOpenCL
378+
$(CXX) -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -o $@ $^ -L. $(LIBZLIB_NAME) $(LDXRM) -lboost_system -lboost_filesystem -lOpenCL -lpthread
379379

380380
# ------------------------------------------------------------
381381
# build rules

data_compression/docs/release.rst

+17
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ Release Note
77
:hidden
88
:maxdepth: 1
99

10+
2022.1
11+
------
12+
13+
Following is the 2022.1 release notes.
14+
15+
* **ZLIB Compression Improvement**
16+
- Reduced TreeGen Initial Interval < 1K to reduce overall resource utilization for 8KB octa core compression.
17+
- Customized Octa-Core compression for 8KB solution ( Reduced Booster Window 8KB)
18+
- Static IP customized.
19+
- Improved Compression IP Timing for Versal and achieved > 250MHz.
20+
- Provided Memory Mapped GZIP File Decompression.
21+
22+
* **ZLIB Decompression Improvement**
23+
- Customized IP for 8KB file size.
24+
- Added ADL32 and provided uncompressed size in TUSER.
25+
- Provided Quad-Core Decompress solution for 32KB and 8KB file size to achieve 4x throughput (upto 2GB/s).
26+
1027
2021.2
1128
------
1229

0 commit comments

Comments
 (0)