Merge pull request #855 from LebedevRI/oss-fuzz-omp-msan

oss-fuzz: msan: try to enable openmp

Author: LebedevRI

.ci/openmp.patch

@@ -0,0 +1,51 @@
+--- kmp.h.orig	2025-05-20 19:15:00.633881763 +0300
++++ kmp.h	2025-05-20 19:47:47.770195902 +0300
+@@ -11,16 +11,20 @@
+ //
+ //===----------------------------------------------------------------------===//
+
+ #ifndef KMP_H
+ #define KMP_H
+
+ #include "kmp_config.h"
+
++#if defined(__has_feature) && __has_feature(memory_sanitizer)
++#include <sanitizer/msan_interface.h>
++#endif
++
+ /* #define BUILD_PARALLEL_ORDERED 1 */
+
+ /* This fix replaces gettimeofday with clock_gettime for better scalability on
+    the Altix.  Requires user code to be linked with -lrt. */
+ //#define FIX_SGI_CLOCK
+
+ /* Defines for OpenMP 3.0 tasking and auto scheduling */
+
+@@ -1414,21 +1418,27 @@ extern void __kmp_query_cpuid(kmp_cpuinf
+ // zero in most cases
+ static inline void __kmp_x86_cpuid(int leaf, int subleaf, struct kmp_cpuid *p) {
+   __asm__ __volatile__("cpuid"
+                        : "=a"(p->eax), "=b"(p->ebx), "=c"(p->ecx), "=d"(p->edx)
+                        : "a"(leaf), "c"(subleaf));
+ }
+ // Load p into FPU control word
+ static inline void __kmp_load_x87_fpu_control_word(const kmp_int16 *p) {
++#if defined(__has_feature) && __has_feature(memory_sanitizer)
++  __msan_check_mem_is_initialized(p, sizeof(*p));
++#endif
+   __asm__ __volatile__("fldcw %0" : : "m"(*p));
+ }
+ // Store FPU control word into p
+ static inline void __kmp_store_x87_fpu_control_word(kmp_int16 *p) {
+   __asm__ __volatile__("fstcw %0" : "=m"(*p));
++#if defined(__has_feature) && __has_feature(memory_sanitizer)
++  __msan_unpoison(p, sizeof(*p));
++#endif
+ }
+ static inline void __kmp_clear_x87_fpu_status_word() {
+ #if KMP_MIC
+   // 32-bit protected mode x87 FPU state
+   struct x87_fpu_state {
+     unsigned cw;
+     unsigned sw;
+     unsigned tw;

.ci/oss-fuzz.sh

@@ -20,6 +20,9 @@ set -ex
 apt-get install -y ninja-build
 export CMAKE_GENERATOR=Ninja
 
+RAWSPEED_SOURCE="$SRC/librawspeed/"
+RAWSPEED_BUILD="$WORK/rawspeed"
+
 ln -f -s /usr/local/bin/lld /usr/bin/ld
 
 cd "$SRC"
@@ -28,10 +31,10 @@ LIBCXX_LLVM_VER="19.1.7"
 
 wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LIBCXX_LLVM_VER/llvm-project-$LIBCXX_LLVM_VER.src.tar.xz
 tar -xf llvm-project-$LIBCXX_LLVM_VER.src.tar.xz llvm-project-$LIBCXX_LLVM_VER.src/{runtimes,cmake,llvm/cmake,libcxx,libcxxabi}/
-LLVM_SOURCE="$SRC/llvm-project-$LIBCXX_LLVM_VER.src"
+LIBCXX_LLVM_SOURCE="$SRC/llvm-project-$LIBCXX_LLVM_VER.src"
 
 LIBCXX_BUILD="$WORK/llvm-project-$LIBCXX_LLVM_VER.libcxx.build"
-cmake -S "$LLVM_SOURCE/runtimes/" -B "$LIBCXX_BUILD" \
+cmake -S "$LIBCXX_LLVM_SOURCE/runtimes/" -B "$LIBCXX_BUILD" \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DLLVM_INCLUDE_TESTS=OFF \
@@ -50,10 +53,12 @@ LIBOMP_LLVM_VER="20.1.5"
 
 wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LIBOMP_LLVM_VER/llvm-project-$LIBOMP_LLVM_VER.src.tar.xz
 tar -xf llvm-project-$LIBOMP_LLVM_VER.src.tar.xz llvm-project-$LIBOMP_LLVM_VER.src/{runtimes,cmake,llvm/cmake,openmp}/
-LLVM_SOURCE="$SRC/llvm-project-$LIBOMP_LLVM_VER.src"
+OPENMP_LLVM_SOURCE="$SRC/llvm-project-$LIBOMP_LLVM_VER.src"
+
+patch $OPENMP_LLVM_SOURCE/openmp/runtime/src/kmp.h $RAWSPEED_SOURCE/.ci/openmp.patch
 
 OPENMP_BUILD="$WORK/llvm-project-$LIBOMP_LLVM_VER.omp.build"
-cmake -S "$LLVM_SOURCE/openmp/" -B "$OPENMP_BUILD" \
+cmake -S "$OPENMP_LLVM_SOURCE/openmp/" -B "$OPENMP_BUILD" \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DLIBOMP_ENABLE_SHARED=OFF \
@@ -68,16 +73,8 @@ if [[ $SANITIZER = *undefined* ]]; then
   CXXFLAGS="$CXXFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
 fi
 
-WITH_OPENMP=ON
-if [[ $SANITIZER = *memory* ]]; then
-  WITH_OPENMP=OFF
-fi
-
-RAWSPEED_SOURCE="$SRC/librawspeed/"
-RAWSPEED_BUILD="$WORK/rawspeed"
-
 cmake -S "$RAWSPEED_SOURCE" -B "$RAWSPEED_BUILD" \
-  -DBINARY_PACKAGE_BUILD=ON -DWITH_OPENMP=$WITH_OPENMP \
+  -DBINARY_PACKAGE_BUILD=ON -DWITH_OPENMP=ON \
   -DWITH_PUGIXML=OFF -DUSE_XMLLINT=OFF -DWITH_JPEG=OFF -DWITH_ZLIB=OFF \
   -DBUILD_TESTING=OFF -DBUILD_TOOLS=OFF -DBUILD_BENCHMARKING=OFF \
   -DCMAKE_BUILD_TYPE=FUZZ -DBUILD_FUZZERS=ON \