This is an archive of the discontinued LLVM Phabricator instance.

Differential D96762

[sanitizers] fix test failing for -Wunused-command-line-argument
ClosedPublic

Authored by protze.joachim on Feb 16 2021, 1:52 AM.

Details

Reviewers
dvyukov
Commits
rGed4230732ade: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script
rGac6c13bfc49f: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script
Summary

GotsanRuntimeCheck fails for me, because of unused command-line arguments in combination with the -Werror flag.
This build error blocks the check-all target.

I run into this issue during 12.0 testing, so I think this should also be backported.

Diff Detail

Event Timeline

protze.joachim requested review of this revision.Feb 16 2021, 1:52 AM
protze.joachim created this revision.
dvyukov added a comment.Feb 16 2021, 2:00 AM

What is the unused argument? Maybe we should remove the unused argument instead?

protze.joachim added a comment.Feb 16 2021, 6:16 AM
FAILED: projects/compiler-rt/lib/tsan/CMakeFiles/GotsanRuntimeCheck 
cd /dev/shm/jprotze/llvm-project/compiler-rt/lib/tsan/go && env "CC=/home/pj416018/sw/UTIL/ccache/bin/clang " IN_TMPDIR=1 SILENT=1 /dev/shm/jprotze/llvm-project/compiler-rt/lib/tsan/go/buildgo.sh
clang-11: error: argument unused during compilation: '-I ../rtl' [-Werror,-Wunused-command-line-argument]
clang-11: error: argument unused during compilation: '-I ../..' [-Werror,-Wunused-command-line-argument]
clang-11: error: argument unused during compilation: '-I ../../sanitizer_common' [-Werror,-Wunused-command-line-argument]
clang-11: error: argument unused during compilation: '-I ../../../include' [-Werror,-Wunused-command-line-argument]

Removing those include directories causes issues in the same compilation step. I'm using ccache-swig as a compiler cache. Probably, this tool breaks the compilation steps further down but does not filter the arguments properly.

protze.joachim updated this revision to Diff 323988.Feb 16 2021, 6:34 AM

How about passing the CMAKE_C_FLAGS into the script? Because of ccache, I use the -Wno-unused-command-line-argument flags anyways.

Herald added a subscriber: mgorny. · View Herald TranscriptFeb 16 2021, 6:34 AM
dvyukov accepted this revision.Feb 16 2021, 11:19 PM

How about passing the CMAKE_C_FLAGS into the script? Because of ccache, I use the -Wno-unused-command-line-argument flags anyways.

This looks fine to me.

This revision is now accepted and ready to land.Feb 16 2021, 11:19 PM
Closed by commit rGac6c13bfc49f: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script (authored by protze.joachim). · Explain WhyFeb 17 2021, 12:21 AM
This revision was automatically updated to reflect the committed changes.
protze.joachim added a commit: rGac6c13bfc49f: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 17 2021, 12:21 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
thakis added a subscriber: thakis.Feb 18 2021, 4:52 PM

This breaks building with PGO: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8854980816661584704/+/steps/package_clang/0/stdout?format=raw

FAILED: projects/compiler-rt/lib/tsan/CMakeFiles/GotsanRuntimeCheck 
cd /b/s/w/ir/cache/builder/src/third_party/llvm/compiler-rt/lib/tsan/go && env "CC=/b/s/w/ir/cache/builder/src/third_party/llvm-bootstrap-install/bin/clang " "EXTRA_CFLAGS=--gcc-toolchain=/b/s/w/ir/cache/builder/src/third_party/llvm-build-tools/gcc-10.2.0-trusty -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wcovered-switch-default -Wdelete-non-virtual-dtor -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -fprofile-instr-use=\"/b/s/w/ir/cache/builder/src/third_party/llvm-instrumented/profdata.prof\" -flto=thin -Wall -Wno-unused-parameter" IN_TMPDIR=1 SILENT=1 /b/s/w/ir/cache/builder/src/third_party/llvm/compiler-rt/lib/tsan/go/buildgo.sh
error: Could not read profile "/b/s/w/ir/cache/builder/src/third_party/llvm-instrumented/profdata.prof": No such file or directory
1 error generated.
dvyukov added a comment.Feb 19 2021, 12:39 AM

Mkay, they I guess we need to revert. Or, Joachim, do you have any ideas for an alternative fix? We could whitelist/blacklist flags from $EXTRA_CFLAGS... I can't think of anything better atm.

thakis added a comment.Feb 21 2021, 7:14 PM

Reverted for now in 4b34e0c797e03fa411200f6819ce56d38ce8cc07.

thakis added a reverting change: rG4b34e0c797e0: Revert "[sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script".Feb 21 2021, 7:14 PM
protze.joachim updated this revision to Diff 325432.Feb 22 2021, 6:19 AM

@thakis thanks for reverting the patch. I was offline over the weekend.

The new patch sets -Wno-error=unused-command-line-argument if -Wno-unused-command-line-argument or -Wno-error=unused-command-line-argument is in $CMAKE_C_FLAGS instead of passing CMAKE_C_FLAGS into the script.

dvyukov reopened this revision.Feb 22 2021, 9:38 AM
This revision is now accepted and ready to land.Feb 22 2021, 9:38 AM
dvyukov accepted this revision.Feb 22 2021, 9:38 AM

This is fine with me.

Closed by commit rGed4230732ade: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script (authored by protze.joachim). · Explain WhyFeb 22 2021, 9:51 AM
This revision was automatically updated to reflect the committed changes.
protze.joachim added a commit: rGed4230732ade: [sanitizers] Pass CMAKE_C_FLAGS into TSan buildgo script.

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
4 lines
go/
2 lines

Diff 324217

compiler-rt/lib/tsan/CMakeLists.txt

Show First 20 Lines • Show All 150 Lines • ▼ Show 20 Lines add_compiler_rt_object_libraries(RTTsan_dynamic
SOURCES ${TSAN_SOURCES} ${TSAN_CXX_SOURCES} ${TSAN_ASM_SOURCES} SOURCES ${TSAN_SOURCES} ${TSAN_CXX_SOURCES} ${TSAN_ASM_SOURCES}
ADDITIONAL_HEADERS ${TSAN_HEADERS} ADDITIONAL_HEADERS ${TSAN_HEADERS}
CFLAGS ${TSAN_RTL_CFLAGS}) CFLAGS ${TSAN_RTL_CFLAGS})
# Build and check Go runtime. # Build and check Go runtime.
set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh)
add_custom_target(GotsanRuntimeCheck add_custom_target(GotsanRuntimeCheck
COMMAND env "CC=${CMAKE_C_COMPILER} ${OSX_SYSROOT_FLAG}" COMMAND env "CC=${CMAKE_C_COMPILER} ${OSX_SYSROOT_FLAG}"
EXTRA_CFLAGS=${CMAKE_C_FLAGS}
IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
DEPENDS tsan ${BUILDGO_SCRIPT} DEPENDS tsan ${BUILDGO_SCRIPT}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go
COMMENT "Checking TSan Go runtime..." COMMENT "Checking TSan Go runtime..."
VERBATIM) VERBATIM)
set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc")
else() else()
foreach(arch ${TSAN_SUPPORTED_ARCH}) foreach(arch ${TSAN_SUPPORTED_ARCH})
if(arch STREQUAL "x86_64") if(arch STREQUAL "x86_64")
add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_amd64.S) add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_amd64.S)
# Sanity check for Go runtime. # Sanity check for Go runtime.
set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh)
add_custom_target(GotsanRuntimeCheck add_custom_target(GotsanRuntimeCheck
COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
EXTRA_CFLAGS=${CMAKE_C_FLAGS}
IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT} DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go
COMMENT "Checking TSan Go runtime..." COMMENT "Checking TSan Go runtime..."
VERBATIM) VERBATIM)
elseif(arch STREQUAL "aarch64") elseif(arch STREQUAL "aarch64")
add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_aarch64.S) add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_aarch64.S)
# Sanity check for Go runtime. # Sanity check for Go runtime.
set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh)
add_custom_target(GotsanRuntimeCheck add_custom_target(GotsanRuntimeCheck
COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
EXTRA_CFLAGS=${CMAKE_C_FLAGS}
IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT} DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go
COMMENT "Checking TSan Go runtime..." COMMENT "Checking TSan Go runtime..."
VERBATIM) VERBATIM)
elseif(arch MATCHES "powerpc64|powerpc64le") elseif(arch MATCHES "powerpc64|powerpc64le")
add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_ppc64.S) add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_ppc64.S)
# Sanity check for Go runtime. # Sanity check for Go runtime.
set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh)
add_custom_target(GotsanRuntimeCheck add_custom_target(GotsanRuntimeCheck
COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
EXTRA_CFLAGS=${CMAKE_C_FLAGS}
IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT} DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go
COMMENT "Checking TSan Go runtime..." COMMENT "Checking TSan Go runtime..."
VERBATIM) VERBATIM)
elseif(arch MATCHES "mips64|mips64le") elseif(arch MATCHES "mips64|mips64le")
add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_mips64.S) add_asm_sources(TSAN_ASM_SOURCES rtl/tsan_rtl_mips64.S)
else() else()
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

compiler-rt/lib/tsan/go/buildgo.sh

Show First 20 Lines • Show All 165 Lines • ▼ Show 20 Lines
SRCS="$SRCS $ADD_SRCS" SRCS="$SRCS $ADD_SRCS"
rm -f $DIR/gotsan.cpp rm -f $DIR/gotsan.cpp
for F in $SRCS; do for F in $SRCS; do
cat $F >> $DIR/gotsan.cpp cat $F >> $DIR/gotsan.cpp
done done
FLAGS=" -I../rtl -I../.. -I../../sanitizer_common -I../../../include -std=c++14 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -DSANITIZER_DEADLOCK_DETECTOR_VERSION=2 $OSCFLAGS $ARCHCFLAGS" FLAGS=" -I../rtl -I../.. -I../../sanitizer_common -I../../../include -std=c++14 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -DSANITIZER_DEADLOCK_DETECTOR_VERSION=2 $OSCFLAGS $ARCHCFLAGS $EXTRA_CFLAGS"
DEBUG_FLAGS="$FLAGS -DSANITIZER_DEBUG=1 -g" DEBUG_FLAGS="$FLAGS -DSANITIZER_DEBUG=1 -g"
FLAGS="$FLAGS -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer" FLAGS="$FLAGS -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer"
if [ "$SUFFIX" = "linux_ppc64le" ]; then if [ "$SUFFIX" = "linux_ppc64le" ]; then
FLAGS="$FLAGS -mcpu=power8 -fno-function-sections" FLAGS="$FLAGS -mcpu=power8 -fno-function-sections"
elif [ "$SUFFIX" = "linux_amd64" ]; then elif [ "$SUFFIX" = "linux_amd64" ]; then
FLAGS="$FLAGS -msse3" FLAGS="$FLAGS -msse3"
fi fi
Show All 32 Lines