6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-05 09:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Changes for MachineBasicBlock to use SortedVector for LiveIns.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243389 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Puyan Lotfi
2015-07-28 06:38:41 +00:00
parent 3942a2979d
commit fbb4b5254d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/llvm/CodeGen/MachineBasicBlock.h
View File

@ -14,6 +14,7 @@
#ifndef LLVM_CODEGEN_MACHINEBASICBLOCK_H #ifndef LLVM_CODEGEN_MACHINEBASICBLOCK_H
#define LLVM_CODEGEN_MACHINEBASICBLOCK_H #define LLVM_CODEGEN_MACHINEBASICBLOCK_H
#include "llvm/ADT/SortedVector.h"
#include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/GraphTraits.h"
#include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstr.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
@ -80,7 +81,7 @@ class MachineBasicBlock : public ilist_node<MachineBasicBlock> {
/// LiveIns - Keep track of the physical registers that are livein of /// LiveIns - Keep track of the physical registers that are livein of
/// the basicblock. /// the basicblock.
std::vector<unsigned> LiveIns; mutable SortedVector<unsigned> LiveIns;
/// Alignment - Alignment of the basic block. Zero if the basic block does /// Alignment - Alignment of the basic block. Zero if the basic block does
/// not need to be aligned. /// not need to be aligned.
@ -318,15 +319,12 @@ public:
/// Adds the specified register as a live in. Note that it is an error to add /// Adds the specified register as a live in. Note that it is an error to add
/// the same register to the same set more than once unless the intention is /// the same register to the same set more than once unless the intention is
/// to call sortUniqueLiveIns after all registers are added. /// to call sortUniqueLiveIns after all registers are added.
void addLiveIn(unsigned Reg) { LiveIns.push_back(Reg); } void addLiveIn(unsigned Reg) { LiveIns.insert(Reg); }
/// Sorts and uniques the LiveIns vector. It can be significantly faster to do /// Sorts and uniques the LiveIns vector. It can be significantly faster to do
/// this than repeatedly calling isLiveIn before calling addLiveIn for every /// this than repeatedly calling isLiveIn before calling addLiveIn for every
/// LiveIn insertion. /// LiveIn insertion.
void sortUniqueLiveIns() { void sortUniqueLiveIns() { LiveIns.sortUnique(); }
std::sort(LiveIns.begin(), LiveIns.end());
LiveIns.erase(std::unique(LiveIns.begin(), LiveIns.end()), LiveIns.end());
}
/// Add PhysReg as live in to this block, and ensure that there is a copy of /// Add PhysReg as live in to this block, and ensure that there is a copy of
/// PhysReg to a virtual register of class RC. Return the virtual register /// PhysReg to a virtual register of class RC. Return the virtual register
@ -339,14 +337,20 @@ public:
/// isLiveIn - Return true if the specified register is in the live in set. /// isLiveIn - Return true if the specified register is in the live in set.
/// ///
bool isLiveIn(unsigned Reg) const; bool isLiveIn(unsigned Reg) const { return LiveIns.has(Reg); }
// Iteration support for live in sets. These sets are kept in sorted // Iteration support for live in sets. These sets are kept in sorted
// order by their register number. // order by their register number.
typedef std::vector<unsigned>::const_iterator livein_iterator; typedef std::vector<unsigned>::const_iterator livein_iterator;
livein_iterator livein_begin() const { return LiveIns.begin(); }
livein_iterator livein_end() const { return LiveIns.end(); }
bool livein_empty() const { return LiveIns.empty(); } bool livein_empty() const { return LiveIns.empty(); }
livein_iterator livein_begin() const {
LiveIns.sortUnique();
return LiveIns.begin();
}
livein_iterator livein_end() const {
LiveIns.sortUnique();
return LiveIns.end();
}
/// getAlignment - Return alignment of the basic block. /// getAlignment - Return alignment of the basic block.
/// The alignment is specified as log2(bytes). /// The alignment is specified as log2(bytes).

5
lib/CodeGen/MachineBasicBlock.cpp
View File

@ -332,11 +332,6 @@ void MachineBasicBlock::removeLiveIn(unsigned Reg) {
LiveIns.erase(I); LiveIns.erase(I);
} }
bool MachineBasicBlock::isLiveIn(unsigned Reg) const {
livein_iterator I = std::find(livein_begin(), livein_end(), Reg);
return I != livein_end();
}
unsigned unsigned
MachineBasicBlock::addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC) { MachineBasicBlock::addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC) {
assert(getParent() && "MBB must be inserted in function"); assert(getParent() && "MBB must be inserted in function");