[llvm] r254042 - Revert r254021
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 24 16:11:18 PST 2015
On Tue, Nov 24, 2015 at 3:57 PM, Rong Xu via llvm-commits <
llvm-commits at lists.llvm.org> wrote:
> Author: xur
> Date: Tue Nov 24 17:57:51 2015
> New Revision: 254042
>
> URL: http://llvm.org/viewvc/llvm-project?rev=254042&view=rev
> Log:
> Revert r254021
>
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.
- Dave
>
> Removed:
> llvm/trunk/test/Transforms/PGOProfile/Inputs/
> llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll
> llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll
> llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll
> llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll
> llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll
> llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll
> llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll
> llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll
> llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/branch1_use.ll (removed)
> @@ -1,21 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/branch1.proftext -o
> %T/branch1.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/branch1.profdata -S |
> FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -define i32 @_Z9test_br_1i(i32 %i) {
> -entry:
> - %cmp = icmp sgt i32 %i, 0
> - br i1 %cmp, label %if.then, label %if.end
> -; CHECK: !prof !0
> -
> -if.then:
> - %add = add nsw i32 %i, 2
> - br label %if.end
> -
> -if.end:
> - %retv = phi i32 [ %add, %if.then ], [ %i, %entry ]
> - ret i32 %retv
> -}
> -
> -; CHECK: !0 = !{!"branch_weights", i32 2, i32 1}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/branch2_use.ll (removed)
> @@ -1,25 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/branch2.proftext -o
> %T/branch2.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/branch2.profdata -S |
> FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -define i32 @_Z9test_br_2i(i32 %i) {
> -entry:
> - %cmp = icmp sgt i32 %i, 0
> - br i1 %cmp, label %if.then, label %if.else
> -; CHECK: !prof !0
> -
> -if.then:
> - %add = add nsw i32 %i, 2
> - br label %if.end
> -
> -if.else:
> - %sub = sub nsw i32 %i, 2
> - br label %if.end
> -
> -if.end:
> - %retv = phi i32 [ %add, %if.then ], [ %sub, %if.else ]
> - ret i32 %retv
> -}
> -
> -; CHECK: !0 = !{!"branch_weights", i32 1, i32 1}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/checksum_mismatch.ll (removed)
> @@ -1,18 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/single_bb.proftext -o
> %T/single_bb.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/single_bb.profdata -S
> 2>&1 | FileCheck %s
> -
> -; CHECK: Function control flow change detected (hash mismatch)
> _Z9single_bbv
> -; CHECK: No profile data available for function _ZL8uncalledii
> -
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -define i32 @_Z9single_bbv() {
> -entry:
> - ret i32 0
> -}
> -
> -define i32 @_ZL8uncalledii(i32 %i, i32 %j) {
> - %mul = mul nsw i32 %i, %j
> - ret i32 %mul
> -}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/landingpad_use.ll (removed)
> @@ -1,94 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/landingpad.proftext -o
> %T/landingpad.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/landingpad.profdata
> -S | FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> - at val = global i32 0, align 4
> - at _ZTIi = external constant i8*
> -
> -define i32 @_Z3bari(i32 %i) {
> -entry:
> - %rem = srem i32 %i, 3
> - %tobool = icmp ne i32 %rem, 0
> - br i1 %tobool, label %if.then, label %if.end
> -; CHECK: !prof !0
> -
> -if.then:
> - %exception = call i8* @__cxa_allocate_exception(i64 4)
> - %tmp = bitcast i8* %exception to i32*
> - store i32 %i, i32* %tmp, align 16
> - call void @__cxa_throw(i8* %exception, i8* bitcast (i8** @_ZTIi to
> i8*), i8* null)
> - unreachable
> -
> -if.end:
> - ret i32 0
> -}
> -
> -declare i8* @__cxa_allocate_exception(i64)
> -
> -declare void @__cxa_throw(i8*, i8*, i8*)
> -
> -define i32 @_Z3fooi(i32 %i) personality i8* bitcast (i32 (...)*
> @__gxx_personality_v0 to i8*) {
> -entry:
> - %rem = srem i32 %i, 2
> - %tobool = icmp ne i32 %rem, 0
> - br i1 %tobool, label %if.then, label %if.end
> -; CHECK: !prof !1
> -
> -if.then:
> - %mul = mul nsw i32 %i, 7
> - %call = invoke i32 @_Z3bari(i32 %mul)
> - to label %invoke.cont unwind label %lpad
> -
> -invoke.cont:
> - br label %if.end
> -
> -lpad:
> - %tmp = landingpad { i8*, i32 }
> - catch i8* bitcast (i8** @_ZTIi to i8*)
> - %tmp1 = extractvalue { i8*, i32 } %tmp, 0
> - %tmp2 = extractvalue { i8*, i32 } %tmp, 1
> - br label %catch.dispatch
> -
> -catch.dispatch:
> - %tmp3 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
> - %matches = icmp eq i32 %tmp2, %tmp3
> - br i1 %matches, label %catch, label %eh.resume
> -; CHECK: !prof !2
> -
> -catch:
> - %tmp4 = call i8* @__cxa_begin_catch(i8* %tmp1)
> - %tmp5 = bitcast i8* %tmp4 to i32*
> - %tmp6 = load i32, i32* %tmp5, align 4
> - %tmp7 = load i32, i32* @val, align 4
> - %sub = sub nsw i32 %tmp7, %tmp6
> - store i32 %sub, i32* @val, align 4
> - call void @__cxa_end_catch()
> - br label %try.cont
> -
> -try.cont:
> - ret i32 -1
> -
> -if.end:
> - %tmp8 = load i32, i32* @val, align 4
> - %add = add nsw i32 %tmp8, %i
> - store i32 %add, i32* @val, align 4
> - br label %try.cont
> -
> -eh.resume:
> - %lpad.val = insertvalue { i8*, i32 } undef, i8* %tmp1, 0
> - %lpad.val3 = insertvalue { i8*, i32 } %lpad.val, i32 %tmp2, 1
> - resume { i8*, i32 } %lpad.val3
> -}
> -
> -declare i32 @__gxx_personality_v0(...)
> -
> -declare i32 @llvm.eh.typeid.for(i8*)
> -
> -declare i8* @__cxa_begin_catch(i8*)
> -
> -declare void @__cxa_end_catch()
> -
> -; CHECK: !0 = !{!"branch_weights", i32 2, i32 1}
> -; CHECK: !1 = !{!"branch_weights", i32 3, i32 2}
> -; CHECK: !2 = !{!"branch_weights", i32 2, i32 0}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/loop1_gen.ll (removed)
> @@ -1,29 +0,0 @@
> -; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -; CHECK: @__llvm_profile_name__Z15test_simple_fori = private constant [20
> x i8] c"_Z15test_simple_fori"
> -
> -define i32 @_Z15test_simple_fori(i32 %n) {
> -entry:
> - br label %for.cond
> -
> -for.cond:
> - %i = phi i32 [ 0, %entry ], [ %inc1, %for.inc ]
> - %sum = phi i32 [ 1, %entry ], [ %inc, %for.inc ]
> - %cmp = icmp slt i32 %i, %n
> - br i1 %cmp, label %for.body, label %for.end
> -
> -for.body:
> - %inc = add nsw i32 %sum, 1
> - br label %for.inc
> -
> -for.inc:
> -; 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)
> - %inc1 = add nsw i32 %i, 1
> - br label %for.cond
> -
> -for.end:
> -; 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)
> - ret i32 %sum
> -}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/loop1_use.ll (removed)
> @@ -1,29 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/loop1.proftext -o %T/loop1.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/loop1.profdata -S |
> FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -define i32 @_Z15test_simple_fori(i32 %n) {
> -entry:
> - br label %for.cond
> -
> -for.cond:
> - %i = phi i32 [ 0, %entry ], [ %inc1, %for.inc ]
> - %sum = phi i32 [ 1, %entry ], [ %inc, %for.inc ]
> - %cmp = icmp slt i32 %i, %n
> - br i1 %cmp, label %for.body, label %for.end
> -; CHECK: !prof !0
> -
> -for.body:
> - %inc = add nsw i32 %sum, 1
> - br label %for.inc
> -
> -for.inc:
> - %inc1 = add nsw i32 %i, 1
> - br label %for.cond
> -
> -for.end:
> - ret i32 %sum
> -}
> -
> -; CHECK: !0 = !{!"branch_weights", i32 96, i32 4}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/loop2_gen.ll (removed)
> @@ -1,26 +0,0 @@
> -; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -; CHECK: @__llvm_profile_name__Z13test_do_whilei = private constant [18 x
> i8] c"_Z13test_do_whilei"
> -
> -define i32 @_Z13test_do_whilei(i32 %n) {
> -entry:
> - br label %do.body
> -
> -do.body:
> - %i.0 = phi i32 [ 0, %entry ], [ %inc1, %do.cond ]
> - %sum = phi i32 [ 1, %entry ], [ %inc, %do.cond ]
> -; 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)
> - %inc = add nsw i32 %sum, 1
> - br label %do.cond
> -
> -do.cond:
> - %inc1 = add nsw i32 %i.0, 1
> - %cmp = icmp slt i32 %i.0, %n
> - br i1 %cmp, label %do.body, label %do.end
> -
> -do.end:
> -; 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)
> - ret i32 %inc
> -}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/loop2_use.ll (removed)
> @@ -1,26 +0,0 @@
> -; RUN: llvm-profdata merge %S/Inputs/loop2.proftext -o %T/loop2.profdata
> -; RUN: opt < %s -pgo-instr-use -pgo-profile-file=%T/loop2.profdata -S |
> FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -define i32 @_Z13test_do_whilei(i32 %n) {
> -entry:
> - br label %do.body
> -
> -do.body:
> - %i.0 = phi i32 [ 0, %entry ], [ %inc1, %do.cond ]
> - %sum = phi i32 [ 1, %entry ], [ %inc, %do.cond ]
> - %inc = add nsw i32 %sum, 1
> - br label %do.cond
> -
> -do.cond:
> - %inc1 = add nsw i32 %i.0, 1
> - %cmp = icmp slt i32 %i.0, %n
> - br i1 %cmp, label %do.body, label %do.end
> -; CHECK: !prof !0
> -
> -do.end:
> - ret i32 %inc
> -}
> -
> -; CHECK: !0 = !{!"branch_weights", i32 92, i32 4}
>
> Removed: llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll?rev=254041&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll (original)
> +++ llvm/trunk/test/Transforms/PGOProfile/single_bb_gen.ll (removed)
> @@ -1,11 +0,0 @@
> -; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-unknown-linux-gnu"
> -
> -; CHECK: @__llvm_profile_name__Z9single_bbv = private constant [13 x i8]
> c"_Z9single_bbv"
> -
> -define i32 @_Z9single_bbv() {
> -entry:
> -; 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)
> - ret i32 0
> -}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151124/86aeef37/attachment.html>
More information about the llvm-commits
mailing list