Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 21, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aebf70
demo: update accel-config-demo
mythi Jul 19, 2023
510dbbd
demo: update openssl-qat-engine
mythi Jul 19, 2023
cad7fea
demo: update crypto-perf
mythi Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions demo/accel-config-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 v0.1.9-beta --depth 1 https://github.com/intel/DML.git && \
RUN cd / && git clone --recurse-submodules --branch v1.1.0 --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/job_api_samples /usr/local/bin/dml_job_api_samples
mv -v /usr/local/bin/tests_mt /usr/local/bin/dml_tests_mt

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

Expand Down
51 changes: 0 additions & 51 deletions demo/accel-config-demo/dml.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions demo/crypto-perf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_SHA256="8eefcc69afa87dccaf8d730d805ded70fb8b64905295d6396977c1322e59eadb"
ARG DPDK_TARBALL=dpdk-23.07-rc4.tar.xz
ARG DPDK_TARBALL_SHA256="f16e25a8b1eeb7335fbd265a6d4f9cce512709436efc80f6422ee9cfdf2f32b9"

ARG SOVERSION=23
RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \
Expand Down
9 changes: 5 additions & 4 deletions demo/openssl-qat-engine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 IPP_CRYPTO_VERSION="ippcp_2021.7.1"
ARG IPSEC_MB_VERSION="v1.4"
ARG IPP_CRYPTO_VERSION="ippcp_2021.8"

RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y \
Expand Down Expand Up @@ -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 && \
Expand All @@ -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/
Expand Down