averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[pruned-liveness] Change markBlockLive to call the scalar implementation for each bit rather than attempt to do it for all bits at the same time.

Browse Source
This commit is contained in:
Michael Gottesman
2023-01-01 21:41:31 -08:00
parent 82abf02883
commit e6b63fbf3d
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/swift/SIL/PrunedLiveness.h
View File

@@ -202,6 +202,8 @@ public:
return bits[bitNo * 2 + 1] ? LiveOut : LiveWithin;
}
/// Returns the liveness in \p resultingFoundLiveness. We only return the
/// bits for endBitNo - startBitNo.
void getLiveness(unsigned startBitNo, unsigned endBitNo,
SmallVectorImpl<IsLive> &resultingFoundLiveness) const {
unsigned actualStartBitNo = startBitNo * 2;
@@ -301,8 +303,8 @@ public:
return liveBlockIter->second.getLiveness(bitNo);
}
// FIXME: This API should directly return the live bitset. The live bitset
// type should have an api for querying and iterating over the live fields.
/// FIXME: This API should directly return the live bitset. The live bitset
/// type should have an api for querying and iterating over the live fields.
void getBlockLiveness(SILBasicBlock *bb, unsigned startBitNo,
unsigned endBitNo,
SmallVectorImpl<IsLive> &foundLivenessInfo) const {
@@ -324,11 +326,6 @@ public:
protected:
void markBlockLive(SILBasicBlock *bb, unsigned bitNo, IsLive isLive) {
markBlockLive(bb, bitNo, bitNo + 1, isLive);
}
void markBlockLive(SILBasicBlock *bb, unsigned startBitNo, unsigned endBitNo,
IsLive isLive) {
assert(isLive != Dead && "erasing live blocks isn't implemented.");
auto iterAndInserted =
liveBlocks.insert(std::make_pair(bb, LivenessSmallBitVector()));
@@ -338,13 +335,33 @@ protected:
// we have more than SmallBitVector's small size number of bits.
auto &insertedBV = iterAndInserted.first->getSecond();
insertedBV.init(numBitsToTrack);
insertedBV.setLiveness(startBitNo, endBitNo, isLive);
insertedBV.setLiveness(bitNo, bitNo + 1, isLive);
if (discoveredBlocks)
discoveredBlocks->push_back(bb);
} else if (isLive == LiveOut) {
// Update the existing entry to be live-out.
iterAndInserted.first->getSecond().setLiveness(startBitNo, endBitNo,
LiveOut);
} else {
// If we are dead, always update to the new liveness.
switch (iterAndInserted.first->getSecond().getLiveness(bitNo)) {
case Dead:
iterAndInserted.first->getSecond().setLiveness(bitNo, bitNo + 1,
isLive);
break;
case LiveWithin:
if (isLive == LiveOut) {
// Update the existing entry to be live-out.
iterAndInserted.first->getSecond().setLiveness(bitNo, bitNo + 1,
LiveOut);
}
break;
case LiveOut:
break;
}
}
}
void markBlockLive(SILBasicBlock *bb, unsigned startBitNo, unsigned endBitNo,
IsLive isLive) {
for (unsigned index : range(startBitNo, endBitNo)) {
markBlockLive(bb, index, isLive);
}
}