[llvm] r369768 - [Attributor] FIX: Treat new attributes as changed ones
Johannes Doerfert via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 23 08:24:58 PDT 2019
Author: jdoerfert
Date: Fri Aug 23 08:24:57 2019
New Revision: 369768
URL: http://llvm.org/viewvc/llvm-project?rev=369768&view=rev
Log:
[Attributor] FIX: Treat new attributes as changed ones
Summary:
When we have new attributes and we end the fixpoint iteration because
the iteration limit is reached, we need to treat the new ones as if they
changed in the last iteration, as they might have.
This adds a test for which we should not derive anything regardless of
the iteration limit, e.g., if we abort there should not be any
attributes manifested in the IR.
Reviewers: uenoku, sstefan1
Subscribers: hiraditya, bollu, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D66549
Added:
llvm/trunk/test/Transforms/FunctionAttrs/new_attributes.ll
Modified:
llvm/trunk/lib/Transforms/IPO/Attributor.cpp
Modified: llvm/trunk/lib/Transforms/IPO/Attributor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Attributor.cpp?rev=369768&r1=369767&r2=369768&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Attributor.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Attributor.cpp Fri Aug 23 08:24:57 2019
@@ -2397,16 +2397,16 @@ ChangeStatus Attributor::run() {
if (AA->update(*this) == ChangeStatus::CHANGED)
ChangedAAs.push_back(AA);
+ // Add attributes to the changed set if they have been created in the last
+ // iteration.
+ ChangedAAs.append(AllAbstractAttributes.begin() + NumAAs,
+ AllAbstractAttributes.end());
+
// Reset the work list and repopulate with the changed abstract attributes.
// Note that dependent ones are added above.
Worklist.clear();
Worklist.insert(ChangedAAs.begin(), ChangedAAs.end());
- // Add attributes to the worklist that have been created in the last
- // iteration.
- Worklist.insert(AllAbstractAttributes.begin() + NumAAs,
- AllAbstractAttributes.end());
-
} while (!Worklist.empty() && ++IterationCounter < MaxFixpointIterations);
size_t NumFinalAAs = AllAbstractAttributes.size();
Added: llvm/trunk/test/Transforms/FunctionAttrs/new_attributes.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/FunctionAttrs/new_attributes.ll?rev=369768&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/FunctionAttrs/new_attributes.ll (added)
+++ llvm/trunk/test/Transforms/FunctionAttrs/new_attributes.ll Fri Aug 23 08:24:57 2019
@@ -0,0 +1,43 @@
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=0 -S | FileCheck %s
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=1 -S | FileCheck %s
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=2 -S | FileCheck %s
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=3 -S | FileCheck %s
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=4 -S | FileCheck %s
+; RUN: opt < %s -attributor -attributor-disable=false -attributor-max-iterations=2147483647 -S | FileCheck %s
+
+; CHECK-NOT: Function
+; CHECK: declare i32 @foo1()
+; CHECK-NOT: Function
+; CHECK: declare i32 @foo2()
+; CHECK-NOT: Function
+; CHECK: declare i32 @foo3()
+declare i32 @foo1()
+declare i32 @foo2()
+declare i32 @foo3()
+
+; CHECK-NOT: Function
+; CHECK: define internal i32 @bar() {
+; CHECK-NEXT: %1 = call i32 @foo1()
+; CHECK-NEXT: %2 = call i32 @foo2()
+; CHECK-NEXT: %3 = call i32 @foo3()
+; CHECK-NEXT: ret i32 1
+; CHECK-NEXT: }
+define internal i32 @bar() {
+ %1 = call i32 @foo1()
+ %2 = call i32 @foo2()
+ %3 = call i32 @foo3()
+ ret i32 1
+}
+
+; CHECK-NOT: Function
+; CHECK: define i32 @baz() {
+; CHECK-NEXT: %1 = call i32 @bar()
+; CHECK-NEXT: ret i32 0
+; CHECK-NEXT: }
+define i32 @baz() {
+ %1 = call i32 @bar()
+ ret i32 0
+}
+
+; We should never derive anything here
+; CHECK-NOT: attributes
More information about the llvm-commits
mailing list