Skip to content

Commit c66c15a

Browse files
KanRobertKanRobert
committed
[X86] Rename some variables for memory fold and format code, NFCI
1. Rename the names of tables to simplify the print 2. Align the abbreviation in the same file Instr -> Inst 3. Clang-format 4. Capitalize the first char of the variable name
1 parent 4142a64 commit c66c15a

File tree

3 files changed

+95
-95
lines changed

3 files changed

+95
-95
lines changed

‎llvm/lib/Target/X86/X86InstrFoldTables.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ using namespace llvm;
2323
// are currently emitted in X86GenInstrInfo.inc in alphabetical order. Which
2424
// makes sorting these tables a simple matter of alphabetizing the table.
2525
#include "X86GenFoldTables.inc"
26-
static const X86MemoryFoldTableEntry BroadcastFoldTable2[] = {
26+
static const X86MemoryFoldTableEntry BroadcastTable2[] = {
2727
{ X86::VADDPDZ128rr, X86::VADDPDZ128rmb, TB_BCAST_SD },
2828
{ X86::VADDPDZ256rr, X86::VADDPDZ256rmb, TB_BCAST_SD },
2929
{ X86::VADDPDZrr, X86::VADDPDZrmb, TB_BCAST_SD },
@@ -200,7 +200,7 @@ static const X86MemoryFoldTableEntry BroadcastFoldTable2[] = {
200200
{ X86::VXORPSZrr, X86::VXORPSZrmb, TB_BCAST_SS },
201201
};
202202

203-
static const X86MemoryFoldTableEntry BroadcastFoldTable3[] = {
203+
static const X86MemoryFoldTableEntry BroadcastTable3[] = {
204204
{ X86::VFMADD132PDZ128r, X86::VFMADD132PDZ128mb, TB_BCAST_SD },
205205
{ X86::VFMADD132PDZ256r, X86::VFMADD132PDZ256mb, TB_BCAST_SD },
206206
{ X86::VFMADD132PDZr, X86::VFMADD132PDZmb, TB_BCAST_SD },
@@ -319,7 +319,7 @@ static const X86MemoryFoldTableEntry BroadcastFoldTable3[] = {
319319

320320
// Table to map instructions safe to broadcast using a different width from the
321321
// element width.
322-
static const X86MemoryFoldTableEntry BroadcastSizeFoldTable2[] = {
322+
static const X86MemoryFoldTableEntry BroadcastSizeTable2[] = {
323323
{ X86::VANDNPDZ128rr, X86::VANDNPSZ128rmb, TB_BCAST_SS },
324324
{ X86::VANDNPDZ256rr, X86::VANDNPSZ256rmb, TB_BCAST_SS },
325325
{ X86::VANDNPDZrr, X86::VANDNPSZrmb, TB_BCAST_SS },
@@ -370,7 +370,7 @@ static const X86MemoryFoldTableEntry BroadcastSizeFoldTable2[] = {
370370
{ X86::VXORPSZrr, X86::VXORPDZrmb, TB_BCAST_SD },
371371
};
372372

373-
static const X86MemoryFoldTableEntry BroadcastSizeFoldTable3[] = {
373+
static const X86MemoryFoldTableEntry BroadcastSizeTable3[] = {
374374
{ X86::VPTERNLOGDZ128rri, X86::VPTERNLOGQZ128rmbi, TB_BCAST_Q },
375375
{ X86::VPTERNLOGDZ256rri, X86::VPTERNLOGQZ256rmbi, TB_BCAST_Q },
376376
{ X86::VPTERNLOGDZrri, X86::VPTERNLOGQZrmbi, TB_BCAST_Q },
@@ -391,16 +391,16 @@ lookupFoldTableImpl(ArrayRef<X86MemoryFoldTableEntry> Table, unsigned RegOp) {
391391
// Make sure the tables are sorted.
392392
static std::atomic<bool> FoldTablesChecked(false);
393393
if (!FoldTablesChecked.load(std::memory_order_relaxed)) {
394-
CHECK_SORTED_UNIQUE(MemoryFoldTable2Addr)
395-
CHECK_SORTED_UNIQUE(MemoryFoldTable0)
396-
CHECK_SORTED_UNIQUE(MemoryFoldTable1)
397-
CHECK_SORTED_UNIQUE(MemoryFoldTable2)
398-
CHECK_SORTED_UNIQUE(MemoryFoldTable3)
399-
CHECK_SORTED_UNIQUE(MemoryFoldTable4)
400-
CHECK_SORTED_UNIQUE(BroadcastFoldTable2)
401-
CHECK_SORTED_UNIQUE(BroadcastFoldTable3)
402-
CHECK_SORTED_UNIQUE(BroadcastSizeFoldTable2)
403-
CHECK_SORTED_UNIQUE(BroadcastSizeFoldTable3)
394+
CHECK_SORTED_UNIQUE(Table2Addr)
395+
CHECK_SORTED_UNIQUE(Table0)
396+
CHECK_SORTED_UNIQUE(Table1)
397+
CHECK_SORTED_UNIQUE(Table2)
398+
CHECK_SORTED_UNIQUE(Table3)
399+
CHECK_SORTED_UNIQUE(Table4)
400+
CHECK_SORTED_UNIQUE(BroadcastTable2)
401+
CHECK_SORTED_UNIQUE(BroadcastTable3)
402+
CHECK_SORTED_UNIQUE(BroadcastSizeTable2)
403+
CHECK_SORTED_UNIQUE(BroadcastSizeTable3)
404404
FoldTablesChecked.store(true, std::memory_order_relaxed);
405405
}
406406
#endif
@@ -414,22 +414,22 @@ lookupFoldTableImpl(ArrayRef<X86MemoryFoldTableEntry> Table, unsigned RegOp) {
414414

415415
const X86MemoryFoldTableEntry *
416416
llvm::lookupTwoAddrFoldTable(unsigned RegOp) {
417-
return lookupFoldTableImpl(MemoryFoldTable2Addr, RegOp);
417+
return lookupFoldTableImpl(Table2Addr, RegOp);
418418
}
419419

420420
const X86MemoryFoldTableEntry *
421421
llvm::lookupFoldTable(unsigned RegOp, unsigned OpNum) {
422422
ArrayRef<X86MemoryFoldTableEntry> FoldTable;
423423
if (OpNum == 0)
424-
FoldTable = ArrayRef(MemoryFoldTable0);
424+
FoldTable = ArrayRef(Table0);
425425
else if (OpNum == 1)
426-
FoldTable = ArrayRef(MemoryFoldTable1);
426+
FoldTable = ArrayRef(Table1);
427427
else if (OpNum == 2)
428-
FoldTable = ArrayRef(MemoryFoldTable2);
428+
FoldTable = ArrayRef(Table2);
429429
else if (OpNum == 3)
430-
FoldTable = ArrayRef(MemoryFoldTable3);
430+
FoldTable = ArrayRef(Table3);
431431
else if (OpNum == 4)
432-
FoldTable = ArrayRef(MemoryFoldTable4);
432+
FoldTable = ArrayRef(Table4);
433433
else
434434
return nullptr;
435435

@@ -445,36 +445,36 @@ struct X86MemUnfoldTable {
445445
std::vector<X86MemoryFoldTableEntry> Table;
446446

447447
X86MemUnfoldTable() {
448-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable2Addr)
448+
for (const X86MemoryFoldTableEntry &Entry : Table2Addr)
449449
// Index 0, folded load and store, no alignment requirement.
450450
addTableEntry(Entry, TB_INDEX_0 | TB_FOLDED_LOAD | TB_FOLDED_STORE);
451451

452-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable0)
452+
for (const X86MemoryFoldTableEntry &Entry : Table0)
453453
// Index 0, mix of loads and stores.
454454
addTableEntry(Entry, TB_INDEX_0);
455455

456-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable1)
456+
for (const X86MemoryFoldTableEntry &Entry : Table1)
457457
// Index 1, folded load
458458
addTableEntry(Entry, TB_INDEX_1 | TB_FOLDED_LOAD);
459459

460-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable2)
460+
for (const X86MemoryFoldTableEntry &Entry : Table2)
461461
// Index 2, folded load
462462
addTableEntry(Entry, TB_INDEX_2 | TB_FOLDED_LOAD);
463463

464-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable3)
464+
for (const X86MemoryFoldTableEntry &Entry : Table3)
465465
// Index 3, folded load
466466
addTableEntry(Entry, TB_INDEX_3 | TB_FOLDED_LOAD);
467467

468-
for (const X86MemoryFoldTableEntry &Entry : MemoryFoldTable4)
468+
for (const X86MemoryFoldTableEntry &Entry : Table4)
469469
// Index 4, folded load
470470
addTableEntry(Entry, TB_INDEX_4 | TB_FOLDED_LOAD);
471471

472472
// Broadcast tables.
473-
for (const X86MemoryFoldTableEntry &Entry : BroadcastFoldTable2)
473+
for (const X86MemoryFoldTableEntry &Entry : BroadcastTable2)
474474
// Index 2, folded broadcast
475475
addTableEntry(Entry, TB_INDEX_2 | TB_FOLDED_LOAD | TB_FOLDED_BCAST);
476476

477-
for (const X86MemoryFoldTableEntry &Entry : BroadcastFoldTable3)
477+
for (const X86MemoryFoldTableEntry &Entry : BroadcastTable3)
478478
// Index 3, folded broadcast
479479
addTableEntry(Entry, TB_INDEX_3 | TB_FOLDED_LOAD | TB_FOLDED_BCAST);
480480

@@ -516,7 +516,7 @@ struct X86MemBroadcastFoldTable {
516516

517517
X86MemBroadcastFoldTable() {
518518
// Broadcast tables.
519-
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastFoldTable2) {
519+
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastTable2) {
520520
unsigned RegOp = Reg2Bcst.KeyOp;
521521
unsigned BcstOp = Reg2Bcst.DstOp;
522522
if (const X86MemoryFoldTableEntry *Reg2Mem = lookupFoldTable(RegOp, 2)) {
@@ -526,7 +526,7 @@ struct X86MemBroadcastFoldTable {
526526
Table.push_back({MemOp, BcstOp, Flags});
527527
}
528528
}
529-
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastSizeFoldTable2) {
529+
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastSizeTable2) {
530530
unsigned RegOp = Reg2Bcst.KeyOp;
531531
unsigned BcstOp = Reg2Bcst.DstOp;
532532
if (const X86MemoryFoldTableEntry *Reg2Mem = lookupFoldTable(RegOp, 2)) {
@@ -537,7 +537,7 @@ struct X86MemBroadcastFoldTable {
537537
}
538538
}
539539

540-
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastFoldTable3) {
540+
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastTable3) {
541541
unsigned RegOp = Reg2Bcst.KeyOp;
542542
unsigned BcstOp = Reg2Bcst.DstOp;
543543
if (const X86MemoryFoldTableEntry *Reg2Mem = lookupFoldTable(RegOp, 3)) {
@@ -547,7 +547,7 @@ struct X86MemBroadcastFoldTable {
547547
Table.push_back({MemOp, BcstOp, Flags});
548548
}
549549
}
550-
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastSizeFoldTable3) {
550+
for (const X86MemoryFoldTableEntry &Reg2Bcst : BroadcastSizeTable3) {
551551
unsigned RegOp = Reg2Bcst.KeyOp;
552552
unsigned BcstOp = Reg2Bcst.DstOp;
553553
if (const X86MemoryFoldTableEntry *Reg2Mem = lookupFoldTable(RegOp, 3)) {

‎llvm/test/TableGen/x86-fold-tables.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
static const X86MemoryFoldTableEntry MemoryFoldTable2Addr[] = {
1+
static const X86MemoryFoldTableEntry Table2Addr[] = {
22
{X86::ADD16ri_DB, X86::ADD16mi, TB_NO_REVERSE},
33
{X86::ADD16rr_DB, X86::ADD16mr, TB_NO_REVERSE},
44
{X86::ADD32ri_DB, X86::ADD32mi, TB_NO_REVERSE},
@@ -214,7 +214,7 @@ static const X86MemoryFoldTableEntry MemoryFoldTable2Addr[] = {
214214
{X86::XOR8rr, X86::XOR8mr, TB_NO_REVERSE},
215215
};
216216

217-
static const X86MemoryFoldTableEntry MemoryFoldTable0[] = {
217+
static const X86MemoryFoldTableEntry Table0[] = {
218218
{X86::BT16ri8, X86::BT16mi8, TB_FOLDED_LOAD},
219219
{X86::BT32ri8, X86::BT32mi8, TB_FOLDED_LOAD},
220220
{X86::BT64ri8, X86::BT64mi8, TB_FOLDED_LOAD},
@@ -407,7 +407,7 @@ static const X86MemoryFoldTableEntry MemoryFoldTable0[] = {
407407
{X86::VPMOVWBZrr, X86::VPMOVWBZmr, TB_FOLDED_STORE},
408408
};
409409

410-
static const X86MemoryFoldTableEntry MemoryFoldTable1[] = {
410+
static const X86MemoryFoldTableEntry Table1[] = {
411411
{X86::AESIMCrr, X86::AESIMCrm, TB_ALIGN_16},
412412
{X86::AESKEYGENASSIST128rr, X86::AESKEYGENASSIST128rm, TB_ALIGN_16},
413413
{X86::BEXTR32rr, X86::BEXTR32rm, 0},
@@ -1294,7 +1294,7 @@ static const X86MemoryFoldTableEntry MemoryFoldTable1[] = {
12941294
{X86::VUCOMISSrr_Int, X86::VUCOMISSrm_Int, TB_NO_REVERSE},
12951295
};
12961296

1297-
static const X86MemoryFoldTableEntry MemoryFoldTable2[] = {
1297+
static const X86MemoryFoldTableEntry Table2[] = {
12981298
{X86::ADD16rr_DB, X86::ADD16rm, TB_NO_REVERSE},
12991299
{X86::ADD32rr_DB, X86::ADD32rm, TB_NO_REVERSE},
13001300
{X86::ADD64rr_DB, X86::ADD64rm, TB_NO_REVERSE},
@@ -3251,7 +3251,7 @@ static const X86MemoryFoldTableEntry MemoryFoldTable2[] = {
32513251
{X86::XORPSrr, X86::XORPSrm, TB_ALIGN_16},
32523252
};
32533253

3254-
static const X86MemoryFoldTableEntry MemoryFoldTable3[] = {
3254+
static const X86MemoryFoldTableEntry Table3[] = {
32553255
{X86::VADDPDZ128rrkz, X86::VADDPDZ128rmkz, 0},
32563256
{X86::VADDPDZ256rrkz, X86::VADDPDZ256rmkz, 0},
32573257
{X86::VADDPDZrrkz, X86::VADDPDZrmkz, 0},
@@ -4861,7 +4861,7 @@ static const X86MemoryFoldTableEntry MemoryFoldTable3[] = {
48614861
{X86::VXORPSZrrkz, X86::VXORPSZrmkz, 0},
48624862
};
48634863

4864-
static const X86MemoryFoldTableEntry MemoryFoldTable4[] = {
4864+
static const X86MemoryFoldTableEntry Table4[] = {
48654865
{X86::VADDPDZ128rrk, X86::VADDPDZ128rmk, 0},
48664866
{X86::VADDPDZ256rrk, X86::VADDPDZ256rmk, 0},
48674867
{X86::VADDPDZrrk, X86::VADDPDZrmk, 0},

0 commit comments

Comments
 (0)