<div dir="ltr"><div>Committed as r206559.</div><div><br></div><div>Thanks,</div><div>-Jiangning</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">2014-04-18 8:55 GMT+08:00 Z. Zheng <span dir="ltr"><<a href="mailto:zhaoshiz@codeaurora.org" target="_blank">zhaoshiz@codeaurora.org</a>></span>:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Rebased, no code change.<br>
<br>
Reviewers, I don't have commit access. Please merge it, Thanks in advance.<br>
<br>
Hi Jiangning, t.p.northover, apazos,<br>
<br>
<a href="http://reviews.llvm.org/D3321" target="_blank">http://reviews.llvm.org/D3321</a><br>
<br>
CHANGE SINCE LAST DIFF<br>
<a href="http://reviews.llvm.org/D3321?vs=8430&id=8619#toc" target="_blank">http://reviews.llvm.org/D3321?vs=8430&id=8619#toc</a><br>
<div class="HOEnZb"><div class="h5"><br>
Files:<br>
lib/Target/AArch64/AArch64ISelLowering.cpp<br>
test/CodeGen/AArch64/andCmpBrToTBZ.ll<br>
<br>
Index: lib/Target/AArch64/AArch64ISelLowering.cpp<br>
===================================================================<br>
--- lib/Target/AArch64/AArch64ISelLowering.cpp<br>
+++ lib/Target/AArch64/AArch64ISelLowering.cpp<br>
@@ -540,6 +540,8 @@<br>
<br>
setTargetDAGCombine(ISD::SIGN_EXTEND);<br>
setTargetDAGCombine(ISD::VSELECT);<br>
+<br>
+ MaskAndBranchFoldingIsLegal = true;<br>
}<br>
<br>
EVT AArch64TargetLowering::getSetCCResultType(LLVMContext &, EVT VT) const {<br>
Index: test/CodeGen/AArch64/andCmpBrToTBZ.ll<br>
===================================================================<br>
--- /dev/null<br>
+++ test/CodeGen/AArch64/andCmpBrToTBZ.ll<br>
@@ -0,0 +1,72 @@<br>
+; RUN: llc -O1 -march=aarch64 -enable-andcmp-sinking=true < %s | FileCheck %s<br>
+; ModuleID = 'and-cbz-extr-mr.bc'<br>
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-n32:64-S128"<br>
+target triple = "aarch64-none-linux-gnu"<br>
+<br>
+define zeroext i1 @foo(i1 %IsEditable, i1 %isTextField, i8* %str1, i8* %str2, i8* %str3, i8* %str4, i8* %str5, i8* %str6, i8* %str7, i8* %str8, i8* %str9, i8* %str10, i8* %str11, i8* %str12, i8* %str13, i32 %int1, i8* %str14) unnamed_addr #0 align 2 {<br>
+; CHECK: foo:<br>
+entry:<br>
+ %tobool = icmp eq i8* %str14, null<br>
+ br i1 %tobool, label %return, label %if.end<br>
+<br>
+; CHECK: %if.end<br>
+; CHECK: tbz<br>
+if.end: ; preds = %entry<br>
+ %and.i.i.i = and i32 %int1, 4<br>
+ %tobool.i.i.i = icmp eq i32 %and.i.i.i, 0<br>
+ br i1 %tobool.i.i.i, label %if.end12, label %land.rhs.i<br>
+<br>
+land.rhs.i: ; preds = %if.end<br>
+ %cmp.i.i.i = icmp eq i8* %str12, %str13<br>
+ br i1 %cmp.i.i.i, label %if.then3, label %lor.rhs.i.i.i<br>
+<br>
+lor.rhs.i.i.i: ; preds = %land.rhs.i<br>
+ %cmp.i13.i.i.i = icmp eq i8* %str10, %str11<br>
+ br i1 %cmp.i13.i.i.i, label %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit, label %if.end5<br>
+<br>
+_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit: ; preds = %lor.rhs.i.i.i<br>
+ %cmp.i.i.i.i = icmp eq i8* %str8, %str9<br>
+ br i1 %cmp.i.i.i.i, label %if.then3, label %if.end5<br>
+<br>
+if.then3: ; preds = %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit, %land.rhs.i<br>
+ %tmp11 = load i8* %str14, align 8<br>
+ %tmp12 = and i8 %tmp11, 2<br>
+ %tmp13 = icmp ne i8 %tmp12, 0<br>
+ br label %return<br>
+<br>
+if.end5: ; preds = %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit, %lor.rhs.i.i.i<br>
+; CHECK: %if.end5<br>
+; CHECK: tbz<br>
+ br i1 %tobool.i.i.i, label %if.end12, label %land.rhs.i19<br>
+<br>
+land.rhs.i19: ; preds = %if.end5<br>
+ %cmp.i.i.i18 = icmp eq i8* %str6, %str7<br>
+ br i1 %cmp.i.i.i18, label %if.then7, label %lor.rhs.i.i.i23<br>
+<br>
+lor.rhs.i.i.i23: ; preds = %land.rhs.i19<br>
+ %cmp.i13.i.i.i22 = icmp eq i8* %str3, %str4<br>
+ br i1 %cmp.i13.i.i.i22, label %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit28, label %if.end12<br>
+<br>
+_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit28: ; preds = %lor.rhs.i.i.i23<br>
+ %cmp.i.i.i.i26 = icmp eq i8* %str1, %str2<br>
+ br i1 %cmp.i.i.i.i26, label %if.then7, label %if.end12<br>
+<br>
+if.then7: ; preds = %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit28, %land.rhs.i19<br>
+ br i1 %isTextField, label %if.then9, label %if.end12<br>
+<br>
+if.then9: ; preds = %if.then7<br>
+ %tmp23 = load i8* %str5, align 8<br>
+ %tmp24 = and i8 %tmp23, 2<br>
+ %tmp25 = icmp ne i8 %tmp24, 0<br>
+ br label %return<br>
+<br>
+if.end12: ; preds = %if.then7, %_ZNK7WebCore4Node10hasTagNameERKNS_13QualifiedNameE.exit28, %lor.rhs.i.i.i23, %if.end5, %if.end<br>
+ %lnot = xor i1 %IsEditable, true<br>
+ br label %return<br>
+<br>
+return: ; preds = %if.end12, %if.then9, %if.then3, %entry<br>
+ %retval.0 = phi i1 [ %tmp13, %if.then3 ], [ %tmp25, %if.then9 ], [ %lnot, %if.end12 ], [ true, %entry ]<br>
+ ret i1 %retval.0<br>
+}<br>
+<br>
+attributes #0 = { nounwind ssp }<br>
</div></div></blockquote></div><br></div>