X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fprofile.pl;h=782e5dc24d468e686dbada7cd30827adb3fedd7a;hb=1b0dc64919e947bb4f4677b138c734e33061f7c4;hp=f5a736399a747d70a9a39ff872152ee3c1f95a77;hpb=b9f960e39d50a30d86b16d52ef593ff6f444c5ce;p=oota-llvm.git

diff --git a/utils/profile.pl b/utils/profile.pl
index f5a736399a7..782e5dc24d4 100755
--- a/utils/profile.pl
+++ b/utils/profile.pl
@@ -5,18 +5,19 @@
 # Synopsis: Insert instrumentation code into a program, run it with the JIT,
 #           then print out a profile report.
 #
-# Syntax:   profile.pl [OPTIONS] bytecodefile <arguments>
+# Syntax:   profile.pl [OPTIONS] bitcodefile <arguments>
 #
 # OPTIONS may include one or more of the following:
-#     -block    - Enable basicblock-level profiling
-#     -function - Enable function-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-block-profiling";
+my $ProfilePass = "-insert-edge-profiling";
 
 my $LLVMProfOpts = "";
 my $ProgramOpts = "";
@@ -28,7 +29,8 @@ 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));
@@ -41,8 +43,9 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
     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 basicblock-level profiling\n";
-    print "  -function - Enable function-level profiling\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";
@@ -53,19 +56,19 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   $LLVMProfOpts .= " " . $_;
 }
 
-die "Must specify LLVM bytecode file as first argument!" if (@ARGV == 0);
+die "Must specify LLVM bitcode file as first argument!" if (@ARGV == 0);
 
 my $BytecodeFile = $ARGV[0];
 
 shift @ARGV;
 
-my $LLIPath = `which lli`;
-$LLIPath = `dirname $LLIPath`;
-chomp $LLIPath;
+my $libdir = `llvm-config --libdir`;
+chomp $libdir;
 
-my $LibProfPath = $LLIPath . "/../../lib/Debug/libprofile_rt.so";
-
-system "opt -q $ProfilePass < $BytecodeFile | lli -fake-argv0 '$BytecodeFile'" .
-       " -load $LibProfPath -$ProgramOpts " . (join ' ', @ARGV);
+my $LibProfPath = $libdir . "/libprofile_rt.so";
 
+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";