Skip to content

Commit 4b25f67

Browse files
author
Krzysztof Parzyszek
committed
[RDF] Really remove remaining uses of PhysicalRegisterInfo::normalize
1 parent f0f467a commit 4b25f67

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

llvm/lib/CodeGen/RDFGraph.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -984,11 +984,6 @@ RegisterRef DataFlowGraph::restrictRef(RegisterRef AR, RegisterRef BR) const {
984984
LaneBitmask M = AR.Mask & BR.Mask;
985985
return M.any() ? RegisterRef(AR.Reg, M) : RegisterRef();
986986
}
987-
#ifndef NDEBUG
988-
// RegisterRef NAR = PRI.normalize(AR);
989-
// RegisterRef NBR = PRI.normalize(BR);
990-
// assert(NAR.Reg != NBR.Reg);
991-
#endif
992987
// This isn't strictly correct, because the overlap may happen in the
993988
// part masked out.
994989
if (PRI.alias(AR, BR))

llvm/lib/CodeGen/RDFLiveness.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void Liveness::computePhiInfo() {
514514
NodeAddr<UseNode*> A = DFG.addr<UseNode*>(UN);
515515
uint16_t F = A.Addr->getFlags();
516516
if ((F & (NodeAttrs::Undef | NodeAttrs::PhiRef)) == 0) {
517-
RegisterRef R = PRI.normalize(A.Addr->getRegRef(DFG));
517+
RegisterRef R = A.Addr->getRegRef(DFG);
518518
RealUses[R.Reg].insert({A.Id,R.Mask});
519519
}
520520
UN = A.Addr->getSibling();
@@ -659,7 +659,7 @@ void Liveness::computePhiInfo() {
659659

660660
for (NodeAddr<UseNode*> UA : PUs) {
661661
std::map<NodeId,RegisterAggr> &PUM = PhiUp[UA.Id];
662-
RegisterRef UR = PRI.normalize(UA.Addr->getRegRef(DFG));
662+
RegisterRef UR = UA.Addr->getRegRef(DFG);
663663
for (const std::pair<const NodeId, RegisterAggr> &P : PUM) {
664664
bool Changed = false;
665665
const RegisterAggr &MidDefs = P.second;
@@ -1113,7 +1113,7 @@ void Liveness::traverse(MachineBasicBlock *B, RefMap &LiveIn) {
11131113
for (NodeAddr<UseNode*> UA : IA.Addr->members_if(DFG.IsUse, DFG)) {
11141114
if (UA.Addr->getFlags() & NodeAttrs::Undef)
11151115
continue;
1116-
RegisterRef RR = PRI.normalize(UA.Addr->getRegRef(DFG));
1116+
RegisterRef RR = UA.Addr->getRegRef(DFG);
11171117
for (NodeAddr<DefNode*> D : getAllReachingDefs(UA))
11181118
if (getBlockWithRef(D.Id) != B)
11191119
LiveIn[RR.Reg].insert({D.Id,RR.Mask});

0 commit comments

Comments
 (0)