From 3b82b54859a7ba132658a3143629cbaa9765c359 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 29 Feb 2020 14:04:30 +0100 Subject: [PATCH 1/4] fix changelog --- debian/changelog | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a112a55..64ce011e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -llvm-toolchain-10 (1:10.0.0~+rc2-3) UNRELEASED; urgency=medium - - * Patch to convert old python3 cgi method into the new html one - - -- Gianfranco Costamagna Tue, 25 Feb 2020 14:57:08 +0100 - llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium [ Sylvestre Ledru ] @@ -14,7 +8,10 @@ llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium [ Aurelien Jarno ] * Also disable hwasan_symbolize on mipsel mips64el riscv64 - -- Sylvestre Ledru Sun, 16 Feb 2020 17:35:25 +0100 + [ Gianfranco Costamagna ] + * Patch to convert old python3 cgi method into the new html one + + -- Sylvestre Ledru Sat, 29 Feb 2020 14:04:22 +0100 llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium From 1ad6142cf1ab78c5275c20f78b771d8be20d491f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 29 Feb 2020 23:40:57 +0100 Subject: [PATCH 2/4] remove hardcoded version --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index dd4f0725..d818970f 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -458,7 +458,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { return 0; } EOF -clang-9 -fprofile-instr-generate -fcoverage-mapping fuzz_me.cc StandaloneFuzzTargetMain.c +clang-$VERSION -fprofile-instr-generate -fcoverage-mapping fuzz_me.cc StandaloneFuzzTargetMain.c rm -rf CORPUS mkdir -p CORPUS From e042e5407dcbfca143e437d147cba36cb64916f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 29 Feb 2020 23:54:01 +0100 Subject: [PATCH 3/4] Bring back libfuzzer, for some reasons I don't remember I disabled it: --- debian/changelog | 4 +-- .../patches/disable-fuzzer-compiler-rt.diff | 31 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 debian/patches/disable-fuzzer-compiler-rt.diff diff --git a/debian/changelog b/debian/changelog index 64ce011e..43b9024c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium [ Sylvestre Ledru ] - * Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system - to bring fuzzer library back + * Bring back libfuzzer, for some reasons I don't remember + I disabled it: https://bugs.llvm.org/show_bug.cgi?id=41956 [ Aurelien Jarno ] diff --git a/debian/patches/disable-fuzzer-compiler-rt.diff b/debian/patches/disable-fuzzer-compiler-rt.diff deleted file mode 100644 index 803327a6..00000000 --- a/debian/patches/disable-fuzzer-compiler-rt.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/lib/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt -@@ -56,6 +56,6 @@ if(COMPILER_RT_BUILD_XRAY) - compiler_rt_build_runtime(xray) - endif() - --if(COMPILER_RT_BUILD_LIBFUZZER) -- compiler_rt_build_runtime(fuzzer) --endif() -+#if(COMPILER_RT_BUILD_LIBFUZZER) -+# compiler_rt_build_runtime(fuzzer) -+#endif() -Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/test/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt -@@ -54,9 +54,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) - compiler_rt_test_runtime(sanitizer_common) - - # OpenBSD not supporting asan, cannot run the tests -- if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID) -- compiler_rt_test_runtime(fuzzer) -- endif() -+# if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID) -+# compiler_rt_test_runtime(fuzzer) -+# endif() - - foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD}) - # cfi testing is gated on ubsan diff --git a/debian/patches/series b/debian/patches/series index 8aa59fc8..234a507e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -133,7 +133,6 @@ workaround-bug-42994-use-linker.diff # bug 939472 #try-to-unbreak-thinlto.diff D67877.patch -disable-fuzzer-compiler-rt.diff no-z3.patch python3-shebang.patch From a3bfe3f25e9be45fe61bb89780ec32403333d940 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 29 Feb 2020 23:56:51 +0100 Subject: [PATCH 4/4] Silent the polly tests in debian/qualify-clang.sh clang (LLVM option parsing): Unknown command line argument '-polly'. Try: 'clang (LLVM option parsing) --help' --- debian/changelog | 3 +++ debian/qualify-clang.sh | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43b9024c..3bd665a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium * Bring back libfuzzer, for some reasons I don't remember I disabled it: https://bugs.llvm.org/show_bug.cgi?id=41956 + * Silent the polly tests in debian/qualify-clang.sh + clang (LLVM option parsing): Unknown command line argument + '-polly'. Try: 'clang (LLVM option parsing) --help' [ Aurelien Jarno ] * Also disable hwasan_symbolize on mipsel mips64el riscv64 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index d818970f..0002456e 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -784,23 +784,23 @@ int main() return 0; } " > foo.c -clang-$VERSION -O3 -mllvm -polly foo.c +#clang-$VERSION -O3 -mllvm -polly -mllvm -polly-parallel -lgomp foo.c # Comment because of https://bugs.llvm.org/show_bug.cgi?id=43164 -# clang-$VERSION -O3 -mllvm -polly -mllvm -lgomp -polly-parallel foo.c -clang-$VERSION -O3 -mllvm -polly -mllvm -polly-vectorizer=stripmine foo.c -clang-$VERSION -S -fsave-optimization-record -emit-llvm foo.c -o matmul.s -opt-$VERSION -S -polly-canonicalize matmul.s > matmul.preopt.ll > /dev/null -opt-$VERSION -basicaa -polly-ast -analyze -q matmul.preopt.ll -polly-process-unprofitable > /dev/null -if test ! -f /usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py; then - echo "Install llvm-$VERSION-tools" - exit 42 -fi -/usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py -source-dir . matmul.opt.yaml -o ./output > /dev/null +#clang-$VERSION -O3 -mllvm -polly -mllvm -lgomp -polly-parallel foo.c +#clang-$VERSION -O3 -mllvm -polly -mllvm -polly-vectorizer=stripmine foo.c +#clang-$VERSION -S -fsave-optimization-record -emit-llvm foo.c -o matmul.s +#opt-$VERSION -S -polly-canonicalize matmul.s > matmul.preopt.ll > /dev/null +#opt-$VERSION -basicaa -polly-ast -analyze -q matmul.preopt.ll -polly-process-unprofitable > /dev/null +#if test ! -f /usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py; then +# echo "Install llvm-$VERSION-tools" +# exit 42 +#fi +#/usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py -source-dir . matmul.opt.yaml -o ./output > /dev/null -if ! grep -q "not inlined into" output/foo.c.html 2>&1; then - echo "Could not find the output from polly" - exit -1 -fi +#if ! grep -q "not inlined into" output/foo.c.html 2>&1; then +# echo "Could not find the output from polly" +# exit -1 +#fi echo " int foo(int x, int y) __attribute__((always_inline));