Only exclude avx512-targeted functions from coverage

ConflictSet.cpp

@@ -1673,7 +1673,9 @@ int firstNeqStride(const uint8_t *ap, const uint8_t *bp) {
 #endif
 }
 
-#if defined(__x86_64__) && !defined(__SANITIZE_THREAD__)
+// This gets covered in local development
+// GCOVR_EXCL_START
+#if defined(HAS_AVX) && !defined(__SANITIZE_THREAD__)
 __attribute__((target("avx512bw"))) int
 longestCommonPrefix(const uint8_t *ap, const uint8_t *bp, int cl) {
   int i = 0;
@@ -1699,6 +1701,7 @@ longestCommonPrefix(const uint8_t *ap, const uint8_t *bp, int cl) {
 }
 __attribute__((target("default")))
 #endif
+// GCOVR_EXCL_STOP
 
 int longestCommonPrefix(const uint8_t *ap, const uint8_t *bp, int cl) {
   assume(cl >= 0);
@@ -1941,9 +1944,6 @@ downLeftSpine:
   return n->entry.rangeVersion <= readVersion;
 }
 
-// Only one of these is ever exercised. I'm not worried about somehow not
-// calling one of these though.
-// GCOVR_EXCL_START
 #ifdef HAS_AVX
 uint32_t compare16_32bit(const InternalVersionT *vs, InternalVersionT rv) {
   uint32_t compared = 0;
@@ -1961,6 +1961,8 @@ uint32_t compare16_32bit(const InternalVersionT *vs, InternalVersionT rv) {
   return compared;
 }
 
+// This gets covered in local development
+// GCOVR_EXCL_START
 __attribute__((target("avx512f"))) uint32_t
 compare16_32bit_avx512(const InternalVersionT *vs, InternalVersionT rv) {
   uint32_t r;