Use dynamic runtime instrumentation for dtrace instead of static instrumentation.

When I originally added this I did not understand how dtrace worked well enough.
Turns out we do not need any of this runtime instrumentation and we can just
dynamically instrument the calls.

This commit rips out the all of the static calls and replaces the old
runtime_statistics dtrace file with a new one that does the dynamic
instrumentation for you. To do this one does the following:

sudo dtrace -s ./swift/utils/runtime_statistics.d -c "$CMD"

The statistics are currently focused around dynamic retain/release counts.

Author: gottesmm

CMakeLists.txt

@@ -185,10 +185,6 @@ set(SWIFT_EXPERIMENTAL_EXTRA_REGEXP_FLAGS "" CACHE STRING
 set(SWIFT_EXPERIMENTAL_EXTRA_NEGATIVE_REGEXP_FLAGS "" CACHE STRING
     "A list of [module_regexp1;flags1;module_regexp2;flags2,...] which can be used to apply specific flags to modules that do not match a cmake regexp. It always applies the first regexp that does not match. The reason this is necessary is that cmake does not provide negative matches in the regex. Instead you have to use NOT in the if statement requiring a separate variable.")
 
-option(SWIFT_RUNTIME_ENABLE_DTRACE
-  "Should the runtime be built with dtrace instrumentation enabled"
-  FALSE)
-
 option(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
   "Should the runtime be built with support for non-thread-safe leak detecting entrypoints"
   FALSE)

stdlib/public/runtime/CMakeLists.txt

@@ -17,13 +17,6 @@ if(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
   set(swift_runtime_leaks_sources Leaks.mm)
 endif()
 
-set(swift_runtime_dtrace_sources)
-if (SWIFT_RUNTIME_ENABLE_DTRACE)
-  set(swift_runtime_dtrace_sources SwiftRuntimeDTraceProbes.d)
-  list(APPEND swift_runtime_compile_flags
-      "-DSWIFT_RUNTIME_ENABLE_DTRACE=1")
-endif()
-
 # Acknowledge that the following sources are known.
 set(LLVM_OPTIONAL_SOURCES
     Remangle.cpp)
@@ -53,7 +46,6 @@ add_swift_library(swiftRuntime IS_STDLIB IS_STDLIB_CORE
   Reflection.cpp
   SwiftObject.cpp
   ${swift_runtime_objc_sources}
-  ${swift_runtime_dtrace_sources}
   ${swift_runtime_leaks_sources}
   C_COMPILE_FLAGS ${swift_runtime_compile_flags}
   INSTALL_IN_COMPONENT stdlib)

stdlib/public/runtime/HeapObject.cpp

@@ -38,14 +38,6 @@
 # include <objc/objc.h>
 #include "swift/Runtime/ObjCBridge.h"
 #endif
-#if SWIFT_RUNTIME_ENABLE_DTRACE
-# include "SwiftRuntimeDTraceProbes.h"
-#else
-# define SWIFT_ALLOCATEOBJECT()
-# define SWIFT_DEALLOCATEOBJECT()
-# define SWIFT_RELEASE()
-# define SWIFT_RETAIN()
-#endif
 #include "Leaks.h"
 
 using namespace swift;
@@ -54,7 +46,6 @@ HeapObject *
 swift::swift_allocObject(HeapMetadata const *metadata,
                          size_t requiredSize,
                          size_t requiredAlignmentMask) {
-  SWIFT_ALLOCATEOBJECT();
   return _swift_allocObject(metadata, requiredSize, requiredAlignmentMask);
 }
 static HeapObject *
@@ -268,7 +259,6 @@ void _swift_release_dealloc(HeapObject *object)
   __attribute__((noinline,used));
 
 void swift::swift_retain(HeapObject *object) {
-  SWIFT_RETAIN();
   _swift_retain(object);
 }
 static void _swift_retain_(HeapObject *object) {
@@ -277,7 +267,6 @@ static void _swift_retain_(HeapObject *object) {
 auto swift::_swift_retain = _swift_retain_;
 
 void swift::swift_retain_n(HeapObject *object, uint32_t n) {
-  SWIFT_RETAIN();
   _swift_retain_n(object, n);
 }
 static void _swift_retain_n_(HeapObject *object, uint32_t n) {
@@ -288,7 +277,6 @@ static void _swift_retain_n_(HeapObject *object, uint32_t n) {
 auto swift::_swift_retain_n = _swift_retain_n_;
 
 void swift::swift_release(HeapObject *object) {
-  SWIFT_RELEASE();
   return _swift_release(object);
 }
 static void _swift_release_(HeapObject *object) {
@@ -299,7 +287,6 @@ static void _swift_release_(HeapObject *object) {
 auto swift::_swift_release = _swift_release_;
 
 void swift::swift_release_n(HeapObject *object, uint32_t n) {
-  SWIFT_RELEASE();
   return _swift_release_n(object, n);
 }
 static void _swift_release_n_(HeapObject *object, uint32_t n) {
@@ -497,7 +484,6 @@ static inline void memset_pattern8(void *b, const void *pattern8, size_t len) {
 
 void swift::swift_deallocObject(HeapObject *object, size_t allocatedSize,
                                 size_t allocatedAlignMask) {
-  SWIFT_DEALLOCATEOBJECT();
   assert(isAlignmentMask(allocatedAlignMask));
   assert(object->refCount.isDeallocating());
 #ifdef SWIFT_RUNTIME_CLOBBER_FREED_OBJECTS

stdlib/public/runtime/SwiftObject.mm

@@ -44,12 +44,6 @@
 # include <malloc/malloc.h>
 # include <dispatch/dispatch.h>
 #endif
-#if SWIFT_RUNTIME_ENABLE_DTRACE
-# include "SwiftRuntimeDTraceProbes.h"
-#else
-#define SWIFT_ISUNIQUELYREFERENCED()
-#define SWIFT_ISUNIQUELYREFERENCEDORPINNED()
-#endif
 
 using namespace swift;
 
@@ -1231,7 +1225,6 @@ static bool usesNativeSwiftReferenceCounting_nonNull(
 ) {
   assert(object != nullptr);
   assert(!object->refCount.isDeallocating());
-  SWIFT_ISUNIQUELYREFERENCED();
   return object->refCount.isUniquelyReferenced();
 }
 
@@ -1335,7 +1328,6 @@ static bool usesNativeSwiftReferenceCounting_nonNull(
 /// pinned flag is set.
 bool swift::swift_isUniquelyReferencedOrPinned_nonNull_native(
                                                     const HeapObject* object) {
-  SWIFT_ISUNIQUELYREFERENCEDORPINNED();
   assert(object != nullptr);
   assert(!object->refCount.isDeallocating());
   return object->refCount.isUniquelyReferencedOrPinned();

stdlib/public/runtime/SwiftRuntimeDTraceProbes.d

@@ -1,30 +1,20 @@
 
-swift*:::retain
+pid$target:*:swift_retain:entry
 {
-        @counts["num retain calls"] = count();
+        @counts["swift_retain"] = count();
 }
 
-swift*:::release
+pid$target:*:swift_release:entry
 {
-        @counts["num release calls"] = count();
+        @counts["swift_release"] = count();
 }
 
-swift*:::allocateObject
+pid$target:*:objc_retain:entry
 {
-        @counts["num allocated objects"] = count();
+        @counts["objc_retain"] = count();
 }
 
-swift*:::deallocateObject
+pid$target:*:objc_release:entry
 {
-        @counts["num deallocated objects"] = count();
-}
-
-swift*:::isUniquelyReferenced
-{
-        @counts["num calls to isUniquelyReferenced"] = count();
-}
-
-swift*:::isUniquelyReferencedOrPinned
-{
-        @counts["num calls to isUniquelyReferencedOrPinned"] = count();
+        @counts["objc_release"] = count();
 }