Fix false postive when using `nvcc`

diff --git a/NEWS b/NEWS
index c2ef2bffbab592755498f3d768d2ae067d8e09d0..b860cd7cd22b4078c5e786bb130b2de5b7fa9948 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ Version 0.XX
   Vandegrift (Debian bug #1019521).
 - Support -D_FORTIFY_SOURCE=3 added in glibc 2.35; reported by Christian
   Göttsche (Debian bug #1027084).
+- Fix false postive when using `nvcc`; reported by Andreas Beckmann (Debian
+  Bug #1033027).
 
 
 Version 0.13

diff --git a/bin/blhc b/bin/blhc
index ba27c55dd08ce6abf0038b239e81204dad01dd18..b6889ae3ca51162e50d5c93f321d18235dc46a0a 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -1081,6 +1081,8 @@ foreach my $file (@ARGV) {
                                \s.+\s
                                -I\S+/mkspecs/[a-z]+-g\++(?:-64)?
                                \s}x;
+            # nvcc is not a regular C compiler
+            next if $line =~ m{^\S+/bin/nvcc\s};
             # Ignore false positives when the line contains only CC=gcc but no
             # other gcc command.
             if ($line =~ /(.*)CC=$cc_regex_full(.*)/o) {

diff --git a/t/logs/false-positives b/t/logs/false-positives
index 1db4f0450fa6ec4456759b8aab9250943cc1a1e3..9ad0dcae2ffa40d01fab9ac89df43d6fea48f569 100644 (file)
--- a/t/logs/false-positives
+++ b/t/logs/false-positives
@@ -76,3 +76,5 @@ mv -f /build/nvidia-cuda-toolkit-10.1.243/debian/tmp/usr/lib/x86_64-linux-gnu/`g
 /usr/lib/ccache/c++ -dM -E -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp -DKCOREADDONS_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -Dlatte2plugin_EXPORTS -I/builds/qt-kde-team/extras/latte-dock/debian/output/latte-dock-0.9.11/obj-x86_64-linux-gnu/liblatte2 -I/builds/qt-kde-team/extras/latte-dock/debian/output/latte-dock-0.9.11/liblatte2 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/KF5/KCoreAddons -I/usr/include/KF5 -I/usr/include/KF5/Plasma -I/usr/include/KF5/KService -I/usr/include/KF5/KConfigCore -I/usr/include/KF5/KPackage -I/usr/include/KF5/KWindowSystem -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/KF5/KDeclarative -I/usr/include/KF5/KIconThemes -I/usr/include -I/usr/include/c++/9 -I/usr/include/x86_64-linux-gnu/c++/9 -I/usr/include/c++/9/backward -I/usr/lib/gcc/x86_64-linux-gnu/9/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu
 
 (cd /tmp/bazel_7uh2rFwh/out/execroot/io_bazel && \   exec env - \     CCACHE_DISABLE=1 \     CCACHE_TEMPDIR=/builds/bazel-team/bazel-bootstrap/debian/output/source_dir/debian/ccachetmp \     LD_LIBRARY_PATH=/usr/lib/libeatmydata \     PATH=/usr/lib/ccache/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \     PWD=/proc/self/cwd \   /usr/lib/ccache/gcc -U_FORTIFY_SOURCE -fstack-protector -Wall -Wunused-but-set-parameter -Wno-free-nonheap-object -fno-omit-frame-pointer -g '-std=c++0x' -Wdate-time '-D_FORTIFY_SOURCE=2' -g -O2 '-ffile-prefix-map=/builds/bazel-team/bazel-bootstrap/debian/output/source_dir=.' -fstack-protector-strong -Wformat '-Werror=format-security' -MD -MF bazel-out/k8-dbg/bin/src/main/cpp/util/_objs/md5/md5.pic.d '-frandom-seed=bazel-out/k8-dbg/bin/src/main/cpp/util/_objs/md5/md5.pic.o' -fPIC -iquote . -iquote bazel-out/k8-dbg/bin -fno-canonical-system-headers -Wno-builtin-macro-redefined '-D__DATE__="redacted"' '-D__TIMESTAMP__="redacted"' '-D__TIME__="redacted"' -c src/main/cpp/util/md5.cc -o bazel-out/k8-dbg/bin/src/main/cpp/util/_objs/md5/md5.pic.o)
+
+/usr/bin/nvcc -DNCCL_OP=5 -DNCCL_TYPE=0 -ccbin cuda-g++ -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_90,code=sm_90 -gencode=arch=compute_90,code=compute_90 -std=c++11 --expt-extended-lambda -Xptxas -maxrregcount=96 -Xfatbin -compress-all -O3 -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter -I. -I.. -I/builds/nvidia-team/nvidia-nccl/debian/output/source_dir/build/include -I../../include --compiler-options "-fPIC -fvisibility=hidden" -dc /builds/nvidia-team/nvidia-nccl/debian/output/source_dir/build/obj/collectives/device/reduce_scatter_sumpostdiv_i8.cu -o /builds/nvidia-team/nvidia-nccl/debian/output/source_dir/build/obj/collectives/device/reduce_scatter_sumpostdiv_i8.o