From: Chris Bieneman <beanz@apple.com>
Date: Tue, 2 Aug 2016 18:23:56 +0000 (+0000)
Subject: Revert "[Order Files] Remove dtrace predicate"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f8c3e3eb83d55e0972d6f7c8b146606acda3d08;p=clang

Revert "[Order Files] Remove dtrace predicate"

This reverts commit r277487.

Removing the probe predicate was a red herring. It results in more symbols being placed in the final order file, but they are symbols from outside the clang image.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@277492 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/perf-training/perf-helper.py b/utils/perf-training/perf-helper.py
index cf90d34e81..30b9caeffd 100644
--- a/utils/perf-training/perf-helper.py
+++ b/utils/perf-training/perf-helper.py
@@ -75,12 +75,13 @@ def dtrace(args):
       target = "oneshot$target:::entry"
   else:
       target = "pid$target:::entry"
+  predicate = '%s/probemod=="%s"/' % (target, os.path.basename(cmd[0]))
   log_timestamp = 'printf("dtrace-TS: %d\\n", timestamp)'
   if opts.use_ustack:
       action = 'ustack(1);'
   else:
       action = 'printf("dtrace-Symbol: %s\\n", probefunc);'
-  dtrace_script = "%s { %s; %s }" % (target, log_timestamp, action)
+  dtrace_script = "%s { %s; %s }" % (predicate, log_timestamp, action)
 
   dtrace_args = []
   if not os.geteuid() == 0: