RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 04:09:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Scalarizer] Fix potential for stale data in Scattered across invocations

Browse Source 
Summary:
Scalarizer has two data structures that hold information about changes
to the function, Gathered and Scattered. These are cleared in finish()
at the end of runOnFunction() if finish() detects any changes to the
function.

However, finish() was checking for changes by only checking if
Gathered was non-empty. The function visitStore() only modifies
Scattered without touching Gathered. As a result, Scattered could have
ended up having stale data if Scalarizer only scalarized store
instructions. Since the data in Scattered is used during the execution
of the pass, this introduced dangling pointer errors.

The fix is to check whether both Scattered and Gathered are empty
before deciding what to do in finish(). This also fixes a problem
where the Function can be modified although the pass returns false.

Reviewers: rnk

Subscribers: rnk, srhines, llvm-commits

Differential Revision: http://reviews.llvm.org/D10459

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243040 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matt Wala 2015-07-23 20:53:46 +00:00
parent 31c063d405
commit 106d75d396
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Transforms/Scalar/Scalarizer.cpp
View File

@ -247,6 +247,7 @@ bool Scalarizer::doInitialization(Module &M) {
}
bool Scalarizer::runOnFunction(Function &F) {
assert(Gathered.empty() && Scattered.empty());
for (Function::iterator BBI = F.begin(), BBE = F.end(); BBI != BBE; ++BBI) {
BasicBlock *BB = BBI;
for (BasicBlock::iterator II = BB->begin(), IE = BB->end(); II != IE;) {
@ -636,7 +637,9 @@ bool Scalarizer::visitStoreInst(StoreInst &SI) {
// Delete the instructions that we scalarized. If a full vector result
// is still needed, recreate it using InsertElements.
bool Scalarizer::finish() {
if (Gathered.empty())
// The presence of data in Gathered or Scattered indicates changes
// made to the Function.
if (Gathered.empty() && Scattered.empty())
return false;
for (GatherList::iterator GMI = Gathered.begin(), GME = Gathered.end();
GMI != GME; ++GMI) {

25
test/Transforms/Scalarizer/store-bug.ll Normal file
View File

@ -0,0 +1,25 @@
; RUN: opt -scalarizer -scalarize-load-store -S < %s | FileCheck %s
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-s0:64:64-f80:128:128-n8:16:32:64-S128"
; This input caused the scalarizer not to clear cached results
; properly.
;
; Any regressions should trigger an assert in the scalarizer.
define void @func(<4 x float> %val, <4 x float> *%ptr) {
store <4 x float> %val, <4 x float> *%ptr
ret void
; CHECK: store float %val.i0, float* %ptr.i0, align 16
; CHECK: store float %val.i1, float* %ptr.i1, align 4
; CHECK: store float %val.i2, float* %ptr.i2, align 8
; CHECK: store float %val.i3, float* %ptr.i3, align 4
}
define void @func.copy(<4 x float> %val, <4 x float> *%ptr) {
store <4 x float> %val, <4 x float> *%ptr
ret void
; CHECK: store float %val.i0, float* %ptr.i0, align 16
; CHECK: store float %val.i1, float* %ptr.i1, align 4
; CHECK: store float %val.i2, float* %ptr.i2, align 8
; CHECK: store float %val.i3, float* %ptr.i3, align 4
}