[RP009] crc32_update_uint64() can be inlined

crc32_update_uint64() is defined with '__attribute__((target("...")))'. But, if the caller and the inline function have different target attributes, the inline function is never inlined. Better to avoid not to block the inlining, as possible as we can. This change uses InnoDB compile option "-mcrc32" or "-mcrc" and not use the '__attribute__((target("...")))' for the crc32_update_uint64(), if compiler and its version allow.

Author: buildup-db

MYSQL_VERSION

@@ -3,4 +3,4 @@ MYSQL_VERSION_MINOR=0
 MYSQL_VERSION_PATCH=42
 MYSQL_VERSION_EXTRA=
 MYSQL_VERSION_STABILITY="LTS"
-MYSQL_RP_REVISION="-RP008"
+MYSQL_RP_REVISION="-RP009"

storage/innobase/include/ut0crc32.h

@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 2011, 2025, Oracle and/or its affiliates.
+Copyright (c) 2025, buildup-db.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License, version 2.0, as published by the
@@ -184,14 +185,20 @@ extern bool ut_poly_mul_cpu_enabled;
 @param[in] crc base CRC32 value
 @param[in] data 8 bytes data to be processed
 @return updated CRC32 value */
-#ifdef CRC32_x86_64
+#ifdef CRC32_NOT_NEED_TARGET_ATTR
+MY_ATTRIBUTE((always_inline))
+#elif defined(CRC32_x86_64)
 MY_ATTRIBUTE((target("sse4.2")))
 #elif defined(CRC32_ARM64_DEFAULT)
 MY_ATTRIBUTE((target("+crc")))
-#endif /* CRC32_x86_64 */
+#endif /* CRC32_NOT_NEED_TARGET_ATTR */
 static inline uint64_t crc32_update_uint64(uint64_t crc, uint64_t data) {
 #ifdef CRC32_x86_64
+#ifdef CRC32_NOT_NEED_TARGET_ATTR
+ return __builtin_ia32_crc32di(crc, data);
+#else
  return _mm_crc32_u64(crc, data);
+#endif /* CRC32_NOT_NEED_TARGET_ATTR */
 #elif defined(CRC32_ARM64)
  return (uint64_t)__crc32cd((uint32_t)crc, data);
 #endif /* CRC32_x86_64 */
@@ -200,6 +207,9 @@ static inline uint64_t crc32_update_uint64(uint64_t crc, uint64_t data) {
 /** Hashes a 64-bit integer with CRC32 instructions of the architecture.
 @param[in]	value	64-bit integer
 @return hashed value */
+#ifdef CRC32_NOT_NEED_TARGET_ATTR
+MY_ATTRIBUTE((always_inline))
+#endif
 static inline uint64_t crc32_hash_uint64(uint64_t value) {
  ut_ad(ut_crc32_cpu_enabled);
  value *= 0xb5eb6fbadd39bf9b;

storage/innobase/include/ut0rnd.h

@@ -198,7 +198,7 @@ static inline uint64_t random_from_interval_fast(uint64_t low, uint64_t high) {
 
 static inline uint64_t hash_uint64(uint64_t value) {
 #ifndef CRC32_DEFAULT
- if (ut_crc32_cpu_enabled) {
+ if (UNIV_LIKELY(ut_crc32_cpu_enabled)) {
  return crc32_hash_uint64(value);
  }
 #endif /* !CRC32_DEFAULT */

storage/innobase/innodb.cmake

@@ -1,4 +1,5 @@
 # Copyright (c) 2006, 2025, Oracle and/or its affiliates.
+# Copyright (c) 2025, buildup-db.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -258,6 +259,26 @@ ELSE()
  ADD_DEFINITIONS(-DMUTEX_SYS)
 ENDIF()
 
+# __attribute__((target("..."))) blocks inlining. better to avoid.
+IF(MY_COMPILER_IS_GNU_OR_CLANG)
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64|x86_64)$")
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+ OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+ AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14))
+ # Can treat __builtin_ia32_crc32di() contanins function inlined
+ ADD_COMPILE_OPTIONS("-mcrc32")
+ ADD_DEFINITIONS(-DCRC32_NOT_NEED_TARGET_ATTR)
+ ENDIF()
+ ELSEIF(NOT APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+ AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
+ # Can treat __crc32cd() contanins function inlined
+ ADD_COMPILE_OPTIONS("-mcrc")
+ ADD_DEFINITIONS(-DCRC32_NOT_NEED_TARGET_ATTR)
+ ENDIF()
+ ENDIF()
+ENDIF()
+
 # Include directories under innobase
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/
  ${CMAKE_SOURCE_DIR}/storage/innobase/include