Skip to content

Commit 6bfca10

Browse files
MacDueMacDue
authored
[AArch64] Tidy up getMemOpInfo cases where Width == Scale (NFC) (llvm#201153)
1 parent e202047 commit 6bfca10

1 file changed

Lines changed: 23 additions & 46 deletions

File tree

‎llvm/lib/Target/AArch64/AArch64InstrInfo.cpp‎

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4588,15 +4588,13 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
45884588
switch (Opcode) {
45894589
// Not a memory operation or something we want to handle.
45904590
default:
4591-
Scale = TypeSize::getFixed(0);
4592-
Width = TypeSize::getFixed(0);
4591+
Scale = Width = TypeSize::getFixed(0);
45934592
MinOffset = MaxOffset = 0;
45944593
return false;
45954594
// LDR / STR
45964595
case AArch64::LDRQui:
45974596
case AArch64::STRQui:
4598-
Scale = TypeSize::getFixed(16);
4599-
Width = TypeSize::getFixed(16);
4597+
Scale = Width = TypeSize::getFixed(16);
46004598
MinOffset = 0;
46014599
MaxOffset = 4095;
46024600
break;
@@ -4605,8 +4603,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
46054603
case AArch64::STRXui:
46064604
case AArch64::STRDui:
46074605
case AArch64::PRFMui:
4608-
Scale = TypeSize::getFixed(8);
4609-
Width = TypeSize::getFixed(8);
4606+
Scale = Width = TypeSize::getFixed(8);
46104607
MinOffset = 0;
46114608
MaxOffset = 4095;
46124609
break;
@@ -4615,8 +4612,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
46154612
case AArch64::LDRSWui:
46164613
case AArch64::STRWui:
46174614
case AArch64::STRSui:
4618-
Scale = TypeSize::getFixed(4);
4619-
Width = TypeSize::getFixed(4);
4615+
Scale = Width = TypeSize::getFixed(4);
46204616
MinOffset = 0;
46214617
MaxOffset = 4095;
46224618
break;
@@ -4626,8 +4622,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
46264622
case AArch64::LDRSHXui:
46274623
case AArch64::STRHui:
46284624
case AArch64::STRHHui:
4629-
Scale = TypeSize::getFixed(2);
4630-
Width = TypeSize::getFixed(2);
4625+
Scale = Width = TypeSize::getFixed(2);
46314626
MinOffset = 0;
46324627
MaxOffset = 4095;
46334628
break;
@@ -4637,8 +4632,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
46374632
case AArch64::LDRSBXui:
46384633
case AArch64::STRBui:
46394634
case AArch64::STRBBui:
4640-
Scale = TypeSize::getFixed(1);
4641-
Width = TypeSize::getFixed(1);
4635+
Scale = Width = TypeSize::getFixed(1);
46424636
MinOffset = 0;
46434637
MaxOffset = 4095;
46444638
break;
@@ -4697,8 +4691,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
46974691
case AArch64::LDRBBpre:
46984692
case AArch64::STRBBpost:
46994693
case AArch64::STRBBpre:
4700-
Scale = TypeSize::getFixed(1);
4701-
Width = TypeSize::getFixed(1);
4694+
Scale = Width = TypeSize::getFixed(1);
47024695
MinOffset = -256;
47034696
MaxOffset = 255;
47044697
break;
@@ -4760,8 +4753,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
47604753
case AArch64::STURBi:
47614754
case AArch64::STURBBi:
47624755
case AArch64::STLURBi:
4763-
Scale = TypeSize::getFixed(1);
4764-
Width = TypeSize::getFixed(1);
4756+
Scale = Width = TypeSize::getFixed(1);
47654757
MinOffset = -256;
47664758
MaxOffset = 255;
47674759
break;
@@ -4849,8 +4841,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
48494841
case AArch64::STZGi:
48504842
case AArch64::STZGPreIndex:
48514843
case AArch64::STZGPostIndex:
4852-
Scale = TypeSize::getFixed(16);
4853-
Width = TypeSize::getFixed(16);
4844+
Scale = Width = TypeSize::getFixed(16);
48544845
MinOffset = -256;
48554846
MaxOffset = 255;
48564847
break;
@@ -4882,8 +4873,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
48824873
break;
48834874
case AArch64::LDR_PXI:
48844875
case AArch64::STR_PXI:
4885-
Scale = TypeSize::getScalable(2);
4886-
Width = TypeSize::getScalable(2);
4876+
Scale = Width = TypeSize::getScalable(2);
48874877
MinOffset = -256;
48884878
MaxOffset = 255;
48894879
break;
@@ -4896,8 +4886,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
48964886
break;
48974887
case AArch64::LDR_ZXI:
48984888
case AArch64::STR_ZXI:
4899-
Scale = TypeSize::getScalable(16);
4900-
Width = TypeSize::getScalable(16);
4889+
Scale = Width = TypeSize::getScalable(16);
49014890
MinOffset = -256;
49024891
MaxOffset = 255;
49034892
break;
@@ -4923,8 +4912,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
49234912
case AArch64::LDNF1D_IMM:
49244913
// A full vectors worth of data
49254914
// Width = mbytes * elements
4926-
Scale = TypeSize::getScalable(16);
4927-
Width = TypeSize::getScalable(16);
4915+
Scale = Width = TypeSize::getScalable(16);
49284916
MinOffset = -8;
49294917
MaxOffset = 7;
49304918
break;
@@ -4976,8 +4964,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
49764964
case AArch64::STNT1W_2Z_STRIDED_IMM:
49774965
case AArch64::STNT1D_2Z_IMM:
49784966
case AArch64::STNT1D_2Z_STRIDED_IMM:
4979-
Scale = TypeSize::getScalable(32);
4980-
Width = TypeSize::getScalable(16 * 2);
4967+
Scale = Width = TypeSize::getScalable(16 * 2);
49814968
MinOffset = -8;
49824969
MaxOffset = 7;
49834970
break;
@@ -4989,8 +4976,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
49894976
case AArch64::ST3H_IMM:
49904977
case AArch64::ST3W_IMM:
49914978
case AArch64::ST3D_IMM:
4992-
Scale = TypeSize::getScalable(48);
4993-
Width = TypeSize::getScalable(16 * 3);
4979+
Scale = Width = TypeSize::getScalable(16 * 3);
49944980
MinOffset = -8;
49954981
MaxOffset = 7;
49964982
break;
@@ -5042,8 +5028,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
50425028
case AArch64::STNT1W_4Z_STRIDED_IMM:
50435029
case AArch64::STNT1D_4Z_IMM:
50445030
case AArch64::STNT1D_4Z_STRIDED_IMM:
5045-
Scale = TypeSize::getScalable(64);
5046-
Width = TypeSize::getScalable(16 * 4);
5031+
Scale = Width = TypeSize::getScalable(16 * 4);
50475032
MinOffset = -8;
50485033
MaxOffset = 7;
50495034
break;
@@ -5064,8 +5049,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
50645049
case AArch64::LDNF1SW_D_IMM:
50655050
// A half vector worth of data
50665051
// Width = mbytes * elements
5067-
Scale = TypeSize::getScalable(8);
5068-
Width = TypeSize::getScalable(8);
5052+
Scale = Width = TypeSize::getScalable(8);
50695053
MinOffset = -8;
50705054
MaxOffset = 7;
50715055
break;
@@ -5081,8 +5065,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
50815065
case AArch64::LDNF1SH_D_IMM:
50825066
// A quarter vector worth of data
50835067
// Width = mbytes * elements
5084-
Scale = TypeSize::getScalable(4);
5085-
Width = TypeSize::getScalable(4);
5068+
Scale = Width = TypeSize::getScalable(4);
50865069
MinOffset = -8;
50875070
MaxOffset = 7;
50885071
break;
@@ -5093,8 +5076,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
50935076
case AArch64::LDNF1SB_D_IMM:
50945077
// A eighth vector worth of data
50955078
// Width = mbytes * elements
5096-
Scale = TypeSize::getScalable(2);
5097-
Width = TypeSize::getScalable(2);
5079+
Scale = Width = TypeSize::getScalable(2);
50985080
MinOffset = -8;
50995081
MaxOffset = 7;
51005082
break;
@@ -5112,8 +5094,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
51125094
case AArch64::STGPi:
51135095
case AArch64::STGPpost:
51145096
case AArch64::STGPpre:
5115-
Scale = TypeSize::getFixed(16);
5116-
Width = TypeSize::getFixed(16);
5097+
Scale = Width = TypeSize::getFixed(16);
51175098
MinOffset = -64;
51185099
MaxOffset = 63;
51195100
break;
@@ -5124,8 +5105,7 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
51245105
case AArch64::LD1RSB_H_IMM:
51255106
case AArch64::LD1RSB_S_IMM:
51265107
case AArch64::LD1RSB_D_IMM:
5127-
Scale = TypeSize::getFixed(1);
5128-
Width = TypeSize::getFixed(1);
5108+
Scale = Width = TypeSize::getFixed(1);
51295109
MinOffset = 0;
51305110
MaxOffset = 63;
51315111
break;
@@ -5134,22 +5114,19 @@ bool AArch64InstrInfo::getMemOpInfo(unsigned Opcode, TypeSize &Scale,
51345114
case AArch64::LD1RH_D_IMM:
51355115
case AArch64::LD1RSH_S_IMM:
51365116
case AArch64::LD1RSH_D_IMM:
5137-
Scale = TypeSize::getFixed(2);
5138-
Width = TypeSize::getFixed(2);
5117+
Scale = Width = TypeSize::getFixed(2);
51395118
MinOffset = 0;
51405119
MaxOffset = 63;
51415120
break;
51425121
case AArch64::LD1RW_IMM:
51435122
case AArch64::LD1RW_D_IMM:
51445123
case AArch64::LD1RSW_IMM:
5145-
Scale = TypeSize::getFixed(4);
5146-
Width = TypeSize::getFixed(4);
5124+
Scale = Width = TypeSize::getFixed(4);
51475125
MinOffset = 0;
51485126
MaxOffset = 63;
51495127
break;
51505128
case AArch64::LD1RD_IMM:
5151-
Scale = TypeSize::getFixed(8);
5152-
Width = TypeSize::getFixed(8);
5129+
Scale = Width = TypeSize::getFixed(8);
51535130
MinOffset = 0;
51545131
MaxOffset = 63;
51555132
break;

0 commit comments

Comments
 (0)