Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -630,6 +630,26 @@
                "-DLLVM_TARGETS_TO_BUILD=X86",
             ])},
 
+        ## X86_64 AVX2 Clang+LLVM check-all + test-suite
+        {'name': "clang-cmake-x86_64-avx2-linux",
+         'slavenames':["avx2-intel64"],
+         'builddir':"clang-cmake-x86_64-avx2-linux",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+             jobs=80,
+             clean=False,
+             checkout_clang_tools_extra=False,
+             checkout_compiler_rt=False,
+             checkout_lld=False,
+             test=True,
+             useTwoStage=False,
+             runTestSuite=True,
+             nt_flags=['--cflag', '-march=broadwell', '--threads=80', '--build-threads=80'],
+             env={'PATH':'/usr/bin/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
+             extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON",
+                               "-DCMAKE_C_FLAGS='-march=broadwell'",
+                               "-DCMAKE_CXX_FLAGS='-march=broadwell'",
+                               "-DLLVM_TARGETS_TO_BUILD='X86'"])},
+
 #        {'name' : "clang-3stage-ubuntu",
 #         'slavenames' : ["ps4-buildslave1a"],
 #         'builddir' : "clang-3stage-ubuntu",
@@ -1098,7 +1118,7 @@
                          cxx_compiler="clang++",
                          ompt=True,
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
-                         
+
         {'name': "libomp-clang-ppc64le-linux-debian",
          'slavenames':["ppc64le-nvidia-K40"],
          'builddir':"libomp-clang-ppc64le-linux-debian",
@@ -1113,7 +1133,7 @@
     ericwf_slaves = ['ericwf-buildslave2', 'ericwf-buildslave',
                      'ericwf-buildslave-fast']
     return [
-        # gribozavr's builders on gribozavr4 
+        # gribozavr's builders on gribozavr4
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian',
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -84,7 +84,7 @@
         create_slave("ppc64le-clang-lnt-test", properties={'jobs': 8}, max_builds=1),
         create_slave("ppc64le-clang-multistage-test", properties={'jobs': 8}, max_builds=1),
         create_slave("ppc64le-sanitizer", properties={'jobs': 4}, max_builds=1),
-        
+
         # POWER 8 PowerPC little endian (powerpc64le) with NVIDIA GPUs
         create_slave("ppc64le-nvidia-K40", properties={'jobs': 4}, max_builds=1),
 
@@ -208,6 +208,9 @@
         # Ubuntu 14.04 x86_64, AMD Athlon(tm) 5150 APU with Radeon(tm) R3, 8GiB RAM
         create_slave("am1i-slv3", properties={'jobs': 8}),
 
+        # X86_64 AVX2, Ubuntu 16.04.2, Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz
+        create_slave("avx2-intel64", properties={'jobs': 80}, max_builds=1),
+
         # Defunct.
         # Debian 86_64, 2 x 6-core Opteron 2.6 GHz
         #create_slave("osu8", properties={'jobs' : 6}, max_builds=2),