Merge branch 'intel:main' into main

intel · Jun 26, 2024 · 21d6af9 · 21d6af9
2 parents 858f10e + 27e24dc
commit 21d6af9
Show file tree

Hide file tree

Showing 59 changed files with 2,716 additions and 759 deletions.
diff --git a/lib/Makefile b/lib/Makefile
@@ -340,7 +340,8 @@ c_lib_objs := \
 	quic_hp_chacha20.o \
 	quic_chacha20_poly1305.o \
 	hmac_ipad_opad.o \
-	cipher_suite_id.o
+	cipher_suite_id.o \
+	capabilities.o
 
 ifeq ($(AESNI_EMU), y)
 c_lib_objs := $(c_lib_objs) \
@@ -678,6 +679,7 @@ asm_avx2_t4_lib_objs := \
 	sm3_msg_avx2.o \
 	sm3_hmac_avx2.o \
 	sha512_x1_ni_avx2.o \
+	sha512_x2_ni_avx2.o \
 	sha512_hmac_ni_avx2.o
 
 #

diff --git a/lib/avx2_t1/mb_mgr_avx2_t1.c b/lib/avx2_t1/mb_mgr_avx2_t1.c
@@ -346,6 +346,9 @@ init_mb_mgr_avx2_t1_internal(IMB_MGR *state, const int reset_mgrs)
         /* Set architecture for future checks */
         state->used_arch = (uint32_t) IMB_ARCH_AVX2;
 
+        /* Set architecture type for future checks */
+        state->used_arch_type = 1;
+
         if (reset_mgrs) {
                 reset_ooo_mgrs(state);
 

diff --git a/lib/avx2_t1/sha_mb_avx2.c b/lib/avx2_t1/sha_mb_avx2.c
@@ -111,15 +111,15 @@ IMB_JOB *
 submit_job_sha384_avx2(MB_MGR_SHA_512_OOO *state, IMB_JOB *job)
 {
         return submit_flush_job_sha_512(state, job, 4, 1, 384, IMB_SHA_512_BLOCK_SIZE,
-                                        SHA384_PAD_SIZE, call_sha512_x4_avx2_from_c);
+                                        SHA384_PAD_SIZE, call_sha512_x4_avx2_from_c, 0);
 }
 
 IMB_DLL_LOCAL
 IMB_JOB *
 flush_job_sha384_avx2(MB_MGR_SHA_512_OOO *state, IMB_JOB *job)
 {
         return submit_flush_job_sha_512(state, job, 4, 0, 384, IMB_SHA_512_BLOCK_SIZE,
-                                        SHA384_PAD_SIZE, call_sha512_x4_avx2_from_c);
+                                        SHA384_PAD_SIZE, call_sha512_x4_avx2_from_c, 0);
 }
 
 /* ========================================================================== */
@@ -132,13 +132,13 @@ IMB_JOB *
 submit_job_sha512_avx2(MB_MGR_SHA_512_OOO *state, IMB_JOB *job)
 {
         return submit_flush_job_sha_512(state, job, 4, 1, 512, IMB_SHA_512_BLOCK_SIZE,
-                                        SHA512_PAD_SIZE, call_sha512_x4_avx2_from_c);
+                                        SHA512_PAD_SIZE, call_sha512_x4_avx2_from_c, 0);
 }
 
 IMB_DLL_LOCAL
 IMB_JOB *
 flush_job_sha512_avx2(MB_MGR_SHA_512_OOO *state, IMB_JOB *job)
 {
         return submit_flush_job_sha_512(state, job, 4, 0, 512, IMB_SHA_512_BLOCK_SIZE,
-                                        SHA512_PAD_SIZE, call_sha512_x4_avx2_from_c);
+                                        SHA512_PAD_SIZE, call_sha512_x4_avx2_from_c, 0);
 }
diff --git a/lib/avx2_t2/mb_mgr_avx2_t2.c b/lib/avx2_t2/mb_mgr_avx2_t2.c
@@ -349,6 +349,9 @@ init_mb_mgr_avx2_t2_internal(IMB_MGR *state, const int reset_mgrs)
         /* Set architecture for future checks */
         state->used_arch = (uint32_t) IMB_ARCH_AVX2;
 
+        /* Set architecture type for future checks */
+        state->used_arch_type = 2;
+
         if (reset_mgrs) {
                 reset_ooo_mgrs(state);
 

diff --git a/lib/avx2_t3/mb_mgr_avx2_t3.c b/lib/avx2_t3/mb_mgr_avx2_t3.c
@@ -349,6 +349,9 @@ init_mb_mgr_avx2_t3_internal(IMB_MGR *state, const int reset_mgrs)
         /* Set architecture for future checks */
         state->used_arch = (uint32_t) IMB_ARCH_AVX2;
 
+        /* Set architecture type for future checks */
+        state->used_arch_type = 3;
+
         if (reset_mgrs) {
                 reset_ooo_mgrs(state);
 

diff --git a/lib/avx2_t4/mb_mgr_avx2_t4.c b/lib/avx2_t4/mb_mgr_avx2_t4.c
@@ -350,6 +350,9 @@ init_mb_mgr_avx2_t4_internal(IMB_MGR *state, const int reset_mgrs)
         /* Set architecture for future checks */
         state->used_arch = (uint32_t) IMB_ARCH_AVX2;
 
+        /* Set architecture type for future checks */
+        state->used_arch_type = 4;
+
         if (reset_mgrs) {
                 reset_ooo_mgrs(state);