Merge pull request #1478 from mythi/PR-2023-033

demo: crypto-perf, accel-config-demo and openssl-qat-engine updates

demo/accel-config-demo/Dockerfile

@@ -35,19 +35,15 @@ RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
     ./configure -q --libdir=/usr/lib64 --enable-test=yes --disable-docs && \
     make install
 
-COPY dml.patch /
+RUN cd / && git clone --recurse-submodules --branch v1.1.0 --depth 1 https://github.com/intel/DML.git && \
-RUN cd / && git clone --recurse-submodules --branch v0.1.9-beta --depth 1 https://github.com/intel/DML.git && \
     mkdir DML/build && cd DML/build && \
-    patch -d .. -p1 < /dml.patch && \
     cmake .. && \
     make install && \
     mv -v /usr/local/bin/tests /usr/local/bin/dml_tests && \
-    mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt && \
+    mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt
-    mv -v /usr/local/bin/job_api_samples /usr/local/bin/dml_job_api_samples
 
-RUN cd / && git clone --recursive --depth 1 --branch v1.0.0 https://github.com/intel/qpl.git && \
+RUN cd / && git clone --recursive --depth 1 --branch v1.2.0 https://github.com/intel/qpl.git && \
     mkdir qpl/build && cd qpl/build && \
-    sed -i '10i #include <stdexcept>' ../tools/benchmarks/include/types.hpp && \
     cmake -DLOG_HW_INIT=ON .. && \
     make install
 

demo/accel-config-demo/dml.patch

@@ -1,51 +0,0 @@
-From 31be752ada72f85b2eca9b5a3eef8c41dedb4ad6 Mon Sep 17 00:00:00 2001
-From: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
-Date: Wed, 28 Dec 2022 17:21:15 +0200
-Subject: [PATCH] tests: Ass includes in order to compile with gcc 11, gcc 12
-
-Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
----
- include/dml/detail/ml/buffer.hpp     | 1 +
- tests/common/t_utility_functions.hpp | 1 +
- tests/utils/include/utils/memory.hpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/include/dml/detail/ml/buffer.hpp b/include/dml/detail/ml/buffer.hpp
-index 8f2f529..d59514c 100644
---- a/include/dml/detail/ml/buffer.hpp
-+++ b/include/dml/detail/ml/buffer.hpp
-@@ -10,6 +10,7 @@
- #include <dml/detail/ml/allocator.hpp>
- #include <dml/detail/ml/utils.hpp>
- #include <memory>
-+#include <utility>
- 
- namespace dml::detail::ml
- {
-diff --git a/tests/common/t_utility_functions.hpp b/tests/common/t_utility_functions.hpp
-index c445cb7..caaf411 100644
---- a/tests/common/t_utility_functions.hpp
-+++ b/tests/common/t_utility_functions.hpp
-@@ -7,6 +7,7 @@
- #ifndef DML_T_UTILITY_FUNCTIONS_HPP
- #define DML_T_UTILITY_FUNCTIONS_HPP
- 
-+#include <stdlib.h>
- #include <vector>
- #include <cstdint>
- 
-diff --git a/tests/utils/include/utils/memory.hpp b/tests/utils/include/utils/memory.hpp
-index 4f3cdcf..e408cd9 100644
---- a/tests/utils/include/utils/memory.hpp
-+++ b/tests/utils/include/utils/memory.hpp
-@@ -12,6 +12,7 @@
- #include <memory>
- #include <vector>
- #include <ostream>
-+#include <utility>
- 
- namespace dml::testing
- {
--- 
-2.39.0
-

demo/crypto-perf/Dockerfile

@@ -8,8 +8,8 @@ RUN echo "deb-src http://deb.debian.org/debian unstable main" >> \
 RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip libssl-dev pkg-config dpkg-dev
 
 # Download & unpack DPDK tarball
-ARG DPDK_TARBALL=dpdk-22.11.tar.xz
+ARG DPDK_TARBALL=dpdk-23.07-rc4.tar.xz
-ARG DPDK_TARBALL_SHA256="8eefcc69afa87dccaf8d730d805ded70fb8b64905295d6396977c1322e59eadb"
+ARG DPDK_TARBALL_SHA256="f16e25a8b1eeb7335fbd265a6d4f9cce512709436efc80f6422ee9cfdf2f32b9"
 
 ARG SOVERSION=23
 RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \

demo/openssl-qat-engine/Dockerfile

@@ -1,10 +1,10 @@
 FROM ubuntu:22.04 as builder
 
 ARG QATLIB_VERSION="23.02.0"
-ARG QAT_ENGINE_VERSION="v1.1.0"
+ARG QAT_ENGINE_VERSION="v1.2.0"
 ARG ASYNC_NGINX_VERSION="v0.5.0"
-ARG IPSEC_MB_VERSION="v1.3"
+ARG IPSEC_MB_VERSION="v1.4"
-ARG IPP_CRYPTO_VERSION="ippcp_2021.7.1"
+ARG IPP_CRYPTO_VERSION="ippcp_2021.8"
 
 RUN apt update && \
     env DEBIAN_FRONTEND=noninteractive apt install -y \
@@ -48,6 +48,7 @@ RUN cd /intel-ipsec-mb && \
     make && make install LIB_INSTALL_DIR=/usr/lib64
 
 RUN cd /QAT_Engine && \
+    sed -i -e 's/GCM_IV_DATA_LEN/IMB_GCM_IV_DATA_LEN/g' qat_evp.c && \
     ./autogen.sh && \
     ./configure \
     --enable-qat_sw && \
@@ -74,7 +75,7 @@ COPY --from=builder /usr/bin/*_sample* /usr/bin/
 COPY --from=builder /usr/lib/libqat.so.3.0.3 /usr/lib/
 COPY --from=builder /usr/lib/libusdm.so.0.1.0 /usr/lib/
 COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.6 /usr/lib/x86_64-linux-gnu/
+COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.8 /usr/lib/x86_64-linux-gnu/
 COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
 COPY --from=builder /var/www/ /var/www/
 COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/