From b51b7d7fb174667c253ec70649aa6356de415680 Mon Sep 17 00:00:00 2001
From: Brendan Hansknecht <brendan.hansknecht@gmail.com>
Date: Tue, 27 Oct 2020 14:25:45 -0700
Subject: [PATCH] Install vagrind-3.16.1 from source

Also, disable passing features.
---
 ci/install-ci-libraries.sh   | 11 ++++++++++-
 compiler/build/src/target.rs |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ci/install-ci-libraries.sh b/ci/install-ci-libraries.sh
index 5a0bcb88a0..834734108a 100755
--- a/ci/install-ci-libraries.sh
+++ b/ci/install-ci-libraries.sh
@@ -59,4 +59,13 @@ esac
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
 add-apt-repository "${REPO_NAME}"
 apt-get update
-apt-get install -y clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clangd-$LLVM_VERSION libc++abi-dev libunwind-dev valgrind
+apt-get install -y clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clangd-$LLVM_VERSION libc++abi-dev libunwind-dev
+
+wget https://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
+tar -xf valgrind-3.16.1.tar.bz2
+cd valgrind-3.16.1
+./autogen.sh
+./configure
+make -j`nproc`
+sudo make install
+cd ..
\ No newline at end of file
diff --git a/compiler/build/src/target.rs b/compiler/build/src/target.rs
index 87b623d429..b545934a55 100644
--- a/compiler/build/src/target.rs
+++ b/compiler/build/src/target.rs
@@ -69,9 +69,7 @@ pub fn target_machine(
         &TargetTriple::create(target_triple_str(target)),
         arch,
         // TODO: this probably should be TargetMachine::get_host_cpu_features() to enable all features.
-        // For now disabling all avx512 because valgrind does not seem to support it.
-        //"-avx512bf16,-avx512bitalg,-avx512bw,-avx512cd,-avx512dq,-avx512er,-avx512f,-avx512ifma,-avx512pf,-avx512vbmi,-avx512vbmi2,-avx512vl,-avx512vnni,-avx512vp2intersect,-avx512vpopcntdq",
-        "+sse2,+cx16,+sahf,-tbm,-avx512ifma,-sha,-gfni,-fma4,-vpclmulqdq,+prfchw,+bmi2,-cldemote,+fsgsbase,-ptwrite,+xsavec,+popcnt,+aes,-avx512bitalg,-movdiri,+xsaves,-avx512er,-avx512vnni,-avx512vpopcntdq,-pconfig,-clwb,-avx512f,-clzero,-pku,+mmx,-lwp,-rdpid,-xop,+rdseed,-waitpkg,-movdir64b,-sse4a,-avx512bw,+clflushopt,+xsave,-avx512vbmi2,+64bit,-avx512vl,+invpcid,-avx512cd,+avx,-vaes,+cx8,+fma,-rtm,+bmi,-enqcmd,+rdrnd,-mwaitx,+sse4.1,+sse4.2,+avx2,+fxsr,-wbnoinvd,+sse,+lzcnt,+pclmul,-prefetchwt1,+f16c,+ssse3,+sgx,-shstk,+cmov,-avx512vbmi,-avx512bf16,+movbe,+xsaveopt,-avx512dq,+adx,-avx512pf,+sse3",
+        "",
         opt,
         reloc,
         model,