[Support] System include SipHash.h

[guy-david]

A regular include may not search the system include path.

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: Guy David (guy-david)

Changes

Match the SYSTEM directive to this header which was introduced by 7f3afab, because a regular include may skip system directories.

---

Full diff: https://github.com/llvm/llvm-project/pull/149499.diff

1 Files Affected:

• (modified) llvm/lib/Support/SipHash.cpp (+1-1)

diff --git a/llvm/lib/Support/SipHash.cpp b/llvm/lib/Support/SipHash.cpp
index 86dad66420435..ffcbc5044670d 100644
--- a/llvm/lib/Support/SipHash.cpp
+++ b/llvm/lib/Support/SipHash.cpp
@@ -12,13 +12,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/SipHash.h"
-#include "siphash/SipHash.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Endian.h"
 #include <cstdint>
+#include <siphash/SipHash.h>
 
 using namespace llvm;
 using namespace support;

[pcc]

Would it also work to remove the SYSTEM directive? That seems like the right thing to do because this isn't a system header. I don't think I added SYSTEM deliberately, it was copy-pasted from the previous target_include_directories for Z3.

[llvm-ci]

LLVM Buildbot has detected a new failure on builder premerge-monolithic-linux running on premerge-linux-1 while building llvm at step 7 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/153/builds/38675

Here is the relevant piece of the build log for the reference

Step 7 (test-build-unified-tree-check-all) failure: test (failure)
...
PASS: lld :: COFF/cgprofile-bad-clusters.s (98676 of 101722)
PASS: lld :: COFF/could-not-open.test (98677 of 101722)
PASS: lld :: COFF/cgprofile-icf.s (98678 of 101722)
PASS: lld :: COFF/autoimport-lto.ll (98679 of 101722)
PASS: cfi-standalone-lld-x86_64 :: cross-dso/simple-fail.cpp (98680 of 101722)
PASS: lld :: COFF/crt-chars.test (98681 of 101722)
PASS: lld :: COFF/constant-export.test (98682 of 101722)
PASS: lld :: COFF/common.test (98683 of 101722)
PASS: lld :: COFF/arm64ec.test (98684 of 101722)
TIMEOUT: MLIR :: Examples/standalone/test.toy (98685 of 101722)
******************** TEST 'MLIR :: Examples/standalone/test.toy' FAILED ********************
Exit Code: 1
Timeout: Reached timeout of 60 seconds

Command Output (stdout):
--
# RUN: at line 1
"/etc/cmake/bin/cmake" "/build/buildbot/premerge-monolithic-linux/llvm-project/mlir/examples/standalone" -G "Ninja"  -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang  -DLLVM_ENABLE_LIBCXX=OFF -DMLIR_DIR=/build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir  -DLLVM_USE_LINKER=lld  -DPython3_EXECUTABLE="/usr/bin/python3.10"
# executed command: /etc/cmake/bin/cmake /build/buildbot/premerge-monolithic-linux/llvm-project/mlir/examples/standalone -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DLLVM_ENABLE_LIBCXX=OFF -DMLIR_DIR=/build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir -DLLVM_USE_LINKER=lld -DPython3_EXECUTABLE=/usr/bin/python3.10
# .---command stdout------------
# | -- The CXX compiler identification is Clang 16.0.6
# | -- The C compiler identification is Clang 16.0.6
# | -- Detecting CXX compiler ABI info
# | -- Detecting CXX compiler ABI info - done
# | -- Check for working CXX compiler: /usr/bin/clang++ - skipped
# | -- Detecting CXX compile features
# | -- Detecting CXX compile features - done
# | -- Detecting C compiler ABI info
# | -- Detecting C compiler ABI info - done
# | -- Check for working C compiler: /usr/bin/clang - skipped
# | -- Detecting C compile features
# | -- Detecting C compile features - done
# | -- Looking for histedit.h
# | -- Looking for histedit.h - found
# | -- Found LibEdit: /usr/include (found version "2.11") 
# | -- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.11") 
# | -- Found LibXml2: /usr/lib/x86_64-linux-gnu/libxml2.so (found version "2.9.13") 
# | -- Using MLIRConfig.cmake in: /build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir
# | -- Using LLVMConfig.cmake in: /build/buildbot/premerge-monolithic-linux/build/lib/cmake/llvm
# | -- Linker detection: unknown
# | -- Performing Test LLVM_LIBSTDCXX_MIN
# | -- Performing Test LLVM_LIBSTDCXX_MIN - Success
# | -- Performing Test LLVM_LIBSTDCXX_SOFT_ERROR
# | -- Performing Test LLVM_LIBSTDCXX_SOFT_ERROR - Success
# | -- Performing Test CXX_SUPPORTS_CUSTOM_LINKER
# | -- Performing Test CXX_SUPPORTS_CUSTOM_LINKER - Success
# | -- Performing Test C_SUPPORTS_FPIC
# | -- Performing Test C_SUPPORTS_FPIC - Success
# | -- Performing Test CXX_SUPPORTS_FPIC

[llvm-ci]

LLVM Buildbot has detected a new failure on builder clang-arm64-windows-msvc running on linaro-armv8-windows-msvc-04 while building llvm at step 7 "test-build-unified-tree-check-runtimes".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/161/builds/7099

Here is the relevant piece of the build log for the reference

Step 7 (test-build-unified-tree-check-runtimes) failure: test (failure)
******************** TEST 'libomp :: tasking/issue-94260-2.c' FAILED ********************
Exit Code: 3221225477

Command Output (stdout):
--
# RUN: at line 1
C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/./bin/clang.exe -fopenmp   -I C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/runtimes/runtimes-bins/openmp/runtime/src -I C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/llvm-project/openmp/runtime/test -L C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/runtimes/runtimes-bins/openmp/runtime/src  -fno-omit-frame-pointer C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\llvm-project\openmp\runtime\test\tasking\issue-94260-2.c -o C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\build\runtimes\runtimes-bins\openmp\runtime\test\tasking\Output\issue-94260-2.c.tmp && C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\build\runtimes\runtimes-bins\openmp\runtime\test\tasking\Output\issue-94260-2.c.tmp
# executed command: C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/./bin/clang.exe -fopenmp -I C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/runtimes/runtimes-bins/openmp/runtime/src -I C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/llvm-project/openmp/runtime/test -L C:/Users/tcwg/llvm-worker/clang-arm64-windows-msvc/build/runtimes/runtimes-bins/openmp/runtime/src -fno-omit-frame-pointer 'C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\llvm-project\openmp\runtime\test\tasking\issue-94260-2.c' -o 'C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\build\runtimes\runtimes-bins\openmp\runtime\test\tasking\Output\issue-94260-2.c.tmp'
# executed command: 'C:\Users\tcwg\llvm-worker\clang-arm64-windows-msvc\build\runtimes\runtimes-bins\openmp\runtime\test\tasking\Output\issue-94260-2.c.tmp'
# note: command had no output on stdout or stderr
# error: command failed with exit status: 0xc0000005

--

********************