<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 24, 2015 at 3:57 PM, Rong Xu via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: xur<br>
Date: Tue Nov 24 17:57:51 2015<br>
New Revision: 254042<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254042&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254042&view=rev</a><br>
Log:<br>
Revert r254021<br></blockquote><div><br></div><div>It's helpful to mention what the original patch was (usually including the original commit message's first line at least - we have a script for this for git users: llvm/utils/git-svn/git-svnrevert which takes a git hash, reverts it and leaves an svn revision number in the local commit message - you can then edit (git commit --amend) that commit message to include some details about why the patch is being reverted - links to buildbots, etc) & why it's being reverted.<br><br>- Dave</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Removed:<br>
llvm/trunk/test/Transforms/PGOProfile/Inputs/<br>
llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll<br>
llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll<br>
llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll<br>
llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll<br>
llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll<br>
llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll<br>
llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll<br>
llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll<br>
llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll (removed)<br>
@@ -1,21 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/branch1.proftext -o %T/branch1.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/branch1.profdata -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-define i32 @_Z9test_br_1i(i32 %i) {<br>
-entry:<br>
- %cmp = icmp sgt i32 %i, 0<br>
- br i1 %cmp, label %if.then, label %if.end<br>
-; CHECK: !prof !0<br>
-<br>
-if.then:<br>
- %add = add nsw i32 %i, 2<br>
- br label %if.end<br>
-<br>
-if.end:<br>
- %retv = phi i32 [ %add, %if.then ], [ %i, %entry ]<br>
- ret i32 %retv<br>
-}<br>
-<br>
-; CHECK: !0 = !{!"branch_weights", i32 2, i32 1}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll (removed)<br>
@@ -1,25 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/branch2.proftext -o %T/branch2.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/branch2.profdata -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-define i32 @_Z9test_br_2i(i32 %i) {<br>
-entry:<br>
- %cmp = icmp sgt i32 %i, 0<br>
- br i1 %cmp, label %if.then, label %if.else<br>
-; CHECK: !prof !0<br>
-<br>
-if.then:<br>
- %add = add nsw i32 %i, 2<br>
- br label %if.end<br>
-<br>
-if.else:<br>
- %sub = sub nsw i32 %i, 2<br>
- br label %if.end<br>
-<br>
-if.end:<br>
- %retv = phi i32 [ %add, %if.then ], [ %sub, %if.else ]<br>
- ret i32 %retv<br>
-}<br>
-<br>
-; CHECK: !0 = !{!"branch_weights", i32 1, i32 1}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll (removed)<br>
@@ -1,18 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/single_bb.proftext -o %T/single_bb.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/single_bb.profdata -S 2>&1 | FileCheck %s<br>
-<br>
-; CHECK: Function control flow change detected (hash mismatch) _Z9single_bbv<br>
-; CHECK: No profile data available for function _ZL8uncalledii<br>
-<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-define i32 @_Z9single_bbv() {<br>
-entry:<br>
- ret i32 0<br>
-}<br>
-<br>
-define i32 @_ZL8uncalledii(i32 %i, i32 %j) {<br>
- %mul = mul nsw i32 %i, %j<br>
- ret i32 %mul<br>
-}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll (removed)<br>
@@ -1,94 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/landingpad.proftext -o %T/landingpad.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/landingpad.profdata -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-@val = global i32 0, align 4<br>
-@_ZTIi = external constant i8*<br>
-<br>
-define i32 @_Z3bari(i32 %i) {<br>
-entry:<br>
- %rem = srem i32 %i, 3<br>
- %tobool = icmp ne i32 %rem, 0<br>
- br i1 %tobool, label %if.then, label %if.end<br>
-; CHECK: !prof !0<br>
-<br>
-if.then:<br>
- %exception = call i8* @__cxa_allocate_exception(i64 4)<br>
- %tmp = bitcast i8* %exception to i32*<br>
- store i32 %i, i32* %tmp, align 16<br>
- call void @__cxa_throw(i8* %exception, i8* bitcast (i8** @_ZTIi to i8*), i8* null)<br>
- unreachable<br>
-<br>
-if.end:<br>
- ret i32 0<br>
-}<br>
-<br>
-declare i8* @__cxa_allocate_exception(i64)<br>
-<br>
-declare void @__cxa_throw(i8*, i8*, i8*)<br>
-<br>
-define i32 @_Z3fooi(i32 %i) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {<br>
-entry:<br>
- %rem = srem i32 %i, 2<br>
- %tobool = icmp ne i32 %rem, 0<br>
- br i1 %tobool, label %if.then, label %if.end<br>
-; CHECK: !prof !1<br>
-<br>
-if.then:<br>
- %mul = mul nsw i32 %i, 7<br>
- %call = invoke i32 @_Z3bari(i32 %mul)<br>
- to label %invoke.cont unwind label %lpad<br>
-<br>
-invoke.cont:<br>
- br label %if.end<br>
-<br>
-lpad:<br>
- %tmp = landingpad { i8*, i32 }<br>
- catch i8* bitcast (i8** @_ZTIi to i8*)<br>
- %tmp1 = extractvalue { i8*, i32 } %tmp, 0<br>
- %tmp2 = extractvalue { i8*, i32 } %tmp, 1<br>
- br label %catch.dispatch<br>
-<br>
-catch.dispatch:<br>
- %tmp3 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))<br>
- %matches = icmp eq i32 %tmp2, %tmp3<br>
- br i1 %matches, label %catch, label %eh.resume<br>
-; CHECK: !prof !2<br>
-<br>
-catch:<br>
- %tmp4 = call i8* @__cxa_begin_catch(i8* %tmp1)<br>
- %tmp5 = bitcast i8* %tmp4 to i32*<br>
- %tmp6 = load i32, i32* %tmp5, align 4<br>
- %tmp7 = load i32, i32* @val, align 4<br>
- %sub = sub nsw i32 %tmp7, %tmp6<br>
- store i32 %sub, i32* @val, align 4<br>
- call void @__cxa_end_catch()<br>
- br label %try.cont<br>
-<br>
-try.cont:<br>
- ret i32 -1<br>
-<br>
-if.end:<br>
- %tmp8 = load i32, i32* @val, align 4<br>
- %add = add nsw i32 %tmp8, %i<br>
- store i32 %add, i32* @val, align 4<br>
- br label %try.cont<br>
-<br>
-eh.resume:<br>
- %lpad.val = insertvalue { i8*, i32 } undef, i8* %tmp1, 0<br>
- %lpad.val3 = insertvalue { i8*, i32 } %lpad.val, i32 %tmp2, 1<br>
- resume { i8*, i32 } %lpad.val3<br>
-}<br>
-<br>
-declare i32 @__gxx_personality_v0(...)<br>
-<br>
-declare i32 @llvm.eh.typeid.for(i8*)<br>
-<br>
-declare i8* @__cxa_begin_catch(i8*)<br>
-<br>
-declare void @__cxa_end_catch()<br>
-<br>
-; CHECK: !0 = !{!"branch_weights", i32 2, i32 1}<br>
-; CHECK: !1 = !{!"branch_weights", i32 3, i32 2}<br>
-; CHECK: !2 = !{!"branch_weights", i32 2, i32 0}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll (removed)<br>
@@ -1,29 +0,0 @@<br>
-; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-; CHECK: @__llvm_profile_name__Z15test_simple_fori = private constant [20 x i8] c"_Z15test_simple_fori"<br>
-<br>
-define i32 @_Z15test_simple_fori(i32 %n) {<br>
-entry:<br>
- br label %for.cond<br>
-<br>
-for.cond:<br>
- %i = phi i32 [ 0, %entry ], [ %inc1, %for.inc ]<br>
- %sum = phi i32 [ 1, %entry ], [ %inc, %for.inc ]<br>
- %cmp = icmp slt i32 %i, %n<br>
- br i1 %cmp, label %for.body, label %for.end<br>
-<br>
-for.body:<br>
- %inc = add nsw i32 %sum, 1<br>
- br label %for.inc<br>
-<br>
-for.inc:<br>
-; CHECK: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([20 x i8], [20 x i8]* @__llvm_profile_name__Z15test_simple_fori, i32 0, i32 0), i64 32052181608, i32 2, i32 0)<br>
- %inc1 = add nsw i32 %i, 1<br>
- br label %for.cond<br>
-<br>
-for.end:<br>
-; CHECK: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([20 x i8], [20 x i8]* @__llvm_profile_name__Z15test_simple_fori, i32 0, i32 0), i64 32052181608, i32 2, i32 1)<br>
- ret i32 %sum<br>
-}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll (removed)<br>
@@ -1,29 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/loop1.proftext -o %T/loop1.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/loop1.profdata -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-define i32 @_Z15test_simple_fori(i32 %n) {<br>
-entry:<br>
- br label %for.cond<br>
-<br>
-for.cond:<br>
- %i = phi i32 [ 0, %entry ], [ %inc1, %for.inc ]<br>
- %sum = phi i32 [ 1, %entry ], [ %inc, %for.inc ]<br>
- %cmp = icmp slt i32 %i, %n<br>
- br i1 %cmp, label %for.body, label %for.end<br>
-; CHECK: !prof !0<br>
-<br>
-for.body:<br>
- %inc = add nsw i32 %sum, 1<br>
- br label %for.inc<br>
-<br>
-for.inc:<br>
- %inc1 = add nsw i32 %i, 1<br>
- br label %for.cond<br>
-<br>
-for.end:<br>
- ret i32 %sum<br>
-}<br>
-<br>
-; CHECK: !0 = !{!"branch_weights", i32 96, i32 4}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll (removed)<br>
@@ -1,26 +0,0 @@<br>
-; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-; CHECK: @__llvm_profile_name__Z13test_do_whilei = private constant [18 x i8] c"_Z13test_do_whilei"<br>
-<br>
-define i32 @_Z13test_do_whilei(i32 %n) {<br>
-entry:<br>
- br label %do.body<br>
-<br>
-do.body:<br>
- %i.0 = phi i32 [ 0, %entry ], [ %inc1, %do.cond ]<br>
- %sum = phi i32 [ 1, %entry ], [ %inc, %do.cond ]<br>
-; CHECK: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @__llvm_profile_name__Z13test_do_whilei, i32 0, i32 0), i64 29706172832, i32 2, i32 0)<br>
- %inc = add nsw i32 %sum, 1<br>
- br label %do.cond<br>
-<br>
-do.cond:<br>
- %inc1 = add nsw i32 %i.0, 1<br>
- %cmp = icmp slt i32 %i.0, %n<br>
- br i1 %cmp, label %do.body, label %do.end<br>
-<br>
-do.end:<br>
-; CHECK: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @__llvm_profile_name__Z13test_do_whilei, i32 0, i32 0), i64 29706172832, i32 2, i32 1)<br>
- ret i32 %inc<br>
-}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll (removed)<br>
@@ -1,26 +0,0 @@<br>
-; RUN: llvm-profdata merge %S/Inputs/loop2.proftext -o %T/loop2.profdata<br>
-; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/loop2.profdata -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-define i32 @_Z13test_do_whilei(i32 %n) {<br>
-entry:<br>
- br label %do.body<br>
-<br>
-do.body:<br>
- %i.0 = phi i32 [ 0, %entry ], [ %inc1, %do.cond ]<br>
- %sum = phi i32 [ 1, %entry ], [ %inc, %do.cond ]<br>
- %inc = add nsw i32 %sum, 1<br>
- br label %do.cond<br>
-<br>
-do.cond:<br>
- %inc1 = add nsw i32 %i.0, 1<br>
- %cmp = icmp slt i32 %i.0, %n<br>
- br i1 %cmp, label %do.body, label %do.end<br>
-; CHECK: !prof !0<br>
-<br>
-do.end:<br>
- ret i32 %inc<br>
-}<br>
-<br>
-; CHECK: !0 = !{!"branch_weights", i32 92, i32 4}<br>
<br>
Removed: llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll?rev=254041&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll?rev=254041&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll (original)<br>
+++ llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll (removed)<br>
@@ -1,11 +0,0 @@<br>
-; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s<br>
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
-target triple = "x86_64-unknown-linux-gnu"<br>
-<br>
-; CHECK: @__llvm_profile_name__Z9single_bbv = private constant [13 x i8] c"_Z9single_bbv"<br>
-<br>
-define i32 @_Z9single_bbv() {<br>
-entry:<br>
-; CHECK: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @__llvm_profile_name__Z9single_bbv, i32 0, i32 0), i64 12884901887, i32 1, i32 0)<br>
- ret i32 0<br>
-}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>