Change tester3printf algo (#635)

shibatch · web-flow · commit f6513a62fad3 · 2025-02-16T14:29:01.000+09:00
Co-authored-by: Naoki Shibata &lt;shibatch.sf.net@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,8 +146,8 @@ set(COSTOVERRIDE_AVX2 2)
 set(COSTOVERRIDE_AVX 2)
 set(COSTOVERRIDE_NEON32 2)
 set(COSTOVERRIDE_NEON32VFPV4 2)
-set(COSTOVERRIDE_SVE 10)
-set(COSTOVERRIDE_SVENOFMA 10)
+set(COSTOVERRIDE_SVE 20)
+set(COSTOVERRIDE_SVENOFMA 20)
 set(COSTOVERRIDE_RVVM1 10)
 set(COSTOVERRIDE_RVVM1NOFMA 10)
 set(COSTOVERRIDE_RVVM2 20)
@@ -253,6 +253,7 @@ set(TARGET_MKALIAS "mkalias")
 # Defined in src/common/CMakeLists.txt via command add_library
 set(TARGET_LIBCOMMON_OBJ "common")
 set(TARGET_LIBARRAYMAP_OBJ "arraymap")
+set(TARGET_PSHA_OBJ "psha_obj")
 
 # Function used to add an executable that is executed on host
 function(add_host_executable TARGETNAME)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -110,6 +110,26 @@ pipeline {
             	     }
                 }
 
+                stage('aarch64 linux clang-18') {
+            	     agent { label 'aarch64 && ubuntu24 && apple' }
+                     options { skipDefaultCheckout() }
+            	     steps {
+                         cleanWs()
+                         checkout scm
+	    	     	 sh '''
+                	 echo "aarch64 clang-18 on" `hostname`
+			 export CC=clang-18
+			 export CXX=clang++-18
+ 			 mkdir build
+			 cd build
+			 cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=../../install -DSLEEF_SHOW_CONFIG=1 -DSLEEF_BUILD_DFT=TRUE -DSLEEF_BUILD_QUAD=TRUE -DSLEEF_BUILD_INLINE_HEADERS=TRUE -DSLEEF_ENFORCE_SVE=TRUE -DEMULATOR=qemu-aarch64-static -DSLEEF_ENABLE_TESTER4=True -DSLEEF_ENABLE_TESTER=False
+			 cmake -E time ninja
+		         export CTEST_OUTPUT_ON_FAILURE=TRUE
+		         ctest -j `nproc`
+			 '''
+            	     }
+                }
+
 		stage('cross-ppc64el gcc') {
             	     agent { label 'x86_64 && ubuntu24 && cuda' }
             	     steps {
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -23,3 +23,19 @@ set_target_properties(${TARGET_LIBARRAYMAP_OBJ} PROPERTIES ${COMMON_TARGET_PROPE
 
 add_host_executable("addSuffix" addSuffix.c)
 set_target_properties("addSuffix" PROPERTIES C_STANDARD 99)
+
+if (NOT SLEEF_OPENSSL_FOUND)
+  add_library(${TARGET_PSHA_OBJ} OBJECT psha2_capi.cpp)
+else()
+  # Tests for internal sha256
+  add_executable(test_psha test_psha2.cpp)
+  target_link_libraries(test_psha ${SLEEF_OPENSSL_LIBRARIES})
+  target_include_directories(test_psha PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+  add_test(NAME test_psha COMMAND test_psha)
+
+  add_executable(test_psha_capi test_psha2.cpp)
+  target_compile_definitions(test_psha_capi PRIVATE TEST_CAPI=1)
+  target_link_libraries(test_psha_capi ${SLEEF_OPENSSL_LIBRARIES})
+  target_include_directories(test_psha_capi PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+  add_test(NAME test_psha_capi COMMAND test_psha_capi)
+endif()
diff --git a/src/common/psha2.hpp b/src/common/psha2.hpp
diff --git a/src/common/psha2_capi.cpp b/src/common/psha2_capi.cpp
diff --git a/src/common/psha2_capi.h b/src/common/psha2_capi.h
diff --git a/src/common/test_psha2.cpp b/src/common/test_psha2.cpp
@@ -9,6 +9,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstdint>
 #include <cstring>
 #include <ctime>
 
@@ -18,7 +19,7 @@ int main(int argc, char **argv) {
   bool success = true;
 
   for(int i=0;i<10000;i++) {
-    int len = rand() % (1 << (rand() % 16));
+    int len = (rand() + ((int64_t)RAND_MAX + 1) * rand()) % (1 << (1 + (rand() % 18)));
     unsigned char *plaintext = (unsigned char *)malloc(len);
     for(int i=0;i<len;i++) plaintext[i] = rand() & 0xff;
 
diff --git a/src/libm-tester/CMakeLists.txt b/src/libm-tester/CMakeLists.txt
@@ -95,14 +95,15 @@ endif()
 
 #
 
-function(add_test_with_emu COST CMD)
+function(add_test_with_emu C CMD)
   if (SDE_COMMAND)
     add_test(NAME ${CMD} COMMAND ${SDE_COMMAND} "--" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMD})
   elseif(EMULATOR)
     add_test(NAME ${CMD} COMMAND ${EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMD})
   else()
     add_test(NAME ${CMD} COMMAND ${CMD})
   endif()
+  set_tests_properties(${CMD} PROPERTIES COST ${C})
 endfunction()
 
 function(add_test_iut IUT C)
@@ -167,10 +168,6 @@ endif()
 
 set(IUT_SRC iutsimd.c ${sleef_SOURCE_DIR}/src/common/main_checkfeature.c testerutil.c)
 
-if (NOT SLEEF_OPENSSL_FOUND)
-  add_library(obj_psha OBJECT psha2_capi.cpp)
-endif()
-
 # Add vector extension `iut`s
 macro(test_extension SIMD)
   if(COMPILER_SUPPORTS_${SIMD})
@@ -386,7 +383,8 @@ macro(test_extension SIMD)
 	target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} ${SLEEF_OPENSSL_LIBRARIES})
 	target_include_directories(${T} PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
       else()
-	target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} obj_psha)
+	target_link_libraries(${T} ${TARGET_LIBSLEEF} ${LIBM} ${TARGET_PSHA_OBJ})
+	target_include_directories(${T} PRIVATE ${sleef_SOURCE_DIR}/src/common)
       endif()
 
       add_dependencies(${T} ${TARGET_HEADERS})
@@ -656,18 +654,3 @@ if (FILECHECK_COMMAND AND COMPILER_SUPPORTS_OPENMP AND SLEEF_ARCH_X86 AND CMAKE_
   add_test(NAME testervecabi-sse2 COMMAND sh -c "${CMAKE_C_COMPILER} -Wno-attributes -fopenmp -msse2 -O3 ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -I${sleef_BINARY_DIR}/include -S -o- | ${FILECHECK_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -check-prefix=CHECK-SSE2")
   add_test(NAME testervecabi-avx2 COMMAND sh -c "${CMAKE_C_COMPILER} -Wno-attributes -fopenmp -mavx2 -O3 ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -I${sleef_BINARY_DIR}/include -S -o- | ${FILECHECK_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/testervecabi.c -check-prefix=CHECK-AVX2")
 endif()
-
-# Tests for internal sha256
-
-if (SLEEF_OPENSSL_FOUND)
-  add_executable(test_psha test_psha2.cpp)
-  target_link_libraries(test_psha ${SLEEF_OPENSSL_LIBRARIES})
-  target_include_directories(test_psha PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
-  add_test(NAME test_psha COMMAND test_psha)
-
-  add_executable(test_psha_capi test_psha2.cpp)
-  target_compile_definitions(test_psha_capi PRIVATE TEST_CAPI=1)
-  target_link_libraries(test_psha_capi ${SLEEF_OPENSSL_LIBRARIES})
-  target_include_directories(test_psha_capi PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
-  add_test(NAME test_psha_capi COMMAND test_psha_capi)
-endif()
diff --git a/src/quad-tester/CMakeLists.txt b/src/quad-tester/CMakeLists.txt
@@ -19,26 +19,30 @@ if(COMPILER_SUPPORTS_FLOAT128)
   list(APPEND COMMON_TARGET_DEFINITIONS ENABLEFLOAT128=1)
 endif()
 
-#
+# Build tester3printf
+
+add_executable(tester3printf tester3printf.c)
+add_dependencies(tester3printf sleefquad sleefquad_headers ${TARGET_LIBSLEEF} ${TARGET_HEADERS})
+target_compile_definitions(tester3printf PRIVATE ${COMMON_TARGET_DEFINITIONS})
+set_target_properties(tester3printf PROPERTIES C_STANDARD 99)
 
-if(SLEEF_OPENSSL_FOUND)
-  # Build tester3printf
-  add_executable(tester3printf tester3printf.c)
-  add_dependencies(tester3printf sleefquad sleefquad_headers ${TARGET_LIBSLEEF} ${TARGET_HEADERS})
-  target_compile_definitions(tester3printf PRIVATE ${COMMON_TARGET_DEFINITIONS})
-  set_target_properties(tester3printf PROPERTIES C_STANDARD 99)
+if (SLEEF_OPENSSL_FOUND)
   target_link_libraries(tester3printf sleefquad ${TARGET_LIBSLEEF} ${SLEEF_OPENSSL_LIBRARIES})
   target_include_directories(tester3printf PRIVATE ${SLEEF_OPENSSL_INCLUDE_DIR})
+else()
+  target_link_libraries(tester3printf sleefquad ${TARGET_LIBSLEEF} ${TARGET_PSHA_OBJ})
+  target_include_directories(tester3printf PRIVATE ${sleef_SOURCE_DIR}/src/common)
+  target_compile_definitions(tester3printf PRIVATE SLEEF_USE_INTERNAL_SHA256=1)
+endif()
 
-  if (SDE_COMMAND)
-    add_test(NAME tester3printf COMMAND ${SDE_COMMAND} "--" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
-  elseif(EMULATOR)
-    add_test(NAME tester3printf COMMAND ${EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
-  else()
-    add_test(NAME tester3printf COMMAND tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
-  endif()
-  set_tests_properties(tester3printf PROPERTIES COST 5.0)
+if (SDE_COMMAND)
+  add_test(NAME tester3printf COMMAND ${SDE_COMMAND} "--" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
+elseif(EMULATOR)
+  add_test(NAME tester3printf COMMAND ${EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
+else()
+  add_test(NAME tester3printf COMMAND tester3printf ${sleef_SOURCE_DIR}/src/quad-tester/hash_printf.txt)
 endif()
+set_tests_properties(tester3printf PROPERTIES COST 5.0)
 
 #
 
diff --git a/src/quad-tester/hash_printf.txt b/src/quad-tester/hash_printf.txt
@@ -1,4 +1,4 @@
-Pe 7ff4a1686c831c7a9b1bd62faffe9b14
-Pf 84331dfc378b032877f7a07767db7cc5
-Pg 2351f96a90d34bf4dd80dd6341a47624
-Pa ad6bb18af2f2648e791098ebf87ce25d
+Pe 5bac203cf4f186c11a0a80cdcce2674ae0ef62c076415a88b8d4c7a2ee0d42df
+Pf a932665a1becd55826e899b63d72bbd700c3aef8981f25452c4cd3bb98239043
+Pg 2377240e7d3ae40fd1dc96a23a7c3c2e32d5d8a2eeb8917428fd4aebf14546d8
+Pa 0903bb415feeadb4bf002223540cf2e6a30dc27831141396d3200a997930e3e3
diff --git a/src/quad-tester/tester3printf.c b/src/quad-tester/tester3printf.c
@@ -9,7 +9,11 @@
 #include <string.h>
 #include <assert.h>
 
+#ifndef SLEEF_USE_INTERNAL_SHA256
 #include <openssl/evp.h>
+#else
+#include "psha2_capi.h"
+#endif
 
 #include "sleefquad.h"
 
@@ -239,7 +243,7 @@ int main(int argc, char **argv) {
       fprintf(stderr, "Error creating context.\n");
       return 0;
     }
-    if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL)) {
+    if (!EVP_DigestInit_ex(ctx, EVP_sha256(), NULL)) {
       fprintf(stderr, "Error initializing context.\n");
       return 0;
     }
@@ -251,26 +255,26 @@ int main(int argc, char **argv) {
     }
 
     // Check digest
-    unsigned int md5_digest_len = EVP_MD_size(EVP_md5());
-    unsigned char *md5_digest;
-    md5_digest = (unsigned char *)malloc(md5_digest_len);
-    if (!EVP_DigestFinal_ex(ctx, md5_digest, &md5_digest_len)) {
+    unsigned int sha256_digest_len = EVP_MD_size(EVP_sha256());
+    unsigned char *sha256_digest;
+    sha256_digest = (unsigned char *)malloc(sha256_digest_len);
+    if (!EVP_DigestFinal_ex(ctx, sha256_digest, &sha256_digest_len)) {
       fprintf(stderr, "Error finalizing digest.\n");
       return 0;
     }
     EVP_MD_CTX_free(ctx);
-    unsigned char mes[64], buf[64];
-    memset(mes, 0, 64);
+    unsigned char mes[256], buf[256];
+    memset(mes, 0, 256);
     sprintf((char *)mes, "%s ", types[j]);
     char tmp[3] = { 0 };
-    for (int i = 0; i < md5_digest_len; i++) {
-      sprintf(tmp, "%02x", md5_digest[i]);
+    for (int i = 0; i < sha256_digest_len; i++) {
+      sprintf(tmp, "%02x", sha256_digest[i]);
       strcat((char *)mes, tmp);
     }
-    free(md5_digest);
+    free(sha256_digest);
 
     if (fp != NULL) {
-      fgets((char *)buf, 60, fp);
+      fgets((char *)buf, 250, fp);
       if (strncmp((char *)mes, (char *)buf, strlen((char *)mes)) != 0) {
 	puts((char *)mes);
 	puts((char *)buf);
