From fb6af2d541725e5404c6ed80bef787693e5861bf Mon Sep 17 00:00:00 2001 From: sdausr Date: Tue, 26 Apr 2022 21:03:11 -0600 Subject: [PATCH 1/7] create master branch from next branch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8493c5090f..f1fb07ea52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('pipeline-library')_ -FullVitisLibPipeline (branch: 'next', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vivado_syn:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2022.1_stable_latest') +FullVitisLibPipeline (branch: 'master', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vivado_syn:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2022.1_released') From 194d3c88030d8370740ddfda0002251f89c535ce Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Sun, 8 May 2022 23:58:01 +0900 Subject: [PATCH 2/7] Use the kernel name compress_kernel_names[2] as the other deflate_buffer(). Makefile does not build the kernel compress_kernel_names[1], xilGzipComp. --- data_compression/common/libs/compress/gzipOCLHost.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data_compression/common/libs/compress/gzipOCLHost.cpp b/data_compression/common/libs/compress/gzipOCLHost.cpp index 6151c2db4b..4dbc6ebaca 100644 --- a/data_compression/common/libs/compress/gzipOCLHost.cpp +++ b/data_compression/common/libs/compress/gzipOCLHost.cpp @@ -1350,9 +1350,7 @@ size_t gzipOCLHost::deflate_buffer( cl_int err; std::string compress_kname; if (m_compressFullKernel == NULL) { - // Random: Use kernel name directly and let XRT - // decide the CU connection based on HBM bank - compress_kname = compress_kernel_names[1]; + compress_kname = compress_kernel_names[2]; OCL_CHECK(err, m_compressFullKernel = new cl::Kernel(*m_program, compress_kname.c_str(), &err)); initialize_checksum = true; } From c5836059296a4af769444d0afe0dbe430671b3de Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Mon, 9 May 2022 00:02:51 +0900 Subject: [PATCH 3/7] Replaced the wrong enum values COMPRESS/DECOMPRESS with COMP_ONLY/DECOMP_ONLY for m_cdflow. The function compares cd_flow to COMPRESS/DECOMPRESS while the arguments are COMP_ONLY/DECOMP_ONLY in zlibDriver.cpp. --- .../common/libs/compress/gzipOCLHost.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data_compression/common/libs/compress/gzipOCLHost.cpp b/data_compression/common/libs/compress/gzipOCLHost.cpp index 4dbc6ebaca..181e55c51b 100644 --- a/data_compression/common/libs/compress/gzipOCLHost.cpp +++ b/data_compression/common/libs/compress/gzipOCLHost.cpp @@ -178,13 +178,13 @@ int gzipOCLHost::init(const std::string& binaryFileName, uint8_t m_kidx) { // Create Command Queue // Compress Command Queue & Kernel Setup // OCL_CHECK(err, m_def_q = new cl::CommandQueue(*m_context, m_device, m_isProfile, &err)); - if ((m_cdflow == BOTH) || (m_cdflow == COMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == COMP_ONLY)) { OCL_CHECK(err, m_def_q = new cl::CommandQueue(*m_context, m_device, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, &err)); } // DeCompress Command Queue & Kernel Setup - if ((m_cdflow == BOTH) || (m_cdflow == DECOMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == DECOMP_ONLY)) { for (uint8_t i = 0; i < D_COMPUTE_UNIT; i++) { OCL_CHECK(err, m_q_dec[i] = new cl::CommandQueue(*m_context, m_device, CL_QUEUE_PROFILING_ENABLE, &err)); OCL_CHECK(err, m_q_rd[i] = new cl::CommandQueue(*m_context, m_device, CL_QUEUE_PROFILING_ENABLE, &err)); @@ -306,16 +306,16 @@ gzipOCLHost::gzipOCLHost(enum State flow, return; } - if ((m_cdflow == BOTH) || (m_cdflow == COMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == COMP_ONLY)) { m_memMgrCmp = new memoryManager(8, m_context, sb_opt, m_def_q); } - if ((m_cdflow == BOTH) || (m_cdflow == DECOMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == DECOMP_ONLY)) { m_memMgrDecMM2S = new memoryManager(8, m_context, sb_opt, m_rd_q); m_memMgrDecS2MM = new memoryManager(8, m_context, sb_opt, m_wr_q); } - if ((m_cdflow == BOTH) || (m_cdflow == COMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == COMP_ONLY)) { if (isSlaveBridge()) { h_buf_checksum = (uint32_t*)m_memMgrCmp->create_host_buffer(CL_MEM_READ_WRITE, sizeof(uint32_t), &(buffer_checksum_data)); @@ -335,7 +335,7 @@ gzipOCLHost::gzipOCLHost(enum State flow, } } - if ((m_cdflow == BOTH) || (m_cdflow == DECOMPRESS)) { + if ((m_cdflow == BOTH) || (m_cdflow == DECOMP_ONLY)) { // Decompression host buffer allocation for (int j = 0; j < DIN_BUFFERCOUNT; ++j) MEM_ALLOC_CHECK(h_dbufstream_in[j].resize(INPUT_BUFFER_SIZE), INPUT_BUFFER_SIZE, "Input Buffer"); From 6f10c1e332f987f6e00a957e27d255f892b03bb7 Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Mon, 9 May 2022 00:50:38 +0900 Subject: [PATCH 4/7] Removed input_size = 0 that stop deflate when 1MB is processed --- data_compression/common/libs/compress/gzipOCLHost.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_compression/common/libs/compress/gzipOCLHost.cpp b/data_compression/common/libs/compress/gzipOCLHost.cpp index 181e55c51b..121f55ab0c 100644 --- a/data_compression/common/libs/compress/gzipOCLHost.cpp +++ b/data_compression/common/libs/compress/gzipOCLHost.cpp @@ -1441,7 +1441,7 @@ size_t gzipOCLHost::deflate_buffer( &(buffer->rd_event))); cl_int err; OCL_CHECK(err, err = buffer->rd_event.setCallback(CL_COMPLETE, event_compress_cb, (void*)buffer)); - input_size = 0; + // input_size = 0; actionDone = true; } } From c5722b6f4bc373a4eeeabe793267264ea241c0b1 Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Mon, 9 May 2022 01:03:45 +0900 Subject: [PATCH 5/7] Fixed the 3rd parameter of run.sh --- data_compression/L3/demos/libzso/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_compression/L3/demos/libzso/Makefile b/data_compression/L3/demos/libzso/Makefile index 6b333d1a67..01c15aab9b 100644 --- a/data_compression/L3/demos/libzso/Makefile +++ b/data_compression/L3/demos/libzso/Makefile @@ -444,5 +444,5 @@ run: xclbin lib host $(EMU_CONFIG) ifeq ($(TARGET), $(filter $(TARGET), sw_emu hw_emu)) XCL_EMULATION_MODE=$(TARGET) ./run.sh $(EXE_FILE) $(XFLIB_DIR) $(XCLBIN_FILE) else - ./run.sh $(EXE_FILE) $(XFLIB_DIR) $(XCLBIN_DIR) + ./run.sh $(EXE_FILE) $(XFLIB_DIR) $(XCLBIN_FILE) endif From 550c115801738d4358c8376858ad5e13e17e0e09 Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Mon, 9 May 2022 01:04:54 +0900 Subject: [PATCH 6/7] Show small numbers under 1.0 --- data_compression/L3/demos/libzso/src/host.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data_compression/L3/demos/libzso/src/host.cpp b/data_compression/L3/demos/libzso/src/host.cpp index 6facbf3f19..a8c0417674 100644 --- a/data_compression/L3/demos/libzso/src/host.cpp +++ b/data_compression/L3/demos/libzso/src/host.cpp @@ -137,8 +137,8 @@ void zlib_compress(const std::string& inFile_name) { std::cout << "#Iterations " << num_iter; std::cout << ", Input File: " << inFile_name; std::cout << ", Output File: " << outFile_name << std::endl; - std::cout << "Input Size: " << input_size / MiB << "MiB "; - std::cout << " Compressed Size: " << compress_len / MiB << "MiB "; + std::cout << "Input Size: " << std::fixed << std::setprecision(2) << (float)input_size / MiB << "MiB "; + std::cout << " Compressed Size: " << std::fixed << std::setprecision(2) << (float)compress_len / MiB << "MiB "; std::cout << " CR: " << std::fixed << std::setprecision(2) << (float)input_size / compress_len; std::cout << " PID: " << getpid(); std::cout << " PPID: " << getppid(); From 7bf881defa5bae9977bd7e10ae3ad2e4ae66cc74 Mon Sep 17 00:00:00 2001 From: Takeshi Ogasawara Date: Mon, 9 May 2022 01:06:54 +0900 Subject: [PATCH 7/7] Initialize m_zlibFlow, which is referenced later. --- data_compression/common/libs/compress/gzipOCLHost.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data_compression/common/libs/compress/gzipOCLHost.cpp b/data_compression/common/libs/compress/gzipOCLHost.cpp index 121f55ab0c..317dc484a6 100644 --- a/data_compression/common/libs/compress/gzipOCLHost.cpp +++ b/data_compression/common/libs/compress/gzipOCLHost.cpp @@ -209,13 +209,18 @@ gzipOCLHost::gzipOCLHost(const std::string& binaryFileName, enum design_flow dflow, const int bank_id) { m_cdflow = cd_flow; + m_zlibFlow = (enum design_flow)dflow; m_device = device; m_pending = 0; m_context = context; m_program = program; m_islibz = true; m_isSlaveBridge = sb_opt; - if (m_zlibFlow) m_checksum = 1; + if (m_zlibFlow) { + m_checksum = 1; + m_isZlib = true; + } + if (m_cdflow == COMP_ONLY) m_kidx = 1; else