[CodeGen] Remove LiveVariables::{isPHIJoin,setPHIJoin}

[kazutakahirata]

The last use of isPHIJoin was removed by:

commit fac770b
Author: Jakob Stoklund Olesen [email protected]
Date: Sat Feb 9 00:04:07 2013 +0000

so there is no reason to maintain PHIJoins.

[llvmbot]

@llvm/pr-subscribers-llvm-regalloc

Author: Kazu Hirata (kazutakahirata)

Changes

The last use of isPHIJoin was removed by:

commit fac770b
Author: Jakob Stoklund Olesen <[email protected]>
Date: Sat Feb 9 00:04:07 2013 +0000

so there is no reason to maintain PHIJoins.

---

Full diff: https://github.com/llvm/llvm-project/pull/69128.diff

3 Files Affected:

• (modified) llvm/include/llvm/CodeGen/LiveVariables.h (-11)
• (modified) llvm/lib/CodeGen/LiveVariables.cpp (-1)
• (modified) llvm/lib/CodeGen/PHIElimination.cpp (-3)

diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h b/llvm/include/llvm/CodeGen/LiveVariables.h
index 90aeb8ceda5590a..9ed4c7bdf7b1771 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -118,11 +118,6 @@ class LiveVariables : public MachineFunctionPass {
   ///
   IndexedMap<VarInfo, VirtReg2IndexFunctor> VirtRegInfo;
 
-  /// PHIJoins - list of virtual registers that are PHI joins. These registers
-  /// may have multiple definitions, and they require special handling when
-  /// building live intervals.
-  SparseBitVector<> PHIJoins;
-
 private:   // Intermediate data structures
   MachineFunction *MF = nullptr;
 
@@ -302,12 +297,6 @@ class LiveVariables : public MachineFunctionPass {
                    MachineBasicBlock *DomBB,
                    MachineBasicBlock *SuccBB,
                    std::vector<SparseBitVector<>> &LiveInSets);
-
-  /// isPHIJoin - Return true if Reg is a phi join register.
-  bool isPHIJoin(Register Reg) { return PHIJoins.test(Reg.id()); }
-
-  /// setPHIJoin - Mark Reg as a phi join register.
-  void setPHIJoin(Register Reg) { PHIJoins.set(Reg.id()); }
 };
 
 } // End llvm namespace
diff --git a/llvm/lib/CodeGen/LiveVariables.cpp b/llvm/lib/CodeGen/LiveVariables.cpp
index 077276b64aa2269..6b983b6320c711f 100644
--- a/llvm/lib/CodeGen/LiveVariables.cpp
+++ b/llvm/lib/CodeGen/LiveVariables.cpp
@@ -601,7 +601,6 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &mf) {
   PhysRegDef.assign(NumRegs, nullptr);
   PhysRegUse.assign(NumRegs, nullptr);
   PHIVarInfo.resize(MF->getNumBlockIDs());
-  PHIJoins.clear();
 
   // FIXME: LiveIntervals will be updated to remove its dependence on
   // LiveVariables to improve compilation time and eliminate bizarre pass
diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp
index dbb9a9ffdf60b53..10d8378ce58d1cf 100644
--- a/llvm/lib/CodeGen/PHIElimination.cpp
+++ b/llvm/lib/CodeGen/PHIElimination.cpp
@@ -330,9 +330,6 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
     if (IncomingReg) {
       LiveVariables::VarInfo &VI = LV->getVarInfo(IncomingReg);
 
-      // Increment use count of the newly created virtual register.
-      LV->setPHIJoin(IncomingReg);
-
       MachineInstr *OldKill = nullptr;
       bool IsPHICopyAfterOldKill = false;
 

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff ea4cc2007efeaf14b8a07b967cb0c570e5b59d7c 4a7029a16b85909e9789832beb55f3da321f6e3a -- llvm/include/llvm/CodeGen/LiveVariables.h llvm/lib/CodeGen/LiveVariables.cpp llvm/lib/CodeGen/PHIElimination.cpp

View the diff from clang-format here.

diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h b/llvm/include/llvm/CodeGen/LiveVariables.h
index 9ed4c7bdf..38c73390d 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -293,8 +293,7 @@ public:
                    MachineBasicBlock *DomBB,
                    MachineBasicBlock *SuccBB);
 
-  void addNewBlock(MachineBasicBlock *BB,
-                   MachineBasicBlock *DomBB,
+  void addNewBlock(MachineBasicBlock *BB, MachineBasicBlock *DomBB,
                    MachineBasicBlock *SuccBB,
                    std::vector<SparseBitVector<>> &LiveInSets);
 };

[kazutakahirata]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff ea4cc2007efeaf14b8a07b967cb0c570e5b59d7c 4a7029a16b85909e9789832beb55f3da321f6e3a -- llvm/include/llvm/CodeGen/LiveVariables.h llvm/lib/CodeGen/LiveVariables.cpp llvm/lib/CodeGen/PHIElimination.cpp

View the diff from clang-format here.

diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h b/llvm/include/llvm/CodeGen/LiveVariables.h
index 9ed4c7bdf..38c73390d 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -293,8 +293,7 @@ public:
                    MachineBasicBlock *DomBB,
                    MachineBasicBlock *SuccBB);
 
-  void addNewBlock(MachineBasicBlock *BB,
-                   MachineBasicBlock *DomBB,
+  void addNewBlock(MachineBasicBlock *BB, MachineBasicBlock *DomBB,
                    MachineBasicBlock *SuccBB,
                    std::vector<SparseBitVector<>> &LiveInSets);
 };

I'm a bit reluctant to follow the clang-format suggestion because the suggestion is just outside the code I am touching.

[dwblaikie]

nice cleanup!