Merge pull request ceph#61740 from Matan-B/wip-matanb-clang-16

script/run-make: clang 14->19

Reviewed-by: Ronen Friedman <[email protected]>
Reviewed-by: Adam Emerson <[email protected]>

Author: Matan-B

cmake/modules/BuildISAL.cmake

@@ -17,6 +17,10 @@ function(build_isal)
   # because it messes with the internal install paths of arrow's bundled deps
   set(NO_DESTDIR_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR)
 
+  if(HAVE_ARMV8_SIMD)
+    list(APPEND configure_cmd CFLAGS=-no-integrated-as)
+  endif()
+
   include(ExternalProject)
   ExternalProject_Add(isal_ext
     SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/isa-l"

cmake/modules/BuildQATzip.cmake

@@ -11,16 +11,21 @@ function(build_qatzip)
   set(configure_cmd env CC=${CMAKE_C_COMPILER} ./configure --prefix=${QATzip_INSTALL_DIR})
   # build a static library with -fPIC that we can link into crypto/compressor plugins
   list(APPEND configure_cmd --with-pic --enable-static --disable-shared)
+
+  set(CFLAGS "-Wno-error=strict-prototypes -Wno-error=unused-but-set-variable")
   if(QATDRV_INCLUDE_DIR)
     list(APPEND configure_cmd --with-ICP_ROOT=${QATDRV_INCLUDE_DIR})
   endif()
   if(QAT_INCLUDE_DIR)
-    list(APPEND configure_cmd CFLAGS=-I${QAT_INCLUDE_DIR})
+    list(APPEND CFLAGS -I${QAT_INCLUDE_DIR})
   endif()
   if(QAT_LIBRARY_DIR)
     list(APPEND configure_cmd LDFLAGS=-L${QAT_LIBRARY_DIR})
   endif()
 
+  list(JOIN CFLAGS " " CFLAGS)
+  list(APPEND configure_cmd CFLAGS=${CFLAGS})
+
   # clear the DESTDIR environment variable from debian/rules,
   # because it messes with the internal install paths of arrow's bundled deps
   set(NO_DESTDIR_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR)

src/CMakeLists.txt

@@ -151,8 +151,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
     endif()
   endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12) # require >= clang-12
-    message(FATAL_ERROR "C++20 support requires a minimum Clang version of 12.")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+    message(FATAL_ERROR "C++20 support requires a minimum Clang version of 16.")
   endif()
   string(APPEND CMAKE_EXE_LINKER_FLAGS " ${CMAKE_EXE_EXPORTS_C_FLAG}")
   string(APPEND CMAKE_LINKER_FLAGS " -rdynamic -export-dynamic ${CMAKE_EXE_EXPORTS_C_FLAG}")
@@ -169,6 +169,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     -Wno-missing-braces
     -Wno-parentheses
     -Wno-deprecated-register)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
+    add_compile_options(
+    -Wno-vla-cxx-extension)
+  endif()
   if(FREEBSD)
     # Need to use the GNU binutils linker to get versioning right.
     string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")

src/erasure-code/jerasure/CMakeLists.txt

@@ -80,6 +80,7 @@ set(jerasure_srcs
   jerasure/src/reed_sol.c
   jerasure_init.cc)
 add_library(jerasure_objs OBJECT ${jerasure_srcs}) 
+target_compile_options(jerasure_objs PRIVATE "-Wno-unused-but-set-variable")
 
 set(ec_jerasure_objs
   $<TARGET_OBJECTS:gf-complete_objs>

src/libcephfs_proxy/CMakeLists.txt

@@ -4,8 +4,10 @@ set(libcephfs_proxy_srcs libcephfs_proxy.c ${proxy_common_srcs})
 
 add_executable(libcephfsd ${libcephfsd_srcs})
 add_library(cephfs_proxy ${CEPH_SHARED} ${libcephfs_proxy_srcs})
+target_compile_options(cephfs_proxy PRIVATE "-Wno-gnu-pointer-arith")
 
 target_link_libraries(libcephfsd cephfs ${CRYPTO_LIBS})
+target_compile_options(libcephfsd PRIVATE "-Wno-gnu-pointer-arith")
 
 if(ENABLE_SHARED)
   set_target_properties(cephfs_proxy PROPERTIES

src/script/lib-build.sh

@@ -72,7 +72,7 @@ function discover_compiler() {
     local cxx_compiler=g++
     local c_compiler=gcc
     # ubuntu/debian ci builds prefer clang
-    for i in {14..12}; do
+    for i in {19..12}; do
         if type -t "clang-$i" > /dev/null; then
             cxx_compiler="clang++-$i"
             c_compiler="clang-$i"

src/script/run-make.sh

@@ -52,6 +52,16 @@ function prepare() {
     local which_pkg="which"
     if command -v apt-get > /dev/null 2>&1 ; then
         which_pkg="debianutils"
+
+        if in_jenkins; then
+            if ! type clang-19 > /dev/null 2>&1 ; then
+                ci_debug "Getting clang-19"
+                wget https://download.ceph.com/qa/llvm.sh
+                chmod +x llvm.sh
+                $DRY_RUN sudo ./llvm.sh 19
+                rm llvm.sh
+            fi
+        fi
     fi
 
     if test -f ./install-deps.sh ; then

src/test/objectstore/allocsim/ops_replayer.cc

@@ -21,7 +21,6 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include <format>
 
 #include <fmt/format.h>