Merge pull request #59551 from jinjunzh/iaadeflate_upgrade_qpl_v1.4.0

Upgrade QPL to v1.4.0+Fix qpl_deflate codec bug for polling timeout
ClickHouse · Feb 23, 2024 · e325afa · e325afa
2 parents 1a4b4d4 + 38d4d1f
commit e325afa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/contrib/qpl b/contrib/qpl
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -223,15 +223,12 @@ Int32 HardwareCodecDeflateQpl::doDecompressDataSynchronous(const char * source,
         LOG_WARNING(log, "DeflateQpl HW codec failed, falling back to SW codec. (Details: doDecompressDataSynchronous->qpl_submit_job with error code: {} - please refer to qpl_status in ./contrib/qpl/include/qpl/c_api/status.h)", static_cast<UInt32>(status));
         return RET_ERROR;
     }
-
     /// Busy waiting till job complete.
-    UInt32 num_checks = 0;
     do
     {
         _tpause(1, __rdtsc() + 1000);
         status = qpl_check_job(job_ptr);
-        ++num_checks;
-    } while (status == QPL_STS_BEING_PROCESSED && num_checks < MAX_CHECKS);
+    } while (status == QPL_STS_BEING_PROCESSED);
 
     if (status != QPL_STS_OK)
     {
@@ -280,7 +277,6 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
 {
     auto n_jobs_processing = decomp_async_job_map.size();
     std::map<UInt32, qpl_job *>::iterator it = decomp_async_job_map.begin();
-    UInt32 num_checks = 0;
 
     while (n_jobs_processing)
     {
@@ -290,7 +286,7 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
         job_ptr = it->second;
 
         auto status = qpl_check_job(job_ptr);
-        if ((status == QPL_STS_BEING_PROCESSED) && (num_checks < MAX_CHECKS))
+        if (status == QPL_STS_BEING_PROCESSED)
         {
             it++;
         }
@@ -316,7 +312,6 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
         {
             it = decomp_async_job_map.begin();
             _tpause(1, __rdtsc() + 1000);
-            ++num_checks;
         }
     }
 }

diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
@@ -65,8 +65,6 @@ class HardwareCodecDeflateQpl
 public:
     /// RET_ERROR stands for hardware codec fail, needs fallback to software codec.
     static constexpr Int32 RET_ERROR = -1;
-    /// Maximum times to check if hardware job complete, otherwise fallback to software codec.
-    static constexpr UInt32 MAX_CHECKS = UINT16_MAX;
 
     HardwareCodecDeflateQpl(SoftwareCodecDeflateQpl & sw_codec_);
     ~HardwareCodecDeflateQpl();