[llvm] r266347 - [DivergenceAnalysis] Treat PHI with incoming undef as constant
Nicolai Haehnle via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 14 10:42:48 PDT 2016
Author: nha
Date: Thu Apr 14 12:42:47 2016
New Revision: 266347
URL: http://llvm.org/viewvc/llvm-project?rev=266347&view=rev
Log:
[DivergenceAnalysis] Treat PHI with incoming undef as constant
Summary:
If a PHI has an incoming undef, we can pretend that it is equal to one
non-undef, non-self incoming value.
This is particularly relevant in combination with the StructurizeCFG
pass, which introduces PHI nodes with undefs. Previously, this lead to
branch conditions that were uniform before StructurizeCFG to become
non-uniform afterwards, which confused the SIAnnotateControlFlow
pass.
This fixes a crash when Mesa radeonsi compiles a shader from
dEQP-GLES3.functional.shaders.switch.switch_in_for_loop_dynamic_vertex
Reviewers: arsenm, tstellarAMD, jingyue
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D19013
Added:
llvm/trunk/test/Analysis/DivergenceAnalysis/AMDGPU/phi-undef.ll
llvm/trunk/test/CodeGen/AMDGPU/branch-uniformity.ll
Modified:
llvm/trunk/include/llvm/IR/Instructions.h
llvm/trunk/lib/Analysis/DivergenceAnalysis.cpp
llvm/trunk/lib/IR/Instructions.cpp
Modified: llvm/trunk/include/llvm/IR/Instructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Instructions.h?rev=266347&r1=266346&r2=266347&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/Instructions.h (original)
+++ llvm/trunk/include/llvm/IR/Instructions.h Thu Apr 14 12:42:47 2016
@@ -2693,6 +2693,11 @@ public:
/// same value, return the value, otherwise return null.
Value *hasConstantValue() const;
+ /// hasConstantOrUndefValue - Whether the specified PHI node always merges
+ /// together the same value, assuming undefs are equal to a unique
+ /// non-undef value.
+ bool hasConstantOrUndefValue() const;
+
/// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const Instruction *I) {
return I->getOpcode() == Instruction::PHI;
Modified: llvm/trunk/lib/Analysis/DivergenceAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DivergenceAnalysis.cpp?rev=266347&r1=266346&r2=266347&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/DivergenceAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/DivergenceAnalysis.cpp Thu Apr 14 12:42:47 2016
@@ -146,7 +146,7 @@ void DivergencePropagator::exploreSyncDe
for (auto I = IPostDom->begin(); isa<PHINode>(I); ++I) {
// A PHINode is uniform if it returns the same value no matter which path is
// taken.
- if (!cast<PHINode>(I)->hasConstantValue() && DV.insert(&*I).second)
+ if (!cast<PHINode>(I)->hasConstantOrUndefValue() && DV.insert(&*I).second)
Worklist.push_back(&*I);
}
Modified: llvm/trunk/lib/IR/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Instructions.cpp?rev=266347&r1=266346&r2=266347&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Instructions.cpp (original)
+++ llvm/trunk/lib/IR/Instructions.cpp Thu Apr 14 12:42:47 2016
@@ -154,6 +154,24 @@ Value *PHINode::hasConstantValue() const
return ConstantValue;
}
+/// hasConstantOrUndefValue - Whether the specified PHI node always merges
+/// together the same value, assuming that undefs result in the same value as
+/// non-undefs.
+/// Unlike \ref hasConstantValue, this does not return a value because the
+/// unique non-undef incoming value need not dominate the PHI node.
+bool PHINode::hasConstantOrUndefValue() const {
+ Value *ConstantValue = nullptr;
+ for (unsigned i = 0, e = getNumIncomingValues(); i != e; ++i) {
+ Value *Incoming = getIncomingValue(i);
+ if (Incoming != this && !isa<UndefValue>(Incoming)) {
+ if (ConstantValue && ConstantValue != Incoming)
+ return false;
+ ConstantValue = Incoming;
+ }
+ }
+ return true;
+}
+
//===----------------------------------------------------------------------===//
// LandingPadInst Implementation
//===----------------------------------------------------------------------===//
Added: llvm/trunk/test/Analysis/DivergenceAnalysis/AMDGPU/phi-undef.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/DivergenceAnalysis/AMDGPU/phi-undef.ll?rev=266347&view=auto
==============================================================================
--- llvm/trunk/test/Analysis/DivergenceAnalysis/AMDGPU/phi-undef.ll (added)
+++ llvm/trunk/test/Analysis/DivergenceAnalysis/AMDGPU/phi-undef.ll Thu Apr 14 12:42:47 2016
@@ -0,0 +1,28 @@
+; RUN: opt -mtriple=amdgcn-- -analyze -divergence %s | FileCheck %s
+
+; CHECK-LABEL: 'test1':
+; CHECK-NEXT: DIVERGENT: i32 %bound
+; CHECK-NEXT: DIVERGENT: %break = icmp sge i32 %counter, %bound
+; CHECK-NEXT: DIVERGENT: br i1 %break, label %footer, label %body
+; CHECK-NEXT: DIVERGENT: br i1 %break, label %end, label %header
+; Note: %counter is not divergent!
+define amdgpu_ps void @test1(i32 %bound) {
+entry:
+ br label %header
+
+header:
+ %counter = phi i32 [ 0, %entry ], [ %counter.footer, %footer ]
+ %break = icmp sge i32 %counter, %bound
+ br i1 %break, label %footer, label %body
+
+body:
+ %counter.next = add i32 %counter, 1
+ br label %footer
+
+footer:
+ %counter.footer = phi i32 [ %counter.next, %body ], [ undef, %header ]
+ br i1 %break, label %end, label %header
+
+end:
+ ret void
+}
Added: llvm/trunk/test/CodeGen/AMDGPU/branch-uniformity.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/branch-uniformity.ll?rev=266347&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/branch-uniformity.ll (added)
+++ llvm/trunk/test/CodeGen/AMDGPU/branch-uniformity.ll Thu Apr 14 12:42:47 2016
@@ -0,0 +1,41 @@
+; RUN: llc -mtriple=amdgcn-- < %s | FileCheck %s
+
+; The branch instruction in LOOP49 has a uniform condition, but PHI instructions
+; introduced by the structurizecfg pass previously caused a false divergence
+; which ended up in an assertion (or incorrect code) because
+; SIAnnotateControlFlow and structurizecfg had different ideas about which
+; branches are uniform.
+;
+; CHECK-LABEL: {{^}}main:
+; CHECK: ; %LOOP49
+; CHECK: v_cmp_ne_i32_e32 vcc,
+; CHECK: s_cbranch_vccnz
+; CHECK: ; %ENDIF53
+define amdgpu_vs float @main(i32 %in) {
+main_body:
+ %cmp = mul i32 %in, 2
+ br label %LOOP
+
+LOOP: ; preds = %ENDLOOP48, %main_body
+ %counter = phi i32 [ 0, %main_body ], [ %counter.next, %ENDLOOP48 ]
+ %v.LOOP = phi i32 [ 0, %main_body ], [ %v.ENDLOOP48, %ENDLOOP48 ]
+ %tmp7 = icmp slt i32 %cmp, %counter
+ br i1 %tmp7, label %IF, label %LOOP49
+
+IF: ; preds = %LOOP
+ %r = bitcast i32 %v.LOOP to float
+ ret float %r
+
+LOOP49: ; preds = %LOOP
+ %tmp8 = icmp ne i32 %counter, 0
+ br i1 %tmp8, label %ENDLOOP48, label %ENDIF53
+
+ENDLOOP48: ; preds = %ENDIF53, %LOOP49
+ %v.ENDLOOP48 = phi i32 [ %v.LOOP, %LOOP49 ], [ %v.ENDIF53, %ENDIF53 ]
+ %counter.next = add i32 %counter, 1
+ br label %LOOP
+
+ENDIF53: ; preds = %LOOP49
+ %v.ENDIF53 = add i32 %v.LOOP, %counter
+ br label %ENDLOOP48
+}
More information about the llvm-commits
mailing list