Add initial XRay support for NetBSD

[krytarowski]

Summary

Reuse the existing FreeBSD code as it is.

Sponsored by <The NetBSD Foundation>

[krytarowski]

This comment was removed by krytarowski.

[dberris]

LGTM -- though @mclow.lists had mentioned that there were breakages due to the original FreeBSD change ignoring Darwin/macOS builds?

[krytarowski]

In D43370#1009740, @dberris wrote:

LGTM -- though @mclow.lists had mentioned that there were breakages due to the original FreeBSD change ignoring Darwin/macOS builds?

I've fixed the fallout.

There were 2 bugs:

• lack of '(' and ')' in lit
• lack of a dummy fallback getTSCFrequency() for unsupported OSes

[emaste]

This LGTM

cmake/config-ix.cmake

 if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
     OS_NAME MATCHES "Linux|Android|Fuchsia")
   set(COMPILER_RT_HAS_SCUDO TRUE)
 else()
   set(COMPILER_RT_HAS_SCUDO FALSE)
 endif()
 
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND XRAY_SUPPORTED_ARCH AND
-    OS_NAME MATCHES "Darwin|Linux|FreeBSD")
+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD")
   set(COMPILER_RT_HAS_XRAY TRUE)
 else()
   set(COMPILER_RT_HAS_XRAY FALSE)
 endif()
 
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND FUZZER_SUPPORTED_ARCH AND
     OS_NAME MATCHES "Android|Darwin|Linux|NetBSD|FreeBSD|Fuchsia")
   set(COMPILER_RT_HAS_FUZZER TRUE)
 else()
   set(COMPILER_RT_HAS_FUZZER FALSE)
 endif()

lib/xray/xray_x86_64.cc

 #include "cpuid.h"
 #include "sanitizer_common/sanitizer_common.h"
 #include "xray_defs.h"
 #include "xray_interface_internal.h"
 
-#if SANITIZER_FREEBSD
+#if SANITIZER_FREEBSD || SANITIZER_NETBSD
+#include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
 
 #include <atomic>
 #include <cstdint>
 #include <errno.h>
 #include <fcntl.h>
 #include <iterator>
TSCFrequency *= 1000;
                  "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
                  &TSCFrequency)) {
     TSCFrequency *= 1000;
   } else {
     Report("Unable to determine CPU frequency for TSC accounting.\n");
   }
   return TSCFrequency == -1 ? 0 : static_cast<uint64_t>(TSCFrequency);
 }
-#elif SANITIZER_FREEBSD
+#elif SANITIZER_FREEBSD || SANITIZER_NETBSD
 uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
     long long TSCFrequency = -1;
     size_t tscfreqsz = sizeof(TSCFrequency);
 
     if (sysctlbyname("machdep.tsc_freq", &TSCFrequency, &tscfreqsz,
         NULL, 0) != -1) {
         return static_cast<uint64_t>(TSCFrequency);
     } else {

test/xray/lit.cfg

config.substitutions.append(
     ('%xraylib',
         ('-lm -lpthread %s -lrt -L%s '
          '-Wl,-whole-archive -lclang_rt.xray-%s -Wl,-no-whole-archive')
         % (libdl_flag, config.compiler_rt_libdir, config.host_arch)))
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-if config.host_os not in ['FreeBSD', 'Linux']:
+if config.host_os not in ['FreeBSD', 'Linux', 'NetBSD']:
   config.unsupported = True
 elif '64' not in config.host_arch:
   if 'arm' in config.host_arch:
     if '-mthumb' in config.target_cflags:
       config.unsupported = True
   else:
     config.unsupported = True