diff --git a/KAELz4/Makefile b/KAELz4/Makefile index 837aebe6b163c52fa70cb21727b03588585d34eb..d615dc102585a074bbe4199060c3407cf5208fdb 100644 --- a/KAELz4/Makefile +++ b/KAELz4/Makefile @@ -18,7 +18,7 @@ ENGINE_INSTALL_PATH := /usr/local/kaelz4 CC=gcc LIBNAME := libkaelz4.so -VERSION = 1.0.0 +VERSION = 2.0.3 TARGET = ${LIBNAME}.${VERSION} SOFTLINK = libkaelz4.so diff --git a/KAELz4/open_source/kaelz4_1_9_4.patch b/KAELz4/open_source/kaelz4_1_9_4.patch index fdc10cc1939ac90a8a9917c5eadebbb5ec40d959..7d1681dbf557996d7557e39b71850cf6400e9f61 100644 --- a/KAELz4/open_source/kaelz4_1_9_4.patch +++ b/KAELz4/open_source/kaelz4_1_9_4.patch @@ -866,7 +866,7 @@ diff -uprN lz4-1.9.4/lib/Makefile lz4-1.9.4-KAELz4/lib/Makefile CFLAGS += $(DEBUGFLAGS) + +KAELZ4_CFLAGS=-I/usr/local/kaelz4/include -DCONF_KAELZ4 -+KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.1.0.0 ++KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.2.0.3 +CFLAGS+=$(KAELZ4_CFLAGS) +LDFLAGS+=$(KAELZ4_LDFLAGS) + @@ -881,7 +881,7 @@ diff -uprN lz4-1.9.4/programs/Makefile lz4-1.9.4-KAELz4/programs/Makefile endif +KAELZ4_CFLAGS=-I/usr/local/kaelz4/include -DCONF_KAELZ4 -+KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.1.0.0 ++KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.2.0.3 +CFLAGS+=$(KAELZ4_CFLAGS) +LDFLAGS+=$(KAELZ4_LDFLAGS) + @@ -930,7 +930,7 @@ diff -uprN lz4-1.9.4/tests/Makefile lz4-1.9.4-KAELz4/tests/Makefile CPPFLAGS+= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ + +KAELZ4_CFLAGS=-I/usr/local/kaelz4/include -DCONF_KAELZ4 -+KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.1.0.0 ++KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.2.0.3 +CFLAGS+=$(KAELZ4_CFLAGS) +LDFLAGS+=$(KAELZ4_LDFLAGS) + diff --git a/KAELz4/src/utils/kaelz4_common.c b/KAELz4/src/utils/kaelz4_common.c index eba1770d7b1e54abbc7163c7fa6e1b5e0f7d8247..65a8e0143c66ac019c8803527a03ab3292bd6409 100644 --- a/KAELz4/src/utils/kaelz4_common.c +++ b/KAELz4/src/utils/kaelz4_common.c @@ -38,7 +38,7 @@ int kaelz4_get_version(KAELz4Version* ver) versionCpy(ver->productName, "Kunpeng Boostkit"); versionCpy(ver->productVersion, "23.0.RC2"); versionCpy(ver->componentName, "KAELz4"); - versionCpy(ver->componentVersion, "1.0.0"); + versionCpy(ver->componentVersion, "2.0.3"); return KAE_ZSTD_SUCC; } diff --git a/KAELz4/test/perftest/lzbench_KAELz4.patch b/KAELz4/test/perftest/lzbench_KAELz4.patch index a214734b63b0d944a4b5a4d98e6d18bd79b81083..ff07cc40b0761e6503aaa13f062ce8767810a82c 100644 --- a/KAELz4/test/perftest/lzbench_KAELz4.patch +++ b/KAELz4/test/perftest/lzbench_KAELz4.patch @@ -853,7 +853,7 @@ diff -uprN lzbench-master/lz4/Makefile lzbench-master-KAELz4/lz4/Makefile CFLAGS += $(DEBUGFLAGS) + +KAELZ4_CFLAGS=-I/usr/local/kaelz4/include -DCONF_KAELZ4 -+KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.1.0.0 ++KAELZ4_LDFLAGS=-L/usr/local/kaelz4/lib -Wl,-rpath,/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.2.0.3 +CFLAGS+=$(KAELZ4_CFLAGS) +LDFLAGS+=$(KAELZ4_LDFLAGS) + @@ -868,7 +868,7 @@ diff -uprN lzbench-master/Makefile lzbench-master-KAELz4/Makefile LDFLAGS += -lzstd +KAEZSTD_CFLAGS = -I/usr/local/kaelz4/include -DCONF_KAELZ4 -+KAEZSTD_LDFLAGS = -lrt -L/usr/local/kaelz4/lib -Wl,-rpath=/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.1.0.0 ++KAEZSTD_LDFLAGS = -lrt -L/usr/local/kaelz4/lib -Wl,-rpath=/usr/local/kaelz4/lib:/usr/local/lib -l:libkaelz4.so.2.0.3 +CFLAGS += $(KAEZSTD_CFLAGS) +LDFLAGS += $(KAEZSTD_LDFLAGS) + diff --git a/KAEOpensslEngine/src/Makefile.am b/KAEOpensslEngine/src/Makefile.am index a8b2b05fb30385005af041632c3d9d4256835132..60ea020441fd21794423eecd84f32bfe76134d84 100644 --- a/KAEOpensslEngine/src/Makefile.am +++ b/KAEOpensslEngine/src/Makefile.am @@ -1,4 +1,4 @@ -VERSION = 2:0:2 +VERSION = 2:0:3 ACLOCAL_AMFLAGS = -I m4 DEPSHEADDIR = $(CURDIR)/../../kae_build/head/ diff --git a/KAEZlib/Makefile b/KAEZlib/Makefile index ac880ccf271c93814033437b9bbeec0f967e3e48..f66cf1d5abe12a1c88cf520085415f955c2d77c4 100644 --- a/KAEZlib/Makefile +++ b/KAEZlib/Makefile @@ -17,7 +17,7 @@ ENGINE_INSTALL_PATH := /usr/local/kaezip CC=gcc LIBNAME := libkaezip.so -VERSION = 2.0.2 +VERSION = 2.0.3 TARGET = ${LIBNAME}.${VERSION} SOFTLINK = libkaezip.so diff --git a/KAEZlib/src/utils/kaezip_conf.c b/KAEZlib/src/utils/kaezip_conf.c index 9714d737f09bba4da12f164a45fddac9c58bc8ec..8b41b1319c78f67e6f187e6917984695e619b81b 100644 --- a/KAEZlib/src/utils/kaezip_conf.c +++ b/KAEZlib/src/utils/kaezip_conf.c @@ -132,6 +132,6 @@ int kaezlib_get_version(KAEZlibVersion* ver) versionCpy(ver->productName, "Kunpeng Boostkit"); versionCpy(ver->productVersion, "24.0.0"); versionCpy(ver->componentName, "KAEZlib"); - versionCpy(ver->componentVersion, "2.0.2"); + versionCpy(ver->componentVersion, "2.0.3"); return 0; } diff --git a/KAEZlib/test/gtest/main.cpp b/KAEZlib/test/gtest/main.cpp index 926de514ad32a19a1b5cbe6da477fdc9d58a3cc8..dd82b4eb95b7bc30a79acdc8d7d6c05aed913c0d 100644 --- a/KAEZlib/test/gtest/main.cpp +++ b/KAEZlib/test/gtest/main.cpp @@ -438,7 +438,7 @@ TEST(ZlibTest, VersionCheck) EXPECT_STREQ(ver.productName, "Kunpeng Boostkit"); EXPECT_STREQ(ver.productVersion, "24.0.0"); EXPECT_STREQ(ver.componentName, "KAEZlib"); - EXPECT_STREQ(ver.componentVersion, "2.0.2"); + EXPECT_STREQ(ver.componentVersion, "2.0.3"); } #endif diff --git a/KAEZstd/Makefile b/KAEZstd/Makefile index 868f1ac698733e34a2fd99d5389d883125aae580..5a729b9effe68fe8324b3c55b767dd48cd01d132 100644 --- a/KAEZstd/Makefile +++ b/KAEZstd/Makefile @@ -18,7 +18,7 @@ ENGINE_INSTALL_PATH := /usr/local/kaezstd CC=gcc LIBNAME := libkaezstd.so -VERSION = 2.0.2 +VERSION = 2.0.3 TARGET = ${LIBNAME}.${VERSION} SOFTLINK = libkaezstd.so diff --git a/KAEZstd/open_source/kaezstd_1_5_2.patch b/KAEZstd/open_source/kaezstd_1_5_2.patch index 0c25b90ef860809dda5737e113561d4c7a0f466d..43adde282bce8991b852d4d5ff6ce36ea69854c7 100644 --- a/KAEZstd/open_source/kaezstd_1_5_2.patch +++ b/KAEZstd/open_source/kaezstd_1_5_2.patch @@ -226,7 +226,7 @@ diff -uprN zstd/lib/libzstd.mk zstd_new/lib/libzstd.mk FLAGS = $(CPPFLAGS) $(CFLAGS) $(ASFLAGS) $(LDFLAGS) +KAEZSTD_CFLAGS=-I/usr/local/kaezstd/include -I$(KAEZSTDPATH)/include -I. -I../lib -DCONF_KAEZSTD -+KAEZSTD_LDFLAGS=-L/usr/local/kaezstd/lib -L$(KAEBUILDPATH)/lib -L$(KAEZSTDPATH) -Wl,-rpath,/usr/local/kaezstd/lib:/usr/local/lib:$(KAEBUILDPATH)/lib -l:libkaezstd.so.2.0.2 ++KAEZSTD_LDFLAGS=-L/usr/local/kaezstd/lib -L$(KAEBUILDPATH)/lib -L$(KAEZSTDPATH) -Wl,-rpath,/usr/local/kaezstd/lib:/usr/local/lib:$(KAEBUILDPATH)/lib -l:libkaezstd.so.2.0.3 +CFLAGS+=$(KAEZSTD_CFLAGS) +LDFLAGS+=$(KAEZSTD_LDFLAGS) ifndef ALREADY_APPENDED_NOEXECSTACK diff --git a/KAEZstd/src/utils/kaezstd_common.c b/KAEZstd/src/utils/kaezstd_common.c index e3ad4fa9c2bb15b0d0eee39254672d31b9623ab3..07e8588d949e1d601440691409ad55cbf7239dca 100644 --- a/KAEZstd/src/utils/kaezstd_common.c +++ b/KAEZstd/src/utils/kaezstd_common.c @@ -38,7 +38,7 @@ int kaezstd_get_version(KAEZstdVersion* ver) versionCpy(ver->productName, "Kunpeng Boostkit"); versionCpy(ver->productVersion, "23.0.RC2"); versionCpy(ver->componentName, "KAEZstd"); - versionCpy(ver->componentVersion, "2.0.2"); + versionCpy(ver->componentVersion, "2.0.3"); return KAE_ZSTD_SUCC; } diff --git a/KAEZstd/test/gtest/main.cpp b/KAEZstd/test/gtest/main.cpp index c0fc94c504756b783358775494a77bebf83f2a0a..d91dda798a7f387ef901873f8dc813db1ef3ba1e 100644 --- a/KAEZstd/test/gtest/main.cpp +++ b/KAEZstd/test/gtest/main.cpp @@ -72,7 +72,7 @@ TEST(functest_version, kaezstd_version) EXPECT_STREQ(ver.productName, "Kunpeng Boostkit"); EXPECT_STREQ(ver.productVersion, "23.0.RC2"); EXPECT_STREQ(ver.componentName, "KAEZstd"); - EXPECT_STREQ(ver.componentVersion, "2.0.2"); + EXPECT_STREQ(ver.componentVersion, "2.0.3"); } // 主函数 diff --git a/README.md b/README.md index b069838f771f62914eec62460107ef5f58fd8e0b..61d1fc777af6776d6fc06cf603631a0f43570522 100644 --- a/README.md +++ b/README.md @@ -579,9 +579,9 @@ sh build.sh engine total 5644 -rw-r--r--. 1 root root 3846524 Aug 22 17:28 kae.a -rwxr-xr-x. 1 root root 995 Aug 22 17:28 kae.la -lrwxrwxrwx. 1 root root 12 Aug 22 17:28 kae.so -> kae.so.2.0.2 -lrwxrwxrwx. 1 root root 12 Aug 22 17:28 kae.so.2 -> kae.so.2.0.2 --rwxr-xr-x. 1 root root 1967736 Aug 22 17:28 kae.so.2.0.2 +lrwxrwxrwx. 1 root root 12 Aug 22 17:28 kae.so -> kae.so.2.0.3 +lrwxrwxrwx. 1 root root 12 Aug 22 17:28 kae.so.2 -> kae.so.2.0.3 +-rwxr-xr-x. 1 root root 1967736 Aug 22 17:28 kae.so.2.0.3 ``` 也可以通过openssl speed命令查看加速引擎是否生效: @@ -620,7 +620,7 @@ sh build.sh zlib ```shell[root@localhost linux-vdso.so.1 (0x0000ffffb0282000) libc.so.6 => /usr/lib64/libc.so.6 (0x0000ffffb0075000) - libkaezip.so.2.0.2 => /usr/local/kaezip/lib/libkaezip.so.2.0.2 (0x0000ffffb0044000) + libkaezip.so.2.0.3 => /usr/local/kaezip/lib/libkaezip.so.2.0.3 (0x0000ffffb0044000) libwd.so.2 => /usr/local/lib/libwd.so.2 (0x0000ffffaffe3000) libwd_comp.so.2 => /usr/local/lib/libwd_comp.so.2 (0x0000ffffaffb2000) /lib/ld-linux-aarch64.so.1 (0x0000ffffb0245000) diff --git a/build.sh b/build.sh index 12722f568638bc8a64d32222874620c1b820496c..087282f8c18813d79ce622d17951c0e06c4d8991 100644 --- a/build.sh +++ b/build.sh @@ -399,7 +399,7 @@ main() { "rpmpack") rm -rf /root/rpmbuild/SOURCES/kae* /root/rpmbuild/RPMS/aarch64/kae-* $KAE_BUILD mkdir -p $KAE_BUILD /root/rpmbuild/SOURCES - tar -zcvf /root/rpmbuild/SOURCES/kae-2.0.2.tar.gz . + tar -zcvf /root/rpmbuild/SOURCES/kae-2.0.3.tar.gz . rpmbuild -bb $KAE_SPEC_FILE cp /root/rpmbuild/RPMS/aarch64/kae* $KAE_BUILD ;; diff --git a/scripts/specFile/kae.spec b/scripts/specFile/kae.spec index beaf061da8aead9b96cef378b9c530ed6c25f5f7..56d7c6947fc81c9785f6da8d16b77326646512be 100644 --- a/scripts/specFile/kae.spec +++ b/scripts/specFile/kae.spec @@ -1,6 +1,6 @@ Name: kae Summary: Huawei Kunpeng Accelerator Engine Zip -Version: 2.0.2 +Version: 2.0.3 Release: 1 License: GPL-2.0 Source: %{name}-%{version}.tar.gz @@ -380,6 +380,9 @@ echo "openssl engine uninstalled" /sbin/ldconfig %changelog +* Mon Nov 4 2024 liuyang 2.0.3-1 +- Update Spec Version Include kunpeng accelerator engine Code + * Tue Mar 19 2024 liuyang 2.0.2-1 - Update Spec Version Include kunpeng accelerator engine Code diff --git a/scripts/specFile/kae_openeuler2403.spec b/scripts/specFile/kae_openeuler2403.spec index b42f0f2b8cfb41bd74835bac6350405d5980fad3..043d61aa745bbdef398d05f33d03ad0c40d0e418 100644 --- a/scripts/specFile/kae_openeuler2403.spec +++ b/scripts/specFile/kae_openeuler2403.spec @@ -1,6 +1,6 @@ Name: kae Summary: Huawei Kunpeng Accelerator Engine Zip -Version: 2.0.2 +Version: 2.0.3 Release: 1 License: GPL-2.0 Source: %{name}-%{version}.tar.gz @@ -380,6 +380,9 @@ echo "openssl engine uninstalled" /sbin/ldconfig %changelog +* Mon Nov 4 2024 liuyang 2.0.3-1 +- Update Spec Version Include kunpeng accelerator engine Code + * Tue Mar 19 2024 liuyang 2.0.2-1 - Update Spec Version Include kunpeng accelerator engine Code