X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Fprofile.pl;h=f9950f97fea82179c1e22a23b820db1ef18211ac;hb=ebb5a971d903aa4479bb2a21472597319a9b0086;hp=857fbfc16458b8c10234bd7535fa7306fd8a341a;hpb=1ca922110d262161ce922ce314bcdaadf5bbe752;p=oota-llvm.git

diff --git a/utils/profile.pl b/utils/profile.pl
index 857fbfc1645..f9950f97fea 100755
--- a/utils/profile.pl
+++ b/utils/profile.pl
@@ -8,14 +8,20 @@
 # Syntax:   profile.pl [OPTIONS] bytecodefile <arguments>
 #
 # OPTIONS may include one or more of the following:
-#     -block - Enable basic block level profiling
+#     -block    - Enable basicblock profiling
+#     -edge     - Enable edge profiling
+#     -function - Enable function profiling
+#     -o <filename> - Emit profiling information to the specified file, instead
+#                     of llvmprof.out
 #
 # Any unrecognized options are passed into the invocation of llvm-prof
 #
 
-my $ProfilePass = "-insert-function-profiling";
+my $ProfilePass = "-insert-edge-profiling";
 
 my $LLVMProfOpts = "";
+my $ProgramOpts = "";
+my $ProfileFile = "";
 
 # Parse arguments...
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
@@ -23,13 +29,25 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   last if /^--$/;  # Stop processing arguments on --
 
   # List command line options here...
-  if (/^-?-block$/) { $ProfilePass = "-insert-block-profiling"; next; }
+  if (/^-?-block$/)    { $ProfilePass = "-insert-block-profiling"; next; }
+  if (/^-?-edge$/)     { $ProfilePass = "-insert-edge-profiling"; next; }
+  if (/^-?-function$/) { $ProfilePass = "-insert-function-profiling"; next; }
+  if (/^-?-o$/) {         # Read -o filename...
+    die "-o option requires a filename argument!" if (!scalar(@ARGV));
+    $ProgramOpts .= " -llvmprof-output $ARGV[0]";
+    $ProfileFile = $ARGV[0];
+    shift;
+    next;
+  }
   if (/^-?-help$/) {
     print "OVERVIEW: profile.pl - Instrumentation and profile printer.\n\n";
     print "USAGE: profile.pl [options] program.bc <program args>\n\n";
     print "OPTIONS:\n";
-    print "  -block - Enable basic block level profiling\n";
-    print "  -help  - Print this usage information\n";
+    print "  -block    - Enable basicblock profiling\n";
+    print "  -edge     - Enable edge profiling\n";
+    print "  -function - Enable function profiling\n";
+    print "  -o <file> - Specify an output file other than llvm-prof.out.\n";
+    print "  -help     - Print this usage information\n";
     print "\nAll other options are passed into llvm-prof.\n";
     exit 1;
   }
@@ -44,13 +62,13 @@ my $BytecodeFile = $ARGV[0];
 
 shift @ARGV;
 
-my $LLIPath = `which lli`;
-$LLIPath = `dirname $LLIPath`;
-chomp $LLIPath;
-
-my $LibProfPath = $LLIPath . "/../../lib/Debug/libprofile_rt.so";
+my $libdir = `llvm-config --libdir`;
+chomp $libdir;
 
-system "opt -q $ProfilePass < $BytecodeFile | lli -fake-argv0 '$BytecodeFile'" .
-       " -load $LibProfPath - " . (join ' ', @ARGV);
+my $LibProfPath = $libdir . "/profile_rt.so";
 
-system "llvm-prof $LLVMProfOpts $BytecodeFile";
+system "opt -q -f $ProfilePass $BytecodeFile -o $BytecodeFile.inst";
+system "lli -fake-argv0 '$BytecodeFile' -load $LibProfPath " .
+       "$BytecodeFile.inst $ProgramOpts " . (join ' ', @ARGV);
+system "rm $BytecodeFile.inst";
+system "llvm-prof $LLVMProfOpts $BytecodeFile $ProfileFile";