Skip to content

Commit 3db9a03

Browse files
gcabiddugcabiddu
committed
QATlib: 21.11.0 release
Add QATlib release 21.11.0. Signed-off-by: Giovanni Cabiddu <[email protected]>
1 parent 878b009 commit 3db9a03

File tree

6 files changed

+103
-71
lines changed

6 files changed

+103
-71
lines changed

‎INSTALL‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
===============================================================================
22

33

4-
August 2021
4+
November 2021
55
===============================================================================
66

77

@@ -137,31 +137,12 @@ Compilation and installation - quickstart instructions
137137
sudo dnf install -y gcc systemd-devel automake autoconf libtool
138138
sudo dnf install -y openssl-devel zlib-devel
139139

140-
# Download source rpm
141-
dnf download --source qatlib
142-
143-
# Extract qatlib sources from rpm
144-
mkdir qatlib_src
145-
cd qatlib_src
146-
rpm2cpio ../qatlib-*.src.rpm | cpio -idmv
147-
tar xzvf qatlib-*.tar.gz
148-
149-
# Build sample code (below qatlib src directory name may differ, depending on version)
150-
cd qatlib-21.08.0
151-
./autogen.sh
152-
./configure
153-
make cpa_sample_code
154-
155-
# Compression sample code expects to find data files at a known location,
156-
# so call the samples-install target to put them there.
157-
sudo make samples-install
140+
# Install qatlib-tests rpm
141+
sudo dnf install -y qatlib-tests
158142

159143
# Run it! (takes several minutes to complete)
160144
cpa_sample_code
161145

162-
# no need to leave the samples installed, so cleanup
163-
sudo make samples-uninstall
164-
165146
----------------------------------------------------------------------------
166147

167148
Summary if building from sources.

‎Samples.am‎

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
# QAT Sample Code #
3636
###################
3737

38+
if SAMPLES
39+
3840
COMMON_SAMPLE_CFLAGS = -D USER_SPACE \
3941
-D_GNU_SOURCE \
4042
-DSC_ENABLE_DYNAMIC_COMPRESSION \
@@ -331,55 +333,57 @@ samples: $(lib_LTLIBRARIES) cpa_sample_code dc_dp_sample dc_stateless_sample \
331333
ec_montedwds_sample eddsa_sample
332334

333335
samples-install: samples
334-
@install -D -m 750 -g qat $(srcdir)/.libs/cpa_sample_code $(bindir)/cpa_sample_code
335-
@install -D -m 750 -g qat $(srcdir)/.libs/dc_dp_sample $(bindir)/dc_dp_sample
336-
@install -D -m 750 -g qat $(srcdir)/.libs/dc_stateless_sample $(bindir)/dc_stateless_sample
337-
@install -D -m 750 -g qat $(srcdir)/.libs/dc_stateless_multi_op_sample $(bindir)/dc_stateless_multi_op_sample
338-
@install -D -m 750 -g qat $(srcdir)/.libs/algchaining_sample $(bindir)/algchaining_sample
339-
@install -D -m 750 -g qat $(srcdir)/.libs/ccm_sample $(bindir)/ccm_sample
340-
@install -D -m 750 -g qat $(srcdir)/.libs/cipher_sample $(bindir)/cipher_sample
341-
@install -D -m 750 -g qat $(srcdir)/.libs/gcm_sample $(bindir)/gcm_sample
342-
@install -D -m 750 -g qat $(srcdir)/.libs/hash_file_sample $(bindir)/hash_file_sample
343-
@install -D -m 750 -g qat $(srcdir)/.libs/hash_sample $(bindir)/hash_sample
344-
@install -D -m 750 -g qat $(srcdir)/.libs/ipsec_sample $(bindir)/ipsec_sample
345-
@install -D -m 750 -g qat $(srcdir)/.libs/ssl_sample $(bindir)/ssl_sample
346-
@install -D -m 750 -g qat $(srcdir)/.libs/sym_dp_sample $(bindir)/sym_dp_sample
347-
@install -D -m 750 -g qat $(srcdir)/.libs/dh_sample $(bindir)/dh_sample
348-
@install -D -m 750 -g qat $(srcdir)/.libs/eddsa_sample $(bindir)/eddsa_sample
349-
@install -D -m 750 -g qat $(srcdir)/.libs/prime_sample $(bindir)/prime_sample
350-
@install -D -m 750 -g qat $(srcdir)/.libs/hkdf_sample $(bindir)/hkdf_sample
351-
@install -D -m 750 -g qat $(srcdir)/.libs/ec_montedwds_sample $(bindir)/ec_montedwds_sample
352-
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary $(datadir)/qat/calgary
353-
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 $(datadir)/qat/calgary32
354-
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury $(datadir)/qat/canterbury
336+
@install -D -m 755 $(srcdir)/.libs/cpa_sample_code $(DESTDIR)$(bindir)/cpa_sample_code
337+
@install -D -m 755 $(srcdir)/.libs/dc_dp_sample $(DESTDIR)$(bindir)/dc_dp_sample
338+
@install -D -m 755 $(srcdir)/.libs/dc_stateless_sample $(DESTDIR)$(bindir)/dc_stateless_sample
339+
@install -D -m 755 $(srcdir)/.libs/dc_stateless_multi_op_sample $(DESTDIR)$(bindir)/dc_stateless_multi_op_sample
340+
@install -D -m 755 $(srcdir)/.libs/algchaining_sample $(DESTDIR)$(bindir)/algchaining_sample
341+
@install -D -m 755 $(srcdir)/.libs/ccm_sample $(DESTDIR)$(bindir)/ccm_sample
342+
@install -D -m 755 $(srcdir)/.libs/cipher_sample $(DESTDIR)$(bindir)/cipher_sample
343+
@install -D -m 755 $(srcdir)/.libs/gcm_sample $(DESTDIR)$(bindir)/gcm_sample
344+
@install -D -m 755 $(srcdir)/.libs/hash_file_sample $(DESTDIR)$(bindir)/hash_file_sample
345+
@install -D -m 755 $(srcdir)/.libs/hash_sample $(DESTDIR)$(bindir)/hash_sample
346+
@install -D -m 755 $(srcdir)/.libs/ipsec_sample $(DESTDIR)$(bindir)/ipsec_sample
347+
@install -D -m 755 $(srcdir)/.libs/ssl_sample $(DESTDIR)$(bindir)/ssl_sample
348+
@install -D -m 755 $(srcdir)/.libs/sym_dp_sample $(DESTDIR)$(bindir)/sym_dp_sample
349+
@install -D -m 755 $(srcdir)/.libs/dh_sample $(DESTDIR)$(bindir)/dh_sample
350+
@install -D -m 755 $(srcdir)/.libs/eddsa_sample $(DESTDIR)$(bindir)/eddsa_sample
351+
@install -D -m 755 $(srcdir)/.libs/prime_sample $(DESTDIR)$(bindir)/prime_sample
352+
@install -D -m 755 $(srcdir)/.libs/hkdf_sample $(DESTDIR)$(bindir)/hkdf_sample
353+
@install -D -m 755 $(srcdir)/.libs/ec_montedwds_sample $(DESTDIR)$(bindir)/ec_montedwds_sample
354+
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary $(DESTDIR)$(datadir)/qat/calgary
355+
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 $(DESTDIR)$(datadir)/qat/calgary32
356+
@install -D -m 644 $(srcdir)/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury $(DESTDIR)$(datadir)/qat/canterbury
355357
@echo ""
356358
@echo "*******************************************************"
357-
@echo "* cpa_sample_code installed under $(bindir) directory *"
359+
@echo "* cpa_sample_code installed under $(DESTDIR)$(bindir) *"
358360
@echo "*******************************************************"
359361
@echo ""
360362

361363
sample-uninstall:
362-
@rm -rf $(bindir)/cpa_sample_code
363-
@rm -rf $(bindir)/dc_dp_sample
364-
@rm -rf $(bindir)/dc_stateless_sample
365-
@rm -rf $(bindir)/dc_stateless_multi_op_sample
366-
@rm -rf $(bindir)/algchaining_sample
367-
@rm -rf $(bindir)/ccm_sample
368-
@rm -rf $(bindir)/cipher_sample
369-
@rm -rf $(bindir)/gcm_sample
370-
@rm -rf $(bindir)/hash_file_sample
371-
@rm -rf $(bindir)/hash_sample
372-
@rm -rf $(bindir)/ipsec_sample
373-
@rm -rf $(bindir)/ssl_sample
374-
@rm -rf $(bindir)/sym_dp_sample
375-
@rm -rf $(bindir)/dh_sample
376-
@rm -rf $(bindir)/eddsa_sample
377-
@rm -rf $(bindir)/prime_sample
378-
@rm -rf $(bindir)/hkdf_sample
379-
@rm -rf $(bindir)/ec_montedwds_sample
380-
@rm -rf $(datadir)/qat/calgary
381-
@rm -rf $(datadir)/qat/calgary32
382-
@rm -rf $(datadir)/qat/canterbury
383-
@rmdir --ignore-fail-on-non-empty $(datadir)/qat
364+
@rm -rf $(DESTDIR)$(bindir)/cpa_sample_code
365+
@rm -rf $(DESTDIR)$(bindir)/dc_dp_sample
366+
@rm -rf $(DESTDIR)$(bindir)/dc_stateless_sample
367+
@rm -rf $(DESTDIR)$(bindir)/dc_stateless_multi_op_sample
368+
@rm -rf $(DESTDIR)$(bindir)/algchaining_sample
369+
@rm -rf $(DESTDIR)$(bindir)/ccm_sample
370+
@rm -rf $(DESTDIR)$(bindir)/cipher_sample
371+
@rm -rf $(DESTDIR)$(bindir)/gcm_sample
372+
@rm -rf $(DESTDIR)$(bindir)/hash_file_sample
373+
@rm -rf $(DESTDIR)$(bindir)/hash_sample
374+
@rm -rf $(DESTDIR)$(bindir)/ipsec_sample
375+
@rm -rf $(DESTDIR)$(bindir)/ssl_sample
376+
@rm -rf $(DESTDIR)$(bindir)/sym_dp_sample
377+
@rm -rf $(DESTDIR)$(bindir)/dh_sample
378+
@rm -rf $(DESTDIR)$(bindir)/eddsa_sample
379+
@rm -rf $(DESTDIR)$(bindir)/prime_sample
380+
@rm -rf $(DESTDIR)$(bindir)/hkdf_sample
381+
@rm -rf $(DESTDIR)$(bindir)/ec_montedwds_sample
382+
@rm -rf $(DESTDIR)$(datadir)/qat/calgary
383+
@rm -rf $(DESTDIR)$(datadir)/qat/calgary32
384+
@rm -rf $(DESTDIR)$(datadir)/qat/canterbury
385+
@rmdir --ignore-fail-on-non-empty $(DESTDIR)$(datadir)/qat
386+
387+
endif
384388

385389
.PHONY: samples samples-install sample-uninstall

‎configure.ac‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([qatlib], [21.08.0], [[email protected]])
5+
AC_INIT([qatlib], [21.11.0], [[email protected]])
66
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign subdir-objects tar-pax])
77

88
AM_SILENT_RULES([yes])
@@ -96,6 +96,14 @@ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
9696
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
9797

9898

99+
# SAMPLES
100+
AC_ARG_ENABLE(samples,
101+
AS_HELP_STRING([--enable-samples], [Create sample programs]),
102+
[enable_samples=${enableval}], [enable_samples="yes"])
103+
AC_MSG_CHECKING(whether to build samples)
104+
AC_MSG_RESULT(${enable_samples})
105+
AM_CONDITIONAL(SAMPLES, test "${enable_samples}" != "no")
106+
99107
# MAX_MR
100108
AC_ARG_VAR(MAX_MR, [Number of Miller Rabin rounds for prime operations. Setting this to a smaller value reduces the memory usage required by the driver (default: 50).])
101109
if ! test "$MAX_MR"; then

‎qatlib.spec.in‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
3939
This package contains headers and libraries required to build applications
4040
that use the Intel QuickAssist APIs.
4141

42+
%package tests
43+
Summary: Sample applications that use qatlib
44+
Requires: %{name}%{?_isa} = %{version}-%{release}
45+
46+
%description tests
47+
This package contains sample applications that use the Intel QuickAssists APIs.
48+
4249
%prep
4350
%autosetup
4451

@@ -52,6 +59,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
5259

5360
%install
5461
%make_install
62+
make DESTDIR=%{buildroot} samples-install
5563
rm %{buildroot}/%{_libdir}/libqat.la
5664
rm %{buildroot}/%{_libdir}/libusdm.la
5765

@@ -69,6 +77,7 @@ exit 0
6977
%systemd_postun_with_restart qat.service
7078

7179
%files
80+
%doc INSTALL
7281
%license LICENSE*
7382
%{_libdir}/libqat.so.%{libqat_soversion}*
7483
%{_libdir}/libusdm.so.%{libusdm_soversion}*
@@ -83,7 +92,37 @@ exit 0
8392
%{_libdir}/libusdm.so
8493
%{_includedir}/qat
8594

95+
%files tests
96+
%{_bindir}/cpa_sample_code
97+
%{_bindir}/dc_dp_sample
98+
%{_bindir}/dc_stateless_sample
99+
%{_bindir}/dc_stateless_multi_op_sample
100+
%{_bindir}/algchaining_sample
101+
%{_bindir}/ccm_sample
102+
%{_bindir}/cipher_sample
103+
%{_bindir}/gcm_sample
104+
%{_bindir}/hash_file_sample
105+
%{_bindir}/hash_sample
106+
%{_bindir}/ipsec_sample
107+
%{_bindir}/ssl_sample
108+
%{_bindir}/sym_dp_sample
109+
%{_bindir}/dh_sample
110+
%{_bindir}/eddsa_sample
111+
%{_bindir}/prime_sample
112+
%{_bindir}/hkdf_sample
113+
%{_bindir}/ec_montedwds_sample
114+
%{_datadir}/qat/calgary
115+
%{_datadir}/qat/calgary32
116+
%{_datadir}/qat/canterbury
117+
86118
%changelog
119+
* Fri Oct 15 2021 Marcin Malinowski <[email protected]> - 21.11-0-1
120+
- Update to qatlib 21.11
121+
- Add test package
122+
123+
* Tue Sep 14 2021 Sahana Prasad <[email protected]> - 21.08.0-2
124+
- Rebuilt with OpenSSL 3.0.0
125+
87126
* Wed Aug 11 2021 Mateusz Polrola <[email protected]> - 21.08-0-1
88127
- Update to qatlib 21.08
89128

‎quickassist/lookaside/access_layer/include/icp_sal_versions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extern "C" {
9090

9191
/* Part name and number of the accelerator device */
9292
#define SAL_INFO2_DRIVER_SW_VERSION_MAJ_NUMBER 21
93-
#define SAL_INFO2_DRIVER_SW_VERSION_MIN_NUMBER 8
93+
#define SAL_INFO2_DRIVER_SW_VERSION_MIN_NUMBER 11
9494
#define SAL_INFO2_DRIVER_SW_VERSION_PATCH_NUMBER 0
9595
#define SAL_INFO2_DRIVER_SW_VERSION_TYPE "in-tree"
9696

‎versionfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
PACKAGE_TYPE=QAT_UPSTREAM_21.08.0
1+
PACKAGE_TYPE=QAT_UPSTREAM_21.11.0
22

33
PACKAGE_OS=L
44

55
PACKAGE_VERSION_MAJOR_NUMBER=21
66

7-
PACKAGE_VERSION_MINOR_NUMBER=08
7+
PACKAGE_VERSION_MINOR_NUMBER=11
88

99
PACKAGE_VERSION_PATCH_NUMBER=0
1010

11-
PACKAGE_VERSION_BUILD_NUMBER=00021
11+
PACKAGE_VERSION_BUILD_NUMBER=00013

0 commit comments

Comments
 (0)