Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

Commit 8074e60

Browse files
author
Quentin Colombet
committed
[RegisterBank] Rename RegisterBank::contains into RegisterBank::covers.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265695 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 8a6b9f2 commit 8074e60

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

include/llvm/CodeGen/GlobalISel/RegisterBank.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ class RegisterBank {
6363
/// if it has been properly constructed.
6464
void verify(const TargetRegisterInfo &TRI) const;
6565

66-
/// Check whether this register bank contains \p RC.
66+
/// Check whether this register bank covers \p RC.
6767
/// In other words, check if this register bank fully covers
6868
/// the registers that \p RC contains.
6969
/// \pre isValid()
70-
bool contains(const TargetRegisterClass &RC) const;
70+
bool covers(const TargetRegisterClass &RC) const;
7171

7272
/// Check whether \p OtherRB is the same as this.
7373
bool operator==(const RegisterBank &OtherRB) const;

lib/CodeGen/GlobalISel/RegisterBank.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ void RegisterBank::verify(const TargetRegisterInfo &TRI) const {
2929
for (unsigned RCId = 0, End = TRI.getNumRegClasses(); RCId != End; ++RCId) {
3030
const TargetRegisterClass &RC = *TRI.getRegClass(RCId);
3131

32-
if (!contains(RC))
32+
if (!covers(RC))
3333
continue;
3434
// Verify that the register bank covers all the sub classes of the
3535
// classes it covers.
3636

3737
// Use a different (slow in that case) method than
3838
// RegisterBankInfo to find the subclasses of RC, to make sure
39-
// both agree on the contains.
39+
// both agree on the covers.
4040
for (unsigned SubRCId = 0; SubRCId != End; ++SubRCId) {
4141
const TargetRegisterClass &SubRC = *TRI.getRegClass(RCId);
4242

@@ -47,12 +47,12 @@ void RegisterBank::verify(const TargetRegisterInfo &TRI) const {
4747
// all the register classes it covers.
4848
assert((getSize() >= SubRC.getSize() * 8) &&
4949
"Size is not big enough for all the subclasses!");
50-
assert(contains(SubRC) && "Not all subclasses are covered");
50+
assert(covers(SubRC) && "Not all subclasses are covered");
5151
}
5252
}
5353
}
5454

55-
bool RegisterBank::contains(const TargetRegisterClass &RC) const {
55+
bool RegisterBank::covers(const TargetRegisterClass &RC) const {
5656
assert(isValid() && "RB hasn't been initialized yet");
5757
return ContainedRegClasses.test(RC.getID());
5858
}
@@ -96,7 +96,7 @@ void RegisterBank::print(raw_ostream &OS, bool IsForDebug,
9696
for (unsigned RCId = 0, End = TRI->getNumRegClasses(); RCId != End; ++RCId) {
9797
const TargetRegisterClass &RC = *TRI->getRegClass(RCId);
9898

99-
if (!contains(RC))
99+
if (!covers(RC))
100100
continue;
101101

102102
if (!IsFirst)

lib/CodeGen/GlobalISel/RegisterBankInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ void RegisterBankInfo::addRegBankCoverage(unsigned ID, unsigned RCId,
9898
// Check if RB is underconstruction.
9999
if (!RB.isValid())
100100
RB.ContainedRegClasses.resize(NbOfRegClasses);
101-
else if (RB.contains(*TRI.getRegClass(RCId)))
102-
// If RB already contains this register class, there is nothing
101+
else if (RB.covers(*TRI.getRegClass(RCId)))
102+
// If RB already covers this register class, there is nothing
103103
// to do.
104104
return;
105105

lib/Target/AArch64/AArch64RegisterBankInfo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ AArch64RegisterBankInfo::AArch64RegisterBankInfo(const TargetRegisterInfo &TRI)
3333
addRegBankCoverage(AArch64::GPRRegBankID, AArch64::GPR64allRegClassID, TRI);
3434
const RegisterBank &RBGPR = getRegBank(AArch64::GPRRegBankID);
3535
(void)RBGPR;
36-
assert(RBGPR.contains(*TRI.getRegClass(AArch64::GPR32RegClassID)) &&
36+
assert(RBGPR.covers(*TRI.getRegClass(AArch64::GPR32RegClassID)) &&
3737
"Subclass not added?");
3838
assert(RBGPR.getSize() == 64 && "GPRs should hold up to 64-bit");
3939

@@ -44,9 +44,9 @@ AArch64RegisterBankInfo::AArch64RegisterBankInfo(const TargetRegisterInfo &TRI)
4444
addRegBankCoverage(AArch64::FPRRegBankID, AArch64::QQQQRegClassID, TRI);
4545
const RegisterBank &RBFPR = getRegBank(AArch64::FPRRegBankID);
4646
(void)RBFPR;
47-
assert(RBFPR.contains(*TRI.getRegClass(AArch64::QQRegClassID)) &&
47+
assert(RBFPR.covers(*TRI.getRegClass(AArch64::QQRegClassID)) &&
4848
"Subclass not added?");
49-
assert(RBFPR.contains(*TRI.getRegClass(AArch64::FPR64RegClassID)) &&
49+
assert(RBFPR.covers(*TRI.getRegClass(AArch64::FPR64RegClassID)) &&
5050
"Subclass not added?");
5151
assert(RBFPR.getSize() == 512 &&
5252
"FPRs should hold up to 512-bit via QQQQ sequence");
@@ -56,7 +56,7 @@ AArch64RegisterBankInfo::AArch64RegisterBankInfo(const TargetRegisterInfo &TRI)
5656
addRegBankCoverage(AArch64::CCRRegBankID, AArch64::CCRRegClassID, TRI);
5757
const RegisterBank &RBCCR = getRegBank(AArch64::CCRRegBankID);
5858
(void)RBCCR;
59-
assert(RBCCR.contains(*TRI.getRegClass(AArch64::CCRRegClassID)) &&
59+
assert(RBCCR.covers(*TRI.getRegClass(AArch64::CCRRegClassID)) &&
6060
"Class not added?");
6161
assert(RBCCR.getSize() == 32 && "CCR should hold up to 32-bit");
6262

0 commit comments

Comments
 (0)